Kouhei Sutou
null+****@clear*****
Tue Jul 7 16:12:57 JST 2015
Kouhei Sutou 2015-07-07 16:12:57 +0900 (Tue, 07 Jul 2015) New Revision: 0bf155384260b5bee1a0ac21f561612a7c1bfbf2 https://github.com/groonga/groonga/commit/0bf155384260b5bee1a0ac21f561612a7c1bfbf2 Message: logical_select: fix a bug that plain drilldown reports the number of hits Modified files: plugins/sharding/logical_select.rb test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected Modified: plugins/sharding/logical_select.rb (+2 -14) =================================================================== --- plugins/sharding/logical_select.rb 2015-07-07 15:43:33 +0900 (ce8f169) +++ plugins/sharding/logical_select.rb 2015-07-07 16:12:57 +0900 (101138f) @@ -104,7 +104,7 @@ module Groonga drilldowns = plain_drilldown.result_sets output_columns = plain_drilldown.output_columns options = { - :offset => plain_drilldown.output_offset, + :offset => plain_drilldown.offset, :limit => plain_drilldown.limit, } @@ -217,7 +217,6 @@ module Groonga attr_reader :limit attr_reader :sort_keys attr_reader :output_columns - attr_reader :output_offset attr_reader :result_sets attr_reader :unsorted_result_sets def initialize(input) @@ -229,12 +228,6 @@ module Groonga @output_columns = @input[:drilldown_output_columns] @output_columns ||= "_key, _nsubrecs" - if @sort_keys.empty? - @output_offset = @offset - else - @output_offset = 0 - end - @result_sets = [] @unsorted_result_sets = [] end @@ -443,10 +436,6 @@ module Groonga def execute_plain_drilldown drilldown =****@conte*****_drilldown group_result = TableGroupResult.new - sort_options = { - :offset => drilldown.offset, - :limit => drilldown.limit, - } begin group_result.key_begin = 0 group_result.key_end = 0 @@ -460,8 +449,7 @@ module Groonga if drilldown.sort_keys.empty? drilldown.result_sets << result_set else - drilldown.result_sets << result_set.sort(drilldown.sort_keys, - sort_options) + drilldown.result_sets << result_set.sort(drilldown.sort_keys) drilldown.unsorted_result_sets << result_set end group_result.table = nil Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected (+1 -1) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected 2015-07-07 15:43:33 +0900 (f8cb68a) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected 2015-07-07 16:12:57 +0900 (65d5a15) @@ -110,7 +110,7 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ - 1 + 3 ], [ [ Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected (+1 -1) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected 2015-07-07 15:43:33 +0900 (2f510bd) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected 2015-07-07 16:12:57 +0900 (6889256) @@ -110,7 +110,7 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ - 2 + 3 ], [ [ Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected (+1 -1) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected 2015-07-07 15:43:33 +0900 (5fb792c) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected 2015-07-07 16:12:57 +0900 (eabf462) @@ -110,7 +110,7 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ - 1 + 3 ], [ [ -------------- next part -------------- HTML����������������������������...Descargar
