[Groonga-commit] groonga/groonga at e34fba5 [master] dump: order table by name instead of ID

Zurück zum Archiv-Index

Kouhei Sutou null+****@clear*****
Mon Jul 25 13:35:23 JST 2016


Kouhei Sutou	2016-07-25 13:35:23 +0900 (Mon, 25 Jul 2016)

  New Revision: e34fba580438b606db1212e63fbcf419bc04389a
  https://github.com/groonga/groonga/commit/e34fba580438b606db1212e63fbcf419bc04389a

  Message:
    dump: order table by name instead of ID
    
    It breaks dump output compatibility but it can be restored as usual.

  Added files:
    test/command/suite/dump/schema/table/order.expected
    test/command/suite/dump/schema/table/order.test
  Modified files:
    lib/proc/proc_dump.c
    test/command/suite/column_remove/fix_size/with_index.expected
    test/command/suite/column_remove/index.expected
    test/command/suite/column_remove/variable_size/with_index.expected
    test/command/suite/column_rename/index/tag.expected
    test/command/suite/delete/reference/cross.expected
    test/command/suite/delete/reference/vector_type.expected
    test/command/suite/dump/record/dump_records_no.expected
    test/command/suite/dump/schema/column/index/index_tiny.expected
    test/command/suite/dump/schema/column/index/with_record.expected
    test/command/suite/dump/schema/column/index/with_reference_column.expected
    test/command/suite/dump/schema/dump_indexes_no.expected
    test/command/suite/dump/schema/plugin/suggest.expected
    test/command/suite/sharding/logical_table_remove/range/max_exclude.expected
    test/command/suite/sharding/logical_table_remove/range/max_include.expected
    test/command/suite/sharding/logical_table_remove/range/min_exclude.expected
    test/command/suite/sharding/logical_table_remove/range/min_exclude_max_exclude.expected
    test/command/suite/sharding/logical_table_remove/range/min_exclude_max_include.expected
    test/command/suite/sharding/logical_table_remove/range/min_include_max_exclude.expected
    test/command/suite/sharding/logical_table_remove/range/min_include_max_include.expected
    test/command/suite/sharding/logical_table_remove/referenced/default.expected
    test/command/suite/sharding/logical_table_remove/referenced/dependent.expected
    test/command/suite/table_create/normalizer/auto/utf8.expected
    test/command/suite/table_create/normalizer/nfkc51/utf8.expected

  Modified: lib/proc/proc_dump.c (+2 -2)
===================================================================
--- lib/proc/proc_dump.c    2016-07-25 09:33:17 +0900 (fad5eba)
+++ lib/proc/proc_dump.c    2016-07-25 13:35:23 +0900 (1667ba7)
@@ -738,7 +738,7 @@ static void
 dump_schema(grn_ctx *ctx, grn_dumper *dumper)
 {
   GRN_TABLE_EACH_BEGIN_FLAGS(ctx, grn_ctx_db(ctx), cursor, id,
-                             GRN_CURSOR_BY_ID | GRN_CURSOR_ASCENDING) {
+                             GRN_CURSOR_BY_KEY | GRN_CURSOR_ASCENDING) {
     void *name;
     int name_size;
     grn_bool is_opened = GRN_TRUE;
@@ -788,7 +788,7 @@ dump_schema(grn_ctx *ctx, grn_dumper *dumper)
   grn_ctx_output_flush(ctx, 0);
 
   GRN_TABLE_EACH_BEGIN_FLAGS(ctx, grn_ctx_db(ctx), cursor, id,
-                             GRN_CURSOR_BY_ID | GRN_CURSOR_ASCENDING) {
+                             GRN_CURSOR_BY_KEY | GRN_CURSOR_ASCENDING) {
     void *name;
     int name_size;
     grn_bool is_opened = GRN_TRUE;

  Modified: test/command/suite/column_remove/fix_size/with_index.expected (+4 -4)
===================================================================
--- test/command/suite/column_remove/fix_size/with_index.expected    2016-07-25 09:33:17 +0900 (7a9412a)
+++ test/command/suite/column_remove/fix_size/with_index.expected    2016-07-25 13:35:23 +0900 (a0d2107)
@@ -7,15 +7,15 @@ table_create Ages TABLE_PAT_KEY UInt8
 column_create Ages users_age COLUMN_INDEX Users age
 [[0,0.0,0.0],true]
 dump
+table_create Ages TABLE_PAT_KEY UInt8
+
 table_create Users TABLE_PAT_KEY ShortText
 column_create Users age COLUMN_SCALAR UInt8
 
-table_create Ages TABLE_PAT_KEY UInt8
-
 column_create Ages users_age COLUMN_INDEX Users age
 column_remove Users age
 [[0,0.0,0.0],true]
 dump
-table_create Users TABLE_PAT_KEY ShortText
-
 table_create Ages TABLE_PAT_KEY UInt8
+
+table_create Users TABLE_PAT_KEY ShortText

  Modified: test/command/suite/column_remove/index.expected (+4 -4)
===================================================================
--- test/command/suite/column_remove/index.expected    2016-07-25 09:33:17 +0900 (bbb7c8b)
+++ test/command/suite/column_remove/index.expected    2016-07-25 13:35:23 +0900 (4457e6b)
@@ -7,16 +7,16 @@ table_create Terms TABLE_PAT_KEY ShortText   --default_tokenizer TokenBigram   -
 column_create Terms users_name COLUMN_INDEX|WITH_POSITION Users name
 [[0,0.0,0.0],true]
 dump
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
 table_create Users TABLE_PAT_KEY ShortText
 column_create Users name COLUMN_SCALAR ShortText
 
-table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
-
 column_create Terms users_name COLUMN_INDEX|WITH_POSITION Users name
 column_remove Terms users_name
 [[0,0.0,0.0],true]
 dump
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
 table_create Users TABLE_PAT_KEY ShortText
 column_create Users name COLUMN_SCALAR ShortText
-
-table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto

  Modified: test/command/suite/column_remove/variable_size/with_index.expected (+4 -4)
===================================================================
--- test/command/suite/column_remove/variable_size/with_index.expected    2016-07-25 09:33:17 +0900 (6a80c70)
+++ test/command/suite/column_remove/variable_size/with_index.expected    2016-07-25 13:35:23 +0900 (ee5cee5)
@@ -7,15 +7,15 @@ table_create Terms TABLE_PAT_KEY ShortText   --default_tokenizer TokenBigram   -
 column_create Terms users_name COLUMN_INDEX|WITH_POSITION Users name
 [[0,0.0,0.0],true]
 dump
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
 table_create Users TABLE_PAT_KEY ShortText
 column_create Users name COLUMN_SCALAR ShortText
 
-table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
-
 column_create Terms users_name COLUMN_INDEX|WITH_POSITION Users name
 column_remove Users name
 [[0,0.0,0.0],true]
 dump
-table_create Users TABLE_PAT_KEY ShortText
-
 table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
+table_create Users TABLE_PAT_KEY ShortText

  Modified: test/command/suite/column_rename/index/tag.expected (+2 -2)
===================================================================
--- test/command/suite/column_rename/index/tag.expected    2016-07-25 09:33:17 +0900 (b1dc36d)
+++ test/command/suite/column_rename/index/tag.expected    2016-07-25 13:35:23 +0900 (c248aa7)
@@ -14,10 +14,10 @@ load --table Memos
 column_rename Tags memos_tag memos_tag_index
 [[0,0.0,0.0],true]
 dump
-table_create Tags TABLE_PAT_KEY ShortText
-
 table_create Memos TABLE_HASH_KEY ShortText
 
+table_create Tags TABLE_PAT_KEY ShortText
+
 column_create Memos tag COLUMN_SCALAR Tags
 
 load --table Memos

  Modified: test/command/suite/delete/reference/cross.expected (+3 -3)
===================================================================
--- test/command/suite/delete/reference/cross.expected    2016-07-25 09:33:17 +0900 (76db46a)
+++ test/command/suite/delete/reference/cross.expected    2016-07-25 13:35:23 +0900 (4283118)
@@ -21,12 +21,12 @@ load --table URLs
 delete URLs --key "http://groonga.org/"
 [[0,0.0,0.0],true]
 dump
-table_create Users TABLE_HASH_KEY ShortText
-
 table_create URLs TABLE_HASH_KEY ShortText
 
-column_create Users bookmarks COLUMN_VECTOR URLs
+table_create Users TABLE_HASH_KEY ShortText
+
 column_create URLs author COLUMN_SCALAR Users
+column_create Users bookmarks COLUMN_VECTOR URLs
 
 load --table Users
 [

  Modified: test/command/suite/delete/reference/vector_type.expected (+2 -2)
===================================================================
--- test/command/suite/delete/reference/vector_type.expected    2016-07-25 09:33:17 +0900 (2a17fbe)
+++ test/command/suite/delete/reference/vector_type.expected    2016-07-25 13:35:23 +0900 (7def712)
@@ -21,11 +21,11 @@ load --table URLs
 delete URLs --key "http://groonga.org/"
 [[0,0.0,0.0],true]
 dump
+table_create URLs TABLE_HASH_KEY ShortText
+
 table_create Users TABLE_HASH_KEY ShortText
 column_create Users bookmarks COLUMN_VECTOR ShortText
 
-table_create URLs TABLE_HASH_KEY ShortText
-
 column_create URLs author COLUMN_SCALAR Users
 
 load --table Users

  Modified: test/command/suite/dump/record/dump_records_no.expected (+2 -2)
===================================================================
--- test/command/suite/dump/record/dump_records_no.expected    2016-07-25 09:33:17 +0900 (f717ae4)
+++ test/command/suite/dump/record/dump_records_no.expected    2016-07-25 13:35:23 +0900 (d70b3d0)
@@ -16,9 +16,9 @@ load --table Users
 dump --dump_records no
 plugin_register token_filters/stop_word
 
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
 table_create Users TABLE_HASH_KEY ShortText
 column_create Users name COLUMN_SCALAR ShortText
 
-table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
-
 column_create Terms users_name_index COLUMN_INDEX|WITH_POSITION Users name

  Modified: test/command/suite/dump/schema/column/index/index_tiny.expected (+2 -2)
===================================================================
--- test/command/suite/dump/schema/column/index/index_tiny.expected    2016-07-25 09:33:17 +0900 (93fee48)
+++ test/command/suite/dump/schema/column/index/index_tiny.expected    2016-07-25 13:35:23 +0900 (abfdef3)
@@ -7,9 +7,9 @@ table_create Names TABLE_HASH_KEY ShortText
 column_create Names users COLUMN_INDEX|INDEX_TINY Users name
 [[0,0.0,0.0],true]
 dump
+table_create Names TABLE_HASH_KEY ShortText
+
 table_create Users TABLE_HASH_KEY ShortText
 column_create Users name COLUMN_SCALAR ShortText
 
-table_create Names TABLE_HASH_KEY ShortText
-
 column_create Names users COLUMN_INDEX|INDEX_TINY Users name

  Modified: test/command/suite/dump/schema/column/index/with_record.expected (+2 -2)
===================================================================
--- test/command/suite/dump/schema/column/index/with_record.expected    2016-07-25 09:33:17 +0900 (4305730)
+++ test/command/suite/dump/schema/column/index/with_record.expected    2016-07-25 13:35:23 +0900 (d74160b)
@@ -12,11 +12,11 @@ load --table Users
 ]
 [[0,0.0,0.0],1]
 dump
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
 table_create Users TABLE_HASH_KEY ShortText
 column_create Users name COLUMN_SCALAR ShortText
 
-table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
-
 load --table Users
 [
 ["_key","name"],

  Modified: test/command/suite/dump/schema/column/index/with_reference_column.expected (+2 -2)
===================================================================
--- test/command/suite/dump/schema/column/index/with_reference_column.expected    2016-07-25 09:33:17 +0900 (a92f51d)
+++ test/command/suite/dump/schema/column/index/with_reference_column.expected    2016-07-25 13:35:23 +0900 (ebd882e)
@@ -16,11 +16,11 @@ dump
 table_create Bookmarks TABLE_HASH_KEY ShortText
 column_create Bookmarks title COLUMN_SCALAR ShortText
 
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
 table_create Users TABLE_HASH_KEY ShortText
 column_create Users name COLUMN_SCALAR ShortText
 
-table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
-
 column_create Users bookmark COLUMN_SCALAR Bookmarks
 
 column_create Terms users_name_index COLUMN_INDEX|WITH_POSITION Users name

  Modified: test/command/suite/dump/schema/dump_indexes_no.expected (+2 -2)
===================================================================
--- test/command/suite/dump/schema/dump_indexes_no.expected    2016-07-25 09:33:17 +0900 (a1447c6)
+++ test/command/suite/dump/schema/dump_indexes_no.expected    2016-07-25 13:35:23 +0900 (9d7b20c)
@@ -22,10 +22,10 @@ plugin_register token_filters/stop_word
 table_create Bookmarks TABLE_HASH_KEY ShortText
 column_create Bookmarks title COLUMN_SCALAR ShortText
 
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
 table_create Users TABLE_HASH_KEY ShortText
 column_create Users name COLUMN_SCALAR ShortText
 
-table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
-
 column_create Bookmarks user COLUMN_SCALAR Users
 column_create Users bookmark COLUMN_SCALAR Bookmarks

  Modified: test/command/suite/dump/schema/plugin/suggest.expected (+12 -12)
===================================================================
--- test/command/suite/dump/schema/plugin/suggest.expected    2016-07-25 09:33:17 +0900 (02ef6ab)
+++ test/command/suite/dump/schema/plugin/suggest.expected    2016-07-25 13:35:23 +0900 (cfd7d8e)
@@ -1,11 +1,15 @@
 dump
 plugin_register suggest/suggest
 
-table_create event_type TABLE_HASH_KEY ShortText
-
 table_create bigram TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
 
-table_create kana TABLE_PAT_KEY ShortText --normalizer NormalizerAuto
+table_create configuration TABLE_HASH_KEY ShortText
+column_create configuration weight COLUMN_SCALAR UInt32
+
+table_create event_dataset TABLE_NO_KEY
+column_create event_dataset time COLUMN_SCALAR Time
+
+table_create event_type TABLE_HASH_KEY ShortText
 
 table_create item_dataset TABLE_PAT_KEY ShortText --default_tokenizer TokenDelimit --normalizer NormalizerAuto
 column_create item_dataset boost COLUMN_SCALAR Int32
@@ -14,6 +18,8 @@ column_create item_dataset freq COLUMN_SCALAR Int32
 column_create item_dataset freq2 COLUMN_SCALAR Int32
 column_create item_dataset last COLUMN_SCALAR Time
 
+table_create kana TABLE_PAT_KEY ShortText --normalizer NormalizerAuto
+
 table_create pair_dataset TABLE_HASH_KEY UInt64
 column_create pair_dataset freq0 COLUMN_SCALAR Int32
 column_create pair_dataset freq1 COLUMN_SCALAR Int32
@@ -21,19 +27,13 @@ column_create pair_dataset freq2 COLUMN_SCALAR Int32
 
 table_create sequence_dataset TABLE_HASH_KEY ShortText
 
-table_create event_dataset TABLE_NO_KEY
-column_create event_dataset time COLUMN_SCALAR Time
-
-table_create configuration TABLE_HASH_KEY ShortText
-column_create configuration weight COLUMN_SCALAR UInt32
-
+column_create event_dataset item COLUMN_SCALAR item_dataset
+column_create event_dataset sequence COLUMN_SCALAR sequence_dataset
+column_create event_dataset type COLUMN_SCALAR event_type
 column_create item_dataset kana COLUMN_VECTOR kana
 column_create pair_dataset post COLUMN_SCALAR item_dataset
 column_create pair_dataset pre COLUMN_SCALAR item_dataset
 column_create sequence_dataset events COLUMN_VECTOR event_dataset
-column_create event_dataset item COLUMN_SCALAR item_dataset
-column_create event_dataset sequence COLUMN_SCALAR sequence_dataset
-column_create event_dataset type COLUMN_SCALAR event_type
 
 load --table configuration
 [

  Added: test/command/suite/dump/schema/table/order.expected (+12 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/dump/schema/table/order.expected    2016-07-25 13:35:23 +0900 (ee22470)
@@ -0,0 +1,12 @@
+table_create z TABLE_NO_KEY
+[[0,0.0,0.0],true]
+table_create a TABLE_NO_KEY
+[[0,0.0,0.0],true]
+table_create j TABLE_NO_KEY
+[[0,0.0,0.0],true]
+dump
+table_create a TABLE_NO_KEY
+
+table_create j TABLE_NO_KEY
+
+table_create z TABLE_NO_KEY

  Added: test/command/suite/dump/schema/table/order.test (+5 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/dump/schema/table/order.test    2016-07-25 13:35:23 +0900 (e9c1a36)
@@ -0,0 +1,5 @@
+table_create z TABLE_NO_KEY
+table_create a TABLE_NO_KEY
+table_create j TABLE_NO_KEY
+
+dump

  Modified: test/command/suite/sharding/logical_table_remove/range/max_exclude.expected (+4 -4)
===================================================================
--- test/command/suite/sharding/logical_table_remove/range/max_exclude.expected    2016-07-25 09:33:17 +0900 (68adc38)
+++ test/command/suite/sharding/logical_table_remove/range/max_exclude.expected    2016-07-25 13:35:23 +0900 (555fed4)
@@ -50,16 +50,16 @@ logical_table_remove Logs timestamp   --max "2015-02-04 00:00:00"   --max_border
 dump
 plugin_register sharding
 
-table_create Times_20150203 TABLE_PAT_KEY Time
-
 table_create Logs_20150204 TABLE_NO_KEY
 column_create Logs_20150204 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150204 TABLE_PAT_KEY Time
-
 table_create Logs_20150205 TABLE_NO_KEY
 column_create Logs_20150205 timestamp COLUMN_SCALAR Time
 
+table_create Times_20150203 TABLE_PAT_KEY Time
+
+table_create Times_20150204 TABLE_PAT_KEY Time
+
 table_create Times_20150205 TABLE_PAT_KEY Time
 
 load --table Times_20150203

  Modified: test/command/suite/sharding/logical_table_remove/range/max_include.expected (+4 -4)
===================================================================
--- test/command/suite/sharding/logical_table_remove/range/max_include.expected    2016-07-25 09:33:17 +0900 (9d455ae)
+++ test/command/suite/sharding/logical_table_remove/range/max_include.expected    2016-07-25 13:35:23 +0900 (38be7c0)
@@ -50,16 +50,16 @@ logical_table_remove Logs timestamp   --max "2015-02-04 00:00:00"   --max_border
 dump
 plugin_register sharding
 
-table_create Times_20150203 TABLE_PAT_KEY Time
-
 table_create Logs_20150204 TABLE_NO_KEY
 column_create Logs_20150204 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150204 TABLE_PAT_KEY Time
-
 table_create Logs_20150205 TABLE_NO_KEY
 column_create Logs_20150205 timestamp COLUMN_SCALAR Time
 
+table_create Times_20150203 TABLE_PAT_KEY Time
+
+table_create Times_20150204 TABLE_PAT_KEY Time
+
 table_create Times_20150205 TABLE_PAT_KEY Time
 
 load --table Times_20150203

  Modified: test/command/suite/sharding/logical_table_remove/range/min_exclude.expected (+2 -2)
===================================================================
--- test/command/suite/sharding/logical_table_remove/range/min_exclude.expected    2016-07-25 09:33:17 +0900 (d1235b4)
+++ test/command/suite/sharding/logical_table_remove/range/min_exclude.expected    2016-07-25 13:35:23 +0900 (2b518c9)
@@ -53,11 +53,11 @@ plugin_register sharding
 table_create Logs_20150203 TABLE_NO_KEY
 column_create Logs_20150203 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150203 TABLE_PAT_KEY Time
-
 table_create Logs_20150204 TABLE_NO_KEY
 column_create Logs_20150204 timestamp COLUMN_SCALAR Time
 
+table_create Times_20150203 TABLE_PAT_KEY Time
+
 table_create Times_20150204 TABLE_PAT_KEY Time
 
 table_create Times_20150205 TABLE_PAT_KEY Time

  Modified: test/command/suite/sharding/logical_table_remove/range/min_exclude_max_exclude.expected (+4 -4)
===================================================================
--- test/command/suite/sharding/logical_table_remove/range/min_exclude_max_exclude.expected    2016-07-25 09:33:17 +0900 (66bd1c9)
+++ test/command/suite/sharding/logical_table_remove/range/min_exclude_max_exclude.expected    2016-07-25 13:35:23 +0900 (d7e1332)
@@ -57,16 +57,16 @@ plugin_register sharding
 table_create Logs_20150203 TABLE_NO_KEY
 column_create Logs_20150203 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150203 TABLE_PAT_KEY Time
-
 table_create Logs_20150204 TABLE_NO_KEY
 column_create Logs_20150204 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150204 TABLE_PAT_KEY Time
-
 table_create Logs_20150205 TABLE_NO_KEY
 column_create Logs_20150205 timestamp COLUMN_SCALAR Time
 
+table_create Times_20150203 TABLE_PAT_KEY Time
+
+table_create Times_20150204 TABLE_PAT_KEY Time
+
 table_create Times_20150205 TABLE_PAT_KEY Time
 
 load --table Logs_20150203

  Modified: test/command/suite/sharding/logical_table_remove/range/min_exclude_max_include.expected (+4 -4)
===================================================================
--- test/command/suite/sharding/logical_table_remove/range/min_exclude_max_include.expected    2016-07-25 09:33:17 +0900 (8c863c9)
+++ test/command/suite/sharding/logical_table_remove/range/min_exclude_max_include.expected    2016-07-25 13:35:23 +0900 (2eeb26a)
@@ -57,16 +57,16 @@ plugin_register sharding
 table_create Logs_20150203 TABLE_NO_KEY
 column_create Logs_20150203 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150203 TABLE_PAT_KEY Time
-
 table_create Logs_20150204 TABLE_NO_KEY
 column_create Logs_20150204 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150204 TABLE_PAT_KEY Time
-
 table_create Logs_20150205 TABLE_NO_KEY
 column_create Logs_20150205 timestamp COLUMN_SCALAR Time
 
+table_create Times_20150203 TABLE_PAT_KEY Time
+
+table_create Times_20150204 TABLE_PAT_KEY Time
+
 table_create Times_20150205 TABLE_PAT_KEY Time
 
 load --table Logs_20150203

  Modified: test/command/suite/sharding/logical_table_remove/range/min_include_max_exclude.expected (+3 -3)
===================================================================
--- test/command/suite/sharding/logical_table_remove/range/min_include_max_exclude.expected    2016-07-25 09:33:17 +0900 (d535b92)
+++ test/command/suite/sharding/logical_table_remove/range/min_include_max_exclude.expected    2016-07-25 13:35:23 +0900 (628312b)
@@ -57,13 +57,13 @@ plugin_register sharding
 table_create Logs_20150203 TABLE_NO_KEY
 column_create Logs_20150203 timestamp COLUMN_SCALAR Time
 
+table_create Logs_20150205 TABLE_NO_KEY
+column_create Logs_20150205 timestamp COLUMN_SCALAR Time
+
 table_create Times_20150203 TABLE_PAT_KEY Time
 
 table_create Times_20150204 TABLE_PAT_KEY Time
 
-table_create Logs_20150205 TABLE_NO_KEY
-column_create Logs_20150205 timestamp COLUMN_SCALAR Time
-
 table_create Times_20150205 TABLE_PAT_KEY Time
 
 load --table Logs_20150203

  Modified: test/command/suite/sharding/logical_table_remove/range/min_include_max_include.expected (+3 -3)
===================================================================
--- test/command/suite/sharding/logical_table_remove/range/min_include_max_include.expected    2016-07-25 09:33:17 +0900 (d156dfd)
+++ test/command/suite/sharding/logical_table_remove/range/min_include_max_include.expected    2016-07-25 13:35:23 +0900 (8b7812e)
@@ -57,13 +57,13 @@ plugin_register sharding
 table_create Logs_20150203 TABLE_NO_KEY
 column_create Logs_20150203 timestamp COLUMN_SCALAR Time
 
+table_create Logs_20150205 TABLE_NO_KEY
+column_create Logs_20150205 timestamp COLUMN_SCALAR Time
+
 table_create Times_20150203 TABLE_PAT_KEY Time
 
 table_create Times_20150204 TABLE_PAT_KEY Time
 
-table_create Logs_20150205 TABLE_NO_KEY
-column_create Logs_20150205 timestamp COLUMN_SCALAR Time
-
 table_create Times_20150205 TABLE_PAT_KEY Time
 
 load --table Logs_20150203

  Modified: test/command/suite/sharding/logical_table_remove/referenced/default.expected (+6 -6)
===================================================================
--- test/command/suite/sharding/logical_table_remove/referenced/default.expected    2016-07-25 09:33:17 +0900 (2fd1c26)
+++ test/command/suite/sharding/logical_table_remove/referenced/default.expected    2016-07-25 13:35:23 +0900 (4e21244)
@@ -52,22 +52,22 @@ logical_table_remove Logs timestamp   --min "2015-02-04 00:00:00"   --min_border
 dump
 plugin_register sharding
 
-table_create Paths_20150203 TABLE_HASH_KEY|KEY_LARGE ShortText
-
 table_create Logs_20150203 TABLE_NO_KEY
 column_create Logs_20150203 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150203 TABLE_PAT_KEY Time
+table_create NotRelated_20150204 TABLE_NO_KEY
 
 table_create PathTerms_20150203 TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
 
-table_create NotRelated_20150204 TABLE_NO_KEY
+table_create PathTerms_20150204 TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
+table_create Paths_20150203 TABLE_HASH_KEY|KEY_LARGE ShortText
 
 table_create Paths_20150204 TABLE_HASH_KEY|KEY_LARGE ShortText
 
-table_create Times_20150204 TABLE_PAT_KEY Time
+table_create Times_20150203 TABLE_PAT_KEY Time
 
-table_create PathTerms_20150204 TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+table_create Times_20150204 TABLE_PAT_KEY Time
 
 column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203
 

  Modified: test/command/suite/sharding/logical_table_remove/referenced/dependent.expected (+4 -4)
===================================================================
--- test/command/suite/sharding/logical_table_remove/referenced/dependent.expected    2016-07-25 09:33:17 +0900 (6754fca)
+++ test/command/suite/sharding/logical_table_remove/referenced/dependent.expected    2016-07-25 13:35:23 +0900 (f259298)
@@ -52,16 +52,16 @@ logical_table_remove Logs timestamp   --min "2015-02-04 00:00:00"   --min_border
 dump
 plugin_register sharding
 
-table_create Paths_20150203 TABLE_HASH_KEY|KEY_LARGE ShortText
-
 table_create Logs_20150203 TABLE_NO_KEY
 column_create Logs_20150203 timestamp COLUMN_SCALAR Time
 
-table_create Times_20150203 TABLE_PAT_KEY Time
+table_create NotRelated_20150204 TABLE_NO_KEY
 
 table_create PathTerms_20150203 TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
 
-table_create NotRelated_20150204 TABLE_NO_KEY
+table_create Paths_20150203 TABLE_HASH_KEY|KEY_LARGE ShortText
+
+table_create Times_20150203 TABLE_PAT_KEY Time
 
 column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203
 

  Modified: test/command/suite/table_create/normalizer/auto/utf8.expected (+2 -2)
===================================================================
--- test/command/suite/table_create/normalizer/auto/utf8.expected    2016-07-25 09:33:17 +0900 (efc9b26)
+++ test/command/suite/table_create/normalizer/auto/utf8.expected    2016-07-25 13:35:23 +0900 (e95d502)
@@ -42,11 +42,11 @@ select Movies --match_columns name --query seven
   ]
 ]
 dump
-table_create Terms TABLE_PAT_KEY ShortText --normalizer NormalizerAuto
-
 table_create Movies TABLE_NO_KEY
 column_create Movies name COLUMN_SCALAR ShortText
 
+table_create Terms TABLE_PAT_KEY ShortText --normalizer NormalizerAuto
+
 load --table Movies
 [
 ["_id","name"],

  Modified: test/command/suite/table_create/normalizer/nfkc51/utf8.expected (+2 -2)
===================================================================
--- test/command/suite/table_create/normalizer/nfkc51/utf8.expected    2016-07-25 09:33:17 +0900 (68df7f6)
+++ test/command/suite/table_create/normalizer/nfkc51/utf8.expected    2016-07-25 13:35:23 +0900 (2d13c55)
@@ -42,11 +42,11 @@ select Movies --match_columns name --query seven
   ]
 ]
 dump
-table_create Terms TABLE_PAT_KEY ShortText --normalizer NormalizerNFKC51
-
 table_create Movies TABLE_NO_KEY
 column_create Movies name COLUMN_SCALAR ShortText
 
+table_create Terms TABLE_PAT_KEY ShortText --normalizer NormalizerNFKC51
+
 load --table Movies
 [
 ["_id","name"],
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Zurück zum Archiv-Index