groonga-query-log 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2eefbe93d2c19b8bbcd1bb9500431012c363f7a
-  data.tar.gz: dae8822afd3dc89125f8739f81f375c120416143
+  metadata.gz: 445e8c02baa8178322d2b5149f9f57026d483803
+  data.tar.gz: a94bf3aa467173b32823c496217e6aa97ad44a4b
 SHA512:
-  metadata.gz: 66d45d79027aaf124b7bf470451c832163685b6debed1f24f8a997876066df2795dbfb9bbdda694874b5436c9855782a05057060e3ebca66e0deb6304cff57fe
-  data.tar.gz: acecf0d714ab9f5de1c61feb57f6f1a9795aa68655e2ee3a016eb03052f7ee1b138fc5449747d136c5d365b798fa13e9308ad820d4acb419270071167c3564ac
+  metadata.gz: 45c1b525c23c3efecc23fd3ed0f0ac003009c67d0e98af01799d68d7e984e51debc3fcd8484753f0e35a4853eff69f9470a2c90217ead4c20807544074ef5ce7
+  data.tar.gz: 9f4d57caaa380448aefd533753d9aac19f49f83eb57ce7934ef7343ae1c0450e7b7fcdcbfded01c221fb56d39dcc0869668b5a8afe63eb88e8147ae65b6a15d4

data/doc/text/news.md

@@ -1,5 +1,14 @@
 # News
 
+## 1.0.8: 2014-07-23
+
+### Improvements
+
+  * groonga-query-log-analyzer: Added "slow" information to query and
+    operations.
+  * groonga-query-log-analyzer: Added "json-stream" reporter. It outputs
+    a statistic as a JSON in one line.
+
 ## 1.0.7: 2014-06-23
 
 ### Improvements

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

@@ -23,6 +23,10 @@ require "groonga/query-log/command-line-utils"
 require "groonga/query-log/parser"
 require "groonga/query-log/analyzer/streamer"
 require "groonga/query-log/analyzer/sized-statistics"
+require "groonga/query-log/analyzer/reporter/console"
+require "groonga/query-log/analyzer/reporter/html"
+require "groonga/query-log/analyzer/reporter/json"
+require "groonga/query-log/analyzer/reporter/json-stream"
 
 module Groonga
   module QueryLog
@@ -175,7 +179,7 @@ module Groonga
             @options[:slow_response_threshold] = threshold
           end
 
-          available_reporters = ["console", "json", "html"]
+          available_reporters = ["console", "json", "json-stream", "html"]
           parser.on("--reporter=REPORTER",
                     available_reporters,
                     "Reports statistics by REPORTER.",
@@ -210,6 +214,8 @@ module Groonga
         case @options[:reporter]
         when "json"
           JSONReporter.new(statistics)
+        when "json-stream"
+          JSONStreamReporter.new(statistics)
         when "html"
           HTMLReporter.new(statistics)
         else
@@ -220,7 +226,6 @@ module Groonga
       def create_stream_reporter
         case @options[:reporter]
         when "json"
-          require 'json'
           Groonga::QueryLog::StreamJSONQueryLogReporter.new
         when "html"
           raise UnsupportedReporter, "HTML reporter doesn't support --stream."

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2014  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
@@ -24,8 +24,16 @@ module Groonga
     class Analyzer
       class ConsoleReporter < Reporter
         class Color
-          NAMES = ["black", "red", "green", "yellow",
-                   "blue", "magenta", "cyan", "white"]
+          NAMES = [
+            "black",
+            "red",
+            "green",
+            "yellow",
+            "blue",
+            "magenta",
+            "cyan",
+            "white",
+          ]
 
           attr_reader :name
           def initialize(name, options={})

data/lib/groonga/query-log/analyzer/reporter/json-stream.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "groonga/query-log/analyzer/reporter"
+
+module Groonga
+  module QueryLog
+    class Analyzer
+      class JSONStreamReporter < Reporter
+        def report_statistic(statistic)
+          write(format_statistic(statistic))
+          write("\n")
+          @index += 1
+        end
+
+        def start
+          @index = 0
+        end
+
+        def finish
+        end
+
+        def report_summary
+          # TODO
+        end
+
+        private
+        def format_statistic(statistic)
+          JSON.generate(statistic.to_hash)
+        end
+      end
+    end
+  end
+end

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

@@ -46,31 +46,7 @@ module Groonga
 
         private
         def format_statistic(statistic)
-          data = {
-            "start_time" => statistic.start_time.to_i,
-            "last_time" => statistic.last_time.to_i,
-            "elapsed" => statistic.elapsed_in_seconds,
-            "return_code" => statistic.return_code,
-          }
-          command = statistic.command
-          arguments = command.arguments.collect do |key, value|
-            {"key" => key, "value" => value}
-          end
-          data["command"] = {
-            "raw" => statistic.raw_command,
-            "name" => command.name,
-            "parameters" => arguments,
-          }
-          operations = []
-          statistic.each_operation do |operation|
-            operation_data = {}
-            operation_data["name"] = operation[:name]
-            operation_data["relative_elapsed"] = operation[:relative_elapsed_in_seconds]
-            operation_data["context"] = operation[:context]
-            operations << operation_data
-          end
-          data["operations"] = operations
-          JSON.generate(data)
+          JSON.generate(statistic.to_hash)
         end
       end
     end

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

@@ -18,9 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/query-log/analyzer/sized-grouped-operations"
-require "groonga/query-log/analyzer/reporter/console"
-require "groonga/query-log/analyzer/reporter/html"
-require "groonga/query-log/analyzer/reporter/json"
 
 module Groonga
   module QueryLog

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

@@ -118,6 +118,35 @@ module Groonga
           command.name == "select"
         end
 
+        def to_hash
+          data = {
+            "start_time" => start_time.to_i,
+            "last_time" => last_time.to_i,
+            "elapsed" => elapsed_in_seconds,
+            "return_code" => return_code,
+            "slow" => slow?,
+          }
+          arguments = command.arguments.collect do |key, value|
+            {"key" => key, "value" => value}
+          end
+          data["command"] = {
+            "raw" => raw_command,
+            "name" => command.name,
+            "parameters" => arguments,
+          }
+          operations = []
+          each_operation do |operation|
+            operation_data = {}
+            operation_data["name"] = operation[:name]
+            operation_data["relative_elapsed"] = operation[:relative_elapsed_in_seconds]
+            operation_data["context"] = operation[:context]
+            operation_data["slow"] = operation[:slow?]
+            operations << operation_data
+          end
+          data["operations"] = operations
+          data
+        end
+
         private
         def nano_seconds_to_seconds(nano_seconds)
           nano_seconds / 1000.0 / 1000.0 / 1000.0

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

@@ -18,6 +18,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

data/test/fixtures/reporter/json-stream.expected

@@ -0,0 +1,2 @@
+{"start_time":START_TIME,"last_time":LAST_TIME,"elapsed":0.003128856,"return_code":0,"slow":false,"command":{"raw":"load --table Video","name":"load","parameters":[{"key":"table","value":"Video"}]},"operations":[]}
+{"start_time":START_TIME,"last_time":LAST_TIME,"elapsed":0.00121714,"return_code":0,"slow":false,"command":{"raw":"select --table Users --query follower:@groonga --output_columns _key,name","name":"select","parameters":[{"key":"table","value":"Users"},{"key":"query","value":"follower:@groonga"},{"key":"output_columns","value":"_key,name"}]},"operations":[{"name":"filter","relative_elapsed":0.0008429529999999999,"context":"query: follower:@groonga","slow":false},{"name":"select","relative_elapsed":2.7947e-05,"context":null,"slow":false},{"name":"output","relative_elapsed":0.000195852,"context":"_key,name","slow":false}]}

data/test/fixtures/reporter/json.expected

@@ -1,4 +1,4 @@
 [
-{"start_time":START_TIME,"last_time":LAST_TIME,"elapsed":0.003128856,"return_code":0,"command":{"raw":"load --table Video","name":"load","parameters":[{"key":"table","value":"Video"}]},"operations":[]},
-{"start_time":START_TIME,"last_time":LAST_TIME,"elapsed":0.00121714,"return_code":0,"command":{"raw":"select --table Users --query follower:@groonga --output_columns _key,name","name":"select","parameters":[{"key":"table","value":"Users"},{"key":"query","value":"follower:@groonga"},{"key":"output_columns","value":"_key,name"}]},"operations":[{"name":"filter","relative_elapsed":0.0008429529999999999,"context":"query: follower:@groonga"},{"name":"select","relative_elapsed":2.7947e-05,"context":null},{"name":"output","relative_elapsed":0.000195852,"context":"_key,name"}]}
+{"start_time":START_TIME,"last_time":LAST_TIME,"elapsed":0.003128856,"return_code":0,"slow":false,"command":{"raw":"load --table Video","name":"load","parameters":[{"key":"table","value":"Video"}]},"operations":[]},
+{"start_time":START_TIME,"last_time":LAST_TIME,"elapsed":0.00121714,"return_code":0,"slow":false,"command":{"raw":"select --table Users --query follower:@groonga --output_columns _key,name","name":"select","parameters":[{"key":"table","value":"Users"},{"key":"query","value":"follower:@groonga"},{"key":"output_columns","value":"_key,name"}]},"operations":[{"name":"filter","relative_elapsed":0.0008429529999999999,"context":"query: follower:@groonga","slow":false},{"name":"select","relative_elapsed":2.7947e-05,"context":null,"slow":false},{"name":"output","relative_elapsed":0.000195852,"context":"_key,name","slow":false}]}
 ]

data/test/test-analyzer.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2014  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
@@ -47,12 +48,16 @@ class AnalyzerTest < Test::Unit::TestCase
     end
   end
 
-  data(:console => "console",
-       :html    => "html",
-       :json    => "json")
+  data("console"     => "console",
+       "HTML"        => "html",
+       "JSON"        => "json",
+       "JSON stream" => "json-stream")
   def test_reporter(reporter)
     actual_result = run_analyzer("--reporter", reporter, @query_log_path)
-    actual_result = normalize_json(actual_result) if reporter == "json"
+    case reporter
+    when "json", "json-stream"
+      actual_result = normalize_json(actual_result)
+    end
 
     expected_result = expected_analyzed_query("reporter/#{reporter}.expected")
     assert_equal(expected_result, actual_result)
@@ -90,10 +95,9 @@ class AnalyzerTest < Test::Unit::TestCase
     end
   end
 
-  def normalize_json(json_string)
-    json_string = json_string.gsub(/(\"start_time\"):\d+/,
-                                   "\\1:START_TIME")
-    json_string.gsub(/(\"last_time\"):\d+/, "\\1:LAST_TIME")
+  def normalize_json(json)
+    json = json.gsub(/("start_time"):\d+/, "\\1:START_TIME")
+    json.gsub(/("last_time"):\d+/, "\\1:LAST_TIME")
   end
 
   def expected_analyzed_query(file_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -186,6 +186,7 @@ files:
 - lib/groonga/query-log/analyzer/reporter.rb
 - lib/groonga/query-log/analyzer/reporter/console.rb
 - lib/groonga/query-log/analyzer/reporter/html.rb
+- lib/groonga/query-log/analyzer/reporter/json-stream.rb
 - lib/groonga/query-log/analyzer/reporter/json.rb
 - lib/groonga/query-log/analyzer/sized-grouped-operations.rb
 - lib/groonga/query-log/analyzer/sized-statistics.rb
@@ -217,6 +218,7 @@ files:
 - test/fixtures/query.log
 - test/fixtures/reporter/console.expected
 - test/fixtures/reporter/html.expected
+- test/fixtures/reporter/json-stream.expected
 - test/fixtures/reporter/json.expected
 - test/groonga-query-log-test-utils.rb
 - test/run-test.rb
@@ -261,6 +263,7 @@ test_files:
 - test/fixtures/other-query.log
 - test/fixtures/reporter/console.expected
 - test/fixtures/reporter/html.expected
+- test/fixtures/reporter/json-stream.expected
 - test/fixtures/reporter/json.expected
 - test/fixtures/query.log
 - test/fixtures/multi.expected