Kouhei Sutou
null+****@clear*****
Tue Oct 20 14:38:19 JST 2015
Kouhei Sutou 2015-10-20 14:38:19 +0900 (Tue, 20 Oct 2015) New Revision: 1a896e31a4d1fd4f714204c3639c5666a67bf1f6 https://github.com/groonga/groonga/commit/1a896e31a4d1fd4f714204c3639c5666a67bf1f6 Message: schema: support column section/weight/position Added files: test/command/suite/schema/tables/columns/type/index.test Copied files: test/command/suite/schema/tables/columns/type/index.expected (from test/command/suite/schema/tables/columns/type/vector.expected) Modified files: lib/proc.c test/command/suite/schema/tables/columns/compress/lz4.expected test/command/suite/schema/tables/columns/compress/zlib.expected test/command/suite/schema/tables/columns/type/scalar.expected test/command/suite/schema/tables/columns/type/vector.expected Modified: lib/proc.c (+10 -1) =================================================================== --- lib/proc.c 2015-10-20 14:29:29 +0900 (37c4efb) +++ lib/proc.c 2015-10-20 14:38:19 +0900 (cc1a5b8) @@ -7894,7 +7894,7 @@ proc_schema_column_output(grn_ctx *ctx, grn_obj *table, grn_obj *column) proc_schema_output_column_name(ctx, column); - GRN_OUTPUT_MAP_OPEN("column", 7); + GRN_OUTPUT_MAP_OPEN("column", 10); GRN_OUTPUT_CSTR("name"); proc_schema_output_column_name(ctx, column); @@ -7914,6 +7914,15 @@ proc_schema_column_output(grn_ctx *ctx, grn_obj *table, grn_obj *column) GRN_OUTPUT_CSTR("compress"); proc_schema_column_output_compress(ctx, column); + GRN_OUTPUT_CSTR("section"); + GRN_OUTPUT_BOOL((column->header.flags & GRN_OBJ_WITH_SECTION) != 0); + + GRN_OUTPUT_CSTR("weight"); + GRN_OUTPUT_BOOL((column->header.flags & GRN_OBJ_WITH_WEIGHT) != 0); + + GRN_OUTPUT_CSTR("position"); + GRN_OUTPUT_BOOL((column->header.flags & GRN_OBJ_WITH_POSITION) != 0); + GRN_OUTPUT_MAP_CLOSE(); } Modified: test/command/suite/schema/tables/columns/compress/lz4.expected (+4 -1) =================================================================== --- test/command/suite/schema/tables/columns/compress/lz4.expected 2015-10-20 14:29:29 +0900 (ac9bcd7) +++ test/command/suite/schema/tables/columns/compress/lz4.expected 2015-10-20 14:38:19 +0900 (cf707e0) @@ -199,7 +199,10 @@ schema "name": "Text", "type": "type" }, - "compress": "lz4" + "compress": "lz4", + "section": false, + "weight": false, + "position": false } } } Modified: test/command/suite/schema/tables/columns/compress/zlib.expected (+4 -1) =================================================================== --- test/command/suite/schema/tables/columns/compress/zlib.expected 2015-10-20 14:29:29 +0900 (eb77b4c) +++ test/command/suite/schema/tables/columns/compress/zlib.expected 2015-10-20 14:38:19 +0900 (0890130) @@ -199,7 +199,10 @@ schema "name": "Text", "type": "type" }, - "compress": "zlib" + "compress": "zlib", + "section": false, + "weight": false, + "position": false } } } Copied: test/command/suite/schema/tables/columns/type/index.expected (+55 -17) 74% =================================================================== --- test/command/suite/schema/tables/columns/type/vector.expected 2015-10-20 14:29:29 +0900 (973bc88) +++ test/command/suite/schema/tables/columns/type/index.expected 2015-10-20 14:38:19 +0900 (c4fdea7) @@ -1,8 +1,12 @@ -table_create Tags TABLE_DAT_KEY ShortText --normalizer NormalizerAuto -[[0,0.0,0.0],true] table_create Posts TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] -column_create Posts tags COLUMN_VECTOR Tags +column_create Posts title COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Posts text COLUMN_SCALAR Text +[[0,0.0,0.0],true] +table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto +[[0,0.0,0.0],true] +column_create Terms index COLUMN_INDEX|WITH_SECTION|WITH_WEIGHT|WITH_POSITION Posts title,text [[0,0.0,0.0],true] schema [ @@ -196,28 +200,47 @@ schema "command_line": "table_create --name Posts --flags TABLE_HASH_KEY --key_type ShortText" }, "columns": { - "tags": { - "name": "tags", + "text": { + "name": "text", "table": "Posts", - "full_name": "Posts.tags", - "type": "vector", + "full_name": "Posts.text", + "type": "scalar", "value_type": { - "name": "Tags", - "type": "reference" + "name": "Text", + "type": "type" }, - "compress": null + "compress": null, + "section": false, + "weight": false, + "position": false + }, + "title": { + "name": "title", + "table": "Posts", + "full_name": "Posts.title", + "type": "scalar", + "value_type": { + "name": "ShortText", + "type": "type" + }, + "compress": null, + "section": false, + "weight": false, + "position": false } } }, - "Tags": { - "name": "Tags", - "type": "double array trie", + "Terms": { + "name": "Terms", + "type": "patricia trie", "key_type": { "name": "ShortText", "type": "type" }, "value_type": null, - "tokenizer": null, + "tokenizer": { + "name": "TokenBigram" + }, "normalizer": { "name": "NormalizerAuto" }, @@ -227,14 +250,29 @@ schema "command": { "name": "table_create", "arguments": { - "name": "Tags", - "flags": "TABLE_DAT_KEY", + "name": "Terms", + "flags": "TABLE_PAT_KEY", "key_type": "ShortText", + "default_tokenizer": "TokenBigram", "normalizer": "NormalizerAuto" }, - "command_line": "table_create --name Tags --flags TABLE_DAT_KEY --key_type ShortText --normalizer NormalizerAuto" + "command_line": "table_create --name Terms --flags TABLE_PAT_KEY --key_type ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto" }, "columns": { + "index": { + "name": "index", + "table": "Terms", + "full_name": "Terms.index", + "type": "index", + "value_type": { + "name": "Posts", + "type": "reference" + }, + "compress": null, + "section": true, + "weight": true, + "position": true + } } } } Added: test/command/suite/schema/tables/columns/type/index.test (+11 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/schema/tables/columns/type/index.test 2015-10-20 14:38:19 +0900 (b7faaf3) @@ -0,0 +1,11 @@ +table_create Posts TABLE_HASH_KEY ShortText +column_create Posts title COLUMN_SCALAR ShortText +column_create Posts text COLUMN_SCALAR Text + +table_create Terms TABLE_PAT_KEY ShortText \ + --default_tokenizer TokenBigram \ + --normalizer NormalizerAuto +column_create Terms index COLUMN_INDEX|WITH_SECTION|WITH_WEIGHT|WITH_POSITION \ + Posts title,text + +schema Modified: test/command/suite/schema/tables/columns/type/scalar.expected (+4 -1) =================================================================== --- test/command/suite/schema/tables/columns/type/scalar.expected 2015-10-20 14:29:29 +0900 (45e288f) +++ test/command/suite/schema/tables/columns/type/scalar.expected 2015-10-20 14:38:19 +0900 (98a7e5d) @@ -199,7 +199,10 @@ schema "name": "Text", "type": "type" }, - "compress": null + "compress": null, + "section": false, + "weight": false, + "position": false } } } Modified: test/command/suite/schema/tables/columns/type/vector.expected (+4 -1) =================================================================== --- test/command/suite/schema/tables/columns/type/vector.expected 2015-10-20 14:29:29 +0900 (973bc88) +++ test/command/suite/schema/tables/columns/type/vector.expected 2015-10-20 14:38:19 +0900 (0e6051e) @@ -205,7 +205,10 @@ schema "name": "Tags", "type": "reference" }, - "compress": null + "compress": null, + "section": false, + "weight": false, + "position": false } } }, -------------- next part -------------- HTML����������������������������...Download