schema: support token filters

groonga · Oct 20, 2015 · 72747a3 · 72747a3
1 parent cc7e6a7
commit 72747a3
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 4 deletions.
diff --git a/lib/proc.c b/lib/proc.c
@@ -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();
 

diff --git a/test/command/suite/schema/plugins.expected b/test/command/suite/schema/plugins.expected
@@ -169,6 +169,8 @@ schema
         "name": "NormalizerNFKC51"
       }
     },
+    "token_filters": {
+    },
     "tables": {
     }
   }

diff --git a/test/command/suite/schema/tables/normalizer.expected b/test/command/suite/schema/tables/normalizer.expected
@@ -166,6 +166,8 @@ schema
         "name": "NormalizerNFKC51"
       }
     },
+    "token_filters": {
+    },
     "tables": {
       "Tags": {
         "name": "Tags",

diff --git a/test/command/suite/schema/tables/token_filters.expected b/test/command/suite/schema/tables/token_filters.expected
@@ -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",

diff --git a/test/command/suite/schema/tables/tokenizer.expected b/test/command/suite/schema/tables/tokenizer.expected
@@ -166,6 +166,8 @@ schema
         "name": "NormalizerNFKC51"
       }
     },
+    "token_filters": {
+    },
     "tables": {
       "Terms": {
         "name": "Terms",

diff --git a/test/command/suite/schema/tables/type/array.expected b/test/command/suite/schema/tables/type/array.expected
@@ -166,6 +166,8 @@ schema
         "name": "NormalizerNFKC51"
       }
     },
+    "token_filters": {
+    },
     "tables": {
       "Logs": {
         "name": "Logs",

diff --git a/test/command/suite/schema/tables/type/hash_table.expected b/test/command/suite/schema/tables/type/hash_table.expected
@@ -166,6 +166,8 @@ schema
         "name": "NormalizerNFKC51"
       }
     },
+    "token_filters": {
+    },
     "tables": {
       "Users": {
         "name": "Users",

diff --git a/test/command/suite/schema/tables/value_type/reference.expected b/test/command/suite/schema/tables/value_type/reference.expected
@@ -168,6 +168,8 @@ schema
         "name": "NormalizerNFKC51"
       }
     },
+    "token_filters": {
+    },
     "tables": {
       "Logs": {
         "name": "Logs",

diff --git a/test/command/suite/schema/tables/value_type/type.expected b/test/command/suite/schema/tables/value_type/type.expected
@@ -166,6 +166,8 @@ schema
         "name": "NormalizerNFKC51"
       }
     },
+    "token_filters": {
+    },
     "tables": {
       "Logs": {
         "name": "Logs",