grntest 1.8.4 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6455869776dca39246bac4338793e91579836a6762c20fb33a9710c01f38bfff
-  data.tar.gz: 5e4f4186f61d6b0d7ba597fe59c0cfa886bd03d7f25227fe835502f801dd6be6
+  metadata.gz: e58246b338b34f388628f0a2762c405d01a2ec9e715d572a45402a09825717fe
+  data.tar.gz: 9d2dcfb7b76374143d26bca3981614b5e242afe5bd04119ce2e8a12a5461efa3
 SHA512:
-  metadata.gz: 3c3c5cec9561a57952c72c4e3b2eea956328553308ff9fe84d2b828f142f1f8f0e57d491c4a326dc6cda7d7c95e56bacb497cad319ae4508a41a19e2df781a90
-  data.tar.gz: 8ad7895b6201d721efaaab67141ac80af2c589f6f7883206350d3e7cda19470aeba8efa3c925b91689b945ac408c9097544c3b94dcd799a9bb730ba42639dcfa
+  metadata.gz: fcfd998dab94f51aaf683f5c9a5089bde2c9c91ad4f39fd3fe0a6803d77faa1bc9617034033d755bef21e191f90a310cb127456f80157e95d3b6e12096702ee1
+  data.tar.gz: bd7b3cc3eb63003ce7bdc1ed93df6caa98c0d5432e6bf9139c7d6a7c595e87ac1389e1e9bcbf657cdec9df0570501b909c59d57b169b91666e7d6cdea18a625d

data/README.md

@@ -221,6 +221,7 @@ Here are available `NAME` s:
 * `remove-important-log-levels`
 * `sleep`
 * `collect-query-log`
+* `sort-query-log-operations`
 
 `ARGUMENTS...` are depends on directive. A directive doesn't require
 any arguments but a directive requires arguments.
@@ -555,6 +556,34 @@ select Users --query _key:User1
 #@collect-query-log false
 ```
 
+#### `sort-query-log-operations`
+
+Usage:
+
+```
+#@sort-query-log-operations [none|shard]
+```
+
+It changes the order of operations in the collected query log. It
+is useful with `collect-query-log` directive.
+
+`none` is the default. Operations are printed in the executed order.
+
+`shard` sorts sharded operations such as `select[...]` and
+`filter[...]` by their names. Sharded operations may be executed in
+parallel. So their order isn't stable. `shard` makes the order stable.
+Non sharded operations keep the executed order.
+
+Example:
+
+```
+#@collect-query-log true
+#@sort-query-log-operations shard
+logical_select Logs --shard_key timestamp --query message:hello
+#@sort-query-log-operations none
+#@collect-query-log false
+```
+
 ## Options
 
 Grntest has many options. You don't need to specify many of them

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 1.8.6: 2026-09-05
+
+### Improvements
+
+  * `#@sort-query-log-operations`: Added for `logical_select`'s
+    `--n_workers` support.
+
+## 1.8.5: 2026-09-04
+
+### Improvements
+
+  * `#@generate-series`: Improved performance.
+
 ## 1.8.4: 2026-03-16
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2026  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
@@ -37,6 +37,7 @@ module Grntest
     attr_accessor :shutdown_wait_timeout
     attr_writer :suppress_backtrace
     attr_writer :collect_query_log
+    attr_accessor :sort_query_log_operations
     attr_writer :debug
     attr_accessor :platform
     attr_accessor :benchmarks
@@ -69,6 +70,7 @@ module Grntest
       @omitted = false
       @suppress_backtrace = true
       @collect_query_log = false
+      @sort_query_log_operations = "none"
       @debug = false
       @platform = guess_platform
       @benchmarks = []

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2026  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
@@ -308,12 +308,17 @@ module Grntest
         @context.collect_query_log = (options[0] == "true")
       end
 
-      def each_generated_series_chunk(evaluator, start, stop)
+      def execute_directive_sort_query_log_operations(line, content, options)
+        @context.sort_query_log_operations = options[0]
+      end
+
+      def each_generated_series_chunk(template, start, stop)
+        evaluator = TemplateEvaluator.new(template, :i)
         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
+          record = evaluator.evaluate(i).to_json
           records << record
           chunk_size += record.bytesize
           if chunk_size > max_chunk_size
@@ -327,8 +332,7 @@ module Grntest
 
       def execute_directive_generate_series(parser, line, content, options)
         start, stop, table, template, = options
-        evaluator = TemplateEvaluator.new(template.force_encoding("UTF-8"))
-        each_generated_series_chunk(evaluator,
+        each_generated_series_chunk(template.force_encoding("UTF-8"),
                                     Integer(start),
                                     Integer(stop)) do |records|
           source = "load --table #{table}\n"
@@ -502,7 +506,7 @@ module Grntest
         return input if @substitutions.empty?
         @substitutions.each_value do |pattern, substituted_evaluator, _|
           input = input.gsub(pattern) do
-            substituted_evaluator.evaluate(match_data: Regexp.last_match)
+            substituted_evaluator.evaluate(Regexp.last_match)
           end
         end
         input
@@ -512,7 +516,7 @@ module Grntest
         return input if @substitutions.empty?
         @substitutions.each_value do |pattern, _, normalized_evaluator|
           input = input.gsub(pattern) do
-            normalized_evaluator.evaluate(match_data: Regexp.last_match)
+            normalized_evaluator.evaluate(Regexp.last_match)
           end
         end
         input
@@ -524,9 +528,11 @@ module Grntest
         substituted.force_encoding("UTF-8")
         normalized.force_encoding("UTF-8")
         substituted_evaluator =
-          TemplateEvaluator.new("<<STRING.chomp\n#{substituted}\nSTRING")
+          TemplateEvaluator.new("<<STRING.chomp\n#{substituted}\nSTRING",
+                                :match_data)
         normalized_evaluator =
-          TemplateEvaluator.new("<<STRING.chomp\n#{normalized}\nSTRING")
+          TemplateEvaluator.new("<<STRING.chomp\n#{normalized}\nSTRING",
+                                :match_data)
         @substitutions[pattern] = [
           compile_pattern(pattern),
           substituted_evaluator,
@@ -629,6 +635,8 @@ module Grntest
           execute_directive_sleep(line, content, options)
         when "collect-query-log"
           execute_directive_collect_query_log(line, content, options)
+        when "sort-query-log-operations"
+          execute_directive_sort_query_log_operations(line, content, options)
         when "generate-series"
           execute_directive_generate_series(parser, line, content, options)
         when "eval"
@@ -948,7 +956,8 @@ module Grntest
             command[:output_type] = nil if command.output_type == :json
             log_query("\#>#{command.to_command_format}")
           end
-          statistic.each_operation do |operation|
+          sorted_operations = sort_operations(statistic)
+          sorted_operations.each do |operation|
             message = operation[:raw_message]
             case operation[:name]
             when "cache"
@@ -962,6 +971,32 @@ module Grntest
         end
       end
 
+      def sort_operations(statistic)
+        sort_key = @context.sort_query_log_operations
+        case sort_key
+        when "shard"
+          first_shard_select_index = nil
+          first_shard_filter_index = nil
+          statistic.each_operation.sort_by do |operation|
+            i = operation[:i]
+            name = operation[:name]
+            if name.start_with?("select[")
+              first_shard_select_index ||= i
+              [first_shard_select_index, name]
+            elsif name.start_with?("filter[")
+              first_shard_filter_index ||= i
+              [first_shard_filter_index, name]
+            else
+              [i]
+            end
+          end
+        when "none"
+          statistic.each_operation
+        else
+          raise Error.nw("unsupported sort-query-log-operations: #{sort_key}")
+        end
+      end
+
       def debug_input(input)
         return unless @context.debug?
         $stderr.puts("> #{input}")

data/lib/grntest/template-evaluator.rb

@@ -15,16 +15,17 @@
 
 module Grntest
   class TemplateEvaluator
-    def initialize(template)
+    def initialize(template, *variable_names)
       @template = template
+      @compiled = eval(<<-TEMPLATE)
+        lambda do |#{variable_names.join(", ")}|
+#{@template}
+        end
+      TEMPLATE
     end
 
-    def evaluate(**local_variables)
-      _binding = binding
-      local_variables.each do |name, value|
-        _binding.local_variable_set(name, value)
-      end
-      _binding.eval(@template)
+    def evaluate(*values)
+      @compiled.call(*values)
     end
   end
 end

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2025  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2026  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
@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.8.4"
+  VERSION = "1.8.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 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.