groonga-query-log 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f93f3372ace5058cc9f8b7eb9f4799ad841862ca62bb7a7045564dd509b700c
-  data.tar.gz: 274f551095b12c0d7ce61f8f3c7be8d3b55531fcf7acf06df74fedc034f918ec
+  metadata.gz: ced33fc1e79df9965df29521aad93a35af71fdf48cf3a040aba8a29e56f75b98
+  data.tar.gz: 4ee6fa7d32c4326eaa817dc636fac696bda773b968860715e9af8290e446be06
 SHA512:
-  metadata.gz: 927ce37d21309f8def6a273c01b6b16a2c21d125a4db976f35bc16df211f81393a14cef1148ff9ac79d6488aa84ea3fdcdba26a69744ec32d605c66726bf3266
-  data.tar.gz: e509b9cfa830dcaf232ab4bf6692741afc44acc03b0fbe78c0135e52dc19a8911e12a18e61581925eb2d448790226ea93dc0c5b6821d06459176d6b7a8ae1e83
+  metadata.gz: 0ff81edec5d8b43878806d1923e487cb2aa28600ae78304ef8b2a13f60a1d78f94a4c0992c8cd0cf78f98ba90c8c4e200bab351eb01b65a19169649a0dd009c2
+  data.tar.gz: '0955ac7ae9a4f3969e336c949c76bd9aed6af824d0ba453b9cd5527b3628812e74358ec695b04f202032e1999d4049a3e9d4b19313851f206e616b4ef154cf95'

data/doc/text/news.md

@@ -1,5 +1,23 @@
 # News
 
+## 1.3.2: 2018-07-03
+
+### Improvements
+
+  * `groonga-query-log-run-regression-test`:
+
+    * Added `--target-command-names` option.
+
+    * Added `--read-timeout` option.
+
+  * `groonga-query-log-verify-server`:
+
+    * Added `--groonga1-read-timeout` option.
+
+    * Added `--groonga2-read-timeout` option.
+
+    * Added `--read-timeout` option.
+
 ## 1.3.1: 2018-06-18
 
 ### Improvements

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

@@ -44,9 +44,13 @@ module GroongaQueryLog
         @run_queries = true
         @skip_finished_queries = false
         @output_query_log = false
+        @stop_on_failure = false
+
         @care_order = true
         @ignored_drilldown_keys = []
-        @stop_on_failure = false
+        @target_command_names = ServerVerifier::Options.new.target_command_names
+
+        @read_timeout = Groonga::Client::Default::READ_TIMEOUT
       end
 
       def run(command_line)
@@ -142,6 +146,14 @@ module GroongaQueryLog
                   "Output query log in verified target Groonga servers") do
           @output_query_log = true
         end
+        parser.on("--[no-]stop-on-failure",
+                  "Stop execution on the first failure",
+                  "(#{@stop_on_failure})") do |boolean|
+          @stop_on_failure = boolean
+        end
+
+        parser.separator("")
+        parser.separator("Comparisons:")
         parser.on("--no-care-order",
                   "Don't care order of select response records") do
           @care_order = false
@@ -152,10 +164,21 @@ module GroongaQueryLog
                   "specifying this option multiple times") do |key|
           @ignored_drilldown_keys << key
         end
-        parser.on("--[no-]stop-on-failure",
-                  "Stop execution on the first failure",
-                  "(#{@stop_on_failure})") do |boolean|
-          @stop_on_failure = boolean
+        target_command_names_label = @target_command_names.join(",")
+        parser.on("--target-command-names=NAME1,NAME2,...", Array,
+                  "Test only NAME1,NAME2,... commands",
+                  "You can use glob to choose command name",
+                  "[#{target_command_names_label}]") do |names|
+          @target_command_names = names
+        end
+
+        parser.separator("")
+        parser.separator("Network:")
+        parser.on("--read-timeout=TIMEOUT", Integer,
+                  "Timeout on reading response from Groonga servers.",
+                  "You can disable timeout by specifying -1.",
+                  "[#{@read_timeout}]") do |timeout|
+          @read_timeout = timeout
         end
 
         parser
@@ -185,6 +208,8 @@ module GroongaQueryLog
           :skip_finished_queries => @skip_finished_queries,
           :ignored_drilldown_keys => @ignored_drilldown_keys,
           :stop_on_failure => @stop_on_failure,
+          :target_command_names => @target_command_names,
+          :read_timeout => @read_timeout,
         }
         directory_options.merge(options)
       end
@@ -436,6 +461,14 @@ module GroongaQueryLog
           if @stop_on_failure
             command_line << "--stop-on-failure"
           end
+          if @options[:target_command_names]
+            command_line << "--target-command-names"
+            command_line << @options[:target_command_names].join(",")
+          end
+          if @options[:read_timeout]
+            command_line << "--read-timeout"
+            command_line << @options[:read_timeout].to_s
+          end
           verify_server = VerifyServer.new
           verify_server.run(command_line, &callback)
         end

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

@@ -73,6 +73,13 @@ module GroongaQueryLog
           @options.groonga1.protocol = protocol
         end
 
+        parser.on("--groonga1-read-timeout=TIMEOUT", Integer,
+                  "Timeout on reading response from Groonga server 1.",
+                  "You can disable timeout by specifying -1.",
+                  "(#{@options.groonga1.read_timeout})") do |timeout|
+          @options.groonga1.read_timeout = timeout
+        end
+
         parser.on("--groonga2-host=HOST",
                   "Host name or IP address of Groonga server 2",
                   "[#{@options.groonga2.host}]") do |host|
@@ -91,6 +98,20 @@ module GroongaQueryLog
           @options.groonga2.protocol = protocol
         end
 
+        parser.on("--groonga2-read-timeout=TIMEOUT", Integer,
+                  "Timeout on reading response from Groonga server 2.",
+                  "You can disable timeout by specifying -1.",
+                  "(#{@options.groonga2.read_timeout})") do |timeout|
+          @options.groonga2.read_timeout = timeout
+        end
+
+        parser.on("--read-timeout=TIMEOUT", Integer,
+                  "Timeout on reading response from both Groonga servers.",
+                  "You can disable timeout by specifying -1.") do |timeout|
+          @options.groonga1.read_timeout = timeout
+          @options.groonga2.read_timeout = timeout
+        end
+
         parser.on("--n-clients=N", Integer,
                   "The max number of concurrency",
                   "[#{@options.n_clients}]") do |n_clients|
@@ -116,7 +137,7 @@ module GroongaQueryLog
           @options.target_command_names << name
         end
 
-        target_command_names_label = @options.target_command_names.join(", ")
+        target_command_names_label = @options.target_command_names.join(",")
         parser.on("--target-command-names=NAME1,NAME2,...", Array,
                   "Replay only NAME1,NAME2,... commands",
                   "You can use glob to choose command name",

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

@@ -245,16 +245,19 @@ module GroongaQueryLog
       attr_accessor :host
       attr_accessor :port
       attr_accessor :protocol
+      attr_accessor :read_timeout
       def initialize
-        @host     = "127.0.0.1"
-        @port     = 10041
-        @protocol = :gqtp
+        @host         = "127.0.0.1"
+        @port         = 10041
+        @protocol     = :gqtp
+        @read_timeout = Groonga::Client::Default::READ_TIMEOUT
       end
 
       def create_client(&block)
-        Groonga::Client.open(:host     => @host,
-                             :port     => @port,
-                             :protocol => @protocol,
+        Groonga::Client.open(:host         => @host,
+                             :port         => @port,
+                             :protocol     => @protocol,
+                             :read_timeout => @read_timeout,
                              &block)
       end
     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.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Groonga-query-log is a collection of library and tools to process [Groonga](http://groonga.org/)'s