Kouhei Sutou
null+****@clear*****
Wed Dec 6 14:42:53 JST 2017
Kouhei Sutou 2017-12-06 14:42:53 +0900 (Wed, 06 Dec 2017) New Revision: e5780681871d6a1b2c684f1dd6b7faeef486ab52 https://github.com/groonga/groonga/commit/e5780681871d6a1b2c684f1dd6b7faeef486ab52 Message: logical_select: log N plain drilldown outputs Modified files: plugins/sharding/logical_select.rb test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.test test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.test test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.test test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.test Modified: plugins/sharding/logical_select.rb (+7 -1) =================================================================== --- plugins/sharding/logical_select.rb 2017-12-06 14:28:14 +0900 (c680997d1) +++ plugins/sharding/logical_select.rb 2017-12-06 14:42:53 +0900 (21a2cad20) @@ -166,8 +166,13 @@ module Groonga } drilldowns.each do |drilldown| + limit = options[:limit] + limit += drilldown.size if limit < 0 + offset = options[:offset] + offset += drilldown.size if offset < 0 + n_written = [drilldown.size - offset, limit].min n_elements = 2 # for N hits and columns - n_elements += drilldown.size + n_elements += n_written writer.array("RESULTSET", n_elements) do writer.array("NHITS", 1) do writer.write(drilldown.size) @@ -176,6 +181,7 @@ module Groonga writer.write_table_records(drilldown, output_columns, options) end + query_logger.log(:size, ":", "output.drilldown(#{n_written})") end end Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected 2017-12-06 14:28:14 +0900 (c5304bf12) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected 2017-12-06 14:42:53 +0900 (0d6ba748e) @@ -137,3 +137,7 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_lim ] ] ] +#>logical_select --drilldown "action" --drilldown_limit "-2" --limit "0" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 output(0) +#:000000000000000 output.drilldown(1) +#<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.test (+2 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.test 2017-12-06 14:28:14 +0900 (de39fe58d) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.test 2017-12-06 14:42:53 +0900 (ed9b4f782) @@ -74,7 +74,9 @@ load --table Logs_20150205 } ] +#@collect-query-log true logical_select Logs timestamp \ --limit 0 \ --drilldown action \ --drilldown_limit -2 +#@collect-query-log false Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected 2017-12-06 14:28:14 +0900 (c38db540c) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected 2017-12-06 14:42:53 +0900 (e554556f0) @@ -133,3 +133,7 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_lim ] ] ] +#>logical_select --drilldown "action" --drilldown_limit "1" --limit "0" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 output(0) +#:000000000000000 output.drilldown(1) +#<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.test (+2 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.test 2017-12-06 14:28:14 +0900 (4cc57e53b) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.test 2017-12-06 14:42:53 +0900 (a2960e57b) @@ -74,7 +74,9 @@ load --table Logs_20150205 } ] +#@collect-query-log true logical_select Logs timestamp \ --limit 0 \ --drilldown action \ --drilldown_limit 1 +#@collect-query-log false Modified: test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected 2017-12-06 14:28:14 +0900 (a72e4b055) +++ test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected 2017-12-06 14:42:53 +0900 (99b610cef) @@ -133,3 +133,7 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_off ] ] ] +#>logical_select --drilldown "action" --drilldown_offset "-1" --limit "0" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 output(0) +#:000000000000000 output.drilldown(1) +#<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.test (+2 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.test 2017-12-06 14:28:14 +0900 (b17d236c4) +++ test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.test 2017-12-06 14:42:53 +0900 (d820e4a76) @@ -74,7 +74,9 @@ load --table Logs_20150205 } ] +#@collect-query-log true logical_select Logs timestamp \ --limit 0 \ --drilldown action \ --drilldown_offset -1 +#@collect-query-log false Modified: test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected 2017-12-06 14:28:14 +0900 (7d1ae8bec) +++ test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected 2017-12-06 14:42:53 +0900 (4e8a32a80) @@ -137,3 +137,7 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_off ] ] ] +#>logical_select --drilldown "action" --drilldown_offset "1" --limit "0" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 output(0) +#:000000000000000 output.drilldown(2) +#<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.test (+2 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.test 2017-12-06 14:28:14 +0900 (7d887ba89) +++ test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.test 2017-12-06 14:42:53 +0900 (6555f336b) @@ -74,7 +74,9 @@ load --table Logs_20150205 } ] +#@collect-query-log true logical_select Logs timestamp \ --limit 0 \ --drilldown action \ --drilldown_offset 1 +#@collect-query-log false -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171206/ef718773/attachment-0001.htm
