grntest 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e58246b338b34f388628f0a2762c405d01a2ec9e715d572a45402a09825717fe
-  data.tar.gz: 9d2dcfb7b76374143d26bca3981614b5e242afe5bd04119ce2e8a12a5461efa3
+  metadata.gz: 7c59c4eb36a3ebc1ac542ffc9bbc5f87d2756ec899c58a105976958f01821a3d
+  data.tar.gz: 17a66afc2d549cbf0234f03cca393bed5dd8c86dd6841ec26492625f4fdfe3d8
 SHA512:
-  metadata.gz: fcfd998dab94f51aaf683f5c9a5089bde2c9c91ad4f39fd3fe0a6803d77faa1bc9617034033d755bef21e191f90a310cb127456f80157e95d3b6e12096702ee1
-  data.tar.gz: bd7b3cc3eb63003ce7bdc1ed93df6caa98c0d5432e6bf9139c7d6a7c595e87ac1389e1e9bcbf657cdec9df0570501b909c59d57b169b91666e7d6cdea18a625d
+  metadata.gz: 0b4468d6a5513043ac62d1d5b1596d093a46bfaf9709f492500bacffa2de6c384fb564c00bacfaa2de659d805c092d6bffadb53991a46d3e2aa8bf54d388972b
+  data.tar.gz: b265cd5cd7cdca7eb31477feff524fc111b2d334a2e5f19495882dc2df83e2bb3a31c0ff9a1b7ba346a39622d181314545be251cd1fabba058712fb50db9710f

data/README.md

@@ -561,26 +561,44 @@ select Users --query _key:User1
 Usage:
 
 ```
-#@sort-query-log-operations [none|shard]
+#@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.
 
-`none` is the default. Operations are printed in the executed order.
+If no `SORT_KEY_N` is specified, no operation is sorted. This 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.
+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
-logical_select Logs --shard_key timestamp --query message:hello
-#@sort-query-log-operations none
+#@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
 ```
 

data/doc/text/news.md

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

data/lib/grntest/execution-context.rb

@@ -70,7 +70,7 @@ module Grntest
       @omitted = false
       @suppress_backtrace = true
       @collect_query_log = false
-      @sort_query_log_operations = "none"
+      @sort_query_log_operations = []
       @debug = false
       @platform = guess_platform
       @benchmarks = []

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

@@ -309,7 +309,18 @@ module Grntest
       end
 
       def execute_directive_sort_query_log_operations(line, content, options)
-        @context.sort_query_log_operations = options[0]
+        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)
@@ -972,28 +983,49 @@ module Grntest
       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[")
+        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]
-            elsif name.start_with?("filter[")
+            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
-        when "none"
-          statistic.each_operation
-        else
-          raise Error.nw("unsupported sort-query-log-operations: #{sort_key}")
         end
       end
 

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

metadata

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