Kouhei Sutou
null+****@clear*****
Tue Oct 20 11:21:06 JST 2015
Kouhei Sutou 2015-10-20 11:21:06 +0900 (Tue, 20 Oct 2015) New Revision: 21ec7e9ee0eae479aef35fb6af37e93056dbdf91 https://github.com/groonga/groonga/commit/21ec7e9ee0eae479aef35fb6af37e93056dbdf91 Message: schema: add value-able type information Modified files: lib/proc.c test/command/suite/schema/plugins.expected 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 (+4 -1) =================================================================== --- lib/proc.c 2015-10-20 11:17:57 +0900 (d12ac8f) +++ lib/proc.c 2015-10-20 11:21:06 +0900 (ac16aff) @@ -7357,7 +7357,7 @@ proc_schema_types(grn_ctx *ctx) proc_schema_output_name(ctx, type); - GRN_OUTPUT_MAP_OPEN("type", 3); + GRN_OUTPUT_MAP_OPEN("type", 4); GRN_OUTPUT_CSTR("name"); proc_schema_output_name(ctx, type); @@ -7368,6 +7368,9 @@ proc_schema_types(grn_ctx *ctx) GRN_OUTPUT_CSTR("can_be_key_type"); GRN_OUTPUT_BOOL(GRN_TYPE_SIZE(DB_OBJ(type)) <= GRN_TABLE_MAX_KEY_SIZE); + GRN_OUTPUT_CSTR("can_be_value_type"); + GRN_OUTPUT_BOOL(!(type->header.flags & GRN_OBJ_KEY_VAR_SIZE)); + GRN_OUTPUT_MAP_CLOSE(); } GRN_OUTPUT_MAP_CLOSE(); Modified: test/command/suite/schema/plugins.expected (+34 -17) =================================================================== --- test/command/suite/schema/plugins.expected 2015-10-20 11:17:57 +0900 (2a2df6a) +++ test/command/suite/schema/plugins.expected 2015-10-20 11:21:06 +0900 (26b5fd5) @@ -17,87 +17,104 @@ schema "Bool": { "name": "Bool", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Float": { "name": "Float", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int16": { "name": "Int16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int32": { "name": "Int32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int64": { "name": "Int64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int8": { "name": "Int8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "LongText": { "name": "LongText", "size": 2147483648, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Object": { "name": "Object", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "ShortText": { "name": "ShortText", "size": 4096, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": false }, "Text": { "name": "Text", "size": 65536, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Time": { "name": "Time", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "TokyoGeoPoint": { "name": "TokyoGeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt16": { "name": "UInt16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt32": { "name": "UInt32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt64": { "name": "UInt64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt8": { "name": "UInt8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "WGS84GeoPoint": { "name": "WGS84GeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true } }, "tokenizers": { Modified: test/command/suite/schema/tables/array.expected (+34 -17) =================================================================== --- test/command/suite/schema/tables/array.expected 2015-10-20 11:17:57 +0900 (247bc89) +++ test/command/suite/schema/tables/array.expected 2015-10-20 11:21:06 +0900 (a23034e) @@ -14,87 +14,104 @@ schema "Bool": { "name": "Bool", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Float": { "name": "Float", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int16": { "name": "Int16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int32": { "name": "Int32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int64": { "name": "Int64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int8": { "name": "Int8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "LongText": { "name": "LongText", "size": 2147483648, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Object": { "name": "Object", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "ShortText": { "name": "ShortText", "size": 4096, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": false }, "Text": { "name": "Text", "size": 65536, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Time": { "name": "Time", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "TokyoGeoPoint": { "name": "TokyoGeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt16": { "name": "UInt16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt32": { "name": "UInt32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt64": { "name": "UInt64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt8": { "name": "UInt8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "WGS84GeoPoint": { "name": "WGS84GeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true } }, "tokenizers": { Modified: test/command/suite/schema/tables/hash_table.expected (+34 -17) =================================================================== --- test/command/suite/schema/tables/hash_table.expected 2015-10-20 11:17:57 +0900 (992fd83) +++ test/command/suite/schema/tables/hash_table.expected 2015-10-20 11:21:06 +0900 (97afc3e) @@ -14,87 +14,104 @@ schema "Bool": { "name": "Bool", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Float": { "name": "Float", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int16": { "name": "Int16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int32": { "name": "Int32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int64": { "name": "Int64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int8": { "name": "Int8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "LongText": { "name": "LongText", "size": 2147483648, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Object": { "name": "Object", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "ShortText": { "name": "ShortText", "size": 4096, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": false }, "Text": { "name": "Text", "size": 65536, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Time": { "name": "Time", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "TokyoGeoPoint": { "name": "TokyoGeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt16": { "name": "UInt16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt32": { "name": "UInt32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt64": { "name": "UInt64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt8": { "name": "UInt8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "WGS84GeoPoint": { "name": "WGS84GeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true } }, "tokenizers": { Modified: test/command/suite/schema/tables/value_type/reference.expected (+34 -17) =================================================================== --- test/command/suite/schema/tables/value_type/reference.expected 2015-10-20 11:17:57 +0900 (7e6689a) +++ test/command/suite/schema/tables/value_type/reference.expected 2015-10-20 11:21:06 +0900 (a94b42a) @@ -16,87 +16,104 @@ schema "Bool": { "name": "Bool", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Float": { "name": "Float", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int16": { "name": "Int16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int32": { "name": "Int32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int64": { "name": "Int64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int8": { "name": "Int8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "LongText": { "name": "LongText", "size": 2147483648, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Object": { "name": "Object", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "ShortText": { "name": "ShortText", "size": 4096, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": false }, "Text": { "name": "Text", "size": 65536, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Time": { "name": "Time", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "TokyoGeoPoint": { "name": "TokyoGeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt16": { "name": "UInt16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt32": { "name": "UInt32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt64": { "name": "UInt64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt8": { "name": "UInt8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "WGS84GeoPoint": { "name": "WGS84GeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true } }, "tokenizers": { Modified: test/command/suite/schema/tables/value_type/type.expected (+34 -17) =================================================================== --- test/command/suite/schema/tables/value_type/type.expected 2015-10-20 11:17:57 +0900 (b216de7) +++ test/command/suite/schema/tables/value_type/type.expected 2015-10-20 11:21:06 +0900 (2a7d32c) @@ -14,87 +14,104 @@ schema "Bool": { "name": "Bool", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Float": { "name": "Float", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int16": { "name": "Int16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int32": { "name": "Int32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int64": { "name": "Int64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "Int8": { "name": "Int8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "LongText": { "name": "LongText", "size": 2147483648, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Object": { "name": "Object", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "ShortText": { "name": "ShortText", "size": 4096, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": false }, "Text": { "name": "Text", "size": 65536, - "can_be_key_type": false + "can_be_key_type": false, + "can_be_value_type": false }, "Time": { "name": "Time", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "TokyoGeoPoint": { "name": "TokyoGeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt16": { "name": "UInt16", "size": 2, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt32": { "name": "UInt32", "size": 4, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt64": { "name": "UInt64", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "UInt8": { "name": "UInt8", "size": 1, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true }, "WGS84GeoPoint": { "name": "WGS84GeoPoint", "size": 8, - "can_be_key_type": true + "can_be_key_type": true, + "can_be_value_type": true } }, "tokenizers": { -------------- next part -------------- HTML����������������������������...Download