grntest 1.8.5 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700629c1af3524674871aadb97ae4fccf658accb7694b7700fea6d4d1f926acb
-  data.tar.gz: a671e1928b1dd25d5462e19294d34060fe45356b35a984219322cbe67567b695
+  metadata.gz: 7c59c4eb36a3ebc1ac542ffc9bbc5f87d2756ec899c58a105976958f01821a3d
+  data.tar.gz: 17a66afc2d549cbf0234f03cca393bed5dd8c86dd6841ec26492625f4fdfe3d8
 SHA512:
-  metadata.gz: 6025788a9481e12bd9627b9b48152a20e8d9665a6f4449575e75389ce409da784bcefd6f409e2e462be5ec42c352f78784ebdd4e2d793ae411907c9907f24206
-  data.tar.gz: dae5d48fc1887d63a47c961f1beb8db167e808ebf8f435d70f667f22740e7d1b8e08e57eb3f59bbbd8b2894443f0b5ac78b630a2d55fa20cceaa679b1530dd15
+  metadata.gz: 0b4468d6a5513043ac62d1d5b1596d093a46bfaf9709f492500bacffa2de6c384fb564c00bacfaa2de659d805c092d6bffadb53991a46d3e2aa8bf54d388972b
+  data.tar.gz: b265cd5cd7cdca7eb31477feff524fc111b2d334a2e5f19495882dc2df83e2bb3a31c0ff9a1b7ba346a39622d181314545be251cd1fabba058712fb50db9710f

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,52 @@ select Users --query _key:User1
 #@collect-query-log false
 ```
 
+#### `sort-query-log-operations`
+
+Usage:
+
+```
+#@sort-query-log-operations [SORT_KEY_1 SORT_KEY_2 ...]
+```
+
+It changes the order of operations in the collected query log. It
+is useful with `collect-query-log` directive.
+
+If no `SORT_KEY_N` is specified, no operation is sorted. This is the
+default. Operations are printed in the executed order.
+
+Here are available `SORT_KEY_N` s:
+
+* `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.
+* `drilldown`: Sorts drilldown operations. Labeled drilldown
+  operations such as `drilldowns[...]` are sorted by their
+  names. Plain drilldown operations such as `drilldown(...): KEY` are
+  sorted by their keys. Drilldown operations may be executed in
+  parallel. So their order isn't stable. `drilldown` makes the order
+  stable. `drilldowns[...].sort` and `drilldown.sort` operations
+  aren't sorted because they are executed after all drilldown
+  operations are finished.
+
+Operations that aren't matched with any `SORT_KEY_N` keep the executed
+order. You can specify multiple `SORT_KEY_N` s at once.
+
+Example:
+
+```
+#@collect-query-log true
+#@sort-query-log-operations shard drilldown
+logical_select Logs \
+  --shard_key timestamp \
+  --query message:hello \
+  --drilldowns[host].keys host \
+  --drilldowns[path].keys path
+#@sort-query-log-operations
+#@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,19 @@
 # News
 
+## 1.8.7: 2026-09-06
+
+### Improvements
+
+  * `#@sort-query-log-operations`: Added `drilldown` sort key. `none`
+    sort key is removed. Use empty sort keys instead.
+
+## 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

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 = []
       @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,6 +308,21 @@ module Grntest
         @context.collect_query_log = (options[0] == "true")
       end
 
+      def execute_directive_sort_query_log_operations(line, content, options)
+        sort_keys = options
+        valid_sort_keys = ["shard", "drilldown"]
+        unsupported_sort_keys = sort_keys - valid_sort_keys
+        if unsupported_sort_keys.empty?
+          @context.sort_query_log_operations = sort_keys
+        else
+          valid_sort_keys_label = "[#{valid_sort_keys.join(', ')}]"
+          message = "must be one of #{valid_sort_keys_label}"
+          log_error("#|e| [sort-query-log-operations] " +
+                    "#{message}: unsupported values: " +
+                    unsupported_sort_keys.collect {|key| "<#{key}>"}.join(", "))
+        end
+      end
+
       def each_generated_series_chunk(template, start, stop)
         evaluator = TemplateEvaluator.new(template, :i)
         max_chunk_size = 1 * 1024 * 1024 # 1MiB
@@ -631,6 +646,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"
@@ -950,7 +967,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"
@@ -964,6 +982,53 @@ module Grntest
         end
       end
 
+      def sort_operations(statistic)
+        sort_keys = @context.sort_query_log_operations
+        return statistic.each_operation if sort_keys.empty?
+
+        sort_shard = sort_keys.include?("shard")
+        sort_drilldown = sort_keys.include?("drilldown")
+        first_shard_select_index = nil
+        first_shard_filter_index = nil
+        first_drilldowns_index = nil
+        first_drilldown_index = nil
+        statistic.each_operation.sort_by do |operation|
+          i = operation[:i]
+          name = operation[:name]
+          if name.start_with?("select[")
+            if sort_shard
+              first_shard_select_index ||= i
+              [first_shard_select_index, name]
+            else
+              [i]
+            end
+          elsif name.start_with?("filter[")
+            if sort_shard
+              first_shard_filter_index ||= i
+              [first_shard_filter_index, name]
+            else
+              [i]
+            end
+          elsif name.start_with?("drilldowns[")
+            if sort_drilldown and not name.end_with?(".sort")
+              first_drilldowns_index ||= i
+              [first_drilldowns_index, name]
+            else
+              [i]
+            end
+          elsif name.start_with?("drilldown")
+            if sort_drilldown and not name.end_with?(".sort")
+              first_drilldown_index ||= i
+              [first_drilldown_index, name, operation[:extra]]
+            else
+              [i]
+            end
+          else
+            [i]
+          end
+        end
+      end
+
       def debug_input(input)
         return unless @context.debug?
         $stderr.puts("> #{input}")

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.8.5"
+  VERSION = "1.8.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.7
 platform: ruby
 authors:
 - Kouhei Sutou