Kouhei Sutou
null+****@clear*****
Wed Dec 6 15:06:13 JST 2017
Kouhei Sutou 2017-12-06 15:06:13 +0900 (Wed, 06 Dec 2017) New Revision: cec9f9b30cbec6b1c7db030549739f49fc24b8c7 https://github.com/groonga/groonga/commit/cec9f9b30cbec6b1c7db030549739f49fc24b8c7 Message: logical_select: log N labeled 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/drilldowns/limit/negative.expected test/command/suite/sharding/logical_select/drilldowns/limit/negative.test test/command/suite/sharding/logical_select/drilldowns/limit/positive.expected test/command/suite/sharding/logical_select/drilldowns/limit/positive.test test/command/suite/sharding/logical_select/drilldowns/offset/negative.expected test/command/suite/sharding/logical_select/drilldowns/offset/negative.test test/command/suite/sharding/logical_select/drilldowns/offset/positive.expected test/command/suite/sharding/logical_select/drilldowns/offset/positive.test Modified: plugins/sharding/logical_select.rb (+7 -1) =================================================================== --- plugins/sharding/logical_select.rb 2017-12-06 14:42:53 +0900 (21a2cad20) +++ plugins/sharding/logical_select.rb 2017-12-06 15:06:13 +0900 (c64c11b21) @@ -167,7 +167,7 @@ module Groonga drilldowns.each do |drilldown| limit = options[:limit] - limit += drilldown.size if limit < 0 + limit += drilldown.size + 1 if limit < 0 offset = options[:offset] offset += drilldown.size if offset < 0 n_written = [drilldown.size - offset, limit].min @@ -202,6 +202,11 @@ module Groonga :limit => drilldown.limit, } + limit = options[:limit] + limit += result_set.size + 1 if limit < 0 + offset = options[:offset] + offset += result_set.size if offset < 0 + n_written = [result_set.size - offset, limit].min writer.array("RESULTSET", n_elements) do writer.array("NHITS", 1) do writer.write(result_set.size) @@ -217,6 +222,7 @@ module Groonga writer.write_table_records(result_set, output_columns, options) end end + query_logger.log(:size, ":", "output.drilldowns(#{n_written})") end end end Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected (+1 -1) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected 2017-12-06 14:42:53 +0900 (0d6ba748e) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected 2017-12-06 15:06:13 +0900 (94095c985) @@ -139,5 +139,5 @@ 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 output.drilldown(2) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/limit/negative.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/limit/negative.expected 2017-12-06 14:42:53 +0900 (d44bc2863) +++ test/command/suite/sharding/logical_select/drilldowns/limit/negative.expected 2017-12-06 15:06:13 +0900 (1f768080d) @@ -174,3 +174,7 @@ logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys actio } ] ] +#>logical_select --drilldowns[action_date].keys "action,date" --drilldowns[action_date].limit "-2" --drilldowns[action_date].output_columns "_value.action,_value.date,_nsubrecs" --limit "0" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 output(0) +#:000000000000000 output.drilldowns(4) +#<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/limit/negative.test (+2 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/limit/negative.test 2017-12-06 14:42:53 +0900 (d097dc928) +++ test/command/suite/sharding/logical_select/drilldowns/limit/negative.test 2017-12-06 15:06:13 +0900 (e4c1c5893) @@ -86,8 +86,10 @@ load --table Logs_20150205 } ] +#@collect-query-log true 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].limit -2 +#@collect-query-log false Modified: test/command/suite/sharding/logical_select/drilldowns/limit/positive.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/limit/positive.expected 2017-12-06 14:42:53 +0900 (9f4d8a500) +++ test/command/suite/sharding/logical_select/drilldowns/limit/positive.expected 2017-12-06 15:06:13 +0900 (abd975342) @@ -159,3 +159,7 @@ logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys actio } ] ] +#>logical_select --drilldowns[action_date].keys "action,date" --drilldowns[action_date].limit "1" --drilldowns[action_date].output_columns "_value.action,_value.date,_nsubrecs" --limit "0" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 output(0) +#:000000000000000 output.drilldowns(1) +#<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/limit/positive.test (+2 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/limit/positive.test 2017-12-06 14:42:53 +0900 (3a91af8d8) +++ test/command/suite/sharding/logical_select/drilldowns/limit/positive.test 2017-12-06 15:06:13 +0900 (91468421b) @@ -86,8 +86,10 @@ load --table Logs_20150205 } ] +#@collect-query-log true 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].limit 1 +#@collect-query-log false Modified: test/command/suite/sharding/logical_select/drilldowns/offset/negative.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/offset/negative.expected 2017-12-06 14:42:53 +0900 (f1b592e4c) +++ test/command/suite/sharding/logical_select/drilldowns/offset/negative.expected 2017-12-06 15:06:13 +0900 (3e0f41316) @@ -159,3 +159,7 @@ logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys actio } ] ] +#>logical_select --drilldowns[action_date].keys "action,date" --drilldowns[action_date].offset "-1" --drilldowns[action_date].output_columns "_value.action,_value.date,_nsubrecs" --limit "0" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 output(0) +#:000000000000000 output.drilldowns(1) +#<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/offset/negative.test (+2 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/offset/negative.test 2017-12-06 14:42:53 +0900 (5d19ef9f1) +++ test/command/suite/sharding/logical_select/drilldowns/offset/negative.test 2017-12-06 15:06:13 +0900 (0533a6b74) @@ -86,8 +86,10 @@ load --table Logs_20150205 } ] +#@collect-query-log true 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].offset -1 +#@collect-query-log false Modified: test/command/suite/sharding/logical_select/drilldowns/offset/positive.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/offset/positive.expected 2017-12-06 14:42:53 +0900 (d55ffe14b) +++ test/command/suite/sharding/logical_select/drilldowns/offset/positive.expected 2017-12-06 15:06:13 +0900 (ec8e1e49e) @@ -174,3 +174,7 @@ logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys actio } ] ] +#>logical_select --drilldowns[action_date].keys "action,date" --drilldowns[action_date].offset "1" --drilldowns[action_date].output_columns "_value.action,_value.date,_nsubrecs" --limit "0" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 output(0) +#:000000000000000 output.drilldowns(4) +#<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/offset/positive.test (+2 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/offset/positive.test 2017-12-06 14:42:53 +0900 (48ae0037e) +++ test/command/suite/sharding/logical_select/drilldowns/offset/positive.test 2017-12-06 15:06:13 +0900 (e3395128e) @@ -86,8 +86,10 @@ load --table Logs_20150205 } ] +#@collect-query-log true 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].offset 1 +#@collect-query-log false -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171206/2c070dee/attachment-0001.htm
