groonga-query-log 1.6.2 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 292e6cac875522bbe44ce9e3ba9720662607e73e2caff72dbb64ef01b403c353
-  data.tar.gz: 7c8ca5a6868504360814aae0c8726cdcbe909ba1806aa8a4c99e1b5324b85087
+  metadata.gz: 5fc818af1a75fea77eee79dc2b7852598ef14796e67a14d043449eebd31b3a15
+  data.tar.gz: 6c101e1c990a46aabc47208b1625db3db90152cbba9c7163fc5ee0e201b7f7a1
 SHA512:
-  metadata.gz: 7ba5b0df58160f31cee7f9acb675bbd5c79b4f878550b184112ca8b557b591007cf8d32477beb7455e21737924785dba8305c2242a7e267a0e12b67bd3c14de6
-  data.tar.gz: 5be7b4777f3153332cea06f6b942b121a4983136dcf6b804f8c0e699b43b2fe70636a7cd8a0da9f4c240a6d2103c0b316e96c8afab659821d40cf0c78a6ea1b2
+  metadata.gz: 942d6b83901dcc4b2bccf8c8639da85cfac8472db3bd59738a8f386b9811c7bb141a7718a3140043b68cef0c71e3434cafabd9686e18a685ca49e0918da24321
+  data.tar.gz: 23c25f00387e3755908222434477d487c7f5f1a707c54f4a86d2969a17c3bb2fcfffbfe88bee7e157651665956b42aa3d27b1d54f2ac9d5246361886be235028

data/doc/text/news.md

@@ -1,5 +1,48 @@
 # News
 
+## 1.6.7: 2020-05-30
+
+### Improves
+
+  * `extract`: Added support for no command request case such as `/`.
+
+  * `server-verifier`: Reduced the number of requests for performance
+    verification.
+
+  * `server-verifier`: Added all elapsed times on slow.
+
+  * `format-regression-test-logs`: Added support for all elapsed times
+    on slow.
+
+## 1.6.6: 2020-05-20
+
+### Fixes
+
+  * `run-regression-test`: Fixed a bug that
+    `--old-groonga-warm-up-command` is ignored.
+
+## 1.6.5: 2020-05-19
+
+### Improvements
+
+  * `run-regression-test`: Added options to customize how to warm up:
+
+    * `--old-groonga-warm-up-command`
+
+    * `--new-groonga-warm-up-command`
+
+## 1.6.4: 2020-05-18
+
+### Improvements
+
+  * `run-regression-test`: Improved how to warm up.
+
+## 1.6.3: 2020-05-11
+
+### Improvements
+
+  * `run-regression-test`: Added `--no-warm-up` option.
+
 ## 1.6.2: 2020-05-09
 
 ### Improvements

data/lib/groonga-query-log/command/extract.rb

@@ -182,6 +182,8 @@ module GroongaQueryLog
       end
 
       def target?(command)
+        return false if command.nil?
+
         name = command.command_name
         target_commands = @options.commands
         exclude_commands = @options.exclude_commands

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

@@ -74,6 +74,8 @@ module GroongaQueryLog
         elapsed_time_old = nil
         elapsed_time_new = nil
         elapsed_time_ratio = nil
+        elapsed_times_old = nil
+        elapsed_times_new = nil
 
         input.each_line do |line|
           unless line.valid_encoding?
@@ -100,11 +102,21 @@ module GroongaQueryLog
             elapsed_time_old = Float($POSTMATCH.chomp)
           when /\Aelapsed_time_new: /
             elapsed_time_new = Float($POSTMATCH.chomp)
+          when /\Aelapsed_times_old: /
+            elapsed_times_old = $POSTMATCH.chomp.split.collect do |value|
+              Float(value)
+            end
+          when /\Aelapsed_times_new: /
+            elapsed_times_new = $POSTMATCH.chomp.split.collect do |value|
+              Float(value)
+            end
           when /\Aelapsed_time_ratio: /
             elapsed_time_ratio = Float($POSTMATCH.chomp)
             report_slow(command,
                         elapsed_time_old,
                         elapsed_time_new,
+                        elapsed_times_old,
+                        elapsed_times_new,
                         elapsed_time_ratio)
           end
         end
@@ -196,11 +208,21 @@ module GroongaQueryLog
       def report_slow(command,
                       elapsed_time_old,
                       elapsed_time_new,
+                      elapsed_times_old,
+                      elapsed_times_new,
                       elapsed_time_ratio)
         report_command(command)
+        elapsed_times_old ||= [elapsed_time_old]
+        elapsed_times_new ||= [elapsed_time_new]
         @output.puts("Slow:")
-        @output.puts("  Old: %s" % format_elapsed_time(elapsed_time_old))
-        @output.puts("  New: %s" % format_elapsed_time(elapsed_time_new))
+        @output.puts("  Old: %s (%s)" % [
+                       format_elapsed_time(elapsed_time_old),
+                       format_elapsed_times(elapsed_times_old),
+                     ])
+        @output.puts("  New: %s (%s)" % [
+                       format_elapsed_time(elapsed_time_new),
+                       format_elapsed_times(elapsed_times_new),
+                     ])
         @output.puts("  Ratio: +%.1f%%" % ((elapsed_time_ratio * 100) - 100))
       end
 

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

@@ -42,13 +42,16 @@ module GroongaQueryLog
         @old_database = "db.old/db"
         @old_groonga_options = []
         @old_groonga_env = {}
+        @old_groonga_warm_up_commands = []
 
         @new_groonga = "groonga"
         @new_database = "db.new/db"
         @new_groonga_options = []
         @new_groonga_env = {}
+        @new_groonga_warm_up_commands = []
 
         @recreate_database = false
+        @warm_up = true
         @load_data = true
         @run_queries = true
         @skip_finished_queries = false
@@ -176,6 +179,14 @@ module GroongaQueryLog
           @old_groonga_env[key] = value
         end
 
+        parser.on("--old-groonga-warm-up-commands=COMMAND",
+                  "Run COMMAND before running tests to warm old groonga up",
+                  "You can specify this option multiple times",
+                  "to specify multiple warm up commands",
+                  "(no additional warm up commands)") do |command|
+          @old_groonga_warm_up_commands << command
+        end
+
         parser.separator("")
         parser.separator("New Groonga:")
         parser.on("--new-groonga=GROONGA",
@@ -201,19 +212,34 @@ module GroongaQueryLog
           @new_groonga_env[key] = value
         end
 
+        parser.on("--new-groonga-warm-up-commands=COMMAND",
+                  "Run COMMAND before running tests to warm new groonga up",
+                  "You can specify this option multiple times",
+                  "to specify multiple warm up commands",
+                  "(no additional warm up commands)") do |command|
+          @new_groonga_warm_up_commands << command
+        end
+
         parser.separator("")
         parser.separator("Operations:")
         parser.on("--recreate-database",
                   "Always recreate Groonga database") do
           @recreate_database = true
         end
+        parser.on("--no-warm-up",
+                  "Don't warm up before test",
+                  "(#{@warm_up})") do |boolean|
+          @warm_up = boolean
+        end
         parser.on("--no-load-data",
-                  "Don't load data. Just loads schema to Groonga database") do
-          @load_data = false
+                  "Don't load data. Just loads schema to Groonga database",
+                 "(#{@load_data})") do |boolean|
+          @load_data = boolean
         end
         parser.on("--no-run-queries",
-                  "Don't run queries. Just creates Groonga database") do
-          @run_queries = false
+                  "Don't run queries. Just creates Groonga database",
+                 "(#{@run_queries})") do |boolean|
+          @run_queries = boolean
         end
         parser.on("--skip-finished-queries",
                   "Don't run finished query logs.") do
@@ -411,9 +437,10 @@ module GroongaQueryLog
       def server_options
         options = {
           :load_data             => @load_data,
-          :run_queries           => @run_queries,
-          :recreate_database     => @recreate_database,
           :output_query_log      => @output_query_log,
+          :recreate_database     => @recreate_database,
+          :run_queries           => @run_queries,
+          :warm_up               => @warm_up,
         }
         directory_options.merge(options)
       end
@@ -448,19 +475,23 @@ module GroongaQueryLog
       end
 
       def old_groonga_server
+        options = server_options
+        options[:warm_up_commands] = @old_groonga_warm_up_commands
         GroongaServer.new(@old_groonga,
                           @old_groonga_options,
                           @old_groonga_env,
                           @old_database,
-                          server_options)
+                          options)
       end
 
       def new_groonga_server
+        options = server_options
+        options[:warm_up_commands] = @new_groonga_warm_up_commands
         GroongaServer.new(@new_groonga,
                           @new_groonga_options,
                           @new_groonga_env,
                           @new_database,
-                          server_options)
+                          options)
       end
 
       def format_report(success,
@@ -558,6 +589,14 @@ module GroongaQueryLog
             retry
           end
 
+          if @options[:warm_up]
+            send_command("dump?dump_records=no")
+            warm_up_commands = @options[:warm_up_commands] || []
+            warm_up_commands.each do |command|
+              send_command(command)
+            end
+          end
+
           yield if block_given?
         end
 

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

@@ -30,5 +30,12 @@ module GroongaQueryLog
         "%.1fmin" % (elapsed_time / 60)
       end
     end
+
+    def format_elapsed_times(elapsed_times)
+      formatted_epalsed_times = elapsed_times.collect do |elapsed_time|
+        format_elapsed_time(elapsed_time)
+      end
+      formatted_epalsed_times.join(" ")
+    end
   end
 end

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

@@ -47,10 +47,18 @@ module GroongaQueryLog
       diff_ratio > @threshold_ratio
     end
 
+    def old_sorted_elapsed_times
+      collect_sorted_elapsed_times(@old_responses)
+    end
+
     def old_elapsed_time
       choose_target_elapsed_time(@old_responses)
     end
 
+    def new_sorted_elapsed_times
+      collect_sorted_elapsed_times(@new_responses)
+    end
+
     def new_elapsed_time
       choose_target_elapsed_time(@new_responses)
     end
@@ -66,18 +74,22 @@ module GroongaQueryLog
       end
     end
 
-    def choose_target_elapsed_time(responses)
+    def collect_sorted_elapsed_times(responses)
       elapsed_times = responses.collect do |response|
         response.elapsed_time
       end
-      sorted_elapsed_times = elapsed_times.sort
+      elapsed_times.sort
+    end
+
+    def choose_target_elapsed_time(responses)
+      sorted_elapsed_times = collect_sorted_elapsed_times(responses)
 
       strategy = @options.choose_strategy
       case strategy
       when :fastest
         sorted_elapsed_times.first
       when :median
-        sorted_elapsed_times[elapsed_times.size / 2]
+        sorted_elapsed_times[sorted_elapsed_times.size / 2]
       else
         message =
           "choose strategy must be :fastest or :median: #{strategy.inspect}"

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

@@ -187,24 +187,38 @@ module GroongaQueryLog
         return
       end
 
-      return unless @options.verify_performance?
+      if @options.verify_performance?
+        verify_performance(command, response1, response2)
+      end
+    end
+
+    def verify_performance(command, response1, response2)
       responses1 = [response1]
       responses2 = [response2]
-      n_tries = 4
-      n_tries.times do
-        responses1 << groonga1_client.execute(command)
-        responses2 << groonga2_client.execute(command)
-      end
       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])
+      return unless verifier.slow?
+
+      n_tries = 4
+      n_tries.times do
+        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_sorted_elapsed_time,
+                        verifier.new_sorted_elapsed_time])
+          return
+        end
       end
     end
 
@@ -233,11 +247,18 @@ module GroongaQueryLog
       output.flush
     end
 
-    def report_slow(output, command, old_elapsed_time, new_elapsed_time)
+    def report_slow(output,
+                    command,
+                    old_elapsed_time,
+                    new_elapsed_time,
+                    old_sorted_elapsed_times,
+                    new_sorted_elapsed_times)
       command_source = command.original_source || command.to_uri_format
       output.puts("command: #{command_source}")
       output.puts("elapsed_time_old: #{old_elapsed_time}")
       output.puts("elapsed_time_new: #{new_elapsed_time}")
+      output.puts("elapsed_times_old: #{old_sorted_elapsed_times.join(' ')}")
+      output.puts("elapsed_times_new: #{new_sorted_elapsed_times.join(' ')}")
       output.puts("elapsed_time_ratio: #{new_elapsed_time / old_elapsed_time}")
       output.flush
     end

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.2"
+  VERSION = "1.6.7"
 end

data/test/command/test-format-regression-test-logs.rb

@@ -109,14 +109,32 @@ Arguments:
   query: column_create
   table: Entries
 Slow:
-  Old: 174.8usec
-  New: 201.7usec
+  Old: 174.8usec (174.8usec)
+  New: 201.7usec (201.7usec)
   Ratio: +15.4%
     OUTPUT
     assert_equal([true, output],
                  run_command([fixture_path("slow.log")]))
   end
 
+  def test_slow_elapsed_times
+    output = <<-OUTPUT
+Command:
+/d/select?match_columns=description&query=column_create&table=Entries
+Name: select
+Arguments:
+  match_columns: description
+  query: column_create
+  table: Entries
+Slow:
+  Old: 174.8usec (174.8usec 184.8usec)
+  New: 201.7usec (201.7usec 211.7usec)
+  Ratio: +15.4%
+    OUTPUT
+    assert_equal([true, output],
+                 run_command([fixture_path("slow-elapsed-times.log")]))
+  end
+
   sub_test_case(".new") do
     def setup
     end

data/test/fixtures/regression-test-logs/slow-elapsed-times.log

@@ -0,0 +1,6 @@
+command: /d/select?match_columns=description&query=column_create&table=Entries
+elapsed_time_old: 0.0001747608184814453
+elapsed_time_new: 0.0002017021179199219
+elapsed_times_old: 0.0001747608184814453 0.0001847608184814453
+elapsed_times_new: 0.0002017021179199219 0.0002117021179199219
+elapsed_time_ratio: 1.154160982264666

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.7
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charty
@@ -272,6 +272,7 @@ files:
 - test/fixtures/query.log
 - test/fixtures/regression-test-logs/command-format.log
 - test/fixtures/regression-test-logs/error.log
+- test/fixtures/regression-test-logs/slow-elapsed-times.log
 - test/fixtures/regression-test-logs/slow.log
 - test/fixtures/regression-test-logs/url-format.log
 - test/fixtures/reporter/console.expected
@@ -345,6 +346,7 @@ test_files:
 - test/fixtures/query.log
 - test/fixtures/regression-test-logs/command-format.log
 - test/fixtures/regression-test-logs/error.log
+- test/fixtures/regression-test-logs/slow-elapsed-times.log
 - test/fixtures/regression-test-logs/slow.log
 - test/fixtures/regression-test-logs/url-format.log
 - test/fixtures/reporter/console.expected