grntest 1.7.3 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4333e40f40a3b7f0d255906972e5c0d7ba7ca5c64dc9b25067aeb8229b65b621
-  data.tar.gz: 10f51f45c7ef3502666222c5ae9208445a168e5daecf45f703ea7809e5a812b3
+  metadata.gz: b9cd8b74ac4dd886a08f1550309a467d95b39f1adc182a915ace5bb10f7c0f78
+  data.tar.gz: ba6b74681a3a7523d0d48ed298efffb4d4d0fede4c0869401fba949e617f02b4
 SHA512:
-  metadata.gz: cc5a1b7ca28af7e531f488c6ebe95418e710badf657dc90167dc824b0f9c61a733ece7438c5fe819de818971c6320b806235f75e10ccc948c6d4e9c001a93899
-  data.tar.gz: 30ba97c16f66bd5a1e6ce10a0af01fbd5fce26d3df872362097d815da45b16079a1c47d2a0c839b3cc36588fc9b8e44c8f7758f3dd6e1d47f69f57838c4bd30b
+  metadata.gz: d285a5183996b4390e93dac09e5416fd8f3e5decbadf4b8ed95458534e65cdd1d74b11efa6635d79e3687de7c7a09a83c1c2d2c6471b0455dfead94061158fdb
+  data.tar.gz: 2fbba81eeb21ebdfdebbcd51d758ad836b54f5017fb27b404025c4d0a930bbf686a71f397e73a0cb66de16c7d84e6231dc3662fc4cd907d201908281f0811494

data/doc/text/news.md

@@ -1,5 +1,20 @@
 # News
 
+## 1.7.5: 2024-04-12
+
+### Improvements
+
+  * `#@generate-series`: Improved performance.
+
+  * `#@require-env`: Added to run tests only when the given
+    environment variable is defined.
+
+## 1.7.4: 2024-04-05
+
+### Improvements
+
+  * http: Added support for canceled requests.
+
 ## 1.7.3: 2024-02-20
 
 ### Improvements

data/lib/grntest/executors/base-executor.rb

@@ -308,28 +308,43 @@ module Grntest
         @context.collect_query_log = (options[0] == "true")
       end
 
+      def each_generated_series_chunk(evaluator, start, stop)
+        max_chunk_size = 1 * 1024 * 1024 # 1MiB
+        chunk_size = 0
+        records = []
+        (Integer(start)..Integer(stop)).each do |i|
+          record = evaluator.evaluate(i: i).to_json
+          records << record
+          chunk_size += record.bytesize
+          if chunk_size > max_chunk_size
+            yield(records)
+            records.clear
+            chunk_size = 0
+          end
+        end
+        yield(records) unless records.empty?
+      end
+
       def execute_directive_generate_series(parser, line, content, options)
         start, stop, table, template, = options
         evaluator = TemplateEvaluator.new(template.force_encoding("UTF-8"))
-        (Integer(start)..Integer(stop)).each_slice(1000) do |range|
-          parser << "load --table #{table}\n"
-          parser << "["
-          first_record = true
-          range.each do |i|
-            record = ""
-            if first_record
-              first_record = false
-            else
-              record << ","
-            end
-            record << "\n"
-            record << evaluator.evaluate(i: i).to_json
-            before = Time.now
-            parser << record
-            elapsed = Time.now - before
-            Thread.pass if elapsed > 1.0
+        each_generated_series_chunk(evaluator,
+                                    Integer(start),
+                                    Integer(stop)) do |records|
+          source = "load --table #{table}\n"
+          values_part_start_position = source.size
+          source << "["
+          records.each_with_index do |record, i|
+            source << "," unless i.zero?
+            source << "\n"
+            source << record
           end
-          parser << "\n]\n"
+          source << "\n]"
+          values = source[values_part_start_position..-1]
+          command = Groonga::Command::Load.new(table: table, values: values)
+          command.original_source = source
+          execute_command(command)
+          Thread.pass
         end
       end
 
@@ -534,6 +549,19 @@ module Grntest
         @benchmark_result = @noop_benchmark_result
       end
 
+      def execute_directive_require_env(line, content, options)
+        env, = options
+        if env.start_with?("!")
+          if ENV[env[1..-1]]
+            omit("require env: #{env}")
+          end
+        else
+          unless ENV[env]
+            omit("require env: #{env}")
+          end
+        end
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -597,6 +625,8 @@ module Grntest
           execute_directive_start_benchmark(line, content, options)
         when "finish-benchmark"
           execute_directive_finish_benchmark(line, content, options)
+        when "require-env"
+          execute_directive_require_env(line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")

data/lib/grntest/executors/http-executor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -83,6 +83,8 @@ module Grntest
         when Net::HTTPBadRequest,
              Net::HTTPNotFound
           # Groonga returns them for an invalid request.
+        when Net::HTTPRequestTimeOut
+          # Groonga returns this for a canceled request.
         when Net::HTTPInternalServerError
           # Groonga returns this for an internal error.
         else

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.7.3"
+  VERSION = "1.7.5"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.5
 platform: ruby
 authors:
 - Kouhei Sutou
 - Haruka Yoshihara
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -270,7 +269,6 @@ homepage: https://github.com/groonga/grntest
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -285,8 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.1
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga
   by writing Groonga commands and expected result.