groonga-query-log 1.6.8 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eae04a296ec14c5c76495fed6305cbf2bd483ae3d1f75927c876d788deaa61ed
-  data.tar.gz: ae995f3d7b5bb5b93fdc380aa3cba02b6de0b5a5a356879c811190c3054fcd27
+  metadata.gz: fca209c185dcd27bb15bdf7444261a754f33d40f73ffe1f1141fc8fe5a2c61ac
+  data.tar.gz: 4efd951340f55639e8d83fbd69d13ef411ca6c62bc0f4bfae59afd982c9d2571
 SHA512:
-  metadata.gz: '02049e8d2e93ad2f0c5564c7492e2b999e54feca6df4beadb1cc7555c25b31980a8b80c223c81873c63b6827f37a06ae340b7bb42ef943c24757632e1e9a115b'
-  data.tar.gz: db3778e5ebe80afc1b789cf8484d3ad65651d907388bd69e1c41fa5531fbe1fec4253af8bd5eee5e02d1ac6d53f108d43587cbd2aad2230bd7e493f8df304f64
+  metadata.gz: fd72aaaf751c2acee54c88eeb9e8b04d528d5d9debc29405afbba617341b89e59012cb8e34fe2e5088b8e945aa8bf8f2610f4329a16b848c51c51ebdf4b75d3e
+  data.tar.gz: b366ad6ce14ffd22da56c7f4432cf59856a6896bdf1a13ebad9d9689043934ab3a13722fb76bb7b5a22a7cdcecc00da62e29940bf191a98b0483bc63af4e17f1

data/doc/text/news.md

@@ -1,5 +1,50 @@
 # News
 
+## 1.7.3: 2020-11-12
+
+### Improvements
+
+  * `check-crash`: Added support for showing Groonga version.
+
+  * `server-verifier`: Added  `--max-limit` option.
+
+  * `run-regression-test`: Added `--max-limit` option.
+
+### Fixes
+
+  * `GroongaQueryLog::Parser`: Fixed a bug that target command filter
+    may not work.
+
+## 1.7.2: 2020-06-02
+
+### Fixes
+
+  * `server-verifier`: Fixed a bug that performance verification
+    doesn't try 5 times.
+
+## 1.7.1: 2020-06-01
+
+### Fixes
+
+  * `server-verifier`: Fixed a bug that performance verification with
+    `--stop-onlfailre` doesn't work.
+
+  * `run-regression-test`: Fixed a bug that failure is ignored.
+
+## 1.7.0: 2020-05-31
+
+### Fixes
+
+  * `server-verifier`: Fixed a bug that performance verification
+    doesn't work.
+
+## 1.6.9: 2020-05-30
+
+### Fixes
+
+  * `server-verifier`: Fixed a bug that performance verification
+    doesn't work.
+
 ## 1.6.8: 2020-05-30
 
 ### Improvements

data/lib/groonga-query-log/command/check-crash.rb

@@ -71,6 +71,7 @@ module GroongaQueryLog
       end
 
       class GroongaProcess
+        attr_reader :version
         attr_reader :pid
         attr_reader :start_time
         attr_reader :start_log_path
@@ -80,7 +81,8 @@ module GroongaQueryLog
         attr_writer :crashed
         attr_writer :finished
         attr_reader :important_entries
-        def initialize(pid, start_time, start_log_path)
+        def initialize(version, pid, start_time, start_log_path)
+          @version = version
           @pid = pid
           @start_time = start_time
           @end_time = @start_time
@@ -121,6 +123,7 @@ module GroongaQueryLog
               need_query_log_parsing = false
               p [:process,
                  :success,
+                 process.version,
                  process.start_time.iso8601,
                  process.end_time.iso8601,
                  process.pid,
@@ -129,6 +132,7 @@ module GroongaQueryLog
             elsif process.crashed?
               p [:process,
                  :crashed,
+                 process.version,
                  process.start_time.iso8601,
                  process.end_time.iso8601,
                  process.pid,
@@ -137,6 +141,7 @@ module GroongaQueryLog
             else
               p [:process,
                  :unfinished,
+                 process.version,
                  process.start_time.iso8601,
                  process.pid,
                  process.start_log_path]
@@ -144,6 +149,7 @@ module GroongaQueryLog
 
             unless process.n_leaks.zero?
               p [:leak,
+                 process.version,
                  process.n_leaks,
                  process.end_time.iso8601,
                  process.pid,
@@ -184,7 +190,8 @@ module GroongaQueryLog
               end
             end
             unless @unflushed_statistics.empty?
-              puts("Unflushed commands in #{start.iso8601}/#{last.iso8601}")
+              puts("Unflushed commands in " +
+                   "#{start_time.iso8601}/#{end_time.iso8601}")
               @unflushed_statistics.each do |statistic|
                 puts("#{statistic.start_time.iso8601}: #{statistic.raw_command}")
               end
@@ -320,7 +327,8 @@ module GroongaQueryLog
           end
 
           case entry.message
-          when /\Agrn_init:/, /\Amroonga \d+\.\d+ started\.\z/
+          when /\Agrn_init: <(.+?)>/, /\Amroonga (\d+\.\d+) started\.\z/
+            version = $1
             process = @running_processes[entry.pid]
             if process
               process.finished = true
@@ -328,12 +336,15 @@ module GroongaQueryLog
               yield(process)
               @running_processes.delete(entry.pid)
             end
-            process = GroongaProcess.new(entry.pid, entry.timestamp, path)
+            process = GroongaProcess.new(version,
+                                         entry.pid,
+                                         entry.timestamp,
+                                         path)
             @running_processes[entry.pid] = process
           when /\Agrn_fin \((\d+)\)\z/
             n_leaks = $1.to_i
             @running_processes[entry.pid] ||=
-              GroongaProcess.new(entry.pid, Time.at(0), path)
+              GroongaProcess.new(nil, entry.pid, Time.at(0), path)
             process = @running_processes[entry.pid]
             process.n_leaks = n_leaks
             process.end_time = entry.timestamp
@@ -343,7 +354,7 @@ module GroongaQueryLog
             @running_processes.delete(entry.pid)
           else
             @running_processes[entry.pid] ||=
-              GroongaProcess.new(entry.pid, Time.at(0), path)
+              GroongaProcess.new(nil, entry.pid, Time.at(0), path)
             process = @running_processes[entry.pid]
             case entry.log_level
             when :notice

data/lib/groonga-query-log/command/run-regression-test.rb

@@ -66,6 +66,7 @@ module GroongaQueryLog
         @rewrite_and_not_operator = false
         @debug_rewrite = false
         @omit_rate = 0.0
+        @max_limit = -1
 
         @care_order = true
         @ignored_drilldown_keys = []
@@ -313,6 +314,12 @@ module GroongaQueryLog
                   "(#{@omit_rate})") do |rate|
           @omit_rate = rate
         end
+        parser.on("--max-limit=LIMIT",
+                  "Use LIMIT as the max limit value",
+                  "Negative value doesn't rewrite the limit parameter",
+                  "(#{@max_limit})") do |limit|
+          @max_limit = limit
+        end
 
         parser.separator("")
         parser.separator("Comparisons:")
@@ -466,6 +473,7 @@ module GroongaQueryLog
             @rewrite_and_not_operator,
           :debug_rewrite => @debug_rewrite,
           :omit_rate => @omit_rate,
+          :max_limit => @max_limit,
           :target_command_names => @target_command_names,
           :verify_performance => @verify_performance,
           :performance_verfifier_options => @performance_verfifier_options,
@@ -790,6 +798,7 @@ module GroongaQueryLog
             begin
               ready_queue.push(true)
               wait_queue.pop
+              true
             ensure
               @old.shutdown
             end
@@ -799,6 +808,7 @@ module GroongaQueryLog
             begin
               ready_queue.push(true)
               wait_queue.pop
+              true
             ensure
               @new.shutdown
             end
@@ -806,9 +816,10 @@ module GroongaQueryLog
           test_thread = Thread.new do
             ready_queue.pop
             ready_queue.pop
-            run_test
+            success = run_test
             wait_queue.push(true)
             wait_queue.push(true)
+            success
           end
 
           old_thread_success = old_thread.value
@@ -824,7 +835,7 @@ module GroongaQueryLog
 
         private
         def run_test
-          same = true
+          success = true
           query_log_paths.each do |query_log_path|
             log_path = test_log_path(query_log_path)
             if @options[:skip_finished_queries] and log_path.exist?
@@ -849,14 +860,14 @@ module GroongaQueryLog
                 callback = nil
               end
               unless verify_server(log_path, query_log_path, &callback)
-                same = false
+                success = false
                 break if @stop_on_failure
               end
             rescue Interrupt
               puts("Interrupt: #{query_log_path}")
             end
           end
-          same
+          success
         end
 
         def verify_server(test_log_path, query_log_path, &callback)
@@ -916,6 +927,10 @@ module GroongaQueryLog
             command_line << "--omit-rate"
             command_line << @options[:omit_rate].to_s
           end
+          if @options[:max_limit] >= 0
+            command_line << "--max-limit"
+            command_line << @options[:max_limit].to_s
+          end
           if @options[:target_command_names]
             command_line << "--target-command-names"
             command_line << @options[:target_command_names].join(",")

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2020  Horimoto Yasuhiro <horimoto@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -280,6 +280,13 @@ module GroongaQueryLog
           @options.nullable_reference_number_accessors << accessor
         end
 
+        parser.on("--max-limit=LIMIT",
+                  "Use LIMIT as the max limit value",
+                  "Negative value doesn't rewrite the limit parameter",
+                  "(#{@options.max_limit})") do |limit|
+          @options.max_limit = limit
+        end
+
         create_parser_performance(parser)
 
         parser.separator("")

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

@@ -160,7 +160,7 @@ module GroongaQueryLog
 
     def target_statistic?(statistic)
       if @target_commands
-        unless @target_commands.include?(statistic.command.name)
+        unless @target_commands.include?(statistic.command.command_name)
           return false
         end
       end

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

@@ -83,19 +83,15 @@ module GroongaQueryLog
           end
           begin
             replay_command(client, id, statistic.command)
-          rescue Groonga::Client::Error
+          rescue => error
             # TODO: add error log mechanism
             $stderr.puts(Time.now.iso8601(6))
             $stderr.puts(statistic.command.original_source)
-            $stderr.puts($!.raw_error.message)
-            $stderr.puts($!.raw_error.backtrace)
-            return false
-          rescue
-            # TODO: add error log mechanism
-            $stderr.puts(Time.now.iso8601(6))
-            $stderr.puts(statistic.command.original_source)
-            $stderr.puts($!.message)
-            $stderr.puts($!.backtrace)
+            if error.respond_to?(:raw_error)
+              error = raw_error
+            end
+            $stderr.puts(error.message)
+            $stderr.puts(error.backtrace)
             return false
           end
         end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2020  Horimoto Yasuhiro <horimoto@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -170,6 +170,14 @@ module GroongaQueryLog
     def verify_command(groonga1_client, groonga2_client, command)
       command["cache"] = "no" if @options.disable_cache?
       command["cache"] = "no" if @options.verify_performance?
+      if @options.max_limit >= 0 and command["limit"]
+        limit = command["limit"].to_i
+        if limit >= 0
+          command["limit"] = [limit, @options.max_limit].min.to_s
+        else
+          command["limit"] = @options.max_limit.to_s
+        end
+      end
       command["output_type"] = "json"
       rewrite_filter(command, "filter")
       rewrite_filter(command, "scorer")
@@ -188,11 +196,19 @@ module GroongaQueryLog
       end
 
       if @options.verify_performance?
-        verify_performance(command, response1, response2)
+        verify_performance(command,
+                           groonga1_client,
+                           groonga2_client,
+                           response1,
+                           response2)
       end
     end
 
-    def verify_performance(command, response1, response2)
+    def verify_performance(command,
+                           groonga1_client,
+                           groonga2_client,
+                           response1,
+                           response2)
       responses1 = [response1]
       responses2 = [response2]
       verifier = PerformanceVerifier.new(command,
@@ -203,23 +219,24 @@ module GroongaQueryLog
 
       n_tries = 4
       n_tries.times do
+        return if stop?
+
         responses1 << groonga1_client.execute(command)
         responses2 << groonga2_client.execute(command)
         verifier = PerformanceVerifier.new(command,
                                            responses1,
                                            responses2,
                                            @options.performance_verifier_options)
-        if verifier.slow?
-          @slow = true
-          @events.push([:slow,
-                        command,
-                        verifier.old_elapsed_time,
-                        verifier.new_elapsed_time,
-                        verifier.old_elapsed_time,
-                        verifier.new_elapsed_time])
-          return
-        end
+        return unless verifier.slow?
       end
+
+      @slow = true
+      @events.push([:slow,
+                    command,
+                    verifier.old_elapsed_time,
+                    verifier.new_elapsed_time,
+                    verifier.old_elapsed_times,
+                    verifier.new_elapsed_times])
     end
 
     def rewrite_filter(command, name)
@@ -308,6 +325,7 @@ module GroongaQueryLog
       attr_reader :performance_verifier_options
       attr_writer :debug_rewrite
       attr_writer :omit_rate
+      attr_accessor :max_limit
       def initialize
         @groonga1 = GroongaOptions.new
         @groonga2 = GroongaOptions.new
@@ -342,6 +360,7 @@ module GroongaQueryLog
         @performance_verifier_options = PerformanceVerifier::Options.new
         @debug_rewrite = false
         @omit_rate = 0.0
+        @max_limit = -1
       end
 
       def request_queue_size

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

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaQueryLog
-  VERSION = "1.6.8"
+  VERSION = "1.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.7.3
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charty
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Groonga-query-log is a collection of library and tools to process [Groonga](http://groonga.org/)'s