grntest 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1bd62dfcf7d618511ed7c0883b8e32326b1b7eee388c71202d93dd5232c0c4
-  data.tar.gz: 95fe9cec3b9289980bb6954b99f47351dc012c45a5bf28e16ab1c2633aadb4f1
+  metadata.gz: b9cd8b74ac4dd886a08f1550309a467d95b39f1adc182a915ace5bb10f7c0f78
+  data.tar.gz: ba6b74681a3a7523d0d48ed298efffb4d4d0fede4c0869401fba949e617f02b4
 SHA512:
-  metadata.gz: d4e76e424c2bde8a576b2913964f37cdf0a1f7d96b81cd4c2c2e015033886b890e8729cc9d7c4339742ee35e1be500736a68bd4c9b3254730200ff75d05dae0f
-  data.tar.gz: 6815b9a5489bf74f2fa1ed0f3b73bdffbdf518b567fc2a1fc2e25786bd5eddd2dfdc2ce6c649f6b1a864db9d6e1b574578a446a84265ab90fbecdf70b4cf676e
+  metadata.gz: d285a5183996b4390e93dac09e5416fd8f3e5decbadf4b8ed95458534e65cdd1d74b11efa6635d79e3687de7c7a09a83c1c2d2c6471b0455dfead94061158fdb
+  data.tar.gz: 2fbba81eeb21ebdfdebbcd51d758ad836b54f5017fb27b404025c4d0a930bbf686a71f397e73a0cb66de16c7d84e6231dc3662fc4cd907d201908281f0811494

data/doc/text/news.md

@@ -1,5 +1,14 @@
 # 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

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Kouhei Sutou
 - Haruka Yoshihara
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs