groonga-query-log 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d76c466c0afc38392bb3dec3b4822deb3d8d7ee
-  data.tar.gz: 2d5f7478e94178b392fe78c75e9fdbcd9e09ba32
+  metadata.gz: 4470d1ef7de4d8221d1a79518f1b5676d0dcf5a0
+  data.tar.gz: 0cf988c683f5db1eb3d78856b058d2f86a757781
 SHA512:
-  metadata.gz: 99182055f76da93c0a2384ad0a01e4719ed672eebbbcf46fa67dd89d3ad3ddefd3042dfecfc75513a34f81e99f87eb6c0928d8029c3b112173e37fa0d8daf686
-  data.tar.gz: 1e030de8949c5f1e3a31ae354b350f221f2ec3d79ee64157a3684313dec9872661d52db002fd835ea03207451937f2638a351cf7530a3ce662854d51207dd6e5
+  metadata.gz: b6444789fc538aaca6f6bce2d23395f22eb8f52028ef11ca5e375544a0a25232c9d94e7bc0d5e77201afd8ea0c5c0ab9f1133bc784fd087a4d9e0d32f04188c1
+  data.tar.gz: e8fe331d8afac900ec3369da373a1c2cfa9cb184a47e6872085fd80a551cdfc2fde0e4d72369b9df7d1ea22386bf88ed24c6720194d04abe5c365c0cf324803f

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 1.2.2: 2016-06-15
+
+### Improvements
+
+  * groonga-query-log-verify-server: Relaxed random score detect condition.
+
+  * groonga-query-log-verify-server: Supported the case that only one
+    response has outputs for `--output_columns "-column"`. The
+    `-column` outputs are ignored.
+
 ## 1.2.1: 2016-05-27
 
 ### Fixes

data/lib/groonga/query-log/response-comparer.rb

@@ -60,7 +60,9 @@ module Groonga
       def same_select_response?
         if care_order?
           if all_output_columns?
-            same_all_output_columns?
+            same_records_all_output_columns?
+          elsif have_unary_minus_output_column?
+            same_records_unary_minus_output_column?
           else
             same_response?
           end
@@ -78,7 +80,7 @@ module Groonga
 
       def random_score?
         return false unless @command.respond_to?(:scorer)
-        @command.scorer == "_score=rand()"
+        /\A_score\s*=\s*rand\(\)\z/ === @command.scorer
       end
 
       def random_sort?
@@ -111,6 +113,51 @@ module Groonga
         end
       end
 
+      def have_unary_minus_output_column?
+        output_columns = @command.output_columns
+        return false if output_columns.nil?
+        output_columns.split(/\s*,?\s*/).any? {|column| column.start_with?("-")}
+      end
+
+      def same_records_unary_minus_output_column?
+        records_result1 = @response1.body[0] || []
+        records_result2 = @response2.body[0] || []
+        return false if records_result1.size != records_result2.size
+
+        n_hits1 = records_result1[0]
+        n_hits2 = records_result2[0]
+        return false if n_hits1 != n_hits2
+
+        columns1 = records_result1[1]
+        columns2 = records_result2[1]
+        records1 = records_result1[2..-1]
+        records2 = records_result2[2..-1]
+
+        if columns1.size != columns2.size
+          if columns2.size > columns1.size
+            columns1, columns2 = columns2, columns1
+            records1, records2 = records2, records1
+          end
+        end
+
+        records1.each_with_index do |record1, record_index|
+          record2 = records2[record_index]
+          column_offset2 = 0
+          columns1.each_with_index do |name, column_index1|
+            column_index2 = column_offset2 + column_index1
+            if name != columns2[column_index2]
+              column_offset2 -= 1
+              next
+            end
+            value1 = record1[column_index1]
+            value2 = record2[column_index2]
+            return false if value1 != value2
+          end
+        end
+
+        true
+      end
+
       def all_output_columns?
         output_columns = @command.output_columns
         output_columns.nil? or
@@ -118,7 +165,7 @@ module Groonga
           output_columns.split(/\s*,?\s*/).include?("*")
       end
 
-      def same_all_output_columns?
+      def same_records_all_output_columns?
         records_result1 = @response1.body[0] || []
         records_result2 = @response2.body[0] || []
         return false if records_result1.size != records_result2.size

data/lib/groonga/query-log/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

data/test/test-response-comparer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2016  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -103,6 +103,10 @@ class ResponseComparerTest < Test::Unit::TestCase
           assert_true(random_score?("_score=rand()"))
         end
 
+        def test_with_spaces
+          assert_true(random_score?("_score = rand()"))
+        end
+
         private
         def random_score?(scorer)
           @command["scorer"] = scorer
@@ -228,6 +232,69 @@ class ResponseComparerTest < Test::Unit::TestCase
           comparer([[[0], []]], [[[0], []]]).send(:all_output_columns?)
         end
       end
+
+      class UnaryMinusTest < self
+        def setup
+          super
+          @command["output_columns"] = "_id, -value"
+        end
+
+        def test_ignore
+          response1 = [
+            [
+              [3],
+              [
+                ["_id", "UInt32"],
+              ],
+              [1],
+              [2],
+              [3],
+            ],
+          ]
+          response2 = [
+            [
+              [3],
+              [
+                ["_id", "UInt32"],
+                ["value", nil],
+              ],
+              [1, -11],
+              [2, -12],
+              [3, -13],
+            ],
+          ]
+          assert do
+            same?(response1, response2)
+          end
+        end
+      end
+
+      class DetectUnaryMinusTest < self
+        def test_unary_minus_column_only
+          assert do
+            have_unary_minus_output_column?("-value")
+          end
+        end
+
+        def test_include_unary_minus_column
+          assert do
+            have_unary_minus_output_column?("_id, -value")
+          end
+        end
+
+        def test_nonexistent
+          assert do
+            not have_unary_minus_output_column?("_id, _key")
+          end
+        end
+
+        private
+        def have_unary_minus_output_column?(output_columns)
+          @command["output_columns"] = output_columns if output_columns
+          comparer([[[0], []]],
+                   [[[0], []]]).send(:have_unary_minus_output_column?)
+        end
+      end
     end
 
     class ForceNoCareOrderTest < self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser