groonga-query-log 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90caf244ba39ca7b7ba11c85821185a693e4d3e
-  data.tar.gz: b51489a8a105f9c8f5ea348e7a804193b1abcd71
+  metadata.gz: 05b507ee733fc255cabbb5cf09e7d050460ed282
+  data.tar.gz: 18b939521cb5c1568f7a3cb7d5cce3aee9042bd8
 SHA512:
-  metadata.gz: 1e5bf6c8af15419ea6383172cdab9b439a772106368607f219ee2653f5a1e813edb55d26d2aa3705ec5ee29e25a0b0b2274c9dc40227e742247c91f2b6e07b8d
-  data.tar.gz: 2e1317950786b1018c1fa4b5eb9444354ff9447d7d401a99a8a220ccf69be384db19283a6da8c7a465b4d3fcfd497d8df3d4e85a19b28852f81510180805f6fa
+  metadata.gz: 102d611f9a0ca59eaef084a138849cd4ee13cf9b7e7fca2ee9921b3cbe3a9b33fd0024aaa6b3ce80e9996ab9f3e8c0e948d1fd081b1e60fe74f237f6bd9be3ad
+  data.tar.gz: 5e59087eca3bda7a8488be18c9b747ef08e90ad47bc2a24f22fee0d71ebdf78a249f3da4030ee04893f189600cc2343ac860a26643506fd39e257bd613a3f839

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+## 1.0.4: 2014-02-09
+
+### Improvements
+
+  * groonga-query-log-verify-server: Supported reading input from the
+    standard input.
+  * groonga-query-log-verify-server: Supported logging error on
+    connecting server.
+  * groonga-query-log-verify-server: Supported random sort select.
+  * groonga-query-log-verify-server: Added `--abort-on-exception` debug option.
+
 ## 1.0.3: 2014-01-06
 
 ### Improvements

data/lib/groonga/query-log/command/verify-server.rb

@@ -31,9 +31,13 @@ module Groonga
         def run(*command_line)
           input_paths = create_parser.parse(*command_line)
           verifier = ServerVerifier.new(@options)
-          input_paths.each do |input_path|
-            File.open(input_path) do |input|
-              verifier.verify(input)
+          if input_paths.empty?
+            verifier.verify($stdin)
+          else
+            input_paths.each do |input_path|
+              File.open(input_path) do |input|
+                verifier.verify(input)
+              end
             end
           end
         end
@@ -124,6 +128,14 @@ module Groonga
                     "[stdout]") do |path|
             @options.output_path = path
           end
+
+          parser.separator("Debug options:")
+          parser.separator("")
+
+          parser.on("--abort-on-exception",
+                    "Abort on exception in threads") do
+            Thread.abort_on_exception = true
+          end
         end
       end
     end

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

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Groonga
+  module QueryLog
+    class ResponseComparer
+      def initialize(command, response1, response2)
+        @command = command
+        @response1 = response1
+        @response2 = response2
+      end
+
+      def same?
+        case @command.name
+        when "select"
+          same_select_response?
+        else
+          same_response?
+        end
+      end
+
+      private
+      def same_response?
+        @response1 == @response2
+      end
+
+      def same_select_response?
+        if random_sort?
+          records_result1 = @response1[0] || []
+          records_result2 = @response2[0] || []
+          records_result1.size == records_result2.size and
+            records_result1[0..1] == records_result2[0..1]
+        else
+          same_response?
+        end
+      end
+
+      def random_score?
+        @command.scorer == "_score=rand()"
+      end
+
+      def random_sort?
+        random_score? and score_sort?
+      end
+
+      def score_sort?
+        sort_items = (@command.sortby || "").split(/\s*,\s*/)
+        normalized_sort_items = sort_items.collect do |item|
+          item.gsub(/\A[+-]/, "")
+        end
+        normalized_sort_items.include?("_score")
+      end
+    end
+  end
+end

data/lib/groonga/query-log/server-verifier.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  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
@@ -22,6 +22,7 @@ require "thread"
 require "groonga/client"
 
 require "groonga/query-log/parser"
+require "groonga/query-log/response-comparer"
 
 module Groonga
   module QueryLog
@@ -59,8 +60,15 @@ module Groonga
       def run_consumers
         @options.n_clients.times.collect do
           Thread.new do
-            loop do
-              break if run_consumer
+            begin
+              loop do
+                break if run_consumer
+              end
+            rescue Groonga::Client::Connection::Error
+              # TODO: add error log mechanism
+              $stderr.puts(Time.now.iso8601)
+              $stderr.puts($!.raw_error.message)
+              $stderr.puts($!.raw_error.backtrace)
             end
           end
         end
@@ -108,18 +116,15 @@ module Groonga
         command["cache"] = "no" if @options.disable_cache?
         response1 = groonga1_client.execute(command)
         response2 = groonga2_client.execute(command)
-        unless same_response?(response1, response2)
+        comparer = ResponseComparer.new(command, response1.body, response2.body)
+        unless comparer.same?
           @different_results.push([command, response1, response2])
         end
       end
 
-      def same_response?(response1, response2)
-        response1.body == response2.body
-      end
-
       def report_result(output, result)
         command, response1, response2 = result
-        output.puts("command: #{command.original_format}")
+        output.puts("command: #{command.original_source}")
         output.puts("response1: #{response1.body}")
         output.puts("response2: #{response2.body}")
       end
@@ -129,6 +134,7 @@ module Groonga
         attr_reader :groonga2
         attr_accessor :n_clients
         attr_writer :request_queue_size
+        attr_writer :disable_cache
         attr_accessor :target_command_names
         attr_accessor :output_path
         def initialize

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  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
@@ -18,6 +18,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/test/test-response-comparer.rb

@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class ResponseComparerTest < Test::Unit::TestCase
+  private
+  def comparer(response1, response2)
+    Groonga::QueryLog::ResponseComparer.new(@command, response1, response2)
+  end
+
+  def same?(response1, response2)
+    comparer(response1, response2).same?
+  end
+
+  class SelectTest < self
+    def setup
+      @command = Groonga::Command::Select.new("select", {})
+    end
+
+    class ScorerTest < self
+      class RandTest < self
+        def setup
+          super
+          @command["scorer"] = "_score=rand()"
+          @command["sortby"] = "_score"
+        end
+
+        def test_different_order
+          assert_true(same?([[[3], [["_id", "UInt32"]], [1], [2], [3]]],
+                            [[[3], [["_id", "UInt32"]], [3], [2], [1]]]))
+        end
+
+        def test_different_attributes
+          assert_false(same?([[[3], [["_id", "UInt32"]], [1], [2], [3]]],
+                             [[[3], [["age", "UInt32"]], [1], [2], [3]]]))
+        end
+
+        def test_different_n_records
+          assert_false(same?([[[3], [["_id", "UInt32"]], [1], [2]]],
+                             [[[3], [["_id", "UInt32"]], [1], [2], [3]]]))
+        end
+      end
+
+      class DetectRandTest < self
+        def test_rand_only
+          assert_true(random_score?("_score=rand()"))
+        end
+
+        private
+        def random_score?(scorer)
+          @command["scorer"] = scorer
+          comparer([], []).send(:random_score?)
+        end
+      end
+    end
+
+    class SortbyTest < self
+      class DetectScoreSortTest < self
+        private
+        def score_sort?(sortby)
+          @command["sortby"] = sortby
+          comparer([], []).send(:score_sort?)
+        end
+
+        class NoScoreTest < self
+          def test_nil
+            assert_false(score_sort?(nil))
+          end
+
+          def test_empty
+            assert_false(score_sort?(""))
+          end
+        end
+
+        class ScoreOnly < self
+          def test_no_sign
+            assert_true(score_sort?("_score"))
+          end
+
+          def test_plus
+            assert_true(score_sort?("+_score"))
+          end
+
+          def test_minus
+            assert_true(score_sort?("-_score"))
+          end
+        end
+
+        class MultipleItemsTest < self
+          def test_no_space
+            assert_true(score_sort?("_id,_score,_key"))
+          end
+
+          def test_have_space
+            assert_true(score_sort?("_id, _score, _key"))
+          end
+
+          def test_plus
+            assert_true(score_sort?("_id,+_score,_key"))
+          end
+
+          def test_minus
+            assert_true(score_sort?("_id,-_score,_key"))
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -154,11 +154,11 @@ description: ''
 email:
 - kou@clear-code.com
 executables:
-- groonga-query-log-analyze
 - groonga-query-log-detect-memory-leak
+- groonga-query-log-verify-server
+- groonga-query-log-analyze
 - groonga-query-log-replay
 - groonga-query-log-extract
-- groonga-query-log-verify-server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -167,52 +167,54 @@ files:
 - Gemfile
 - groonga-query-log.gemspec
 - lib/groonga/query-log.rb
-- lib/groonga/query-log/parser.rb
+- lib/groonga/query-log/version.rb
 - lib/groonga/query-log/extractor.rb
-- lib/groonga/query-log/command-line-utils.rb
-- lib/groonga/query-log/command/detect-memory-leak.rb
 - lib/groonga/query-log/command/verify-server.rb
+- lib/groonga/query-log/command/detect-memory-leak.rb
 - lib/groonga/query-log/command/replay.rb
-- lib/groonga/query-log/version.rb
-- lib/groonga/query-log/server-verifier.rb
 - lib/groonga/query-log/memory-leak-detector.rb
+- lib/groonga/query-log/parser.rb
 - lib/groonga/query-log/analyzer.rb
+- lib/groonga/query-log/response-comparer.rb
+- lib/groonga/query-log/command-line-utils.rb
+- lib/groonga/query-log/server-verifier.rb
 - lib/groonga/query-log/replayer.rb
-- lib/groonga/query-log/analyzer/sized-grouped-operations.rb
-- lib/groonga/query-log/analyzer/streamer.rb
 - lib/groonga/query-log/analyzer/statistic.rb
+- lib/groonga/query-log/analyzer/streamer.rb
+- lib/groonga/query-log/analyzer/sized-statistics.rb
+- lib/groonga/query-log/analyzer/sized-grouped-operations.rb
+- lib/groonga/query-log/analyzer/reporter.rb
 - lib/groonga/query-log/analyzer/reporter/console.rb
-- lib/groonga/query-log/analyzer/reporter/html.rb
 - lib/groonga/query-log/analyzer/reporter/json.rb
-- lib/groonga/query-log/analyzer/reporter.rb
-- lib/groonga/query-log/analyzer/sized-statistics.rb
+- lib/groonga/query-log/analyzer/reporter/html.rb
 - doc/text/news.md
 - doc/text/lgpl-2.1.txt
 - .yardopts
-- test/run-test.rb
-- test/test-extractor.rb
-- test/command/test-select.rb
-- test/test-analyzer.rb
 - test/test-replayer.rb
-- test/test-parser.rb
-- test/fixtures/no-report-summary.expected
-- test/fixtures/order/elapsed.expected
+- test/command/test-select.rb
+- test/test-response-comparer.rb
+- test/groonga-query-log-test-utils.rb
+- test/test-extractor.rb
+- test/run-test.rb
+- test/fixtures/n_entries.expected
+- test/fixtures/other-query.log
+- test/fixtures/multi.expected
 - test/fixtures/order/-start-time.expected
+- test/fixtures/order/elapsed.expected
 - test/fixtures/order/start-time.expected
 - test/fixtures/order/-elapsed.expected
-- test/fixtures/n_entries.expected
-- test/fixtures/other-query.log
+- test/fixtures/no-report-summary.expected
+- test/fixtures/query.log
 - test/fixtures/reporter/json.expected
-- test/fixtures/reporter/console.expected
 - test/fixtures/reporter/html.expected
-- test/fixtures/multi.expected
-- test/fixtures/query.log
-- test/groonga-query-log-test-utils.rb
-- bin/groonga-query-log-analyze
+- test/fixtures/reporter/console.expected
+- test/test-analyzer.rb
+- test/test-parser.rb
 - bin/groonga-query-log-detect-memory-leak
+- bin/groonga-query-log-verify-server
+- bin/groonga-query-log-analyze
 - bin/groonga-query-log-replay
 - bin/groonga-query-log-extract
-- bin/groonga-query-log-verify-server
 homepage: https://github.com/groonga/groonga-query-log
 licenses:
 - LGPLv2.1+
@@ -241,23 +243,24 @@ summary: Groonga-query-log is a collection of library and tools to process [groo
   as a library. You can analyze your groonga's queries and test with your groonga's
   query log by using groonga-query-log as a tool.
 test_files:
-- test/run-test.rb
-- test/test-extractor.rb
-- test/command/test-select.rb
-- test/test-analyzer.rb
 - test/test-replayer.rb
-- test/test-parser.rb
-- test/fixtures/no-report-summary.expected
-- test/fixtures/order/elapsed.expected
+- test/command/test-select.rb
+- test/test-response-comparer.rb
+- test/groonga-query-log-test-utils.rb
+- test/test-extractor.rb
+- test/run-test.rb
+- test/fixtures/n_entries.expected
+- test/fixtures/other-query.log
+- test/fixtures/multi.expected
 - test/fixtures/order/-start-time.expected
+- test/fixtures/order/elapsed.expected
 - test/fixtures/order/start-time.expected
 - test/fixtures/order/-elapsed.expected
-- test/fixtures/n_entries.expected
-- test/fixtures/other-query.log
+- test/fixtures/no-report-summary.expected
+- test/fixtures/query.log
 - test/fixtures/reporter/json.expected
-- test/fixtures/reporter/console.expected
 - test/fixtures/reporter/html.expected
-- test/fixtures/multi.expected
-- test/fixtures/query.log
-- test/groonga-query-log-test-utils.rb
+- test/fixtures/reporter/console.expected
+- test/test-analyzer.rb
+- test/test-parser.rb
 has_rdoc: