YUKI Hiroshi
null+****@clear*****
Tue Jun 2 18:38:58 JST 2015
YUKI Hiroshi 2015-06-02 18:38:58 +0900 (Tue, 02 Jun 2015) New Revision: e7fd6dab2c3a0f5882ba01930f9130fc597490c4 https://github.com/droonga/droonga-engine/commit/e7fd6dab2c3a0f5882ba01930f9130fc597490c4 Message: Don't modify offset and limit for distributed search with just single slice Modified files: lib/droonga/plugins/search/distributed_search_planner.rb Modified: lib/droonga/plugins/search/distributed_search_planner.rb (+6 -2) =================================================================== --- lib/droonga/plugins/search/distributed_search_planner.rb 2015-06-02 18:37:58 +0900 (df35742) +++ lib/droonga/plugins/search/distributed_search_planner.rb 2015-06-02 18:38:58 +0900 (1d1310a) @@ -160,6 +160,8 @@ module Droonga @records_offset = final_offset @records_limit = final_limit + return unles****@datas*****? + updated_sort_limit = nil updated_output_limit = nil if final_limit == UNLIMITED @@ -180,6 +182,7 @@ module Droonga end def calculate_sort_offset! + return unles****@datas*****? # Offset for workers must be zero, because we have to apply "limit" and # "offset" on the last gathering phase instead of each reducing phase. if rich_sort? @@ -212,17 +215,18 @@ module Droonga end def calculate_output_offset! + return unles****@datas*****? @output["offset"] = 0 if have_records? and @output["offset"] end def final_offset - return @original_output_offset unles****@datas*****? + return 0 unles****@datas*****? @original_sort_offset + @original_output_offset end def final_limit - return @original_output_limit unles****@datas*****? + return UNLIMITED unles****@datas*****? if @original_sort_limit == UNLIMITED and @original_output_limit == UNLIMITED -------------- next part -------------- HTML����������������������������...Descargar
