Susumu Yata
null+****@clear*****
Thu Apr 13 22:56:08 JST 2017
Susumu Yata 2017-04-13 22:56:08 +0900 (Thu, 13 Apr 2017) New Revision: eb8f4654ad45329c3f8eb194e754b846070c415b https://github.com/groonga/groonga/commit/eb8f4654ad45329c3f8eb194e754b846070c415b Message: Revert "test: remove tests for sortby because it is deprecated" These tests are kept for backward compatibility tests. This reverts commit cb757ac79997693b6fe718d0c1d64e81fca35639. Added files: test/command/suite/select/drilldown/labeled/sortby/sub_record_column/multiple.expected test/command/suite/select/drilldown/labeled/sortby/sub_record_column/multiple.test test/command/suite/select/drilldowns/sortby/sub_record_column/multiple.expected test/command/suite/select/drilldowns/sortby/sub_record_column/multiple.test test/command/suite/select/sortby/compressed.expected test/command/suite/select/sortby/compressed.test test/command/suite/select/sortby/geo/distance/limit.expected test/command/suite/select/sortby/geo/distance/limit.test test/command/suite/select/sortby/geo/distance/no_limit.expected test/command/suite/select/sortby/geo/distance/no_limit.test test/command/suite/select/sortby/geo/distance/not_indexed.expected test/command/suite/select/sortby/geo/distance/not_indexed.test test/command/suite/select/sortby/geo/distance/offset_and_limit.expected test/command/suite/select/sortby/geo/distance/offset_and_limit.test test/command/suite/select/sortby/geo/distance/with_condition.expected test/command/suite/select/sortby/geo/distance/with_condition.test test/command/suite/select/sortby/geo/distance/without_condition.expected test/command/suite/select/sortby/geo/distance/without_condition.test test/command/suite/select/sortby/index.expected test/command/suite/select/sortby/index.test test/command/suite/select/sortby/key/double_array_trie.expected test/command/suite/select/sortby/key/double_array_trie.test test/command/suite/select/sortby/key/hash_key.expected test/command/suite/select/sortby/key/hash_key.test test/command/suite/select/sortby/key/patricia_trie.expected test/command/suite/select/sortby/key/patricia_trie.test test/command/suite/select/sortby/string_use_8bit.expected test/command/suite/select/sortby/string_use_8bit.test test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.test test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.test test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.test test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.test test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.test test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.test test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.test test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.test test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.test test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.test test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.test test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.test test/command/suite/sharding/logical_select/drilldowns/sortby/ascending.expected test/command/suite/sharding/logical_select/drilldowns/sortby/ascending.test test/command/suite/sharding/logical_select/drilldowns/sortby/descending.expected test/command/suite/sharding/logical_select/drilldowns/sortby/descending.test test/command/suite/sharding/logical_select/drilldowns/sortby/limit.expected test/command/suite/sharding/logical_select/drilldowns/sortby/limit.test test/command/suite/sharding/logical_select/drilldowns/sortby/multiple/one_shard.expected test/command/suite/sharding/logical_select/drilldowns/sortby/multiple/one_shard.test test/command/suite/sharding/logical_select/drilldowns/sortby/offset.expected test/command/suite/sharding/logical_select/drilldowns/sortby/offset.test test/command/suite/sharding/logical_select/drilldowns/sortby/offset_limit.expected test/command/suite/sharding/logical_select/drilldowns/sortby/offset_limit.test test/command/suite/sharding/logical_select/sortby/shard_key/ascending.expected test/command/suite/sharding/logical_select/sortby/shard_key/ascending.test Added: test/command/suite/select/drilldown/labeled/sortby/sub_record_column/multiple.expected (+121 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/drilldown/labeled/sortby/sub_record_column/multiple.expected 2017-04-13 22:56:08 +0900 (69e0940) @@ -0,0 +1,121 @@ +table_create Tags TABLE_PAT_KEY ShortText +[[0,0.0,0.0],true] +table_create Memos TABLE_HASH_KEY ShortText +[[0,0.0,0.0],true] +column_create Memos tag COLUMN_SCALAR Tags +[[0,0.0,0.0],true] +column_create Memos date COLUMN_SCALAR Time +[[0,0.0,0.0],true] +load --table Memos +[ +{"_key": "Rroonga is fast!", "tag": "Rroonga", "date": "2014-11-17 00:00:00"}, +{"_key": "Mroonga is fast!", "tag": "Mroonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga is fast!", "tag": "Groonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga sticker!", "tag": "Groonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga is good!", "tag": "Groonga", "date": "2014-11-17 00:00:00"} +] +[[0,0.0,0.0],5] +select Memos --filter true --drilldown[tag].keys tag,date --drilldown[tag].output_columns _key[0],_key[1],_nsubrecs --drilldown[tag].sortby _value.tag._key,_value.date +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 5 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "_key", + "ShortText" + ], + [ + "date", + "Time" + ], + [ + "tag", + "Tags" + ] + ], + [ + 1, + "Rroonga is fast!", + 1416150000.0, + "Rroonga" + ], + [ + 2, + "Mroonga is fast!", + 1416063600.0, + "Mroonga" + ], + [ + 3, + "Groonga is fast!", + 1416063600.0, + "Groonga" + ], + [ + 4, + "Groonga sticker!", + 1416063600.0, + "Groonga" + ], + [ + 5, + "Groonga is good!", + 1416150000.0, + "Groonga" + ] + ], + { + "tag": [ + [ + 4 + ], + [ + [ + "_key[0]", + null + ], + [ + "_key[1]", + null + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Groonga", + 1416063600.0, + 2 + ], + [ + "Groonga", + 1416150000.0, + 1 + ], + [ + "Mroonga", + 1416063600.0, + 1 + ], + [ + "Rroonga", + 1416150000.0, + 1 + ] + ] + } + ] +] Added: test/command/suite/select/drilldown/labeled/sortby/sub_record_column/multiple.test (+20 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/drilldown/labeled/sortby/sub_record_column/multiple.test 2017-04-13 22:56:08 +0900 (be8269f) @@ -0,0 +1,20 @@ +table_create Tags TABLE_PAT_KEY ShortText + +table_create Memos TABLE_HASH_KEY ShortText +column_create Memos tag COLUMN_SCALAR Tags +column_create Memos date COLUMN_SCALAR Time + +load --table Memos +[ +{"_key": "Rroonga is fast!", "tag": "Rroonga", "date": "2014-11-17 00:00:00"}, +{"_key": "Mroonga is fast!", "tag": "Mroonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga is fast!", "tag": "Groonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga sticker!", "tag": "Groonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga is good!", "tag": "Groonga", "date": "2014-11-17 00:00:00"} +] + +select Memos \ + --filter true \ + --drilldown[tag].keys tag,date \ + --drilldown[tag].output_columns _key[0],_key[1],_nsubrecs \ + --drilldown[tag].sortby _value.tag._key,_value.date Added: test/command/suite/select/drilldowns/sortby/sub_record_column/multiple.expected (+121 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/drilldowns/sortby/sub_record_column/multiple.expected 2017-04-13 22:56:08 +0900 (ab37421) @@ -0,0 +1,121 @@ +table_create Tags TABLE_PAT_KEY ShortText +[[0,0.0,0.0],true] +table_create Memos TABLE_HASH_KEY ShortText +[[0,0.0,0.0],true] +column_create Memos tag COLUMN_SCALAR Tags +[[0,0.0,0.0],true] +column_create Memos date COLUMN_SCALAR Time +[[0,0.0,0.0],true] +load --table Memos +[ +{"_key": "Rroonga is fast!", "tag": "Rroonga", "date": "2014-11-17 00:00:00"}, +{"_key": "Mroonga is fast!", "tag": "Mroonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga is fast!", "tag": "Groonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga sticker!", "tag": "Groonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga is good!", "tag": "Groonga", "date": "2014-11-17 00:00:00"} +] +[[0,0.0,0.0],5] +select Memos --filter true --drilldowns[tag].keys tag,date --drilldowns[tag].output_columns _key[0],_key[1],_nsubrecs --drilldowns[tag].sortby _value.tag._key,_value.date +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 5 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "_key", + "ShortText" + ], + [ + "date", + "Time" + ], + [ + "tag", + "Tags" + ] + ], + [ + 1, + "Rroonga is fast!", + 1416150000.0, + "Rroonga" + ], + [ + 2, + "Mroonga is fast!", + 1416063600.0, + "Mroonga" + ], + [ + 3, + "Groonga is fast!", + 1416063600.0, + "Groonga" + ], + [ + 4, + "Groonga sticker!", + 1416063600.0, + "Groonga" + ], + [ + 5, + "Groonga is good!", + 1416150000.0, + "Groonga" + ] + ], + { + "tag": [ + [ + 4 + ], + [ + [ + "_key[0]", + null + ], + [ + "_key[1]", + null + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Groonga", + 1416063600.0, + 2 + ], + [ + "Groonga", + 1416150000.0, + 1 + ], + [ + "Mroonga", + 1416063600.0, + 1 + ], + [ + "Rroonga", + 1416150000.0, + 1 + ] + ] + } + ] +] Added: test/command/suite/select/drilldowns/sortby/sub_record_column/multiple.test (+20 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/drilldowns/sortby/sub_record_column/multiple.test 2017-04-13 22:56:08 +0900 (8791e66) @@ -0,0 +1,20 @@ +table_create Tags TABLE_PAT_KEY ShortText + +table_create Memos TABLE_HASH_KEY ShortText +column_create Memos tag COLUMN_SCALAR Tags +column_create Memos date COLUMN_SCALAR Time + +load --table Memos +[ +{"_key": "Rroonga is fast!", "tag": "Rroonga", "date": "2014-11-17 00:00:00"}, +{"_key": "Mroonga is fast!", "tag": "Mroonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga is fast!", "tag": "Groonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga sticker!", "tag": "Groonga", "date": "2014-11-16 00:00:00"}, +{"_key": "Groonga is good!", "tag": "Groonga", "date": "2014-11-17 00:00:00"} +] + +select Memos \ + --filter true \ + --drilldowns[tag].keys tag,date \ + --drilldowns[tag].output_columns _key[0],_key[1],_nsubrecs \ + --drilldowns[tag].sortby _value.tag._key,_value.date Added: test/command/suite/select/sortby/compressed.expected (+55 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/compressed.expected 2017-04-13 22:56:08 +0900 (fe13707) @@ -0,0 +1,55 @@ +table_create Users TABLE_HASH_KEY ShortText +[[0,0.0,0.0],true] +column_create Users name COLUMN_SCALAR|COMPRESS_ZLIB ShortText +[[0,0.0,0.0],true] +load --table Users +[ +{"_key": "alice", "name": "Alice"}, +{"_key": "kou", "name": "kou"}, +{"_key": "mori", "name": "森"} +] +[[0,0.0,0.0],3] +select Users --sortby name +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 3 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "_key", + "ShortText" + ], + [ + "name", + "ShortText" + ] + ], + [ + 1, + "alice", + "Alice" + ], + [ + 2, + "kou", + "kou" + ], + [ + 3, + "mori", + "森" + ] + ] + ] +] Added: test/command/suite/select/sortby/compressed.test (+11 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/compressed.test 2017-04-13 22:56:08 +0900 (52c5b3f) @@ -0,0 +1,11 @@ +table_create Users TABLE_HASH_KEY ShortText +column_create Users name COLUMN_SCALAR|COMPRESS_ZLIB ShortText + +load --table Users +[ +{"_key": "alice", "name": "Alice"}, +{"_key": "kou", "name": "kou"}, +{"_key": "mori", "name": "森"} +] + +select Users --sortby name Added: test/command/suite/select/sortby/geo/distance/limit.expected (+37 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/limit.expected 2017-04-13 22:56:08 +0900 (f7f02bb) @@ -0,0 +1,37 @@ +select LandMarks --sortby 'geo_distance(point, "0x0")' --limit 3 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 11 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + 1, + "0x0" + ], + [ + 2, + "-1x1" + ], + [ + 3, + "1x2" + ] + ] + ] +] Added: test/command/suite/select/sortby/geo/distance/limit.test (+3 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/limit.test 2017-04-13 22:56:08 +0900 (aadcfcc) @@ -0,0 +1,3 @@ +#@include fixture/geo/sort/init.grn + +select LandMarks --sortby 'geo_distance(point, "0x0")' --limit 3 Added: test/command/suite/select/sortby/geo/distance/no_limit.expected (+69 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/no_limit.expected 2017-04-13 22:56:08 +0900 (0b918ca) @@ -0,0 +1,69 @@ +select LandMarks --sortby 'geo_distance(point, "0x0")' --limit -1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 11 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + 1, + "0x0" + ], + [ + 2, + "-1x1" + ], + [ + 3, + "1x2" + ], + [ + 4, + "2x-2" + ], + [ + 5, + "2x3" + ], + [ + 6, + "-3x3" + ], + [ + 7, + "3x4" + ], + [ + 8, + "-4x4" + ], + [ + 9, + "4x5" + ], + [ + 10, + "5x-5" + ], + [ + 11, + "5x6" + ] + ] + ] +] Added: test/command/suite/select/sortby/geo/distance/no_limit.test (+3 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/no_limit.test 2017-04-13 22:56:08 +0900 (34fd913) @@ -0,0 +1,3 @@ +#@include fixture/geo/sort/init.grn + +select LandMarks --sortby 'geo_distance(point, "0x0")' --limit -1 Added: test/command/suite/select/sortby/geo/distance/not_indexed.expected (+55 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/not_indexed.expected 2017-04-13 22:56:08 +0900 (63a4505) @@ -0,0 +1,55 @@ +table_create Locations TABLE_PAT_KEY WGS84GeoPoint +[[0,0.0,0.0],true] +table_create Shops TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Shops name COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Shops location COLUMN_SCALAR WGS84GeoPoint +[[0,0.0,0.0],true] +column_create Locations shop COLUMN_INDEX Shops location +[[0,0.0,0.0],true] +load --table Shops +[ +{"name":"根津のたいやき", "location":"128592911x503145263"}, +{"name":"たい焼 カタオカ", "location":null} +] +[[0,0.0,0.0],2] +select Shops --sortby 'geo_distance(location, "35.67487x139.76352")' --output_columns '_id, name, location' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 2 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "name", + "ShortText" + ], + [ + "location", + "WGS84GeoPoint" + ] + ], + [ + 1, + "根津のたいやき", + "128592911x503145263" + ], + [ + 2, + "たい焼 カタオカ", + "0x0" + ] + ] + ] +] Added: test/command/suite/select/sortby/geo/distance/not_indexed.test (+18 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/not_indexed.test 2017-04-13 22:56:08 +0900 (336c187) @@ -0,0 +1,18 @@ +table_create Locations TABLE_PAT_KEY WGS84GeoPoint + +table_create Shops TABLE_NO_KEY +column_create Shops name COLUMN_SCALAR ShortText +column_create Shops location COLUMN_SCALAR WGS84GeoPoint + +column_create Locations shop COLUMN_INDEX Shops location + +load --table Shops +[ +{"name":"根津のたいやき", "location":"128592911x503145263"}, +{"name":"たい焼 カタオカ", "location":null} +] + +select Shops \ + --sortby 'geo_distance(location, "35.67487x139.76352")' \ + --output_columns '_id, name, location' + Added: test/command/suite/select/sortby/geo/distance/offset_and_limit.expected (+37 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/offset_and_limit.expected 2017-04-13 22:56:08 +0900 (b11e33e) @@ -0,0 +1,37 @@ +select LandMarks --sortby 'geo_distance(point, "0x0")' --offset 2 --limit 3 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 11 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + 3, + "1x2" + ], + [ + 4, + "2x-2" + ], + [ + 5, + "2x3" + ] + ] + ] +] Added: test/command/suite/select/sortby/geo/distance/offset_and_limit.test (+3 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/offset_and_limit.test 2017-04-13 22:56:08 +0900 (4dbbebf) @@ -0,0 +1,3 @@ +#@include fixture/geo/sort/init.grn + +select LandMarks --sortby 'geo_distance(point, "0x0")' --offset 2 --limit 3 Added: test/command/suite/select/sortby/geo/distance/with_condition.expected (+53 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/with_condition.expected 2017-04-13 22:56:08 +0900 (33e374c) @@ -0,0 +1,53 @@ +select Shops --sortby 'geo_distance(location, "35.67487x139.76352")' --output_columns 'name, _score' --filter 'geo_in_circle(location, "35.67487x139.76352", 3000)' --scorer '_score=geo_distance(location, "35.67487x139.76352")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 7 + ], + [ + [ + "name", + "ShortText" + ], + [ + "_score", + "Int32" + ] + ], + [ + "銀座 かずや", + 280 + ], + [ + "たい焼き鉄次 大丸東京店", + 810 + ], + [ + "たいやき神田達磨 八重洲店", + 970 + ], + [ + "にしみや 甘味処", + 1056 + ], + [ + "築地 さのきや", + 1186 + ], + [ + "しげ田", + 1530 + ], + [ + "柳屋 たい焼き", + 2179 + ] + ] + ] +] Added: test/command/suite/select/sortby/geo/distance/with_condition.test (+8 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/with_condition.test 2017-04-13 22:56:08 +0900 (f060a3a) @@ -0,0 +1,8 @@ +#@include fixture/geo/taiyaki/init.grn + +select Shops \ + --sortby 'geo_distance(location, "35.67487x139.76352")' \ + --output_columns 'name, _score' \ + --filter 'geo_in_circle(location, "35.67487x139.76352", 3000)' \ + --scorer '_score=geo_distance(location, "35.67487x139.76352")' + Added: test/command/suite/select/sortby/geo/distance/without_condition.expected (+51 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/without_condition.expected 2017-04-13 22:56:08 +0900 (8694e50) @@ -0,0 +1,51 @@ +select Shops --sortby 'geo_distance(location, "35.67487x139.76352")' --output_columns 'name' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 36 + ], + [ + [ + "name", + "ShortText" + ] + ], + [ + "銀座 かずや" + ], + [ + "たい焼き鉄次 大丸東京店" + ], + [ + "たいやき神田達磨 八重洲店" + ], + [ + "にしみや 甘味処" + ], + [ + "築地 さのきや" + ], + [ + "しげ田" + ], + [ + "柳屋 たい焼き" + ], + [ + "松島屋" + ], + [ + "尾長屋 錦糸町店" + ], + [ + "根津のたいやき" + ] + ] + ] +] Added: test/command/suite/select/sortby/geo/distance/without_condition.test (+6 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/geo/distance/without_condition.test 2017-04-13 22:56:08 +0900 (5b708e1) @@ -0,0 +1,6 @@ +#@include fixture/geo/taiyaki/init.grn + +select Shops \ + --sortby 'geo_distance(location, "35.67487x139.76352")' \ + --output_columns 'name' + Added: test/command/suite/select/sortby/index.expected (+95 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/index.expected 2017-04-13 22:56:08 +0900 (83f883f) @@ -0,0 +1,95 @@ +table_create Logs TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs message 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 Logs message +[[0,0.0,0.0],true] +load --table Logs +[ +["message"], +["Error: no such file."], +["Critical: disk full."], +["Error: invalid argument."] +] +[[0,0.0,0.0],3] +select Terms --sortby -index +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 11 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "_key", + "ShortText" + ], + [ + "index", + "Logs" + ] + ], + [ + 6, + ".", + 10 + ], + [ + 2, + ":", + 6 + ], + [ + 1, + "error", + 4 + ], + [ + 7, + "critical", + 1 + ], + [ + 11, + "argument", + 1 + ], + [ + 8, + "disk", + 1 + ], + [ + 5, + "file", + 1 + ], + [ + 3, + "no", + 1 + ], + [ + 10, + "invalid", + 1 + ], + [ + 9, + "full", + 1 + ] + ] + ] +] Added: test/command/suite/select/sortby/index.test (+17 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/index.test 2017-04-13 22:56:08 +0900 (3a08bda) @@ -0,0 +1,17 @@ +table_create Logs TABLE_NO_KEY +column_create Logs message COLUMN_SCALAR Text + +table_create Terms TABLE_PAT_KEY ShortText \ + --default_tokenizer TokenBigram \ + --normalizer NormalizerAuto +column_create Terms index COLUMN_INDEX|WITH_SECTION Logs message + +load --table Logs +[ +["message"], +["Error: no such file."], +["Critical: disk full."], +["Error: invalid argument."] +] + +select Terms --sortby -index Added: test/command/suite/select/sortby/key/double_array_trie.expected (+46 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/key/double_array_trie.expected 2017-04-13 22:56:08 +0900 (4f80e8e) @@ -0,0 +1,46 @@ +table_create Numbers TABLE_DAT_KEY Int32 +[[0,0.0,0.0],true] +load --table Numbers +[ +{"_key": 127}, +{"_key": 256}, +{"_key": -255} +] +[[0,0.0,0.0],3] +select Numbers --sortby _key +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 3 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "_key", + "Int32" + ] + ], + [ + 3, + -255 + ], + [ + 1, + 127 + ], + [ + 2, + 256 + ] + ] + ] +] Added: test/command/suite/select/sortby/key/double_array_trie.test (+10 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/key/double_array_trie.test 2017-04-13 22:56:08 +0900 (ce060f4) @@ -0,0 +1,10 @@ +table_create Numbers TABLE_DAT_KEY Int32 + +load --table Numbers +[ +{"_key": 127}, +{"_key": 256}, +{"_key": -255} +] + +select Numbers --sortby _key Added: test/command/suite/select/sortby/key/hash_key.expected (+46 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/key/hash_key.expected 2017-04-13 22:56:08 +0900 (6dccef6) @@ -0,0 +1,46 @@ +table_create Numbers TABLE_HASH_KEY Int32 +[[0,0.0,0.0],true] +load --table Numbers +[ +{"_key": 127}, +{"_key": 256}, +{"_key": -255} +] +[[0,0.0,0.0],3] +select Numbers --sortby _key +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 3 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "_key", + "Int32" + ] + ], + [ + 3, + -255 + ], + [ + 1, + 127 + ], + [ + 2, + 256 + ] + ] + ] +] Added: test/command/suite/select/sortby/key/hash_key.test (+10 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/key/hash_key.test 2017-04-13 22:56:08 +0900 (d75e120) @@ -0,0 +1,10 @@ +table_create Numbers TABLE_HASH_KEY Int32 + +load --table Numbers +[ +{"_key": 127}, +{"_key": 256}, +{"_key": -255} +] + +select Numbers --sortby _key Added: test/command/suite/select/sortby/key/patricia_trie.expected (+46 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/key/patricia_trie.expected 2017-04-13 22:56:08 +0900 (e0cf7a4) @@ -0,0 +1,46 @@ +table_create Numbers TABLE_PAT_KEY Int32 +[[0,0.0,0.0],true] +load --table Numbers +[ +{"_key": 127}, +{"_key": 256}, +{"_key": -255} +] +[[0,0.0,0.0],3] +select Numbers --sortby _key +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 3 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "_key", + "Int32" + ] + ], + [ + 3, + -255 + ], + [ + 1, + 127 + ], + [ + 2, + 256 + ] + ] + ] +] Added: test/command/suite/select/sortby/key/patricia_trie.test (+10 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/key/patricia_trie.test 2017-04-13 22:56:08 +0900 (c62d1d4) @@ -0,0 +1,10 @@ +table_create Numbers TABLE_PAT_KEY Int32 + +load --table Numbers +[ +{"_key": 127}, +{"_key": 256}, +{"_key": -255} +] + +select Numbers --sortby _key Added: test/command/suite/select/sortby/string_use_8bit.expected (+55 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/string_use_8bit.expected 2017-04-13 22:56:08 +0900 (358ad4e) @@ -0,0 +1,55 @@ +table_create Users TABLE_HASH_KEY ShortText +[[0,0.0,0.0],true] +column_create Users name COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Users +[ +{"_key": "alice", "name": "Alice"}, +{"_key": "kou", "name": "kou"}, +{"_key": "mori", "name": "森"} +] +[[0,0.0,0.0],3] +select Users --sortby name +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 3 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "_key", + "ShortText" + ], + [ + "name", + "ShortText" + ] + ], + [ + 1, + "alice", + "Alice" + ], + [ + 2, + "kou", + "kou" + ], + [ + 3, + "mori", + "森" + ] + ] + ] +] Added: test/command/suite/select/sortby/string_use_8bit.test (+11 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/sortby/string_use_8bit.test 2017-04-13 22:56:08 +0900 (f994231) @@ -0,0 +1,11 @@ +table_create Users TABLE_HASH_KEY ShortText +column_create Users name COLUMN_SCALAR ShortText + +load --table Users +[ +{"_key": "alice", "name": "Alice"}, +{"_key": "kou", "name": "kou"}, +{"_key": "mori", "name": "森"} +] + +select Users --sortby name Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.expected (+181 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.expected 2017-04-13 22:56:08 +0900 (fed9bc7) @@ -0,0 +1,181 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action,date --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldown[action_date].sortby _nsubrecs +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Start", + "2015-02-03", + 1 + ], + [ + "Shutdown", + "2015-02-03", + 1 + ], + [ + "Start", + "2015-02-04", + 1 + ], + [ + "Restart", + "2015-02-04", + 2 + ], + [ + "Restart", + "2015-02-05", + 4 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.test (+93 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.test 2017-04-13 22:56:08 +0900 (51d7b81) @@ -0,0 +1,93 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown[action_date].keys action,date \ + --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldown[action_date].sortby _nsubrecs Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.expected (+181 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.expected 2017-04-13 22:56:08 +0900 (eb8c7be) @@ -0,0 +1,181 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action,date --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldown[action_date].sortby -_nsubrecs +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Restart", + "2015-02-05", + 4 + ], + [ + "Restart", + "2015-02-04", + 2 + ], + [ + "Start", + "2015-02-03", + 1 + ], + [ + "Start", + "2015-02-04", + 1 + ], + [ + "Shutdown", + "2015-02-03", + 1 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.test (+93 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.test 2017-04-13 22:56:08 +0900 (32544e3) @@ -0,0 +1,93 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown[action_date].keys action,date \ + --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldown[action_date].sortby -_nsubrecs Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.expected (+161 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.expected 2017-04-13 22:56:08 +0900 (aedf2c2) @@ -0,0 +1,161 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action,date --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldown[action_date].sortby _nsubrecs --drilldown[action_date].limit 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Start", + "2015-02-03", + 1 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.test (+94 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.test 2017-04-13 22:56:08 +0900 (b8badfc) @@ -0,0 +1,94 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown[action_date].keys action,date \ + --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldown[action_date].sortby _nsubrecs \ + --drilldown[action_date].limit 1 Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.expected (+177 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.expected 2017-04-13 22:56:08 +0900 (830d70b) @@ -0,0 +1,177 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:53:00", + "memo": "2015-02-05 13:53:00", + "date": "2015-02-05", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Start" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],5] +logical_select Logs timestamp --min "2015-02-05 00:00:00" --min_border "include" --max "2015-02-06 00:00:00" --max_border "exclude" --limit 0 --drilldown[action_date].keys action,date --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldown[action_date].sortby -_nsubrecs,_value.date,_value.action +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 5 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 3 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Restart", + "2015-02-05", + 2 + ], + [ + "Shutdown", + "2015-02-05", + 2 + ], + [ + "Start", + "2015-02-05", + 1 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.test (+103 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.test 2017-04-13 22:56:08 +0900 (33e32f8) @@ -0,0 +1,103 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:53:00", + "memo": "2015-02-05 13:53:00", + "date": "2015-02-05", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Start" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --min "2015-02-05 00:00:00" \ + --min_border "include" \ + --max "2015-02-06 00:00:00" \ + --max_border "exclude" \ + --limit 0 \ + --drilldown[action_date].keys action,date \ + --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldown[action_date].sortby -_nsubrecs,_value.date,_value.action Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.expected (+176 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.expected 2017-04-13 22:56:08 +0900 (6a49550) @@ -0,0 +1,176 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action,date --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldown[action_date].sortby _nsubrecs --drilldown[action_date].offset 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Shutdown", + "2015-02-03", + 1 + ], + [ + "Start", + "2015-02-04", + 1 + ], + [ + "Restart", + "2015-02-04", + 2 + ], + [ + "Restart", + "2015-02-05", + 4 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.test (+94 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.test 2017-04-13 22:56:08 +0900 (c861fa3) @@ -0,0 +1,94 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown[action_date].keys action,date \ + --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldown[action_date].sortby _nsubrecs \ + --drilldown[action_date].offset 1 Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.expected (+161 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.expected 2017-04-13 22:56:08 +0900 (7627307) @@ -0,0 +1,161 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action,date --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldown[action_date].sortby _nsubrecs --drilldown[action_date].offset 1 --drilldown[action_date].limit 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Shutdown", + "2015-02-03", + 1 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.test (+95 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.test 2017-04-13 22:56:08 +0900 (8b6b47c) @@ -0,0 +1,95 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown[action_date].keys action,date \ + --drilldown[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldown[action_date].sortby _nsubrecs \ + --drilldown[action_date].offset 1 \ + --drilldown[action_date].limit 1 Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.expected (+143 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.expected 2017-04-13 22:56:08 +0900 (c5c999c) @@ -0,0 +1,143 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sortby _nsubrecs +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + [ + [ + 3 + ], + [ + [ + "_key", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Shutdown", + 1 + ], + [ + "Start", + 2 + ], + [ + "Restart", + 6 + ] + ] + ] +] Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.test (+80 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.test 2017-04-13 22:56:08 +0900 (cb450c6) @@ -0,0 +1,80 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown action \ + --drilldown_sortby _nsubrecs Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.expected (+143 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.expected 2017-04-13 22:56:08 +0900 (9c3a106) @@ -0,0 +1,143 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sortby -_nsubrecs +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + [ + [ + 3 + ], + [ + [ + "_key", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Restart", + 6 + ], + [ + "Start", + 2 + ], + [ + "Shutdown", + 1 + ] + ] + ] +] Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.test (+80 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.test 2017-04-13 22:56:08 +0900 (33743c2) @@ -0,0 +1,80 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown action \ + --drilldown_sortby -_nsubrecs Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected (+135 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected 2017-04-13 22:56:08 +0900 (b4dd6ac) @@ -0,0 +1,135 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sortby _nsubrecs --drilldown_limit 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + [ + [ + 3 + ], + [ + [ + "_key", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Shutdown", + 1 + ] + ] + ] +] Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.test (+81 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.test 2017-04-13 22:56:08 +0900 (aac7889) @@ -0,0 +1,81 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown action \ + --drilldown_sortby _nsubrecs \ + --drilldown_limit 1 Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.expected (+143 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.expected 2017-04-13 22:56:08 +0900 (923cfae) @@ -0,0 +1,143 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Shutdown" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sortby -_nsubrecs,_key +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + [ + [ + 3 + ], + [ + [ + "_key", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Restart", + 5 + ], + [ + "Shutdown", + 2 + ], + [ + "Start", + 2 + ] + ] + ] +] Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.test (+80 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.test 2017-04-13 22:56:08 +0900 (c5af323) @@ -0,0 +1,80 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Shutdown" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown action \ + --drilldown_sortby -_nsubrecs,_key Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected (+139 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected 2017-04-13 22:56:08 +0900 (5c8a966) @@ -0,0 +1,139 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sortby _nsubrecs --drilldown_offset 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + [ + [ + 3 + ], + [ + [ + "_key", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Start", + 2 + ], + [ + "Restart", + 6 + ] + ] + ] +] Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.test (+81 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.test 2017-04-13 22:56:08 +0900 (7dd2366) @@ -0,0 +1,81 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown action \ + --drilldown_sortby _nsubrecs \ + --drilldown_offset 1 Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected (+135 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected 2017-04-13 22:56:08 +0900 (3edac75) @@ -0,0 +1,135 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sortby _nsubrecs --drilldown_offset 1 --drilldown_limit 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + [ + [ + 3 + ], + [ + [ + "_key", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Start", + 2 + ] + ] + ] +] Added: test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.test (+82 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.test 2017-04-13 22:56:08 +0900 (7c456f4) @@ -0,0 +1,82 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldown action \ + --drilldown_sortby _nsubrecs \ + --drilldown_offset 1 \ + --drilldown_limit 1 Added: test/command/suite/sharding/logical_select/drilldowns/sortby/ascending.expected (+181 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/ascending.expected 2017-04-13 22:56:08 +0900 (cda0ecd) @@ -0,0 +1,181 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys action,date --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldowns[action_date].sortby _nsubrecs +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Start", + "2015-02-03", + 1 + ], + [ + "Shutdown", + "2015-02-03", + 1 + ], + [ + "Start", + "2015-02-04", + 1 + ], + [ + "Restart", + "2015-02-04", + 2 + ], + [ + "Restart", + "2015-02-05", + 4 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldowns/sortby/ascending.test (+93 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/ascending.test 2017-04-13 22:56:08 +0900 (237ba91) @@ -0,0 +1,93 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldowns[action_date].keys action,date \ + --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldowns[action_date].sortby _nsubrecs Added: test/command/suite/sharding/logical_select/drilldowns/sortby/descending.expected (+181 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/descending.expected 2017-04-13 22:56:08 +0900 (2e37933) @@ -0,0 +1,181 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys action,date --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldowns[action_date].sortby -_nsubrecs +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Restart", + "2015-02-05", + 4 + ], + [ + "Restart", + "2015-02-04", + 2 + ], + [ + "Start", + "2015-02-03", + 1 + ], + [ + "Start", + "2015-02-04", + 1 + ], + [ + "Shutdown", + "2015-02-03", + 1 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldowns/sortby/descending.test (+93 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/descending.test 2017-04-13 22:56:08 +0900 (c41cfea) @@ -0,0 +1,93 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldowns[action_date].keys action,date \ + --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldowns[action_date].sortby -_nsubrecs Added: test/command/suite/sharding/logical_select/drilldowns/sortby/limit.expected (+161 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/limit.expected 2017-04-13 22:56:08 +0900 (406225d) @@ -0,0 +1,161 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys action,date --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldowns[action_date].sortby _nsubrecs --drilldowns[action_date].limit 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Start", + "2015-02-03", + 1 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldowns/sortby/limit.test (+94 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/limit.test 2017-04-13 22:56:08 +0900 (776d386) @@ -0,0 +1,94 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldowns[action_date].keys action,date \ + --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldowns[action_date].sortby _nsubrecs \ + --drilldowns[action_date].limit 1 Added: test/command/suite/sharding/logical_select/drilldowns/sortby/multiple/one_shard.expected (+177 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/multiple/one_shard.expected 2017-04-13 22:56:08 +0900 (bdd805b) @@ -0,0 +1,177 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:53:00", + "memo": "2015-02-05 13:53:00", + "date": "2015-02-05", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Start" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],5] +logical_select Logs timestamp --min "2015-02-05 00:00:00" --min_border "include" --max "2015-02-06 00:00:00" --max_border "exclude" --limit 0 --drilldowns[action_date].keys action,date --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldowns[action_date].sortby -_nsubrecs,_value.date,_value.action +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 5 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 3 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Restart", + "2015-02-05", + 2 + ], + [ + "Shutdown", + "2015-02-05", + 2 + ], + [ + "Start", + "2015-02-05", + 1 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldowns/sortby/multiple/one_shard.test (+103 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/multiple/one_shard.test 2017-04-13 22:56:08 +0900 (a78201f) @@ -0,0 +1,103 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:53:00", + "memo": "2015-02-05 13:53:00", + "date": "2015-02-05", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Start" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Shutdown" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --min "2015-02-05 00:00:00" \ + --min_border "include" \ + --max "2015-02-06 00:00:00" \ + --max_border "exclude" \ + --limit 0 \ + --drilldowns[action_date].keys action,date \ + --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldowns[action_date].sortby -_nsubrecs,_value.date,_value.action Added: test/command/suite/sharding/logical_select/drilldowns/sortby/offset.expected (+176 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/offset.expected 2017-04-13 22:56:08 +0900 (357595e) @@ -0,0 +1,176 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys action,date --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldowns[action_date].sortby _nsubrecs --drilldowns[action_date].offset 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Shutdown", + "2015-02-03", + 1 + ], + [ + "Start", + "2015-02-04", + 1 + ], + [ + "Restart", + "2015-02-04", + 2 + ], + [ + "Restart", + "2015-02-05", + 4 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldowns/sortby/offset.test (+94 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/offset.test 2017-04-13 22:56:08 +0900 (3b30674) @@ -0,0 +1,94 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldowns[action_date].keys action,date \ + --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldowns[action_date].sortby _nsubrecs \ + --drilldowns[action_date].offset 1 Added: test/command/suite/sharding/logical_select/drilldowns/sortby/offset_limit.expected (+161 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/offset_limit.expected 2017-04-13 22:56:08 +0900 (03f7744) @@ -0,0 +1,161 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150203 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150204 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 date COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Logs_20150205 action COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys action,date --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs --drilldowns[action_date].sortby _nsubrecs --drilldowns[action_date].offset 1 --drilldowns[action_date].limit 1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ] + ], + { + "action_date": [ + [ + 5 + ], + [ + [ + "action", + "ShortText" + ], + [ + "date", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ] + ], + [ + "Shutdown", + "2015-02-03", + 1 + ] + ] + } + ] +] Added: test/command/suite/sharding/logical_select/drilldowns/sortby/offset_limit.test (+95 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/drilldowns/sortby/offset_limit.test 2017-04-13 22:56:08 +0900 (8fcbe4f) @@ -0,0 +1,95 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +column_create Logs_20150203 date COLUMN_SCALAR ShortText +column_create Logs_20150203 action COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +column_create Logs_20150204 date COLUMN_SCALAR ShortText +column_create Logs_20150204 action COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +column_create Logs_20150205 date COLUMN_SCALAR ShortText +column_create Logs_20150205 action COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00", + "date": "2015-02-03", + "action": "Start" +}, +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59", + "date": "2015-02-03", + "action": "Shutdown" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00", + "date": "2015-02-04", + "action": "Start" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00", + "date": "2015-02-04", + "action": "Restart" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00", + "date": "2015-02-04", + "action": "Restart" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00", + "date": "2015-02-05", + "action": "Restart" +}, +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00", + "date": "2015-02-05", + "action": "Restart" +} +] + +logical_select Logs timestamp \ + --limit 0 \ + --drilldowns[action_date].keys action,date \ + --drilldowns[action_date].output_columns _value.action,_value.date,_nsubrecs \ + --drilldowns[action_date].sortby _nsubrecs \ + --drilldowns[action_date].offset 1 \ + --drilldowns[action_date].limit 1 Added: test/command/suite/sharding/logical_select/sortby/shard_key/ascending.expected (+142 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/sortby/shard_key/ascending.expected 2017-04-13 22:56:08 +0900 (7bf15cf) @@ -0,0 +1,142 @@ +plugin_register sharding +[[0,0.0,0.0],true] +table_create Logs_20150203 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150203 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150204 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150204 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Logs_20150205 TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +[[0,0.0,0.0],true] +column_create Logs_20150205 memo COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59" +}, +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00" +} +] +[[0,0.0,0.0],2] +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00" +} +] +[[0,0.0,0.0],3] +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00" +}, +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00" +} +] +[[0,0.0,0.0],4] +logical_select Logs timestamp --sortby timestamp +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "memo", + "ShortText" + ], + [ + "timestamp", + "Time" + ] + ], + [ + 2, + "2015-02-03 12:49:00", + 1422935340.0 + ], + [ + 1, + "2015-02-03 23:59:59", + 1422975599.0 + ], + [ + 1, + "2015-02-04 00:00:00", + 1422975600.0 + ], + [ + 3, + "2015-02-04 13:49:00", + 1423025340.0 + ], + [ + 2, + "2015-02-04 13:50:00", + 1423025400.0 + ], + [ + 4, + "2015-02-05 13:49:00", + 1423111740.0 + ], + [ + 3, + "2015-02-05 13:50:00", + 1423111800.0 + ], + [ + 2, + "2015-02-05 13:51:00", + 1423111860.0 + ], + [ + 1, + "2015-02-05 13:52:00", + 1423111920.0 + ] + ] + ] +] Added: test/command/suite/sharding/logical_select/sortby/shard_key/ascending.test (+66 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_select/sortby/shard_key/ascending.test 2017-04-13 22:56:08 +0900 (95b8fe8) @@ -0,0 +1,66 @@ +#@on-error omit +plugin_register sharding +#@on-error default + +table_create Logs_20150203 TABLE_NO_KEY +column_create Logs_20150203 timestamp COLUMN_SCALAR Time +column_create Logs_20150203 memo COLUMN_SCALAR ShortText + +table_create Logs_20150204 TABLE_NO_KEY +column_create Logs_20150204 timestamp COLUMN_SCALAR Time +column_create Logs_20150204 memo COLUMN_SCALAR ShortText + +table_create Logs_20150205 TABLE_NO_KEY +column_create Logs_20150205 timestamp COLUMN_SCALAR Time +column_create Logs_20150205 memo COLUMN_SCALAR ShortText + +load --table Logs_20150203 +[ +{ + "timestamp": "2015-02-03 23:59:59", + "memo": "2015-02-03 23:59:59" +}, +{ + "timestamp": "2015-02-03 12:49:00", + "memo": "2015-02-03 12:49:00" +} +] + +load --table Logs_20150204 +[ +{ + "timestamp": "2015-02-04 00:00:00", + "memo": "2015-02-04 00:00:00" +}, +{ + "timestamp": "2015-02-04 13:50:00", + "memo": "2015-02-04 13:50:00" +}, +{ + "timestamp": "2015-02-04 13:49:00", + "memo": "2015-02-04 13:49:00" +} +] + +load --table Logs_20150205 +[ +{ + "timestamp": "2015-02-05 13:52:00", + "memo": "2015-02-05 13:52:00" +}, +{ + "timestamp": "2015-02-05 13:51:00", + "memo": "2015-02-05 13:51:00" +}, +{ + "timestamp": "2015-02-05 13:50:00", + "memo": "2015-02-05 13:50:00" +}, +{ + "timestamp": "2015-02-05 13:49:00", + "memo": "2015-02-05 13:49:00" +} +] + +logical_select Logs timestamp \ + --sortby timestamp
