[Groonga-commit] groonga/groonga-query-log at bf5437c [master] verify-server: improve all output columns detection

Back to archive index

Kouhei Sutou null+****@clear*****
Fri May 16 17:18:12 JST 2014


Kouhei Sutou	2014-05-16 17:18:12 +0900 (Fri, 16 May 2014)

  New Revision: bf5437c1f5292813ec9a1c2d7894526e193d1e97
  https://github.com/groonga/groonga-query-log/commit/bf5437c1f5292813ec9a1c2d7894526e193d1e97

  Message:
    verify-server: improve all output columns detection

  Modified files:
    lib/groonga/query-log/response-comparer.rb
    test/test-response-comparer.rb

  Modified: lib/groonga/query-log/response-comparer.rb (+2 -1)
===================================================================
--- lib/groonga/query-log/response-comparer.rb    2014-05-16 17:13:06 +0900 (c026c50)
+++ lib/groonga/query-log/response-comparer.rb    2014-05-16 17:18:12 +0900 (aa19c13)
@@ -90,7 +90,8 @@ module Groonga
       end
 
       def all_output_columns?
-        @command.output_columns == "*"
+        output_columns =****@comma*****_columns
+        output_columns.nil? or output_columns.split(/\s*,?\s*/).include?("*")
       end
 
       def same_all_output_columns?

  Modified: test/test-response-comparer.rb (+10 -2)
===================================================================
--- test/test-response-comparer.rb    2014-05-16 17:13:06 +0900 (e87b564)
+++ test/test-response-comparer.rb    2014-05-16 17:18:12 +0900 (e11d465)
@@ -185,13 +185,21 @@ class ResponseComparerTest < Test::Unit::TestCase
       end
 
       class DetectAllTest < self
-        def test_all_output_columns
+        def test_star_only
           assert_true(all_output_columns?("*"))
         end
 
+        def test_include_star
+          assert_true(all_output_columns?("_key, _value, *"))
+        end
+
+        def test_default
+          assert_true(all_output_columns?(nil))
+        end
+
         private
         def all_output_columns?(output_columns)
-          @command["output_columns"] = output_columns
+          @command["output_columns"] = output_columns if output_columns
           comparer([[[0]]], [[[0]]]).send(:all_output_columns?)
         end
       end
-------------- next part --------------
HTML����������������������������...
下载 



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