schema: support tokenizer

groonga · Oct 20, 2015 · e0349be · e0349be
1 parent 21ec7e9
commit e0349be
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/lib/proc.c b/lib/proc.c
@@ -7530,6 +7530,14 @@ proc_schema_table_output_value_type(grn_ctx *ctx, grn_obj *table)
   GRN_OUTPUT_MAP_CLOSE();
 }
 
+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)
 {
@@ -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();

diff --git a/test/command/suite/schema/tables/array.expected b/test/command/suite/schema/tables/array.expected
@@ -171,7 +171,8 @@ schema
         "name": "Logs",
         "type": "array",
         "key_type": null,
-        "value_type": null
+        "value_type": null,
+        "tokenizer": null
       }
     }
   }

diff --git a/test/command/suite/schema/tables/hash_table.expected b/test/command/suite/schema/tables/hash_table.expected
@@ -174,7 +174,8 @@ schema
           "name": "ShortText",
           "type": "type"
         },
-        "value_type": null
+        "value_type": null,
+        "tokenizer": null
       }
     }
   }

diff --git a/test/command/suite/schema/tables/value_type/reference.expected b/test/command/suite/schema/tables/value_type/reference.expected
@@ -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
       }
     }
   }

diff --git a/test/command/suite/schema/tables/value_type/type.expected b/test/command/suite/schema/tables/value_type/type.expected
@@ -174,7 +174,8 @@ schema
         "value_type": {
           "name": "Int32",
           "type": "type"
-        }
+        },
+        "tokenizer": null
       }
     }
   }