schema: support outputting value type

groonga · Oct 20, 2015 · 741ff14 · 741ff14
1 parent ae98718
commit 741ff14
Show file tree

Hide file tree

Showing 9 changed files with 387 additions and 3 deletions.
diff --git a/lib/proc.c b/lib/proc.c
@@ -7495,6 +7495,38 @@ proc_schema_table_output_key_type(grn_ctx *ctx, grn_obj *table)
   GRN_OUTPUT_MAP_CLOSE();
 }
 
+static void
+proc_schema_table_output_value_type(grn_ctx *ctx, grn_obj *table)
+{
+  grn_obj *value_type = NULL;
+  grn_id range = GRN_ID_NIL;
+
+  if (table->header.type != GRN_TABLE_DAT_KEY) {
+    range = grn_obj_get_range(ctx, table);
+  }
+  if (range != GRN_ID_NIL) {
+    value_type = grn_ctx_at(ctx, range);
+  }
+  if (!value_type) {
+    GRN_OUTPUT_NULL();
+    return;
+  }
+
+  GRN_OUTPUT_MAP_OPEN("value_type", 2);
+
+  GRN_OUTPUT_CSTR("name");
+  proc_schema_output_name(ctx, value_type);
+
+  GRN_OUTPUT_CSTR("type");
+  if (grn_obj_is_table(ctx, value_type)) {
+    GRN_OUTPUT_CSTR("reference");
+  } else {
+    GRN_OUTPUT_CSTR("type");
+  }
+
+  GRN_OUTPUT_MAP_CLOSE();
+}
+
 static void
 proc_schema_tables(grn_ctx *ctx)
 {
@@ -7516,7 +7548,7 @@ proc_schema_tables(grn_ctx *ctx)
 
     proc_schema_output_name(ctx, table);
 
-    GRN_OUTPUT_MAP_OPEN("table", 3);
+    GRN_OUTPUT_MAP_OPEN("table", 4);
 
     GRN_OUTPUT_CSTR("name");
     proc_schema_output_name(ctx, table);
@@ -7527,6 +7559,9 @@ proc_schema_tables(grn_ctx *ctx)
     GRN_OUTPUT_CSTR("key_type");
     proc_schema_table_output_key_type(ctx, table);
 
+    GRN_OUTPUT_CSTR("value_type");
+    proc_schema_table_output_value_type(ctx, table);
+
     GRN_OUTPUT_MAP_CLOSE();
   }
   GRN_OUTPUT_MAP_CLOSE();

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

diff --git a/test/command/suite/schema/array.test → test/command/suite/schema/tables/array.test b/test/command/suite/schema/array.test → test/command/suite/schema/tables/array.test
diff --git a/.../command/suite/schema/hash_table.expected → ...d/suite/schema/tables/hash_table.expected b/.../command/suite/schema/hash_table.expected → ...d/suite/schema/tables/hash_table.expected
@@ -156,7 +156,8 @@ schema
         "key_type": {
           "name": "ShortText",
           "type": "type"
-        }
+        },
+        "value_type": null
       }
     }
   }

diff --git a/test/command/suite/schema/hash_table.test → ...mmand/suite/schema/tables/hash_table.test b/test/command/suite/schema/hash_table.test → ...mmand/suite/schema/tables/hash_table.test
diff --git a/test/command/suite/schema/tables/value_type/reference.expected b/test/command/suite/schema/tables/value_type/reference.expected
@@ -0,0 +1,175 @@
+table_create Users TABLE_HASH_KEY ShortText
+[[0,0.0,0.0],true]
+table_create Logs TABLE_NO_KEY --value_type Users
+[[0,0.0,0.0],true]
+schema
+[
+  [
+    0,
+    0.0,
+    0.0
+  ],
+  {
+    "plugins": {
+    },
+    "types": {
+      "Bool": {
+        "name": "Bool",
+        "size": 1,
+        "can_be_key_type": true
+      },
+      "Float": {
+        "name": "Float",
+        "size": 8,
+        "can_be_key_type": true
+      },
+      "Int16": {
+        "name": "Int16",
+        "size": 2,
+        "can_be_key_type": true
+      },
+      "Int32": {
+        "name": "Int32",
+        "size": 4,
+        "can_be_key_type": true
+      },
+      "Int64": {
+        "name": "Int64",
+        "size": 8,
+        "can_be_key_type": true
+      },
+      "Int8": {
+        "name": "Int8",
+        "size": 1,
+        "can_be_key_type": true
+      },
+      "LongText": {
+        "name": "LongText",
+        "size": 2147483648,
+        "can_be_key_type": false
+      },
+      "Object": {
+        "name": "Object",
+        "size": 8,
+        "can_be_key_type": true
+      },
+      "ShortText": {
+        "name": "ShortText",
+        "size": 4096,
+        "can_be_key_type": true
+      },
+      "Text": {
+        "name": "Text",
+        "size": 65536,
+        "can_be_key_type": false
+      },
+      "Time": {
+        "name": "Time",
+        "size": 8,
+        "can_be_key_type": true
+      },
+      "TokyoGeoPoint": {
+        "name": "TokyoGeoPoint",
+        "size": 8,
+        "can_be_key_type": true
+      },
+      "UInt16": {
+        "name": "UInt16",
+        "size": 2,
+        "can_be_key_type": true
+      },
+      "UInt32": {
+        "name": "UInt32",
+        "size": 4,
+        "can_be_key_type": true
+      },
+      "UInt64": {
+        "name": "UInt64",
+        "size": 8,
+        "can_be_key_type": true
+      },
+      "UInt8": {
+        "name": "UInt8",
+        "size": 1,
+        "can_be_key_type": true
+      },
+      "WGS84GeoPoint": {
+        "name": "WGS84GeoPoint",
+        "size": 8,
+        "can_be_key_type": true
+      }
+    },
+    "tokenizers": {
+      "TokenBigram": {
+        "name": "TokenBigram"
+      },
+      "TokenBigramIgnoreBlank": {
+        "name": "TokenBigramIgnoreBlank"
+      },
+      "TokenBigramIgnoreBlankSplitSymbol": {
+        "name": "TokenBigramIgnoreBlankSplitSymbol"
+      },
+      "TokenBigramIgnoreBlankSplitSymbolAlpha": {
+        "name": "TokenBigramIgnoreBlankSplitSymbolAlpha"
+      },
+      "TokenBigramIgnoreBlankSplitSymbolAlphaDigit": {
+        "name": "TokenBigramIgnoreBlankSplitSymbolAlphaDigit"
+      },
+      "TokenBigramSplitSymbol": {
+        "name": "TokenBigramSplitSymbol"
+      },
+      "TokenBigramSplitSymbolAlpha": {
+        "name": "TokenBigramSplitSymbolAlpha"
+      },
+      "TokenBigramSplitSymbolAlphaDigit": {
+        "name": "TokenBigramSplitSymbolAlphaDigit"
+      },
+      "TokenDelimit": {
+        "name": "TokenDelimit"
+      },
+      "TokenDelimitNull": {
+        "name": "TokenDelimitNull"
+      },
+      "TokenMecab": {
+        "name": "TokenMecab"
+      },
+      "TokenRegexp": {
+        "name": "TokenRegexp"
+      },
+      "TokenTrigram": {
+        "name": "TokenTrigram"
+      },
+      "TokenUnigram": {
+        "name": "TokenUnigram"
+      }
+    },
+    "normalizers": {
+      "NormalizerAuto": {
+        "name": "NormalizerAuto"
+      },
+      "NormalizerNFKC51": {
+        "name": "NormalizerNFKC51"
+      }
+    },
+    "tables": {
+      "Logs": {
+        "name": "Logs",
+        "type": "array",
+        "key_type": null,
+        "value_type": {
+          "name": "Users",
+          "type": "reference"
+        }
+      },
+      "Users": {
+        "name": "Users",
+        "type": "hash table",
+        "key_type": {
+          "name": "ShortText",
+          "type": "type"
+        },
+        "value_type": null
+      }
+    }
+  }
+]
diff --git a/test/command/suite/schema/tables/value_type/reference.test b/test/command/suite/schema/tables/value_type/reference.test
@@ -0,0 +1,5 @@
+table_create Users TABLE_HASH_KEY ShortText
+
+table_create Logs TABLE_NO_KEY --value_type Users
+
+schema