[Groonga-commit] groonga/groonga at def275d [master] logical_parameters: return values before setting new values

Back to archive index

Kouhei Sutou null+****@clear*****
Fri Aug 14 15:15:33 JST 2015


Kouhei Sutou	2015-08-14 15:15:33 +0900 (Fri, 14 Aug 2015)

  New Revision: def275df5c2c10219c41f279a7d9096da3193b50
  https://github.com/groonga/groonga/commit/def275df5c2c10219c41f279a7d9096da3193b50

  Message:
    logical_parameters: return values before setting new values
    
    It's for consistency.

  Modified files:
    plugins/sharding/logical_parameters.rb
    test/command/suite/sharding/logical_parameters/range_index/always.expected
    test/command/suite/sharding/logical_parameters/range_index/logical_range_filter/always.expected
    test/command/suite/sharding/logical_parameters/range_index/logical_range_filter/never.expected
    test/command/suite/sharding/logical_parameters/range_index/never.expected

  Modified: plugins/sharding/logical_parameters.rb (+2 -1)
===================================================================
--- plugins/sharding/logical_parameters.rb    2015-08-14 15:16:03 +0900 (b7542b0)
+++ plugins/sharding/logical_parameters.rb    2015-08-14 15:15:33 +0900 (75ff569)
@@ -8,7 +8,6 @@ module Groonga
 
       def run_body(input)
         range_index = parse_range_index(input[:range_index])
-        Parameters.range_index = range_index if range_index
 
         parameters = [
           :range_index,
@@ -19,6 +18,8 @@ module Groonga
             writer.write(Parameters.__send__(name))
           end
         end
+
+        Parameters.range_index = range_index if range_index
       end
 
       private

  Modified: test/command/suite/sharding/logical_parameters/range_index/always.expected (+1 -1)
===================================================================
--- test/command/suite/sharding/logical_parameters/range_index/always.expected    2015-08-14 15:16:03 +0900 (512a005)
+++ test/command/suite/sharding/logical_parameters/range_index/always.expected    2015-08-14 15:15:33 +0900 (38dfc85)
@@ -1,4 +1,4 @@
 register sharding
 [[0,0.0,0.0],true]
 logical_parameters --range_index always
-[[0,0.0,0.0],{"range_index":"always"}]
+[[0,0.0,0.0],{"range_index":"auto"}]

  Modified: test/command/suite/sharding/logical_parameters/range_index/logical_range_filter/always.expected (+1 -1)
===================================================================
--- test/command/suite/sharding/logical_parameters/range_index/logical_range_filter/always.expected    2015-08-14 15:16:03 +0900 (a21b0ed)
+++ test/command/suite/sharding/logical_parameters/range_index/logical_range_filter/always.expected    2015-08-14 15:15:33 +0900 (4627e8c)
@@ -42,7 +42,7 @@ load --table Logs_20150205
 ]
 [[0,0.0,0.0],4]
 logical_parameters --range_index always
-[[0,0.0,0.0],{"range_index":"always"}]
+[[0,0.0,0.0],{"range_index":"auto"}]
 log_level --level debug
 [[0,0.0,0.0],true]
 logical_range_filter Logs timestamp   --limit -1   --filter 'user_id == 2'

  Modified: test/command/suite/sharding/logical_parameters/range_index/logical_range_filter/never.expected (+1 -1)
===================================================================
--- test/command/suite/sharding/logical_parameters/range_index/logical_range_filter/never.expected    2015-08-14 15:16:03 +0900 (c061a29)
+++ test/command/suite/sharding/logical_parameters/range_index/logical_range_filter/never.expected    2015-08-14 15:15:33 +0900 (4665731)
@@ -42,7 +42,7 @@ load --table Logs_20150205
 ]
 [[0,0.0,0.0],4]
 logical_parameters --range_index never
-[[0,0.0,0.0],{"range_index":"never"}]
+[[0,0.0,0.0],{"range_index":"auto"}]
 log_level --level debug
 [[0,0.0,0.0],true]
 logical_range_filter Logs timestamp   --limit -1   --filter 'user_id == 2'

  Modified: test/command/suite/sharding/logical_parameters/range_index/never.expected (+1 -1)
===================================================================
--- test/command/suite/sharding/logical_parameters/range_index/never.expected    2015-08-14 15:16:03 +0900 (9f32fd7)
+++ test/command/suite/sharding/logical_parameters/range_index/never.expected    2015-08-14 15:15:33 +0900 (9bfe83a)
@@ -1,4 +1,4 @@
 register sharding
 [[0,0.0,0.0],true]
 logical_parameters --range_index never
-[[0,0.0,0.0],{"range_index":"never"}]
+[[0,0.0,0.0],{"range_index":"auto"}]
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index