This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Tarantool -- an efficient key/value data store".
The branch core-error-reporting has been updated
via cfbe355884c4a88ed596c11d770452cf7c1482b4 (commit)
via 5fa44c6e6f646ba3fa8e6a377608186110dd64bd (commit)
via ae9e5ef64f1cc8e0495b02cbf0f46cd86996992d (commit)
via 1419a6e2943fd59099c2e60621dae507a51eda91 (commit)
via ba71da768ad562e3a0c4146521942f8e7b075325 (commit)
via 2e426125285047cd43029903da95ddbe75703d33 (commit)
via 66e5ed9489a7a976e998007438f4503d443b87f6 (commit)
via df298cada5a2adb4892b2e8db01f06dbcf636a18 (commit)
via 9db2803c48c2f2e089c556e861ad12dac8d74f88 (commit)
via 87bd27a3758d5f5245ebb2c2002862a94e44b02a (commit)
via 53cb9701ec11a5bdd74959f2b79742f50e91fd74 (commit)
via d8df4aee5b13c7c40808b8783425f17ff0c9a81b (commit)
via 3ef3176a37b12368b742ba05b831beea4c6db8ea (commit)
via 07dc47fa277f46f4e422823b142c0bb66ea21f92 (commit)
via bbca430955345a57b8111eb53049211164faa130 (commit)
via cf9cc2df9f9bfa979425d922aeae22d2f5a71664 (commit)
via 44f5399b490759ee47c34bf3ed01d08d381d167e (commit)
via c06cda26cf897423f85ba7cad0e68ef54104186a (commit)
via 44d0c1ca72506fffb8801c523c090bfac73779bd (commit)
via 3e544aac4d63cfc7d1436fbd187d2da46eafe1a2 (commit)
via 60f28f1bcb27dd977a1f8409e8d1cf2740a44844 (commit)
via a2bd93f68da0334bd621b91439c33710404607fa (commit)
via f7bbe259d425025cb33281f650160172f06cff18 (commit)
via 9298278ebf4940e54a6fd0d497c82af1dc716412 (commit)
via dd0aafb406e917f46b92aebbdba53454c182ef44 (commit)
via dbf7c101a499bb5ebaee47b2c88741f43a42f769 (commit)
via f7e3f794b94898724dc4f718098e89db54edf93e (commit)
via 1a9bd036e09cf3fdba12d6a70a5365dd14fecac3 (commit)
via 6039c2e086d265c073a125c6878dff889ef5579d (commit)
via a4d75a661820c7864a770d1d8191ec5e218ecdaf (commit)
via aba07b3511dcc10e3f0a1d7f5bc0ec8aa2950fd9 (commit)
via 922a27bf240e472299e93fa452ab0988fa42a424 (commit)
from 8cf4386e7998ac6cc00c97cfa15ae2e0c7649f50 (commit)
Summary of changes:
.gitignore | 10 +-
Makefile | 5 +
core/tarantool.c | 40 +-
doc/silverbox-protocol.txt | 424 ++++++++++++++----
mod/silverbox/Makefile | 1 +
mod/silverbox/assoc.h | 11 +-
mod/silverbox/box.c | 522 +--------------------
mod/silverbox/box.h | 77 +---
mod/silverbox/client/perl/lib/MR/SilverBox.pm | 2 +-
mod/silverbox/index.c | 607 +++++++++++++++++++++++++
mod/silverbox/{box.h => index.h} | 139 ++-----
mod/silverbox/memcached.c | 4 +-
mod/silverbox/memcached.rl | 4 +-
mod/silverbox/t/box.pl | 35 ++-
scripts/rules.mk | 1 +
scripts/run_test.sh | 8 +-
test/Makefile | 3 +
test/admin.py | 112 +++++
test/box/args.result | 31 ++
test/box/args.test | 12 +
test/box/show.result | Bin 0 -> 2180 bytes
test/box/show.test | 19 +
test/box/suite.ini | 3 +
test/box/tarantool.cfg | 16 +
test/lib/admin.py | 90 ++++
test/lib/tarantool_preprocessor.py | 63 +++
test/lib/tarantool_silverbox_server.py | 134 ++++++
test/lib/test_suite.py | 249 ++++++++++
test/run | 1 +
test/test-run.py | 141 ++++++
third_party/gopt/gopt.c | 28 +-
third_party/gopt/gopt.h | 38 +-
32 files changed, 2024 insertions(+), 806 deletions(-)
create mode 100644 mod/silverbox/index.c
copy mod/silverbox/{box.h => index.h} (55%)
create mode 100644 test/Makefile
create mode 100755 test/admin.py
create mode 100644 test/box/args.result
create mode 100644 test/box/args.test
create mode 100644 test/box/show.result
create mode 100644 test/box/show.test
create mode 100644 test/box/suite.ini
create mode 100644 test/box/tarantool.cfg
create mode 100644 test/lib/__init__.py
create mode 100644 test/lib/admin.py
create mode 100644 test/lib/tarantool_preprocessor.py
create mode 100644 test/lib/tarantool_silverbox_server.py
create mode 100644 test/lib/test_suite.py
create mode 120000 test/run
create mode 100755 test/test-run.py
commit cfbe355884c4a88ed596c11d770452cf7c1482b4
Merge: 8cf4386 5fa44c6
Author: Konstantin Osipov <[email protected]>
Date: Mon Dec 20 20:55:31 2010 +0300
Merge branch 'core-help' into core-error-reporting
Conflicts:
core/tarantool.c
mod/silverbox/box.c
Resolve conflicts manually. Update tests.
diff --cc core/tarantool.c
index f8ece3a,05d23e4..190738a
--- a/core/tarantool.c
+++ b/core/tarantool.c
@@@ -54,11 -54,11 +54,12 @@@
#include <tarantool_version.h>
static pid_t master_pid;
- const char *cfg_filename = "tarantool.cfg";
+ #define DEFAULT_CFG_FILENAME "tarantool.cfg"
+ const char *cfg_filename = DEFAULT_CFG_FILENAME;
+char *binary_filename;
struct tarantool_cfg cfg;
-bool init_storage;
+bool init_storage, booting = true;
extern int daemonize(int nochdir, int noclose);
@@@ -236,27 -238,30 +237,31 @@@ main(int argc, char **argv
palloc_init();
const void *opt_def =
- gopt_start(gopt_option('h', 0, gopt_shorts('h', '?'),
gopt_longs("help"),
- NULL, "display this help"),
- gopt_option('c', GOPT_ARG, gopt_shorts('c'),
gopt_longs("config"),
- "=<filename>", "path to config file"),
- gopt_option('v', 0, gopt_shorts('V'),
gopt_longs("version"),
- NULL, "print version"),
+ gopt_start(
+ gopt_option('g', GOPT_ARG, gopt_shorts(0),
+ gopt_longs("cfg-get",
"cfg_get"),
+ "=KEY", "return a value from
configuration file described by KEY"),
+ gopt_option('c', GOPT_ARG, gopt_shorts('c'),
+ gopt_longs("config"),
+ "=FILE", "path to
configuration file (default: " DEFAULT_CFG_FILENAME ")"),
#ifdef STORAGE
gopt_option('C', 0, gopt_shorts(0),
gopt_longs("cat"),
- "=<filename>", "cat file to stdout in
readable format"),
- gopt_option('I', 0, gopt_shorts(0),
gopt_longs("init_storage", "init-storage"),
- NULL, "initialize storage"),
+ "=FILE", "cat snapshot file
to stdout in readable format and exit"),
+ gopt_option('I', 0, gopt_shorts(0),
+ gopt_longs("init-storage",
"init_storage"),
+ NULL, "initialize storage
(an empty snapshot file) and exit"),
#endif
gopt_option('v', 0, gopt_shorts('v'),
gopt_longs("verbose"),
- NULL, "increase log level"),
+ NULL, "increase verbosity
level in log messages"),
gopt_option('D', 0, gopt_shorts('D'),
gopt_longs("daemonize"),
- NULL, "daemonize"),
- gopt_option('g', GOPT_ARG, gopt_shorts(0),
gopt_longs("cfg_get", "cfg-get"),
- "=<key>", "return value from config
described by key"));
+ NULL, "redirect input/output
streams to a log file and run as daemon"),
+ gopt_option('h', 0, gopt_shorts('h', '?'), gopt_longs("help"),
+ NULL, "display this help and
exit"),
+ gopt_option('V', 0, gopt_shorts('V'),
gopt_longs("version"),
+ NULL, "print program version
and exit"));
void *opt = gopt_sort(&argc, (const char **)argv, opt_def);
+ binary_filename = argv[0];
if (gopt(opt, 'V')){
puts(tarantool_version());
diff --cc test/box/args.result
index 0000000,21d9c9b..8a14d8c
mode 000000,100644..100644
--- a/test/box/args.result
+++ b/test/box/args.result
@@@ -1,0 -1,31 +1,31 @@@
+ tarantool_silverbox --no-such-option
+ tarantool_silverbox: --no-such-option: unknown option
+
+ tarantool_silverbox --help
+ Tarantool -- an efficient in-memory data store.
+ Usage: tarantool_silverbox [OPTIONS]
+
+ --cfg-get=KEY return a value from configuration file described
by KEY
+ -c, --config=FILE path to configuration file (default:
tarantool.cfg)
+ --cat=FILE cat snapshot file to stdout in readable format
and exit
+ --init-storage initialize storage (an empty snapshot file) and
exit
+ -v, --verbose increase verbosity level in log messages
+ -D, --daemonize redirect input/output streams to a log file and
run as daemon
+ -h, --help display this help and exit
+ -V, --version print program version and exit
+
+ Please visit project home page at http:tarantool
+ to see online documentation, submit bugs or contribute a patch.
+
+ tarantool_silverbox --config
+ tarantool_silverbox: --config: option requires an option argument
+
+ tarantool_silverbox --config tarantool.cfg
-<time> <pid> 0/(null) _ F> PANIC tarantool.c:deamon is running
++tarantool_silverbox: i am already running
+
+ tarantool_silverbox --daemonize
-<time> <pid> 0/(null) _ F> PANIC tarantool.c:deamon is running
++tarantool_silverbox: i am already running
+
+ tarantool_silverbox --version
+ 1.3.minor-<rev>-<commit>
+
--
Tarantool -- an efficient key/value data store
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
