Kouhei Sutou 2019-03-18 09:31:47 +0900 (Mon, 18 Mar 2019) Revision: e089ffd734157e9e3f0c7364119786aa184c43f7 https://github.com/groonga/groonga/commit/e089ffd734157e9e3f0c7364119786aa184c43f7 Message: test: use --limit 0 to ensure loading data before sort/limit Modified files: test/command/suite/select/load_table/key.expected test/command/suite/select/load_table/key.test test/command/suite/select/load_table/no_key.expected test/command/suite/select/load_table/no_key.test test/command/suite/sharding/logical_select/load_table/key.expected test/command/suite/sharding/logical_select/load_table/key.test test/command/suite/sharding/logical_select/load_table/no_key.expected test/command/suite/sharding/logical_select/load_table/no_key.test Modified: test/command/suite/select/load_table/key.expected (+3 -18) =================================================================== --- test/command/suite/select/load_table/key.expected 2019-03-15 22:22:42 +0900 (09b993d2e) +++ test/command/suite/select/load_table/key.expected 2019-03-18 09:31:47 +0900 (82a41fd7a) @@ -24,7 +24,7 @@ load --table Logs } ] [[0,0.0,0.0],3] -select Logs --load_table LoadedLogs --load_columns "_key, original_id, timestamp_text" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" +select Logs --load_table LoadedLogs --load_columns "_key, original_id, timestamp_text" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" --limit 0 [ [ 0, @@ -49,29 +49,14 @@ select Logs --load_table LoadedLogs --load_columns "_key, original_id, tim "timestamp", "Time" ] - ], - [ - 1, - "2015-02-03:1", - 1422928140.0 - ], - [ - 2, - "2015-02-03:2", - 1422935340.0 - ], - [ - 3, - "2015-02-04:1", - 1422975600.0 ] ] ] ] -#>select --load_columns "_key, original_id, timestamp_text" --load_table "LoadedLogs" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" --table "Logs" +#>select --limit "0" --load_columns "_key, original_id, timestamp_text" --load_table "LoadedLogs" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" --table "Logs" #:000000000000000 select(3) #:000000000000000 load(3) -#:000000000000000 output(3) +#:000000000000000 output(0) #<000000000000000 rc=0 select --table LoadedLogs [ Modified: test/command/suite/select/load_table/key.test (+2 -1) =================================================================== --- test/command/suite/select/load_table/key.test 2019-03-15 22:22:42 +0900 (fdaeb6010) +++ test/command/suite/select/load_table/key.test 2019-03-18 09:31:47 +0900 (88ccb9b3e) @@ -26,7 +26,8 @@ select \ Logs \ --load_table LoadedLogs \ --load_columns "_key, original_id, timestamp_text" \ - --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" + --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" \ + --limit 0 #@collect-query-log false select --table LoadedLogs Modified: test/command/suite/select/load_table/no_key.expected (+2 -37) =================================================================== --- test/command/suite/select/load_table/no_key.expected 2019-03-15 22:22:42 +0900 (08e993290) +++ test/command/suite/select/load_table/no_key.expected 2019-03-18 09:31:47 +0900 (6e45d6dc9) @@ -21,43 +21,8 @@ load --table Logs } ] [[0,0.0,0.0],3] -select Logs --load_table LoadedLogs --load_columns "original_id, timestamp_text" --load_values "_id, timestamp" -[ - [ - 0, - 0.0, - 0.0 - ], - [ - [ - [ - 3 - ], - [ - [ - "_id", - "UInt32" - ], - [ - "timestamp", - "Time" - ] - ], - [ - 1, - 1422928140.0 - ], - [ - 2, - 1422935340.0 - ], - [ - 3, - 1422975600.0 - ] - ] - ] -] +select Logs --load_table LoadedLogs --load_columns "original_id, timestamp_text" --load_values "_id, timestamp" --limit 0 +[[0,0.0,0.0],[[[3],[["_id","UInt32"],["timestamp","Time"]]]]] select --table LoadedLogs [ [ Modified: test/command/suite/select/load_table/no_key.test (+2 -1) =================================================================== --- test/command/suite/select/load_table/no_key.test 2019-03-15 22:22:42 +0900 (a64ff5927) +++ test/command/suite/select/load_table/no_key.test 2019-03-18 09:31:47 +0900 (c7375ebc9) @@ -22,6 +22,7 @@ select \ Logs \ --load_table LoadedLogs \ --load_columns "original_id, timestamp_text" \ - --load_values "_id, timestamp" + --load_values "_id, timestamp" \ + --limit 0 select --table LoadedLogs Modified: test/command/suite/sharding/logical_select/load_table/key.expected (+1 -16) =================================================================== --- test/command/suite/sharding/logical_select/load_table/key.expected 2019-03-15 22:22:42 +0900 (328d38864) +++ test/command/suite/sharding/logical_select/load_table/key.expected 2019-03-18 09:31:47 +0900 (3f6739942) @@ -34,7 +34,7 @@ load --table Logs_20150204 } ] [[0,0.0,0.0],1] -logical_select --logical_table Logs --shard_key timestamp --load_table Logs --load_columns "_key, original_id, timestamp_text" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" +logical_select --logical_table Logs --shard_key timestamp --load_table Logs --load_columns "_key, original_id, timestamp_text" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" --limit 0 [ [ 0, @@ -59,21 +59,6 @@ logical_select --logical_table Logs --shard_key timestamp --load_table Log "timestamp", "Time" ] - ], - [ - 1, - "2015-02-03:1", - 1422928140.0 - ], - [ - 2, - "2015-02-03:2", - 1422935340.0 - ], - [ - 1, - "2015-02-04:1", - 1422975600.0 ] ] ] Modified: test/command/suite/sharding/logical_select/load_table/key.test (+2 -1) =================================================================== --- test/command/suite/sharding/logical_select/load_table/key.test 2019-03-15 22:22:42 +0900 (fd8cc8fff) +++ test/command/suite/sharding/logical_select/load_table/key.test 2019-03-18 09:31:47 +0900 (26e77047c) @@ -37,6 +37,7 @@ logical_select \ --shard_key timestamp \ --load_table Logs \ --load_columns "_key, original_id, timestamp_text" \ - --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" + --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" \ + --limit 0 select --table Logs Modified: test/command/suite/sharding/logical_select/load_table/no_key.expected (+2 -37) =================================================================== --- test/command/suite/sharding/logical_select/load_table/no_key.expected 2019-03-15 22:22:42 +0900 (8fd2eec2b) +++ test/command/suite/sharding/logical_select/load_table/no_key.expected 2019-03-18 09:31:47 +0900 (1f494d57b) @@ -31,43 +31,8 @@ load --table Logs_20150204 } ] [[0,0.0,0.0],1] -logical_select --logical_table Logs --shard_key timestamp --load_table Logs --load_columns "original_id, timestamp_text" --load_values "_id, timestamp" -[ - [ - 0, - 0.0, - 0.0 - ], - [ - [ - [ - 3 - ], - [ - [ - "_id", - "UInt32" - ], - [ - "timestamp", - "Time" - ] - ], - [ - 1, - 1422928140.0 - ], - [ - 2, - 1422935340.0 - ], - [ - 1, - 1422975600.0 - ] - ] - ] -] +logical_select --logical_table Logs --shard_key timestamp --load_table Logs --load_columns "original_id, timestamp_text" --load_values "_id, timestamp" --limit 0 +[[0,0.0,0.0],[[[3],[["_id","UInt32"],["timestamp","Time"]]]]] select --table Logs [ [ Modified: test/command/suite/sharding/logical_select/load_table/no_key.test (+2 -1) =================================================================== --- test/command/suite/sharding/logical_select/load_table/no_key.test 2019-03-15 22:22:42 +0900 (cc89c90db) +++ test/command/suite/sharding/logical_select/load_table/no_key.test 2019-03-18 09:31:47 +0900 (5a12f1aac) @@ -34,6 +34,7 @@ logical_select \ --shard_key timestamp \ --load_table Logs \ --load_columns "original_id, timestamp_text" \ - --load_values "_id, timestamp" + --load_values "_id, timestamp" \ + --limit 0 select --table Logs -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190318/b96e6477/attachment-0001.html>
