Kouhei Sutou
null+****@clear*****
Fri Dec 21 10:01:33 JST 2012
Kouhei Sutou 2012-12-21 10:01:33 +0900 (Fri, 21 Dec 2012) New Revision: c4a8deaa4990020468bdfc88ab7f92080e80269d https://github.com/groonga/groonga/commit/c4a8deaa4990020468bdfc88ab7f92080e80269d Log: table_list: add missing default_tokenizer and normalizer headers Modified files: lib/proc.c test/command/suite/table_list/flags/default.expected test/command/suite/table_list/flags/key_normalize.expected test/command/suite/table_list/flags/key_with_sis.expected test/command/suite/table_list/flags/table_dat_key.expected test/command/suite/table_list/flags/table_hash_key.expected test/command/suite/table_list/flags/table_pat_key.expected test/command/suite/table_list/multi_tables.expected test/command/suite/table_list/one_table.expected test/command/suite/table_list/zero_table.expected Modified: lib/proc.c (+9 -1) =================================================================== --- lib/proc.c 2012-12-21 09:57:29 +0900 (16befb3) +++ lib/proc.c 2012-12-21 10:01:33 +0900 (e2cfa68) @@ -1635,7 +1635,7 @@ proc_table_list(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_dat n_top_level_elements = n_elements_for_header + n_tables; GRN_OUTPUT_ARRAY_OPEN("TABLE_LIST", n_top_level_elements); - GRN_OUTPUT_ARRAY_OPEN("HEADER", 6); + GRN_OUTPUT_ARRAY_OPEN("HEADER", 8); GRN_OUTPUT_ARRAY_OPEN("PROPERTY", 2); GRN_OUTPUT_CSTR("id"); GRN_OUTPUT_CSTR("UInt32"); @@ -1660,6 +1660,14 @@ proc_table_list(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_dat GRN_OUTPUT_CSTR("range"); GRN_OUTPUT_CSTR("ShortText"); GRN_OUTPUT_ARRAY_CLOSE(); + GRN_OUTPUT_ARRAY_OPEN("PROPERTY", 2); + GRN_OUTPUT_CSTR("default_tokenizer"); + GRN_OUTPUT_CSTR("ShortText"); + GRN_OUTPUT_ARRAY_CLOSE(); + GRN_OUTPUT_ARRAY_OPEN("PROPERTY", 2); + GRN_OUTPUT_CSTR("normalizer"); + GRN_OUTPUT_CSTR("ShortText"); + GRN_OUTPUT_ARRAY_CLOSE(); GRN_OUTPUT_ARRAY_CLOSE(); for (i = 0; i < n_tables; i++) { Modified: test/command/suite/table_list/flags/default.expected (+8 -0) =================================================================== --- test/command/suite/table_list/flags/default.expected 2012-12-21 09:57:29 +0900 (319724a) +++ test/command/suite/table_list/flags/default.expected 2012-12-21 10:01:33 +0900 (b3f1368) @@ -32,6 +32,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ], [ Modified: test/command/suite/table_list/flags/key_normalize.expected (+8 -0) =================================================================== --- test/command/suite/table_list/flags/key_normalize.expected 2012-12-21 09:57:29 +0900 (82ad707) +++ test/command/suite/table_list/flags/key_normalize.expected 2012-12-21 10:01:33 +0900 (c2dbf83) @@ -32,6 +32,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ], [ Modified: test/command/suite/table_list/flags/key_with_sis.expected (+8 -0) =================================================================== --- test/command/suite/table_list/flags/key_with_sis.expected 2012-12-21 09:57:29 +0900 (48e1729) +++ test/command/suite/table_list/flags/key_with_sis.expected 2012-12-21 10:01:33 +0900 (425cc58) @@ -32,6 +32,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ], [ Modified: test/command/suite/table_list/flags/table_dat_key.expected (+8 -0) =================================================================== --- test/command/suite/table_list/flags/table_dat_key.expected 2012-12-21 09:57:29 +0900 (ea4188d) +++ test/command/suite/table_list/flags/table_dat_key.expected 2012-12-21 10:01:33 +0900 (76f4a04) @@ -32,6 +32,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ], [ Modified: test/command/suite/table_list/flags/table_hash_key.expected (+8 -0) =================================================================== --- test/command/suite/table_list/flags/table_hash_key.expected 2012-12-21 09:57:29 +0900 (642de09) +++ test/command/suite/table_list/flags/table_hash_key.expected 2012-12-21 10:01:33 +0900 (0f30fdf) @@ -32,6 +32,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ], [ Modified: test/command/suite/table_list/flags/table_pat_key.expected (+8 -0) =================================================================== --- test/command/suite/table_list/flags/table_pat_key.expected 2012-12-21 09:57:29 +0900 (c27c787) +++ test/command/suite/table_list/flags/table_pat_key.expected 2012-12-21 10:01:33 +0900 (96e138f) @@ -32,6 +32,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ], [ Modified: test/command/suite/table_list/multi_tables.expected (+8 -0) =================================================================== --- test/command/suite/table_list/multi_tables.expected 2012-12-21 09:57:29 +0900 (40591f7) +++ test/command/suite/table_list/multi_tables.expected 2012-12-21 10:01:33 +0900 (93b6f2b) @@ -34,6 +34,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ], [ Modified: test/command/suite/table_list/one_table.expected (+8 -0) =================================================================== --- test/command/suite/table_list/one_table.expected 2012-12-21 09:57:29 +0900 (9aef4c5) +++ test/command/suite/table_list/one_table.expected 2012-12-21 10:01:33 +0900 (8a8d206) @@ -32,6 +32,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ], [ Modified: test/command/suite/table_list/zero_table.expected (+8 -0) =================================================================== --- test/command/suite/table_list/zero_table.expected 2012-12-21 09:57:29 +0900 (133b205) +++ test/command/suite/table_list/zero_table.expected 2012-12-21 10:01:33 +0900 (306da0a) @@ -30,6 +30,14 @@ table_list [ "range", "ShortText" + ], + [ + "default_tokenizer", + "ShortText" + ], + [ + "normalizer", + "ShortText" ] ] ] -------------- next part -------------- HTML����������������������������... Download