Kouhei Sutou
null+****@clear*****
Tue Oct 20 12:41:51 JST 2015
Kouhei Sutou 2015-10-20 12:41:51 +0900 (Tue, 20 Oct 2015) New Revision: 72747a3c7e6c61f50b8115a2c12fa82baa12112a https://github.com/groonga/groonga/commit/72747a3c7e6c61f50b8115a2c12fa82baa12112a Message: schema: support token filters Modified files: lib/proc.c test/command/suite/schema/plugins.expected test/command/suite/schema/tables/normalizer.expected test/command/suite/schema/tables/token_filters.expected test/command/suite/schema/tables/tokenizer.expected test/command/suite/schema/tables/type/array.expected test/command/suite/schema/tables/type/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 (+35 -1) =================================================================== --- lib/proc.c 2015-10-20 12:41:30 +0900 (3565891) +++ lib/proc.c 2015-10-20 12:41:51 +0900 (eacf16d) @@ -7444,6 +7444,39 @@ proc_schema_output_normalizers(grn_ctx *ctx) GRN_OBJ_FIN(ctx, &normalizers); } +static void +proc_schema_output_token_filters(grn_ctx *ctx) +{ + grn_obj token_filters; + int i, n; + + GRN_PTR_INIT(&token_filters, GRN_OBJ_VECTOR, GRN_DB_OBJECT); + + grn_ctx_get_all_token_filters(ctx, &token_filters); + + GRN_OUTPUT_CSTR("token_filters"); + + n = GRN_BULK_VSIZE(&token_filters) / sizeof(grn_obj *); + GRN_OUTPUT_MAP_OPEN("token_filters", n); + for (i = 0; i < n; i++) { + grn_obj *token_filter; + + token_filter = GRN_PTR_VALUE_AT(&token_filters, i); + + proc_schema_output_name(ctx, token_filter); + + GRN_OUTPUT_MAP_OPEN("token_filter", 1); + + GRN_OUTPUT_CSTR("name"); + proc_schema_output_name(ctx, token_filter); + + GRN_OUTPUT_MAP_CLOSE(); + } + GRN_OUTPUT_MAP_CLOSE(); + + GRN_OBJ_FIN(ctx, &token_filters); +} + static const char * proc_schema_table_type_name(grn_ctx *ctx, grn_obj *table) { @@ -7850,11 +7883,12 @@ static grn_obj * proc_schema(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) { - GRN_OUTPUT_MAP_OPEN("schema", 5); + GRN_OUTPUT_MAP_OPEN("schema", 6); proc_schema_output_plugins(ctx); proc_schema_output_types(ctx); proc_schema_output_tokenizers(ctx); proc_schema_output_normalizers(ctx); + proc_schema_output_token_filters(ctx); proc_schema_output_tables(ctx); GRN_OUTPUT_MAP_CLOSE(); Modified: test/command/suite/schema/plugins.expected (+2 -0) =================================================================== --- test/command/suite/schema/plugins.expected 2015-10-20 12:41:30 +0900 (26b5fd5) +++ test/command/suite/schema/plugins.expected 2015-10-20 12:41:51 +0900 (9a425d6) @@ -169,6 +169,8 @@ schema "name": "NormalizerNFKC51" } }, + "token_filters": { + }, "tables": { } } Modified: test/command/suite/schema/tables/normalizer.expected (+2 -0) =================================================================== --- test/command/suite/schema/tables/normalizer.expected 2015-10-20 12:41:30 +0900 (792821b) +++ test/command/suite/schema/tables/normalizer.expected 2015-10-20 12:41:51 +0900 (91216d0) @@ -166,6 +166,8 @@ schema "name": "NormalizerNFKC51" } }, + "token_filters": { + }, "tables": { "Tags": { "name": "Tags", Modified: test/command/suite/schema/tables/token_filters.expected (+5 -3) =================================================================== --- test/command/suite/schema/tables/token_filters.expected 2015-10-20 12:41:30 +0900 (2b2ec38) +++ test/command/suite/schema/tables/token_filters.expected 2015-10-20 12:41:51 +0900 (8d78dcf) @@ -150,9 +150,6 @@ schema "TokenDelimitNull": { "name": "TokenDelimitNull" }, - "TokenFilterStopWord": { - "name": "TokenFilterStopWord" - }, "TokenMecab": { "name": "TokenMecab" }, @@ -174,6 +171,11 @@ schema "name": "NormalizerNFKC51" } }, + "token_filters": { + "TokenFilterStopWord": { + "name": "TokenFilterStopWord" + } + }, "tables": { "Terms": { "name": "Terms", Modified: test/command/suite/schema/tables/tokenizer.expected (+2 -0) =================================================================== --- test/command/suite/schema/tables/tokenizer.expected 2015-10-20 12:41:30 +0900 (056ace3) +++ test/command/suite/schema/tables/tokenizer.expected 2015-10-20 12:41:51 +0900 (06de651) @@ -166,6 +166,8 @@ schema "name": "NormalizerNFKC51" } }, + "token_filters": { + }, "tables": { "Terms": { "name": "Terms", Modified: test/command/suite/schema/tables/type/array.expected (+2 -0) =================================================================== --- test/command/suite/schema/tables/type/array.expected 2015-10-20 12:41:30 +0900 (1adf541) +++ test/command/suite/schema/tables/type/array.expected 2015-10-20 12:41:51 +0900 (dc79219) @@ -166,6 +166,8 @@ schema "name": "NormalizerNFKC51" } }, + "token_filters": { + }, "tables": { "Logs": { "name": "Logs", Modified: test/command/suite/schema/tables/type/hash_table.expected (+2 -0) =================================================================== --- test/command/suite/schema/tables/type/hash_table.expected 2015-10-20 12:41:30 +0900 (e598cbc) +++ test/command/suite/schema/tables/type/hash_table.expected 2015-10-20 12:41:51 +0900 (b735266) @@ -166,6 +166,8 @@ schema "name": "NormalizerNFKC51" } }, + "token_filters": { + }, "tables": { "Users": { "name": "Users", Modified: test/command/suite/schema/tables/value_type/reference.expected (+2 -0) =================================================================== --- test/command/suite/schema/tables/value_type/reference.expected 2015-10-20 12:41:30 +0900 (c5b2871) +++ test/command/suite/schema/tables/value_type/reference.expected 2015-10-20 12:41:51 +0900 (a3142ff) @@ -168,6 +168,8 @@ schema "name": "NormalizerNFKC51" } }, + "token_filters": { + }, "tables": { "Logs": { "name": "Logs", Modified: test/command/suite/schema/tables/value_type/type.expected (+2 -0) =================================================================== --- test/command/suite/schema/tables/value_type/type.expected 2015-10-20 12:41:30 +0900 (0bafd6f) +++ test/command/suite/schema/tables/value_type/type.expected 2015-10-20 12:41:51 +0900 (1cf0463) @@ -166,6 +166,8 @@ schema "name": "NormalizerNFKC51" } }, + "token_filters": { + }, "tables": { "Logs": { "name": "Logs", -------------- next part -------------- HTML����������������������������...Download