groonga-query-log 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667417fb7b63c25c6adb833d1fa0fa109446ecae
-  data.tar.gz: 164767949783e4afd493d9d78c24e8aa1d52e5c5
+  metadata.gz: c26ff585a73f2e6091da363ac4b4fe02aeddf420
+  data.tar.gz: 7d9e5c1965f7d3e208257be44893e189dd59a15a
 SHA512:
-  metadata.gz: a2e7934dea3d48b4562b8bbc06423afbfe0dc9dce3da064c2fd2bc792e4a05887e0b6f91425e85b697396da95811666190cf3d319271b3a3c9bd0c10c636093c
-  data.tar.gz: 1108f20380850332eb1328145ac2dd94c436274d2185f9cf99c779e40d2deb03529bc4239029fcf6675c968a6fd06cc1aa3d63f983f30d3782dc837e79d77337
+  metadata.gz: 50495861548b4c83bd5d8d7b7ba9aa2e4cca02a809029eec84aa2bce150cca688c5dc77b4fd50fa37447f178481dfcdac7a268d469311385770c40135c3be846
+  data.tar.gz: fc6b3040396bcd0443a67c6df6bfeaeccd3aec0713905230d1c139b5f177480d7eaea2bb0750a2a51aa3ac5c1ec7f21d5337987c021576962d17d9984e70b986

data/doc/text/news.md

@@ -1,5 +1,20 @@
 # News
 
+## 1.2.6: 2017-05-31
+
+### Improvements
+
+  * Supported changed query log format since Groonga 7.0.1. The output
+    format is changed about dynamic columns, drilldown, labeled
+    drilldown, but groonga-query-log still supports previous format.
+
+  * groonga-query-log-extract: Fixed to ignore empty command not to
+    raise exception error.
+
+  * groonga-query-log-detect-memory-leak
+    groonga-query-log-replay: Fixed uninitialized constant error when
+    executing command.
+
 ## 1.2.5: 2017-05-08
 
 ### Fixes

data/lib/groonga/query-log/command/detect-memory-leak.rb

@@ -18,6 +18,7 @@
 
 require "optparse"
 
+require "groonga/query-log/version"
 require "groonga/query-log/memory-leak-detector"
 
 module Groonga

data/lib/groonga/query-log/command/replay.rb

@@ -18,6 +18,7 @@
 
 require "optparse"
 
+require "groonga/query-log/version"
 require "groonga/query-log/replayer"
 
 module Groonga

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

@@ -64,13 +64,15 @@ module Groonga
       def parse_line(time_stamp, context_id, type, rest, &block)
         case type
         when ">"
+          return if rest.empty?
           statistic = create_statistic(context_id)
           statistic.start(time_stamp, rest)
           @parsing_statistics[context_id] = statistic
         when ":"
-          return unless /\A(\d+) (.+)\((\d+)\)/ =~ rest
+          return unless /\A(\d+) (.+)\((\d+)\)(\[.+\])?/ =~ rest
           elapsed = $1
           name = $2
+          name += $4 if $4
           n_records = $3.to_i
           statistic = @parsing_statistics[context_id]
           return if statistic.nil?

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

@@ -16,6 +16,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.2.5"
+    VERSION = "1.2.6"
   end
 end

data/test/test-parser.rb

@@ -113,7 +113,7 @@ class ParserTest < Test::Unit::TestCase
       assert_equal([0], statistics.collect(&:return_code))
     end
 
-    def test_fialure
+    def test_failure
       statistics = parse(<<-LOG)
 2012-12-13 11:15:21.628105|0x7fff148c8a50|>table_create --name Videos
 2012-12-13 11:15:21.645119|0x7fff148c8a50|<000000017041150 rc=-22
@@ -121,4 +121,140 @@ class ParserTest < Test::Unit::TestCase
       assert_equal([-22], statistics.collect(&:return_code))
     end
   end
+
+  class FormatCompatibilityTest < self
+    class DynamicColumnsTest < self
+      def test_no_labeled_columns
+        statistics = parse(<<-LOG)
+2017-05-30 19:11:37.932576|0x7ffc6ae1ba20|>select Items   --columns[price_with_tax].stage initial   --columns[price_with_tax].type UInt32   --columns[price_with_tax].flags COLUMN_SCALAR   --columns[price_with_tax].value 'price * 1.08'   --filter 'price_with_tax > 550'
+2017-05-30 19:11:37.976349|0x7ffc6ae1ba20|:000000043784801 filter(3)
+2017-05-30 19:11:37.976383|0x7ffc6ae1ba20|:000000043808671 select(3)
+2017-05-30 19:11:37.976534|0x7ffc6ae1ba20|:000000043961723 output(3)
+2017-05-30 19:11:37.976650|0x7ffc6ae1ba20|<000000044078013 rc=0
+        LOG
+        operations = statistics.first.operations.collect do |operation|
+          [operation[:name], operation[:n_records]]
+        end
+        expected = [
+          ["filter", 3],
+          ["select", 3],
+          ["output", 3]
+        ]
+        assert_equal(expected, operations)
+      end
+
+      def test_labeled_columns
+        statistics = parse(<<-LOG)
+2017-05-30 19:11:38.036856|0x7fffb7d8d9b0|>select Items   --columns[price_with_tax].stage initial   --columns[price_with_tax].type UInt32   --columns[price_with_tax].flags COLUMN_SCALAR   --columns[price_with_tax].value 'price * 1.08'   --filter 'price_with_tax > 550'
+2017-05-30 19:11:38.037234|0x7fffb7d8d9b0|:000000000381368 columns[price_with_tax](6)
+2017-05-30 19:11:38.085663|0x7fffb7d8d9b0|:000000048816481 filter(3)
+2017-05-30 19:11:38.085691|0x7fffb7d8d9b0|:000000048837085 select(3)
+2017-05-30 19:11:38.085825|0x7fffb7d8d9b0|:000000048972310 output(3)
+2017-05-30 19:11:38.085929|0x7fffb7d8d9b0|<000000049076026 rc=0
+        LOG
+        operations = statistics.first.operations.collect do |operation|
+          [operation[:name], operation[:n_records]]
+        end
+        expected = [
+          ["columns[price_with_tax]", 6],
+          ["filter", 3],
+          ["select", 3],
+          ["output", 3]
+        ]
+        assert_equal(expected, operations)
+      end
+    end
+
+    class DrilldownTest < self
+      def test_no_output_drilldown
+        statistics = parse(<<-LOG)
+2017-05-31 11:22:19.928613|0x7ffe470b0cc0|>select Memos --drilldown tag
+2017-05-31 11:22:19.928705|0x7ffe470b0cc0|:000000000095083 select(4)
+2017-05-31 11:22:19.929002|0x7ffe470b0cc0|:000000000393647 output(4)
+2017-05-31 11:22:19.929040|0x7ffe470b0cc0|:000000000428917 drilldown(3)
+2017-05-31 11:22:19.929109|0x7ffe470b0cc0|<000000000498630 rc=0
+        LOG
+        operations = statistics.first.operations.collect do |operation|
+          [operation[:name], operation[:n_records]]
+        end
+        expected = [
+          ["select", 4],
+          ["output", 4],
+          ["drilldown", 3]
+        ]
+        assert_equal(expected, operations)
+      end
+
+      def test_output_drilldown
+        statistics = parse(<<-LOG)
+2017-05-31 11:22:19.977081|0x7ffec4a59cd0|>select Memos --drilldown tag
+2017-05-31 11:22:19.977214|0x7ffec4a59cd0|:000000000138164 select(4)
+2017-05-31 11:22:19.977381|0x7ffec4a59cd0|:000000000304772 drilldown(3)
+2017-05-31 11:22:19.977572|0x7ffec4a59cd0|:000000000495092 output(4)
+2017-05-31 11:22:19.977615|0x7ffec4a59cd0|:000000000535908 output.drilldown(3)
+2017-05-31 11:22:19.977701|0x7ffec4a59cd0|<000000000623964 rc=0
+        LOG
+        operations = statistics.first.operations.collect do |operation|
+          [operation[:name], operation[:n_records]]
+        end
+        expected = [
+          ["select", 4],
+          ["drilldown", 3],
+          ["output", 4],
+          ["output.drilldown", 3]
+        ]
+        assert_equal(expected, operations)
+      end
+    end
+
+    class LabeledDrilldownTest < self
+      def test_no_output_drilldown
+        statistics = parse(<<-LOG)
+2017-05-31 11:22:19.683806|0x7ffc1ee41940|>select Shops   --drilldown[item].keys items   --drilldown[item].sortby price   --drilldown[item].output_columns _key,_nsubrecs,price,price_with_tax   --drilldown[item].columns[price_with_tax].stage initial   --drilldown[item].columns[price_with_tax].type UInt32   --drilldown[item].columns[price_with_tax].flags COLUMN_SCALAR   --drilldown[item].columns[price_with_tax].value 'price * 1.08'   --drilldown[real_price].table item   --drilldown[real_price].keys price_with_tax
+2017-05-31 11:22:19.683980|0x7ffc1ee41940|:000000000176192 select(3)
+2017-05-31 11:22:19.684356|0x7ffc1ee41940|:000000000553162 output(3)
+2017-05-31 11:22:19.684468|0x7ffc1ee41940|:000000000665698 drilldown(6)[item]
+2017-05-31 11:22:19.684488|0x7ffc1ee41940|:000000000683901 drilldown(3)[real_price]
+2017-05-31 11:22:19.684558|0x7ffc1ee41940|<000000000754417 rc=0
+        LOG
+        operations = statistics.first.operations.collect do |operation|
+          [operation[:name], operation[:n_records]]
+        end
+        expected = [
+          ["select", 3],
+          ["output", 3],
+          ["drilldown[item]", 6],
+          ["drilldown[real_price]", 3]
+        ]
+        assert_equal(expected, operations)
+      end
+
+      def test_output_drilldown
+        statistics = parse(<<-LOG)
+2017-05-31 11:22:19.758189|0x7ffd1fc97890|>select Shops   --drilldown[item].keys items   --drilldown[item].sortby price   --drilldown[item].output_columns _key,_nsubrecs,price,price_with_tax   --drilldown[item].columns[price_with_tax].stage initial   --drilldown[item].columns[price_with_tax].type UInt32   --drilldown[item].columns[price_with_tax].flags COLUMN_SCALAR   --drilldown[item].columns[price_with_tax].value 'price * 1.08'   --drilldown[real_price].table item   --drilldown[real_price].keys price_with_tax
+2017-05-31 11:22:19.758462|0x7ffd1fc97890|:000000000276579 select(3)
+2017-05-31 11:22:19.758727|0x7ffd1fc97890|:000000000542224 columns[price_with_tax](6)
+2017-05-31 11:22:19.758738|0x7ffd1fc97890|:000000000550409 drilldowns[item](6)
+2017-05-31 11:22:19.758806|0x7ffd1fc97890|:000000000619409 drilldowns[real_price](3)
+2017-05-31 11:22:19.758915|0x7ffd1fc97890|:000000000729209 output(3)
+2017-05-31 11:22:19.759015|0x7ffd1fc97890|:000000000829476 output.drilldowns[item](6)
+2017-05-31 11:22:19.759034|0x7ffd1fc97890|:000000000847090 output.drilldowns[real_price](3)
+2017-05-31 11:22:19.759103|0x7ffd1fc97890|<000000000916234 rc=0
+        LOG
+        operations = statistics.first.operations.collect do |operation|
+          [operation[:name], operation[:n_records]]
+        end
+        expected = [
+          ["select", 3],
+          ["columns[price_with_tax]", 6],
+          ["drilldowns[item]", 6],
+          ["drilldowns[real_price]", 3],
+          ["output", 3],
+          ["output.drilldowns[item]", 6],
+          ["output.drilldowns[real_price]", 3]
+        ]
+        assert_equal(expected, operations)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -154,15 +154,15 @@ description: ''
 email:
 - kou@clear-code.com
 executables:
-- groonga-query-log-extract
+- groonga-query-log-show-running-queries
 - groonga-query-log-run-regression-test
-- groonga-query-log-analyze
-- groonga-query-log-verify-server
 - groonga-query-log-check-command-version-compatibility
+- groonga-query-log-analyze
 - groonga-query-log-detect-memory-leak
 - groonga-query-log-format-regression-test-logs
-- groonga-query-log-show-running-queries
+- groonga-query-log-extract
 - groonga-query-log-replay
+- groonga-query-log-verify-server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Groonga-query-log is a collection of library and tools to process [Groonga](http://groonga.org/)'s
@@ -269,33 +269,33 @@ summary: Groonga-query-log is a collection of library and tools to process [Groo
   as a library. You can analyze your Groonga's queries and test with your Groonga's
   query log by using groonga-query-log as a tool.
 test_files:
-- test/test-response-comparer.rb
+- test/test-analyzer.rb
+- test/helper.rb
+- test/test-incompatibility-detector.rb
+- test/command/test-format-regression-test-logs.rb
+- test/command/test-extract.rb
 - test/run-test.rb
-- test/test-replayer.rb
 - test/test-parser.rb
-- test/helper.rb
-- test/fixtures/query.log
-- test/fixtures/n_entries.expected
-- test/fixtures/other-query.log
 - test/fixtures/no-report-summary.expected
+- test/fixtures/target-tables.expected
+- test/fixtures/target-commands.expected
+- test/fixtures/n_entries.expected
 - test/fixtures/reporter/json-stream.expected
+- test/fixtures/reporter/console.expected
 - test/fixtures/reporter/json.expected
 - test/fixtures/reporter/html.expected
-- test/fixtures/reporter/console.expected
+- test/fixtures/order/elapsed.expected
+- test/fixtures/order/-elapsed.expected
+- test/fixtures/order/start-time.expected
+- test/fixtures/order/-start-time.expected
 - test/fixtures/regression-test-logs/command-format.log
 - test/fixtures/regression-test-logs/url-format.log
-- test/fixtures/target-commands.expected
-- test/fixtures/multi.expected
 - test/fixtures/run-regression-test/query-logs/query.log
 - test/fixtures/run-regression-test/schema/schema.grn
 - test/fixtures/run-regression-test/indexes/indexes.grn
 - test/fixtures/run-regression-test/data/data.grn
-- test/fixtures/order/-elapsed.expected
-- test/fixtures/order/start-time.expected
-- test/fixtures/order/-start-time.expected
-- test/fixtures/order/elapsed.expected
-- test/fixtures/target-tables.expected
-- test/command/test-format-regression-test-logs.rb
-- test/command/test-extract.rb
-- test/test-analyzer.rb
-- test/test-incompatibility-detector.rb
+- test/fixtures/other-query.log
+- test/fixtures/multi.expected
+- test/fixtures/query.log
+- test/test-response-comparer.rb
+- test/test-replayer.rb