groonga-query-log 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19db4dbc5d30a42ab59bcf8f53ac7a0979868eec
-  data.tar.gz: c5246d85603fff8aef80ddc32bae71ecdde03572
+  metadata.gz: ef3fb91d35e9b109dbe0ed81c97ecb0c375bd2a0
+  data.tar.gz: 11e6b3884e5562bd6c48a43d00ad7412b70c110b
 SHA512:
-  metadata.gz: b96e3b574555936adb3d828abf724ed058e3235c52752b2448af96039882c472691c7437a133833a4f06936d6be77e8a7c028eb89e588cbddd548c3740b802dc
-  data.tar.gz: 086037f92e27646a62f7f488ec3fa36cb5b49b909d29b63c3603422a62abfbd76aaf85aa68205b3a6a619b82444e773ba9790763af2e32c99dec9365f581390a
+  metadata.gz: 58de76b440c6422371b5d7c07af81739761326d31de648bcb305635e7d8a7a9b96efac1c43b29875fb89e1602641e49b51412712cf59a024e277071fcd75ec2d
+  data.tar.gz: b666945ee6ca3c20222af9289b95f5b18afe0671164d35479c70c5253fcd32f9aaa422ef9506726cc43c15ac6cf594a56fd601fa6a0cc634c71a3d553424acdc

data/doc/text/news.md

@@ -1,5 +1,31 @@
 # News
 
+## 1.2.0: 2016-05-27
+
+### Improvements
+
+  * groonga-query-log-verify-server: Added `normalize` command to the
+    default check target commands.
+
+  * groonga-query-log-verify-server: Added `logical_shard_list`
+    command to the default check target commands.
+
+  * groonga-query-log-verify-server: Added `io_flush` command to the
+    default check target commands.
+
+  * groonga-query-log-verify-server: Added `object_exist` command to the
+    default check target commands.
+
+  * groonga-query-log-analyzer: Added `--target-commands` option.
+
+  * groonga-query-log-analyzer: Added `--target-tables` option.
+
+### Fixes
+
+  * Fixed undefined variable name error.
+
+  * groonga-query-log-analyzer: Fixed console output format
+
 ## 1.1.9: 2016-01-22
 
 ### Fixes

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

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -115,6 +113,8 @@ module Groonga
         @options[:output] = "-"
         @options[:slow_operation_threshold] = 0.1
         @options[:slow_response_threshold] = 0.2
+        @options[:target_commands] = nil
+        @options[:target_tables] = nil
         @options[:reporter] = "console"
         @options[:dynamic_sort] = true
         @options[:stream] = false
@@ -181,6 +181,22 @@ module Groonga
             @options[:slow_response_threshold] = threshold
           end
 
+          parser.on("--target-commands=COMMAND1,COMMAND2,...",
+                    Array,
+                    "Process only COMMANDS.",
+                    "Example: --target-commands=select,logical_select",
+                    "Process all commands by default") do |commands|
+            @options[:target_commands] = commands
+          end
+
+          parser.on("--target-tables=TABLE1,TABLE2,...",
+                    Array,
+                    "Process only TABLES.",
+                    "Example: --target-tables=Items,Users",
+                    "Process all tables by default") do |tables|
+            @options[:target_tables] = tables
+          end
+
           available_reporters = ["console", "json", "json-stream", "html"]
           parser.on("--reporter=REPORTER",
                     available_reporters,

data/lib/groonga/query-log/analyzer/reporter/console.rb

@@ -148,7 +148,7 @@ module Groonga
 
         def report_statistic(statistic)
           @index += 1
-          write("%*d) %s" % [@digit, @index, format_heading(statistic)])
+          write("%*d) %s\n" % [@digit, @index, format_heading(statistic)])
           report_parameters(statistic)
           report_operations(statistic)
         end

data/lib/groonga/query-log/command/format-regression-test-logs.rb

@@ -92,7 +92,7 @@ module Groonga
           rescue JSON::ParserError
             puts(command)
             puts("failed to parse old response: #{$!.message}")
-            puts(response1)
+            puts(response_old)
             valid = false
           end
 
@@ -101,7 +101,7 @@ module Groonga
           rescue JSON::ParserError
             puts(command)
             puts("failed to parse new response: #{$!.message}")
-            puts(response2)
+            puts(response_new)
             valid = false
           end
 

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

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2016  Kouhei Sutou <kou@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
@@ -27,6 +25,8 @@ module Groonga
         @options = options
         @slow_operation_threshold = options[:slow_operation_threshold]
         @slow_response_threshold = options[:slow_response_threshold]
+        @target_commands = options[:target_commands]
+        @target_tables = options[:target_tables]
         @parsing_statistics = {}
       end
 
@@ -84,6 +84,7 @@ module Groonga
           statistic = @parsing_statistics.delete(context_id)
           return if statistic.nil?
           statistic.finish(elapsed.to_i, return_code.to_i)
+          return unless target_statistic?(statistic)
           block.call(statistic)
         end
       end
@@ -98,6 +99,25 @@ module Groonga
         end
         statistic
       end
+
+      def target_statistic?(statistic)
+        if @target_commands
+          unless @target_commands.include?(statistic.command.name)
+            return false
+          end
+        end
+
+        if @target_tables
+          table = statistic.command["table"]
+          return false if table.nil?
+
+          unless @target_tables.include?(table)
+            return false
+          end
+        end
+
+        true
+      end
     end
   end
 end

data/lib/groonga/query-log/server-verifier.rb

@@ -154,9 +154,13 @@ module Groonga
           @disable_cache = false
           @output_path = nil
           @target_command_names = [
+            "io_flush",
             "logical_count",
             "logical_range_filter",
+            "logical_shard_list",
             "logical_select",
+            "normalize",
+            "object_exist",
             "select",
           ]
           @care_order = true

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

@@ -16,6 +16,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.1.9"
+    VERSION = "1.2.0"
   end
 end

data/test/fixtures/multi.expected

@@ -13,24 +13,28 @@ Summary:
   Slow Operations:
 
 Slow Queries:
-1) [2012-12-17 15:00:10.1-2012-12-17 15:00:10.1 (0.05231682)](0): table_create --name Comments --flags TABLE_HASH_KEY --key_type UInt32  name: <table_create>
+1) [2012-12-17 15:00:10.1-2012-12-17 15:00:10.1 (0.05231682)](0): table_create --name Comments --flags TABLE_HASH_KEY --key_type UInt32
+  name: <table_create>
   parameters:
     <name>: <Comments>
     <flags>: <TABLE_HASH_KEY>
     <key_type>: <UInt32>
 
-2) [2012-12-17 15:00:10.1-2012-12-17 15:00:10.1 (0.04463578)](0): column_create --table Comments --name title --flags COLUMN_SCALAR --type ShortText  name: <column_create>
+2) [2012-12-17 15:00:10.1-2012-12-17 15:00:10.1 (0.04463578)](0): column_create --table Comments --name title --flags COLUMN_SCALAR --type ShortText
+  name: <column_create>
   parameters:
     <table>: <Comments>
     <name>: <title>
     <flags>: <COLUMN_SCALAR>
     <type>: <ShortText>
 
-3) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video  name: <load>
+3) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
   parameters:
     <table>: <Video>
 
-4) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name  name: <select>
+4) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name
+  name: <select>
   parameters:
     <table>: <Users>
     <query>: <follower:@groonga>

data/test/fixtures/n_entries.expected

@@ -13,7 +13,8 @@ Summary:
   Slow Operations:
 
 Slow Queries:
-1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video  name: <load>
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
   parameters:
     <table>: <Video>
 

data/test/fixtures/no-report-summary.expected

@@ -1,10 +1,12 @@
 
 Slow Queries:
-1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video  name: <load>
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
   parameters:
     <table>: <Video>
 
-2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name  name: <select>
+2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name
+  name: <select>
   parameters:
     <table>: <Users>
     <query>: <follower:@groonga>

data/test/fixtures/order/-elapsed.expected

@@ -13,11 +13,13 @@ Summary:
   Slow Operations:
 
 Slow Queries:
-1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video  name: <load>
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
   parameters:
     <table>: <Video>
 
-2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name  name: <select>
+2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name
+  name: <select>
   parameters:
     <table>: <Users>
     <query>: <follower:@groonga>

data/test/fixtures/order/-start-time.expected

@@ -13,7 +13,8 @@ Summary:
   Slow Operations:
 
 Slow Queries:
-1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name  name: <select>
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name
+  name: <select>
   parameters:
     <table>: <Users>
     <query>: <follower:@groonga>
@@ -22,7 +23,8 @@ Slow Queries:
   2) 0.00002795:     select(     2)
   3) 0.00019585:     output(     2) _key,name
 
-2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video  name: <load>
+2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
   parameters:
     <table>: <Video>
 

data/test/fixtures/order/elapsed.expected

@@ -13,7 +13,8 @@ Summary:
   Slow Operations:
 
 Slow Queries:
-1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name  name: <select>
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name
+  name: <select>
   parameters:
     <table>: <Users>
     <query>: <follower:@groonga>
@@ -22,7 +23,8 @@ Slow Queries:
   2) 0.00002795:     select(     2)
   3) 0.00019585:     output(     2) _key,name
 
-2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video  name: <load>
+2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
   parameters:
     <table>: <Video>
 

data/test/fixtures/order/start-time.expected

@@ -13,11 +13,13 @@ Summary:
   Slow Operations:
 
 Slow Queries:
-1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video  name: <load>
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
   parameters:
     <table>: <Video>
 
-2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name  name: <select>
+2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name
+  name: <select>
   parameters:
     <table>: <Users>
     <query>: <follower:@groonga>

data/test/fixtures/reporter/console.expected

@@ -13,11 +13,13 @@ Summary:
   Slow Operations:
 
 Slow Queries:
-1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video  name: <load>
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
   parameters:
     <table>: <Video>
 
-2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name  name: <select>
+2) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name
+  name: <select>
   parameters:
     <table>: <Users>
     <query>: <follower:@groonga>

data/test/fixtures/target-commands.expected

@@ -0,0 +1,25 @@
+Summary:
+  Threshold:
+    slow response     : 0.2
+    slow operation    : 0.1
+  # of responses      : 1
+  # of slow responses : 0
+  responses/sec       : 821.5981727656638
+  start time          : 2012-12-12 17:39:17.3
+  last time           : 2012-12-12 17:39:17.3
+  period(sec)         : 0.00121714
+  slow response ratio : 0.000%
+  total response time : 0.00121714
+  Slow Operations:
+
+Slow Queries:
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00121714)](0): select --table Users --query follower:@groonga --output_columns _key,name
+  name: <select>
+  parameters:
+    <table>: <Users>
+    <query>: <follower:@groonga>
+    <output_columns>: <_key,name>
+  1) 0.00084295:     filter(     2) query: follower:@groonga
+  2) 0.00002795:     select(     2)
+  3) 0.00019585:     output(     2) _key,name
+

data/test/fixtures/target-tables.expected

@@ -0,0 +1,20 @@
+Summary:
+  Threshold:
+    slow response     : 0.2
+    slow operation    : 0.1
+  # of responses      : 1
+  # of slow responses : 0
+  responses/sec       : 319.6056322182932
+  start time          : 2012-12-12 17:39:17.3
+  last time           : 2012-12-12 17:39:17.3
+  period(sec)         : 0.003128856
+  slow response ratio : 0.000%
+  total response time : 0.003128856
+  Slow Operations:
+
+Slow Queries:
+1) [2012-12-12 17:39:17.3-2012-12-12 17:39:17.3 (0.00312886)](0): load --table Video
+  name: <load>
+  parameters:
+    <table>: <Video>
+

data/test/test-analyzer.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -80,6 +78,20 @@ class AnalyzerTest < Test::Unit::TestCase
     assert_equal(expected_result, actual_result)
   end
 
+  def test_target_commands
+    actual_result = run_analyzer("--target-commands=select",
+                                 @query_log_path)
+    expected_result = expected_analyzed_query("target-commands.expected")
+    assert_equal(expected_result, actual_result)
+  end
+
+  def test_target_tables
+    actual_result = run_analyzer("--target-tables=Video",
+                                 @query_log_path)
+    expected_result = expected_analyzed_query("target-tables.expected")
+    assert_equal(expected_result, actual_result)
+  end
+
   def test_no_report_summary
     actual_result = run_analyzer("--no-report-summary", @query_log_path)
     expected_result = expected_analyzed_query("no-report-summary.expected")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -228,6 +228,8 @@ files:
 - test/fixtures/reporter/html.expected
 - test/fixtures/reporter/json-stream.expected
 - test/fixtures/reporter/json.expected
+- test/fixtures/target-commands.expected
+- test/fixtures/target-tables.expected
 - test/helper.rb
 - test/run-test.rb
 - test/test-analyzer.rb
@@ -255,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Groonga-query-log is a collection of library and tools to process [Groonga](http://groonga.org/)'s
@@ -265,6 +267,8 @@ summary: Groonga-query-log is a collection of library and tools to process [Groo
 test_files:
 - test/test-analyzer.rb
 - test/fixtures/multi.expected
+- test/fixtures/target-tables.expected
+- test/fixtures/target-commands.expected
 - test/fixtures/n_entries.expected
 - test/fixtures/query.log
 - test/fixtures/other-query.log