Extract output_offset method and preserve it first

droonga · Dec 5, 2013 · daf167b · daf167b
1 parent 959d108
commit daf167b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/droonga/plugin/distributor/distributed_search_plan.rb b/lib/droonga/plugin/distributor/distributed_search_plan.rb
@@ -140,6 +140,7 @@ def transform!
 
       def calculate_offset_and_limit!
         @original_sort_offset = sort_offset
+        @original_output_offset = output_offset
 
         calculate_sort_offset!
         calculate_output_offset!
@@ -194,13 +195,16 @@ def sort_offset
         end
       end
 
+      def output_offset
+        @output["offset"] || 0
+      end
+
       def calculate_output_offset!
-        @output_offset = @output["offset"] || 0
         @output["offset"] = 0 if has_records?
       end
 
       def final_offset
-        @original_sort_offset + @output_offset
+        @original_sort_offset + @original_output_offset
       end
 
       def has_records?