groonga-query-log 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e343f6fe86cf4117900b88baee314e9b4ef2570c15e0257f257d4315fbaecb84
-  data.tar.gz: 4ef1a78600e75017755da500403667143c80e253cc6f5703856c03fd5d82ec2c
+  metadata.gz: 7c4745d088436d712bbc9d1b010c0219008baac00d05f5c5ebb59423912353ab
+  data.tar.gz: 3d663956a09c081278a1f6a06534dfcd08e7a46c5ee270d06469be274817f8d7
 SHA512:
-  metadata.gz: 561a1599048cab3d12ebc6808ae2c2296ee94cc8612dc10b9aee67d4ddef17a2125bfa15f00b8ab379aa5d675bca4c71d375fde189e6ce003ba779bc4d0e027d
-  data.tar.gz: 5cc75c283ee307b4951646808a14db37b69e85f73178d4d9e0e425e505a24fc5fe1fdebb5b2f9e5666b7f5c25fd5f973d73341478dad0c1685406f89ca54a753
+  metadata.gz: 705cfcf529854898bd27884a714ac123776f8e560e088ebacc5860049061de29c3454bcfafd45ab3655d812492659ced950d9fa66727d831fb4d7b3961cf779c
+  data.tar.gz: eccf8a59cb0f6faba614bf9e4beae35228c4b3634a04e3d2a1af0fa50d7da60750e53a6ef891a3295c301bb47301c38685ece802b001b5a2e12ef4df1c384916

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+
+## 1.5.2: 2019-09-26
+
+### Improvements
+
+  * `check-performance-regression`:
+
+    * Added support that the case which different operations exist.
+
+    * Added support for multiple operation sets.
+
 ## 1.5.1: 2019-09-13
 
 ### Improvements

data/lib/groonga-query-log/command/check-performance-regression.rb

@@ -1,5 +1,6 @@
 # Copyright (C) 2019  Kentaro Hayashi <hayashi@clear-code.com>
 # Copyright (C) 2019  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2019  Horimoto Yasuhiro <horimoto@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -278,6 +279,15 @@ module GroongaQueryLog
         end
       end
 
+      class OperationSet
+        attr_reader :names
+        attr_reader :statistics
+        def initialize(names, statistics)
+          @names = names
+          @statistics = statistics
+        end
+      end
+
       class QueryStatistic < Statistic
         attr_reader :query
         def initialize(query, old, new, threshold)
@@ -289,22 +299,44 @@ module GroongaQueryLog
           @threshold.slow_query?(diff_elapsed_time, ratio)
         end
 
-        def each_operation_statistic
-          @old.first.operations.each_with_index do |operation, i|
-            old_operations = @old.collect do |statistic|
-              statistic.operations[i]
+        def operation_sets
+          old_operation_name_sets = @old.group_by do |statistic|
+            statistic.operations.collect do |operation|
+              operation[:name]
+            end
+          end
+          new_operation_name_sets = @new.group_by do |statistic|
+            statistic.operations.collect do |operation|
+              operation[:name]
             end
-            # TODO: old and new may use different index
-            new_operations = @new.collect do |statistic|
-              statistic.operations[i]
+          end
+
+          operation_sets = []
+          operation_name_sets =
+            (old_operation_name_sets.keys & new_operation_name_sets.keys)
+          operation_name_sets.each do |operation_names|
+            old = old_operation_name_sets[operation_names]
+            next if old.nil?
+            new = new_operation_name_sets[operation_names]
+            next if new.nil?
+            statistics = operation_names.size.times.collect do |i|
+              old_operations = old.collect do |statistic|
+                statistic.operations[i]
+              end
+              new_operations = new.collect do |statistic|
+                statistic.operations[i]
+              end
+              operation = old_operations[0]
+              OperationStatistic.new(operation,
+                                     i,
+                                     old_operations,
+                                     new_operations,
+                                     @threshold)
             end
-            operation_statistic = OperationStatistic.new(operation,
-                                                         i,
-                                                         old_operations,
-                                                         new_operations,
-                                                         @threshold)
-            yield(operation_statistic)
+            operation_set = OperationSet.new(operation_names, statistics)
+            operation_sets << operation_set
           end
+          operation_sets
         end
 
         private
@@ -355,25 +387,31 @@ Query: #{query_statistic.query}
   Mean (old): #{format_elapsed_time(query_statistic.old_elapsed_time)}
   Mean (new): #{format_elapsed_time(query_statistic.new_elapsed_time)}
   Diff:       #{format_diff(query_statistic)}
-  Operations:
             REPORT
-            query_statistic.each_operation_statistic do |operation_statistic|
-              n_target_operations += 1
-              next unless operation_statistic.slow?
-
-              n_slow_operations += 1
-              index = operation_statistic.index
-              name = operation_statistic.name
-              context = operation_statistic.context
-              label = [name, context].compact.join(" ")
-              old_elapsed_time = operation_statistic.old_elapsed_time
-              new_elapsed_time = operation_statistic.new_elapsed_time
+
+            operation_sets = query_statistic.operation_sets
+            operation_sets.each_with_index do |operation_set, nth_operation_set|
               @output.puts(<<-REPORT)
+  Operation set[#{nth_operation_set}]:
+              REPORT
+              operation_set.statistics.each do |operation_statistic|
+                n_target_operations += 1
+                next unless operation_statistic.slow?
+
+                n_slow_operations += 1
+                index = operation_statistic.index
+                name = operation_statistic.name
+                context = operation_statistic.context
+                label = [name, context].compact.join(" ")
+                old_elapsed_time = operation_statistic.old_elapsed_time
+                new_elapsed_time = operation_statistic.new_elapsed_time
+                @output.puts(<<-REPORT)
     Operation[#{index}]: #{label}
       Mean (old): #{format_elapsed_time(old_elapsed_time)}
       Mean (new): #{format_elapsed_time(new_elapsed_time)}
       Diff:       #{format_diff(operation_statistic)}
-              REPORT
+                REPORT
+              end
             end
           end
 

data/lib/groonga-query-log/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaQueryLog
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

data/test/command/test-check-performance-regression.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2019  Kentaro Hayashi <hayashi@clear-code.com>
+# Copyright (C) 2019  Horimoto Yasuhiro <horimoto@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -118,7 +119,7 @@ Query: select --table Site --limit 0
   Mean (old): 12.0msec
   Mean (new): 14.0msec
   Diff:       +2.0msec/+1.17
-  Operations:
+  Operation set[0]:
     Operation[0]: select
       Mean (old): 5.0msec
       Mean (new): 6.0msec
@@ -146,7 +147,7 @@ Query: select --table Site --filter "_id >= 4 && _id <= 6"
   Mean (old): 70.0msec
   Mean (new): 90.0msec
   Diff:       +20.0msec/+1.29
-  Operations:
+  Operation set[0]:
     Operation[0]: filter #<accessor _id(Site)> greater_equal 4
       Mean (old): 40.0msec
       Mean (new): 80.0msec
@@ -186,7 +187,7 @@ Query: select --table Site --limit 0
   Mean (old): 12.0msec
   Mean (new): 14.0msec
   Diff:       +2.0msec/+1.17
-  Operations:
+  Operation set[0]:
     Operation[0]: select
       Mean (old): 5.0msec
       Mean (new): 6.0msec
@@ -233,7 +234,7 @@ Query: select --table Site --limit 0
   Mean (old): 12.0msec
   Mean (new): 14.0msec
   Diff:       +2.0msec/+1.17
-  Operations:
+  Operation set[0]:
 Summary:
   Slow queries:    1/1(100.00%)
   Slow operations: 0/2(  0.00%)
@@ -276,7 +277,7 @@ Query: select --table Site --limit 0
   Mean (old): 12.0msec
   Mean (new): 14.0msec
   Diff:       +2.0msec/+1.17
-  Operations:
+  Operation set[0]:
     Operation[0]: select
       Mean (old): 5.0msec
       Mean (new): 6.0msec
@@ -308,4 +309,25 @@ Summary:
       assert_equal(expected, actual)
     end
   end
+
+  def test_different_operations
+    actual = run_command("--slow-query-ratio=0.0",
+                         "--slow-query-second=0.0",
+                         "--slow-operation-ratio=0.0",
+                         "--slow-operation-second=0.0",
+                         fixture_path("different_operations1.log"),
+                         fixture_path("different_operations2.log"))
+    expected = <<-OUTPUT
+Query: select Memos   --output_columns _key,tag   --filter 'all_records() && (tag == \"groonga\" || tag == \"mroonga\" || tag == \"droonga\")'   --sortby _id
+  Mean (old): 7.1msec
+  Mean (new): 82.8msec
+  Diff:       +75.7msec/+11.64
+Summary:
+  Slow queries:    1/1(100.00%)
+  Slow operations: 0/0(  0.00%)
+  Caches (old):    0/1(  0.00%)
+  Caches (new):    0/1(  0.00%)
+    OUTPUT
+    assert_equal(expected, actual)
+  end
 end

data/test/fixtures/check-performance-regression/different_operations1.log

@@ -0,0 +1,9 @@
+2019-09-24 11:26:52.247684|0x7ffd3772d330|>select Memos   --output_columns _key,tag   --filter 'all_records() && (tag == "groonga" || tag == "mroonga" || tag == "droonga")'   --sortby _id
+2019-09-24 11:26:52.254556|0x7ffd3772d330|:000000006876176 filter(2): Memos.tag equal #<record:pat:Tags id:1 key:"groonga">
+2019-09-24 11:26:52.254577|0x7ffd3772d330|:000000006896105 filter(3): Memos.tag equal #<record:pat:Tags id:2 key:"mroonga">
+2019-09-24 11:26:52.254589|0x7ffd3772d330|:000000006907737 filter(4): Memos.tag equal #<record:pat:Tags id:4 key:"droonga">
+2019-09-24 11:26:52.254601|0x7ffd3772d330|:000000006919999 filter(4): all_records()
+2019-09-24 11:26:52.254608|0x7ffd3772d330|:000000006926366 select(4)
+2019-09-24 11:26:52.254649|0x7ffd3772d330|:000000006968407 sort(4): _id
+2019-09-24 11:26:52.254696|0x7ffd3772d330|:000000007015885 output(4)
+2019-09-24 11:26:52.254795|0x7ffd3772d330|<000000007115023 rc=0

data/test/fixtures/check-performance-regression/different_operations2.log

@@ -0,0 +1,7 @@
+2019-09-24 11:28:16.384410|0x7ffcd86f6b40|>select Memos   --output_columns _key,tag   --filter 'all_records() && (tag == "groonga" || tag == "mroonga" || tag == "droonga")'   --sortby _id
+2019-09-24 11:28:16.467000|0x7ffcd86f6b40|:000000082594372 filter(4): in_values(Memos.tag, #<record:pat:Tags id:1 key:"groonga">, #<record:pat:Tags id:2 key:"mroonga">, #<record:pat:Tags id:4 key:"droonga">)
+2019-09-24 11:28:16.467016|0x7ffcd86f6b40|:000000082610035 filter(4): all_records()
+2019-09-24 11:28:16.467038|0x7ffcd86f6b40|:000000082633089 select(4)
+2019-09-24 11:28:16.467067|0x7ffcd86f6b40|:000000082662096 sort(4): _id
+2019-09-24 11:28:16.467129|0x7ffcd86f6b40|:000000082723557 output(4)
+2019-09-24 11:28:16.467194|0x7ffcd86f6b40|<000000082788858 rc=0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -239,6 +239,8 @@ files:
 - test/command/test-format-regression-test-logs.rb
 - test/command/test-run-regression-test.rb
 - test/fixtures/check-performance-regression/cache.log
+- test/fixtures/check-performance-regression/different_operations1.log
+- test/fixtures/check-performance-regression/different_operations2.log
 - test/fixtures/check-performance-regression/nquery.log
 - test/fixtures/check-performance-regression/nquery2.log
 - test/fixtures/check-performance-regression/query1.log
@@ -305,9 +307,11 @@ test_files:
 - test/fixtures/n_entries.expected
 - test/fixtures/check-performance-regression/query1.log
 - test/fixtures/check-performance-regression/cache.log
+- test/fixtures/check-performance-regression/different_operations2.log
 - test/fixtures/check-performance-regression/nquery2.log
 - test/fixtures/check-performance-regression/nquery.log
 - test/fixtures/check-performance-regression/query2.log
+- test/fixtures/check-performance-regression/different_operations1.log
 - test/fixtures/target-tables.expected
 - test/fixtures/no-report-summary.expected
 - test/fixtures/order/-start-time.expected