Kouhei Sutou
null+****@clear*****
Fri Sep 30 22:29:13 JST 2016
Kouhei Sutou 2016-09-30 22:29:13 +0900 (Fri, 30 Sep 2016) New Revision: 89e1a80686f216470b6de6bffa546373c7de3e13 https://github.com/groonga/groonga/commit/89e1a80686f216470b6de6bffa546373c7de3e13 Message: dump: sort load table names by key to make output stable TODO: Referenced tables should be loaded first then tables that (or their columns) refer other tables should be loaded. Modified files: lib/proc/proc_dump.c test/command/suite/column_copy/different.expected test/command/suite/column_copy/same_key_type.expected test/command/suite/delete/reference/cross.expected test/command/suite/delete/reference/vector_type.expected test/command/suite/sharding/logical_table_remove/broken/column/default.expected test/command/suite/sharding/logical_table_remove/broken/column/dependent.expected test/command/suite/sharding/logical_table_remove/broken/column/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/column/force.expected test/command/suite/sharding/logical_table_remove/broken/index_column/default.expected test/command/suite/sharding/logical_table_remove/broken/index_column/dependent.expected test/command/suite/sharding/logical_table_remove/broken/index_column/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/index_column/force.expected test/command/suite/sharding/logical_table_remove/broken/lexicon/default.expected test/command/suite/sharding/logical_table_remove/broken/lexicon/dependent.expected test/command/suite/sharding/logical_table_remove/broken/lexicon/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/lexicon/force.expected test/command/suite/sharding/logical_table_remove/broken/referenced_table/default.expected test/command/suite/sharding/logical_table_remove/broken/referenced_table/dependent.expected test/command/suite/sharding/logical_table_remove/broken/referenced_table/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/referenced_table/force.expected test/command/suite/sharding/logical_table_remove/broken/shard_key_column/default.expected test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent.expected test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/shard_key_column/force.expected test/command/suite/sharding/logical_table_remove/broken/table/default.expected test/command/suite/sharding/logical_table_remove/broken/table/dependent.expected test/command/suite/sharding/logical_table_remove/broken/table/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/table/force.expected test/command/suite/sharding/logical_table_remove/broken/table_and_column/default.expected test/command/suite/sharding/logical_table_remove/broken/table_and_column/dependent.expected test/command/suite/sharding/logical_table_remove/broken/table_and_column/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/table_and_column/force.expected test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/default.expected test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/dependent.expected test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/force.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_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_copy/different.expected test/command/suite/table_copy/same_key_type.expected Modified: lib/proc/proc_dump.c (+1 -1) =================================================================== --- lib/proc/proc_dump.c 2016-09-29 16:43:08 +0900 (e02b66d) +++ lib/proc/proc_dump.c 2016-09-30 22:29:13 +0900 (27b656d) @@ -886,7 +886,7 @@ dump_selected_tables_records(grn_ctx *ctx, grn_dumper *dumper, grn_obj *tables) static void dump_all_records(grn_ctx *ctx, grn_dumper *dumper) { - GRN_DB_EACH_BEGIN_BY_ID(ctx, cursor, id) { + GRN_DB_EACH_BEGIN_BY_KEY(ctx, cursor, id) { void *name; int name_size; grn_obj *table; Modified: test/command/suite/column_copy/different.expected (+8 -8) =================================================================== --- test/command/suite/column_copy/different.expected 2016-09-29 16:43:08 +0900 (cd90151) +++ test/command/suite/column_copy/different.expected 2016-09-30 22:29:13 +0900 (14be27a) @@ -16,14 +16,6 @@ column_create LargeNumbers id_text COLUMN_SCALAR Text column_copy SmallNumbers id_uint8 LargeNumbers id_text [[0,0.0,0.0],true] dump --dump_schema no -load --table SmallNumbers -[ -["_key","id_uint8"], -[10,11], -[20,22], -[30,33] -] - load --table LargeNumbers [ ["_key","id_text"], @@ -31,3 +23,11 @@ load --table LargeNumbers [20,"22"], [30,"33"] ] + +load --table SmallNumbers +[ +["_key","id_uint8"], +[10,11], +[20,22], +[30,33] +] Modified: test/command/suite/column_copy/same_key_type.expected (+8 -8) =================================================================== --- test/command/suite/column_copy/same_key_type.expected 2016-09-29 16:43:08 +0900 (f9a52f7) +++ test/command/suite/column_copy/same_key_type.expected 2016-09-30 22:29:13 +0900 (b7b1bd9) @@ -16,14 +16,6 @@ column_create Friends age_uint8 COLUMN_SCALAR UInt8 column_copy Users age_text Friends age_uint8 [[0,0.0,0.0],true] dump --dump_schema no -load --table Users -[ -["_key","age_text"], -["alice","12"], -["bob","29"], -["charlie","9"] -] - load --table Friends [ ["_key","age_uint8"], @@ -31,3 +23,11 @@ load --table Friends ["bob",29], ["charlie",9] ] + +load --table Users +[ +["_key","age_text"], +["alice","12"], +["bob","29"], +["charlie","9"] +] Modified: test/command/suite/delete/reference/cross.expected (+6 -6) =================================================================== --- test/command/suite/delete/reference/cross.expected 2016-09-29 16:43:08 +0900 (4283118) +++ test/command/suite/delete/reference/cross.expected 2016-09-30 22:29:13 +0900 (a9d3b04) @@ -28,12 +28,6 @@ table_create Users TABLE_HASH_KEY ShortText column_create URLs author COLUMN_SCALAR Users column_create Users bookmarks COLUMN_VECTOR URLs -load --table Users -[ -["_key","bookmarks"], -["mori",["http://mroonga.org/","http://ranguba.org/"]] -] - load --table URLs [ ["_key","author"], @@ -41,4 +35,10 @@ load --table URLs ["http://ranguba.org/",""] ] +load --table Users +[ +["_key","bookmarks"], +["mori",["http://mroonga.org/","http://ranguba.org/"]] +] + column_create URLs bookmarks_index COLUMN_INDEX Users bookmarks Modified: test/command/suite/delete/reference/vector_type.expected (+6 -6) =================================================================== --- test/command/suite/delete/reference/vector_type.expected 2016-09-29 16:43:08 +0900 (7def712) +++ test/command/suite/delete/reference/vector_type.expected 2016-09-30 22:29:13 +0900 (55a2894) @@ -28,12 +28,6 @@ column_create Users bookmarks COLUMN_VECTOR ShortText column_create URLs author COLUMN_SCALAR Users -load --table Users -[ -["_key","bookmarks"], -["mori",["http://mroonga.org/","http://groonga.org/","http://ranguba.org/"]] -] - load --table URLs [ ["_key","author"], @@ -41,4 +35,10 @@ load --table URLs ["http://ranguba.org/",""] ] +load --table Users +[ +["_key","bookmarks"], +["mori",["http://mroonga.org/","http://groonga.org/","http://ranguba.org/"]] +] + column_create URLs bookmarks_index COLUMN_INDEX Users bookmarks Modified: test/command/suite/sharding/logical_table_remove/broken/column/default.expected (+15 -15) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/column/default.expected 2016-09-29 16:43:08 +0900 (24a9c29) +++ test/command/suite/sharding/logical_table_remove/broken/column/default.expected 2016-09-30 22:29:13 +0900 (d9175b4) @@ -87,13 +87,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -101,14 +94,6 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] -load --table Paths_20150204 -[ -["_key"], -["/tmp/log"], -["/root/"], -["/etc/aliases"] -] - load --table Logs_20150204 [ ["_id","timestamp"], @@ -117,6 +102,21 @@ load --table Logs_20150204 [3,1423025400.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + +load --table Paths_20150204 +[ +["_key"], +["/tmp/log"], +["/root/"], +["/etc/aliases"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create PathTerms_20150204 index COLUMN_INDEX|WITH_POSITION Paths_20150204 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/column/dependent.expected (+15 -15) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/column/dependent.expected 2016-09-29 16:43:08 +0900 (6b561af) +++ test/command/suite/sharding/logical_table_remove/broken/column/dependent.expected 2016-09-30 22:29:13 +0900 (9e29539) @@ -89,13 +89,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -103,14 +96,6 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] -load --table Paths_20150204 -[ -["_key"], -["/tmp/log"], -["/root/"], -["/etc/aliases"] -] - load --table Logs_20150204 [ ["_id","timestamp"], @@ -119,6 +104,21 @@ load --table Logs_20150204 [3,1423025400.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + +load --table Paths_20150204 +[ +["_key"], +["/tmp/log"], +["/root/"], +["/etc/aliases"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create PathTerms_20150204 index COLUMN_INDEX|WITH_POSITION Paths_20150204 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/column/dependent_force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/column/dependent_force.expected 2016-09-29 16:43:08 +0900 (35a74f0) +++ test/command/suite/sharding/logical_table_remove/broken/column/dependent_force.expected 2016-09-30 22:29:13 +0900 (935a77f) @@ -78,13 +78,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -92,6 +85,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/column/force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/column/force.expected 2016-09-29 16:43:08 +0900 (2e826e5) +++ test/command/suite/sharding/logical_table_remove/broken/column/force.expected 2016-09-30 22:29:13 +0900 (2c6b66f) @@ -78,13 +78,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -92,6 +85,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/index_column/default.expected (+15 -15) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/index_column/default.expected 2016-09-29 16:43:08 +0900 (3d6a658) +++ test/command/suite/sharding/logical_table_remove/broken/index_column/default.expected 2016-09-30 22:29:13 +0900 (ac9baf7) @@ -89,13 +89,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -103,14 +96,6 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] -load --table Paths_20150204 -[ -["_key"], -["/tmp/log"], -["/root/"], -["/etc/aliases"] -] - load --table Logs_20150204 [ ["_id","timestamp"], @@ -119,6 +104,21 @@ load --table Logs_20150204 [3,1423025400.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + +load --table Paths_20150204 +[ +["_key"], +["/tmp/log"], +["/root/"], +["/etc/aliases"] +] + load --table Times_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/index_column/dependent.expected (+15 -15) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/index_column/dependent.expected 2016-09-29 16:43:08 +0900 (c08de62) +++ test/command/suite/sharding/logical_table_remove/broken/index_column/dependent.expected 2016-09-30 22:29:13 +0900 (a55fe10) @@ -90,13 +90,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -104,14 +97,6 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] -load --table Paths_20150204 -[ -["_key"], -["/tmp/log"], -["/root/"], -["/etc/aliases"] -] - load --table Logs_20150204 [ ["_id","timestamp"], @@ -120,6 +105,21 @@ load --table Logs_20150204 [3,1423025400.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + +load --table Paths_20150204 +[ +["_key"], +["/tmp/log"], +["/root/"], +["/etc/aliases"] +] + load --table Times_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/index_column/dependent_force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/index_column/dependent_force.expected 2016-09-29 16:43:08 +0900 (b738256) +++ test/command/suite/sharding/logical_table_remove/broken/index_column/dependent_force.expected 2016-09-30 22:29:13 +0900 (3e39cd9) @@ -78,13 +78,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -92,5 +85,12 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/index_column/force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/index_column/force.expected 2016-09-29 16:43:08 +0900 (c566382) +++ test/command/suite/sharding/logical_table_remove/broken/index_column/force.expected 2016-09-30 22:29:13 +0900 (9d3fed9) @@ -83,13 +83,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -97,6 +90,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/lexicon/default.expected (+15 -15) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/lexicon/default.expected 2016-09-29 16:43:08 +0900 (bb5e540) +++ test/command/suite/sharding/logical_table_remove/broken/lexicon/default.expected 2016-09-30 22:29:13 +0900 (886ac44) @@ -88,13 +88,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -102,14 +95,6 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] -load --table Paths_20150204 -[ -["_key"], -["/tmp/log"], -["/root/"], -["/etc/aliases"] -] - load --table Logs_20150204 [ ["_id","timestamp"], @@ -118,6 +103,21 @@ load --table Logs_20150204 [3,1423025400.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + +load --table Paths_20150204 +[ +["_key"], +["/tmp/log"], +["/root/"], +["/etc/aliases"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create PathTerms_20150204 index COLUMN_INDEX|WITH_POSITION Paths_20150204 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/lexicon/dependent.expected (+15 -15) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/lexicon/dependent.expected 2016-09-29 16:43:08 +0900 (84251e9) +++ test/command/suite/sharding/logical_table_remove/broken/lexicon/dependent.expected 2016-09-30 22:29:13 +0900 (792b195) @@ -90,13 +90,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -104,14 +97,6 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] -load --table Paths_20150204 -[ -["_key"], -["/tmp/log"], -["/root/"], -["/etc/aliases"] -] - load --table Logs_20150204 [ ["_id","timestamp"], @@ -120,6 +105,21 @@ load --table Logs_20150204 [3,1423025400.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + +load --table Paths_20150204 +[ +["_key"], +["/tmp/log"], +["/root/"], +["/etc/aliases"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create PathTerms_20150204 index COLUMN_INDEX|WITH_POSITION Paths_20150204 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/lexicon/dependent_force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/lexicon/dependent_force.expected 2016-09-29 16:43:08 +0900 (3680b3a) +++ test/command/suite/sharding/logical_table_remove/broken/lexicon/dependent_force.expected 2016-09-30 22:29:13 +0900 (b69c625) @@ -87,13 +87,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -101,5 +94,12 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/lexicon/force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/lexicon/force.expected 2016-09-29 16:43:08 +0900 (8f35b4d) +++ test/command/suite/sharding/logical_table_remove/broken/lexicon/force.expected 2016-09-30 22:29:13 +0900 (9d12e55) @@ -86,13 +86,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -100,6 +93,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/referenced_table/default.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/referenced_table/default.expected 2016-09-29 16:43:08 +0900 (f39b4ba) +++ test/command/suite/sharding/logical_table_remove/broken/referenced_table/default.expected 2016-09-30 22:29:13 +0900 (b8b2ceb) @@ -71,13 +71,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -85,6 +78,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Times_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/referenced_table/dependent.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/referenced_table/dependent.expected 2016-09-29 16:43:08 +0900 (bf639df) +++ test/command/suite/sharding/logical_table_remove/broken/referenced_table/dependent.expected 2016-09-30 22:29:13 +0900 (f8adf0f) @@ -71,13 +71,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -85,6 +78,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp #|e| grn_ctx_at: failed to open object: <271>(<Paths_20150204>):<48>(<table:hash_key>) Modified: test/command/suite/sharding/logical_table_remove/broken/referenced_table/dependent_force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/referenced_table/dependent_force.expected 2016-09-29 16:43:08 +0900 (12e1839) +++ test/command/suite/sharding/logical_table_remove/broken/referenced_table/dependent_force.expected 2016-09-30 22:29:13 +0900 (54c7687) @@ -71,13 +71,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -85,6 +78,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp #|e| grn_ctx_at: failed to open object: <271>(<Paths_20150204>):<48>(<table:hash_key>) Modified: test/command/suite/sharding/logical_table_remove/broken/referenced_table/force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/referenced_table/force.expected 2016-09-29 16:43:08 +0900 (a25afe7) +++ test/command/suite/sharding/logical_table_remove/broken/referenced_table/force.expected 2016-09-30 22:29:13 +0900 (abc0453) @@ -71,13 +71,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -85,6 +78,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Times_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/shard_key_column/default.expected (+15 -15) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/shard_key_column/default.expected 2016-09-29 16:43:08 +0900 (4997c2c) +++ test/command/suite/sharding/logical_table_remove/broken/shard_key_column/default.expected 2016-09-30 22:29:13 +0900 (4fdad3c) @@ -78,13 +78,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 column_create Logs_20150204 path COLUMN_SCALAR Paths_20150204 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -92,14 +85,6 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] -load --table Paths_20150204 -[ -["_key"], -["/tmp/log"], -["/root/"], -["/etc/aliases"] -] - load --table Logs_20150204 [ ["_id","path"], @@ -108,6 +93,21 @@ load --table Logs_20150204 [3,"/etc/aliases"] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + +load --table Paths_20150204 +[ +["_key"], +["/tmp/log"], +["/root/"], +["/etc/aliases"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create PathTerms_20150204 index COLUMN_INDEX|WITH_POSITION Paths_20150204 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent.expected (+15 -15) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent.expected 2016-09-29 16:43:08 +0900 (baaa41d) +++ test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent.expected 2016-09-30 22:29:13 +0900 (b1aeea9) @@ -78,13 +78,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 column_create Logs_20150204 path COLUMN_SCALAR Paths_20150204 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -92,14 +85,6 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] -load --table Paths_20150204 -[ -["_key"], -["/tmp/log"], -["/root/"], -["/etc/aliases"] -] - load --table Logs_20150204 [ ["_id","path"], @@ -108,6 +93,21 @@ load --table Logs_20150204 [3,"/etc/aliases"] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + +load --table Paths_20150204 +[ +["_key"], +["/tmp/log"], +["/root/"], +["/etc/aliases"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create PathTerms_20150204 index COLUMN_INDEX|WITH_POSITION Paths_20150204 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent_force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent_force.expected 2016-09-29 16:43:08 +0900 (06bf3b5) +++ test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent_force.expected 2016-09-30 22:29:13 +0900 (39d82f7) @@ -78,13 +78,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -92,5 +85,12 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/shard_key_column/force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/shard_key_column/force.expected 2016-09-29 16:43:08 +0900 (2a721fe) +++ test/command/suite/sharding/logical_table_remove/broken/shard_key_column/force.expected 2016-09-30 22:29:13 +0900 (145988e) @@ -82,13 +82,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -96,6 +89,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table/default.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table/default.expected 2016-09-29 16:43:08 +0900 (0e6e629) +++ test/command/suite/sharding/logical_table_remove/broken/table/default.expected 2016-09-30 22:29:13 +0900 (834098b) @@ -82,13 +82,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -96,6 +89,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table/dependent.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table/dependent.expected 2016-09-29 16:43:08 +0900 (a750aef) +++ test/command/suite/sharding/logical_table_remove/broken/table/dependent.expected 2016-09-30 22:29:13 +0900 (5f02a34) @@ -82,13 +82,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -96,6 +89,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table/dependent_force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table/dependent_force.expected 2016-09-29 16:43:08 +0900 (9ff50ee) +++ test/command/suite/sharding/logical_table_remove/broken/table/dependent_force.expected 2016-09-30 22:29:13 +0900 (24577dd) @@ -67,13 +67,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -81,5 +74,12 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/table/force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table/force.expected 2016-09-29 16:43:08 +0900 (83dcf4f) +++ test/command/suite/sharding/logical_table_remove/broken/table/force.expected 2016-09-30 22:29:13 +0900 (f9e0f10) @@ -73,13 +73,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -87,6 +80,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table_and_column/default.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table_and_column/default.expected 2016-09-29 16:43:08 +0900 (0e6e629) +++ test/command/suite/sharding/logical_table_remove/broken/table_and_column/default.expected 2016-09-30 22:29:13 +0900 (834098b) @@ -82,13 +82,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -96,6 +89,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table_and_column/dependent.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table_and_column/dependent.expected 2016-09-29 16:43:08 +0900 (a750aef) +++ test/command/suite/sharding/logical_table_remove/broken/table_and_column/dependent.expected 2016-09-30 22:29:13 +0900 (5f02a34) @@ -82,13 +82,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -96,6 +89,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table_and_column/dependent_force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table_and_column/dependent_force.expected 2016-09-29 16:43:08 +0900 (363e114) +++ test/command/suite/sharding/logical_table_remove/broken/table_and_column/dependent_force.expected 2016-09-30 22:29:13 +0900 (4a39cbe) @@ -80,13 +80,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -94,6 +87,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table_and_column/force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table_and_column/force.expected 2016-09-29 16:43:08 +0900 (049a40b) +++ test/command/suite/sharding/logical_table_remove/broken/table_and_column/force.expected 2016-09-30 22:29:13 +0900 (8406764) @@ -78,13 +78,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -92,6 +85,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/default.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/default.expected 2016-09-29 16:43:08 +0900 (88673a1) +++ test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/default.expected 2016-09-30 22:29:13 +0900 (3bb8a5b) @@ -88,13 +88,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -102,6 +95,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/dependent.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/dependent.expected 2016-09-29 16:43:08 +0900 (2210803) +++ test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/dependent.expected 2016-09-30 22:29:13 +0900 (a3a53c4) @@ -88,13 +88,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -102,6 +95,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/dependent_force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/dependent_force.expected 2016-09-29 16:43:08 +0900 (f7355b2) +++ test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/dependent_force.expected 2016-09-30 22:29:13 +0900 (cb54657) @@ -81,13 +81,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -95,5 +88,12 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/force.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/force.expected 2016-09-29 16:43:08 +0900 (d3b9053) +++ test/command/suite/sharding/logical_table_remove/broken/table_and_reference_table/force.expected 2016-09-30 22:29:13 +0900 (cd88270) @@ -87,13 +87,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -101,6 +94,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/range/max_exclude.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/range/max_exclude.expected 2016-09-29 16:43:08 +0900 (555fed4) +++ test/command/suite/sharding/logical_table_remove/range/max_exclude.expected 2016-09-30 22:29:13 +0900 (5a99bfa) @@ -62,13 +62,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time table_create Times_20150205 TABLE_PAT_KEY Time -load --table Times_20150203 -[ -["_key"], -[1422935340.0], -[1422975599.0] -] - load --table Logs_20150204 [ ["_id","timestamp"], @@ -86,5 +79,12 @@ load --table Logs_20150205 [4,1423111920.0] ] +load --table Times_20150203 +[ +["_key"], +[1422935340.0], +[1422975599.0] +] + column_create Times_20150204 timestamp_index COLUMN_INDEX Logs_20150204 timestamp column_create Times_20150205 timestamp_index COLUMN_INDEX Logs_20150205 timestamp Modified: test/command/suite/sharding/logical_table_remove/range/max_include.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/range/max_include.expected 2016-09-29 16:43:08 +0900 (38be7c0) +++ test/command/suite/sharding/logical_table_remove/range/max_include.expected 2016-09-30 22:29:13 +0900 (25ebade) @@ -62,13 +62,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time table_create Times_20150205 TABLE_PAT_KEY Time -load --table Times_20150203 -[ -["_key"], -[1422935340.0], -[1422975599.0] -] - load --table Logs_20150204 [ ["_id","timestamp"], @@ -87,5 +80,12 @@ load --table Logs_20150205 [4,1423111920.0] ] +load --table Times_20150203 +[ +["_key"], +[1422935340.0], +[1422975599.0] +] + column_create Times_20150204 timestamp_index COLUMN_INDEX Logs_20150204 timestamp column_create Times_20150205 timestamp_index COLUMN_INDEX Logs_20150205 timestamp Modified: test/command/suite/sharding/logical_table_remove/range/min_include_max_exclude.expected (+10 -10) =================================================================== --- test/command/suite/sharding/logical_table_remove/range/min_include_max_exclude.expected 2016-09-29 16:43:08 +0900 (628312b) +++ test/command/suite/sharding/logical_table_remove/range/min_include_max_exclude.expected 2016-09-30 22:29:13 +0900 (41b6e90) @@ -73,16 +73,6 @@ load --table Logs_20150203 [2,1422975599.0] ] -load --table Times_20150204 -[ -["_key"], -[1422975600.0], -[1422975601.0], -[1423025340.0], -[1423025400.0], -[1423061999.0] -] - load --table Logs_20150205 [ ["_id","timestamp"], @@ -94,5 +84,15 @@ load --table Logs_20150205 [6,1423111980.0] ] +load --table Times_20150204 +[ +["_key"], +[1422975600.0], +[1422975601.0], +[1423025340.0], +[1423025400.0], +[1423061999.0] +] + column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp column_create Times_20150205 timestamp_index COLUMN_INDEX Logs_20150205 timestamp Modified: test/command/suite/sharding/logical_table_remove/range/min_include_max_include.expected (+10 -10) =================================================================== --- test/command/suite/sharding/logical_table_remove/range/min_include_max_include.expected 2016-09-29 16:43:08 +0900 (8b7812e) +++ test/command/suite/sharding/logical_table_remove/range/min_include_max_include.expected 2016-09-30 22:29:13 +0900 (b442de9) @@ -73,16 +73,6 @@ load --table Logs_20150203 [2,1422975599.0] ] -load --table Times_20150204 -[ -["_key"], -[1422975600.0], -[1422975601.0], -[1423025340.0], -[1423025400.0], -[1423061999.0] -] - load --table Logs_20150205 [ ["_id","timestamp"], @@ -95,5 +85,15 @@ load --table Logs_20150205 ] delete --table Logs_20150205 --id 1 +load --table Times_20150204 +[ +["_key"], +[1422975600.0], +[1422975601.0], +[1423025340.0], +[1423025400.0], +[1423061999.0] +] + column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp column_create Times_20150205 timestamp_index COLUMN_INDEX Logs_20150205 timestamp Modified: test/command/suite/sharding/logical_table_remove/referenced/default.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/referenced/default.expected 2016-09-29 16:43:08 +0900 (d17f626) +++ test/command/suite/sharding/logical_table_remove/referenced/default.expected 2016-09-30 22:29:13 +0900 (8397557) @@ -71,13 +71,6 @@ table_create Times_20150204 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -85,6 +78,13 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + load --table Paths_20150204 [ ["_key"], Modified: test/command/suite/sharding/logical_table_remove/referenced/dependent.expected (+7 -7) =================================================================== --- test/command/suite/sharding/logical_table_remove/referenced/dependent.expected 2016-09-29 16:43:08 +0900 (8b1febc) +++ test/command/suite/sharding/logical_table_remove/referenced/dependent.expected 2016-09-30 22:29:13 +0900 (5dbcff8) @@ -65,13 +65,6 @@ table_create Times_20150203 TABLE_PAT_KEY Time column_create Logs_20150203 path COLUMN_SCALAR Paths_20150203 -load --table Paths_20150203 -[ -["_key"], -["/tmp/log"], -["/var/"] -] - load --table Logs_20150203 [ ["_id","path","timestamp"], @@ -79,5 +72,12 @@ load --table Logs_20150203 [2,"/var/",1422975599.0] ] +load --table Paths_20150203 +[ +["_key"], +["/tmp/log"], +["/var/"] +] + column_create PathTerms_20150203 index COLUMN_INDEX|WITH_POSITION Paths_20150203 _key column_create Times_20150203 timestamp_index COLUMN_INDEX Logs_20150203 timestamp Modified: test/command/suite/table_copy/different.expected (+2 -2) =================================================================== --- test/command/suite/table_copy/different.expected 2016-09-29 16:43:08 +0900 (ce04f58) +++ test/command/suite/table_copy/different.expected 2016-09-30 22:29:13 +0900 (96b5b50) @@ -12,7 +12,7 @@ table_create LargeNumbers TABLE_HASH_KEY UInt64 table_copy SmallNumbers LargeNumbers [[0,0.0,0.0],true] dump --dump_schema no -load --table SmallNumbers +load --table LargeNumbers [ ["_key"], [10], @@ -20,7 +20,7 @@ load --table SmallNumbers [30] ] -load --table LargeNumbers +load --table SmallNumbers [ ["_key"], [10], Modified: test/command/suite/table_copy/same_key_type.expected (+2 -2) =================================================================== --- test/command/suite/table_copy/same_key_type.expected 2016-09-29 16:43:08 +0900 (a77a709) +++ test/command/suite/table_copy/same_key_type.expected 2016-09-30 22:29:13 +0900 (4714e76) @@ -12,7 +12,7 @@ table_create Friends TABLE_PAT_KEY ShortText table_copy Users Friends [[0,0.0,0.0],true] dump --dump_schema no -load --table Users +load --table Friends [ ["_key"], ["alice"], @@ -20,7 +20,7 @@ load --table Users ["charlie"] ] -load --table Friends +load --table Users [ ["_key"], ["alice"], -------------- next part -------------- HTML����������������������������...Download