Kouhei Sutou
null+****@clear*****
Sat Apr 4 22:32:22 JST 2015
Kouhei Sutou 2015-04-04 22:32:22 +0900 (Sat, 04 Apr 2015) New Revision: f1cae9e661594351d57a7e2a8460eacf1efef75e https://github.com/groonga/groonga/commit/f1cae9e661594351d57a7e2a8460eacf1efef75e Message: dump: add --dump_indexes option You can disable dumping indexes by "--dump_indexes no". Added files: test/command/suite/dump/schema/dump_indexes_no.expected test/command/suite/dump/schema/dump_indexes_no.test Modified files: lib/proc.c Modified: lib/proc.c (+8 -3) =================================================================== --- lib/proc.c 2015-04-04 22:29:14 +0900 (723a4a7) +++ lib/proc.c 2015-04-04 22:32:22 +0900 (e3ce6e9) @@ -3438,15 +3438,18 @@ proc_dump(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) grn_obj *dump_plugins_raw = VAR(1); grn_obj *dump_schema_raw = VAR(2); grn_obj *dump_records_raw = VAR(3); + grn_obj *dump_indexes_raw = VAR(4); grn_bool is_dump_plugins; grn_bool is_dump_schema; grn_bool is_dump_records; + grn_bool is_dump_indexes; grn_ctx_set_output_type(ctx, GRN_CONTENT_GROONGA_COMMAND_LIST); is_dump_plugins = bool_option_value(dump_plugins_raw, GRN_TRUE); is_dump_schema = bool_option_value(dump_schema_raw, GRN_TRUE); is_dump_records = bool_option_value(dump_records_raw, GRN_TRUE); + is_dump_indexes = bool_option_value(dump_indexes_raw, GRN_TRUE); if (is_dump_plugins) { dump_plugins(ctx, outbuf); @@ -3464,8 +3467,9 @@ proc_dump(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) dump_all_records(ctx, outbuf); } } - - dump_indexes(ctx, outbuf); + if (is_dump_indexes) { + dump_indexes(ctx, outbuf); + } /* remove the last newline because another one will be added by the caller. maybe, the caller of proc functions currently doesn't consider the @@ -6818,7 +6822,8 @@ grn_db_init_builtin_query(grn_ctx *ctx) DEF_VAR(vars[1], "dump_plugins"); DEF_VAR(vars[2], "dump_schema"); DEF_VAR(vars[3], "dump_records"); - DEF_COMMAND("dump", proc_dump, 4, vars); + DEF_VAR(vars[4], "dump_indexes"); + DEF_COMMAND("dump", proc_dump, 5, vars); /* Deprecated. Use "plugin_register" instead. */ DEF_VAR(vars[0], "path"); Added: test/command/suite/dump/schema/dump_indexes_no.expected (+31 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/dump/schema/dump_indexes_no.expected 2015-04-04 22:32:22 +0900 (a1447c6) @@ -0,0 +1,31 @@ +plugin_register token_filters/stop_word +[[0,0.0,0.0],true] +table_create Bookmarks TABLE_HASH_KEY ShortText +[[0,0.0,0.0],true] +column_create Bookmarks title COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Users TABLE_HASH_KEY ShortText +[[0,0.0,0.0],true] +column_create Users name COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Users bookmark COLUMN_SCALAR Bookmarks +[[0,0.0,0.0],true] +column_create Bookmarks user COLUMN_SCALAR Users +[[0,0.0,0.0],true] +table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto +[[0,0.0,0.0],true] +column_create Terms users_name_index COLUMN_INDEX|WITH_POSITION Users name +[[0,0.0,0.0],true] +dump --dump_indexes no +plugin_register token_filters/stop_word + +table_create Bookmarks TABLE_HASH_KEY ShortText +column_create Bookmarks title COLUMN_SCALAR ShortText + +table_create Users TABLE_HASH_KEY ShortText +column_create Users name COLUMN_SCALAR ShortText + +table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto + +column_create Bookmarks user COLUMN_SCALAR Users +column_create Users bookmark COLUMN_SCALAR Bookmarks Added: test/command/suite/dump/schema/dump_indexes_no.test (+17 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/dump/schema/dump_indexes_no.test 2015-04-04 22:32:22 +0900 (85c123b) @@ -0,0 +1,17 @@ +plugin_register token_filters/stop_word + +table_create Bookmarks TABLE_HASH_KEY ShortText +column_create Bookmarks title COLUMN_SCALAR ShortText + +table_create Users TABLE_HASH_KEY ShortText +column_create Users name COLUMN_SCALAR ShortText + +column_create Users bookmark COLUMN_SCALAR Bookmarks +column_create Bookmarks user COLUMN_SCALAR Users + +table_create Terms TABLE_PAT_KEY ShortText \ + --default_tokenizer TokenBigram \ + --normalizer NormalizerAuto +column_create Terms users_name_index COLUMN_INDEX|WITH_POSITION Users name + +dump --dump_indexes no -------------- next part -------------- HTML����������������������������...Download