Kouhei Sutou
null+****@clear*****
Tue Oct 20 11:27:33 JST 2015
Kouhei Sutou 2015-10-20 11:27:33 +0900 (Tue, 20 Oct 2015) New Revision: e0349be9ba00b507596bddaa2d923e0e03fde4b4 https://github.com/groonga/groonga/commit/e0349be9ba00b507596bddaa2d923e0e03fde4b4 Message: schema: support tokenizer Modified files: lib/proc.c test/command/suite/schema/tables/array.expected test/command/suite/schema/tables/hash_table.expected test/command/suite/schema/tables/value_type/reference.expected test/command/suite/schema/tables/value_type/type.expected Modified: lib/proc.c (+12 -1) =================================================================== --- lib/proc.c 2015-10-20 11:21:06 +0900 (ac16aff) +++ lib/proc.c 2015-10-20 11:27:33 +0900 (26edd23) @@ -7531,6 +7531,14 @@ proc_schema_table_output_value_type(grn_ctx *ctx, grn_obj *table) } static void +proc_schema_table_output_tokenizer(grn_ctx *ctx, grn_obj *table) +{ + grn_obj *tokenizer; + tokenizer = grn_obj_get_info(ctx, table, GRN_INFO_DEFAULT_TOKENIZER, NULL); + proc_schema_output_name(ctx, tokenizer); +} + +static void proc_schema_tables(grn_ctx *ctx) { grn_obj tables; @@ -7551,7 +7559,7 @@ proc_schema_tables(grn_ctx *ctx) proc_schema_output_name(ctx, table); - GRN_OUTPUT_MAP_OPEN("table", 4); + GRN_OUTPUT_MAP_OPEN("table", 5); GRN_OUTPUT_CSTR("name"); proc_schema_output_name(ctx, table); @@ -7565,6 +7573,9 @@ proc_schema_tables(grn_ctx *ctx) GRN_OUTPUT_CSTR("value_type"); proc_schema_table_output_value_type(ctx, table); + GRN_OUTPUT_CSTR("tokenizer"); + proc_schema_table_output_tokenizer(ctx, table); + GRN_OUTPUT_MAP_CLOSE(); } GRN_OUTPUT_MAP_CLOSE(); Modified: test/command/suite/schema/tables/array.expected (+2 -1) =================================================================== --- test/command/suite/schema/tables/array.expected 2015-10-20 11:21:06 +0900 (a23034e) +++ test/command/suite/schema/tables/array.expected 2015-10-20 11:27:33 +0900 (4bf3bcf) @@ -171,7 +171,8 @@ schema "name": "Logs", "type": "array", "key_type": null, - "value_type": null + "value_type": null, + "tokenizer": null } } } Modified: test/command/suite/schema/tables/hash_table.expected (+2 -1) =================================================================== --- test/command/suite/schema/tables/hash_table.expected 2015-10-20 11:21:06 +0900 (97afc3e) +++ test/command/suite/schema/tables/hash_table.expected 2015-10-20 11:27:33 +0900 (3714826) @@ -174,7 +174,8 @@ schema "name": "ShortText", "type": "type" }, - "value_type": null + "value_type": null, + "tokenizer": null } } } Modified: test/command/suite/schema/tables/value_type/reference.expected (+4 -2) =================================================================== --- test/command/suite/schema/tables/value_type/reference.expected 2015-10-20 11:21:06 +0900 (a94b42a) +++ test/command/suite/schema/tables/value_type/reference.expected 2015-10-20 11:27:33 +0900 (f71ea27) @@ -176,7 +176,8 @@ schema "value_type": { "name": "Users", "type": "reference" - } + }, + "tokenizer": null }, "Users": { "name": "Users", @@ -185,7 +186,8 @@ schema "name": "ShortText", "type": "type" }, - "value_type": null + "value_type": null, + "tokenizer": null } } } Modified: test/command/suite/schema/tables/value_type/type.expected (+2 -1) =================================================================== --- test/command/suite/schema/tables/value_type/type.expected 2015-10-20 11:21:06 +0900 (2a7d32c) +++ test/command/suite/schema/tables/value_type/type.expected 2015-10-20 11:27:33 +0900 (77e82a2) @@ -174,7 +174,8 @@ schema "value_type": { "name": "Int32", "type": "type" - } + }, + "tokenizer": null } } } -------------- next part -------------- HTML����������������������������...Download