groonga-query-log 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fc818af1a75fea77eee79dc2b7852598ef14796e67a14d043449eebd31b3a15
-  data.tar.gz: 6c101e1c990a46aabc47208b1625db3db90152cbba9c7163fc5ee0e201b7f7a1
+  metadata.gz: eae04a296ec14c5c76495fed6305cbf2bd483ae3d1f75927c876d788deaa61ed
+  data.tar.gz: ae995f3d7b5bb5b93fdc380aa3cba02b6de0b5a5a356879c811190c3054fcd27
 SHA512:
-  metadata.gz: 942d6b83901dcc4b2bccf8c8639da85cfac8472db3bd59738a8f386b9811c7bb141a7718a3140043b68cef0c71e3434cafabd9686e18a685ca49e0918da24321
-  data.tar.gz: 23c25f00387e3755908222434477d487c7f5f1a707c54f4a86d2969a17c3bb2fcfffbfe88bee7e157651665956b42aa3d27b1d54f2ac9d5246361886be235028
+  metadata.gz: '02049e8d2e93ad2f0c5564c7492e2b999e54feca6df4beadb1cc7555c25b31980a8b80c223c81873c63b6827f37a06ae340b7bb42ef943c24757632e1e9a115b'
+  data.tar.gz: db3778e5ebe80afc1b789cf8484d3ad65651d907388bd69e1c41fa5531fbe1fec4253af8bd5eee5e02d1ac6d53f108d43587cbd2aad2230bd7e493f8df304f64

data/doc/text/news.md

@@ -1,8 +1,17 @@
 # News
 
+## 1.6.8: 2020-05-30
+
+### Improvements
+
+  * `server-verifier`: Stopped sorting elapsed times.
+
+  * `run-regression-test`: Ensured killing Groonga server on start up
+    error.
+
 ## 1.6.7: 2020-05-30
 
-### Improves
+### Improvements
 
   * `extract`: Added support for no command request case such as `/`.
 

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

@@ -559,6 +559,7 @@ module GroongaQueryLog
           @host = "127.0.0.1"
           @port = find_unused_port
           @options = options
+          @pid = nil
         end
 
         def run
@@ -579,25 +580,28 @@ module GroongaQueryLog
           spawn_args << @database_path.to_s
           @pid = spawn(*spawn_args)
 
-          n_retries = 10
           begin
-            send_command("status")
-          rescue SystemCallError
-            sleep(1)
-            n_retries -= 1
-            raise if n_retries.zero?
-            retry
-          end
+            n_retries = 60
+            begin
+              send_command("status")
+            rescue SystemCallError
+              sleep(1)
+              n_retries -= 1
+              raise if n_retries.zero?
+              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)
+            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
+          rescue
+            shutdown
+            raise
           end
-
-          yield if block_given?
         end
 
         def ensure_database
@@ -688,11 +692,14 @@ module GroongaQueryLog
         end
 
         def shutdown
+          return if @pid.nil?
           begin
             send_command("shutdown")
           rescue SystemCallError
+            Process.kill(:KILL, @pid)
           end
           Process.waitpid(@pid)
+          @pid = nil
         end
 
         def n_leaked_objects
@@ -769,7 +776,6 @@ module GroongaQueryLog
           @n_clients = options[:n_clients] || 1
           @stop_on_failure = options[:stop_on_failure]
           @options = options
-          @n_ready_waits = 2
           @n_executed_commands = 0
         end
 
@@ -777,21 +783,39 @@ module GroongaQueryLog
           @old.ensure_database
           @new.ensure_database
 
+          ready_queue = Thread::Queue.new
+          wait_queue = Thread::Queue.new
           old_thread = Thread.new do
-            @old.run do
-              run_test
+            @old.run
+            begin
+              ready_queue.push(true)
+              wait_queue.pop
+            ensure
+              @old.shutdown
             end
           end
           new_thread = Thread.new do
-            @new.run do
-              run_test
+            @new.run
+            begin
+              ready_queue.push(true)
+              wait_queue.pop
+            ensure
+              @new.shutdown
             end
           end
+          test_thread = Thread.new do
+            ready_queue.pop
+            ready_queue.pop
+            run_test
+            wait_queue.push(true)
+            wait_queue.push(true)
+          end
 
           old_thread_success = old_thread.value
           new_thread_success = new_thread.value
+          test_thread_success = test_thread.value
 
-          old_thread_success and new_thread_success
+          old_thread_success and new_thread_success and test_thread_success
         end
 
         def n_executed_commands
@@ -800,9 +824,6 @@ module GroongaQueryLog
 
         private
         def run_test
-          @n_ready_waits -= 1
-          return true unless @n_ready_waits.zero?
-
           same = true
           query_log_paths.each do |query_log_path|
             log_path = test_log_path(query_log_path)
@@ -835,16 +856,6 @@ module GroongaQueryLog
               puts("Interrupt: #{query_log_path}")
             end
           end
-
-          old_thread = Thread.new do
-            @old.shutdown
-          end
-          new_thread = Thread.new do
-            @new.shutdown
-          end
-          old_thread.join
-          new_thread.join
-
           same
         end
 

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

@@ -47,16 +47,16 @@ module GroongaQueryLog
       diff_ratio > @threshold_ratio
     end
 
-    def old_sorted_elapsed_times
-      collect_sorted_elapsed_times(@old_responses)
+    def old_elapsed_times
+      collect_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)
+    def new_elapsed_times
+      collect_elapsed_times(@new_responses)
     end
 
     def new_elapsed_time
@@ -74,15 +74,14 @@ module GroongaQueryLog
       end
     end
 
-    def collect_sorted_elapsed_times(responses)
-      elapsed_times = responses.collect do |response|
+    def collect_elapsed_times(responses)
+      responses.collect do |response|
         response.elapsed_time
       end
-      elapsed_times.sort
     end
 
     def choose_target_elapsed_time(responses)
-      sorted_elapsed_times = collect_sorted_elapsed_times(responses)
+      sorted_elapsed_times = collect_elapsed_times(responses).sort
 
       strategy = @options.choose_strategy
       case strategy

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

@@ -215,8 +215,8 @@ module GroongaQueryLog
                         command,
                         verifier.old_elapsed_time,
                         verifier.new_elapsed_time,
-                        verifier.old_sorted_elapsed_time,
-                        verifier.new_sorted_elapsed_time])
+                        verifier.old_elapsed_time,
+                        verifier.new_elapsed_time])
           return
         end
       end
@@ -251,14 +251,14 @@ module GroongaQueryLog
                     command,
                     old_elapsed_time,
                     new_elapsed_time,
-                    old_sorted_elapsed_times,
-                    new_sorted_elapsed_times)
+                    old_elapsed_times,
+                    new_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_times_old: #{old_elapsed_times.join(' ')}")
+      output.puts("elapsed_times_new: #{new_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.7"
+  VERSION = "1.6.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Kouhei Sutou