groonga-query-log 1.2.8 → 1.2.9

data/test/helper.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2017  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
@@ -21,10 +19,27 @@ require "stringio"
 
 require "groonga/command"
 
-require "groonga/query-log"
+require "groonga-query-log"
+
+module Helper
+  module Path
+    def fixture_path(*components)
+      File.join(File.dirname(__FILE__), "fixtures", *components)
+    end
+  end
 
-module Path
-  def fixture_path(*components)
-    File.join(File.dirname(__FILE__), "fixtures", *components)
+  module Command
+    def open_error_output
+      Tempfile.open("groonga-query-log.error") do |error|
+        error.sync = true
+        original_stderr = $stderr.dup
+        $stderr.reopen(error)
+        begin
+          yield(error)
+        ensure
+          $stderr.reopen(original_stderr)
+        end
+      end
+    end
   end
 end

data/test/test-incompatibility-detector.rb

@@ -25,7 +25,7 @@ class IncompatibilityDetectorTest < Test::Unit::TestCase
   end
 
   def parse_query_log(query_log)
-    parser = Groonga::QueryLog::Parser.new
+    parser = GroongaQueryLog::Parser.new
     parser.parse(query_log) do |statistic|
       return statistic
     end
@@ -33,13 +33,13 @@ class IncompatibilityDetectorTest < Test::Unit::TestCase
 
   sub_test_case("version1") do
     def setup
-      @detector = Groonga::QueryLog::IncompatibilityDetector::Version1.new
+      @detector = GroongaQueryLog::IncompatibilityDetector::Version1.new
     end
   end
 
   sub_test_case("version2") do
     def setup
-      @detector = Groonga::QueryLog::IncompatibilityDetector::Version2.new
+      @detector = GroongaQueryLog::IncompatibilityDetector::Version2.new
     end
 
     sub_test_case("select") do

data/test/test-parser.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2017  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
@@ -48,7 +46,7 @@ class ParserTest < Test::Unit::TestCase
   private
   def parse(log)
     statistics = []
-    parser = Groonga::QueryLog::Parser.new
+    parser = GroongaQueryLog::Parser.new
     parser.parse(StringIO.new(log)) do |statistic|
       statistics << statistic
     end
@@ -257,4 +255,21 @@ class ParserTest < Test::Unit::TestCase
       end
     end
   end
+
+  class ExtraFieldTest < self
+    def test_load
+      statistics = parse(<<-LOG)
+2017-12-11 09:37:04.516938|0x7fffc430dff0|>load --table Numbers
+2017-12-11 09:37:04.517993|0x7fffc430dff0|:000000001056310 load(3): [1][2][3]
+2017-12-11 09:37:04.517999|0x7fffc430dff0|<000000001061996 rc=-22
+      LOG
+      operations = statistics.first.operations.collect do |operation|
+        [operation[:name], operation[:n_records], operation[:extra]]
+      end
+      expected = [
+        ["load", 3, "[1][2][3]"],
+      ]
+      assert_equal(expected, operations)
+    end
+  end
 end

data/test/test-replayer.rb

@@ -20,7 +20,7 @@ class ReplayerTest < Test::Unit::TestCase
   class OptionTest < self
     class ClientTest < self
       def setup
-        @options = Groonga::QueryLog::Replayer::Options.new
+        @options = GroongaQueryLog::Replayer::Options.new
         @options.n_clients = 1
       end
 
@@ -40,7 +40,7 @@ class ReplayerTest < Test::Unit::TestCase
 
       private
       def replay
-        replayer = Groonga::QueryLog::Replayer.new(@options)
+        replayer = GroongaQueryLog::Replayer.new(@options)
         replayer.replay(StringIO.new(""))
       end
 
@@ -49,7 +49,7 @@ class ReplayerTest < Test::Unit::TestCase
         default_options = {
           :host     => "127.0.0.1",
           :port     => 10041,
-          :protocol => :gqtp,
+          :protocol => :http,
         }
         expected_open_options = default_options.merge(expected_options)
         mock(Groonga::Client).open(expected_open_options).yields(client) do
@@ -60,7 +60,7 @@ class ReplayerTest < Test::Unit::TestCase
 
     class TargetCommandNameTest < self
       def setup
-        @options = Groonga::QueryLog::Replayer::Options.new
+        @options = GroongaQueryLog::Replayer::Options.new
       end
 
       def test_default

data/test/test-response-comparer.rb

@@ -19,8 +19,8 @@ class ResponseComparerTest < Test::Unit::TestCase
   def comparer(response1, response2, options={})
     response1 = normalize_response(response1)
     response2 = normalize_response(response2)
-    Groonga::QueryLog::ResponseComparer.new(@command, response1, response2,
-                                            options)
+    GroongaQueryLog::ResponseComparer.new(@command, response1, response2,
+                                          options)
   end
 
   def same?(response1, response2, options={})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: groonga-log
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -154,15 +168,17 @@ description: ''
 email:
 - kou@clear-code.com
 executables:
-- groonga-query-log-replay
+- groonga-query-log-check-command-version-compatibility
+- groonga-query-log-extract
+- groonga-query-log-run-regression-test
+- groonga-query-log-analyze
+- groonga-query-log-check-crash
+- groonga-query-log-analyze-load
+- groonga-query-log-verify-server
 - groonga-query-log-format-regression-test-logs
+- groonga-query-log-replay
 - groonga-query-log-show-running-queries
 - groonga-query-log-detect-memory-leak
-- groonga-query-log-verify-server
-- groonga-query-log-run-regression-test
-- groonga-query-log-check-command-version-compatibility
-- groonga-query-log-analyze
-- groonga-query-log-extract
 extensions: []
 extra_rdoc_files: []
 files:
@@ -171,7 +187,9 @@ files:
 - README.md
 - Rakefile
 - bin/groonga-query-log-analyze
+- bin/groonga-query-log-analyze-load
 - bin/groonga-query-log-check-command-version-compatibility
+- bin/groonga-query-log-check-crash
 - bin/groonga-query-log-detect-memory-leak
 - bin/groonga-query-log-extract
 - bin/groonga-query-log-format-regression-test-logs
@@ -183,34 +201,48 @@ files:
 - doc/text/news.md
 - doc/text/run-regression-test.md
 - groonga-query-log.gemspec
+- lib/groonga-query-log.rb
+- lib/groonga-query-log/command-line.rb
+- lib/groonga-query-log/command-version-compatibility-checker.rb
+- lib/groonga-query-log/command/analyze-load.rb
+- lib/groonga-query-log/command/analyzer.rb
+- lib/groonga-query-log/command/analyzer/reporter.rb
+- lib/groonga-query-log/command/analyzer/reporter/console.rb
+- lib/groonga-query-log/command/analyzer/reporter/csv.rb
+- lib/groonga-query-log/command/analyzer/reporter/html.rb
+- lib/groonga-query-log/command/analyzer/reporter/json-stream.rb
+- lib/groonga-query-log/command/analyzer/reporter/json.rb
+- lib/groonga-query-log/command/analyzer/sized-grouped-operations.rb
+- lib/groonga-query-log/command/analyzer/sized-statistics.rb
+- lib/groonga-query-log/command/analyzer/streamer.rb
+- lib/groonga-query-log/command/check-command-version-compatibility.rb
+- lib/groonga-query-log/command/check-crash.rb
+- lib/groonga-query-log/command/detect-memory-leak.rb
+- lib/groonga-query-log/command/extract.rb
+- lib/groonga-query-log/command/format-regression-test-logs.rb
+- lib/groonga-query-log/command/replay.rb
+- lib/groonga-query-log/command/run-regression-test.rb
+- lib/groonga-query-log/command/show-running-queries.rb
+- lib/groonga-query-log/command/verify-server.rb
+- lib/groonga-query-log/incompatibility-detector.rb
+- lib/groonga-query-log/memory-leak-detector.rb
+- lib/groonga-query-log/parser.rb
+- lib/groonga-query-log/replayer.rb
+- lib/groonga-query-log/response-comparer.rb
+- lib/groonga-query-log/server-verifier.rb
+- lib/groonga-query-log/statistic.rb
+- lib/groonga-query-log/version.rb
 - lib/groonga/query-log.rb
-- lib/groonga/query-log/analyzer.rb
-- 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
-- lib/groonga/query-log/analyzer/statistic.rb
-- lib/groonga/query-log/analyzer/streamer.rb
-- lib/groonga/query-log/command-line-utils.rb
-- lib/groonga/query-log/command-version-compatibility-checker.rb
+- lib/groonga/query-log/command/analyzer.rb
 - lib/groonga/query-log/command/check-command-version-compatibility.rb
 - lib/groonga/query-log/command/detect-memory-leak.rb
 - lib/groonga/query-log/command/extract.rb
 - lib/groonga/query-log/command/format-regression-test-logs.rb
-- lib/groonga/query-log/command/replay.rb
+- lib/groonga/query-log/command/reply.rb
 - lib/groonga/query-log/command/run-regression-test.rb
 - lib/groonga/query-log/command/show-running-queries.rb
 - lib/groonga/query-log/command/verify-server.rb
-- lib/groonga/query-log/incompatibility-detector.rb
-- lib/groonga/query-log/memory-leak-detector.rb
-- lib/groonga/query-log/parser.rb
-- lib/groonga/query-log/replayer.rb
-- lib/groonga/query-log/response-comparer.rb
-- lib/groonga/query-log/server-verifier.rb
-- lib/groonga/query-log/version.rb
+- test/command/test-analyzer.rb
 - test/command/test-extract.rb
 - test/command/test-format-regression-test-logs.rb
 - test/fixtures/multi.expected
@@ -229,35 +261,13 @@ files:
 - test/fixtures/reporter/json-stream.expected
 - test/fixtures/reporter/json.expected
 - test/fixtures/run-regression-test/data/data.grn
-- test/fixtures/run-regression-test/db.new/db
-- test/fixtures/run-regression-test/db.new/db.0000000
-- test/fixtures/run-regression-test/db.new/db.0000100
-- test/fixtures/run-regression-test/db.new/db.0000101
-- test/fixtures/run-regression-test/db.new/db.0000102
-- test/fixtures/run-regression-test/db.new/db.0000103
-- test/fixtures/run-regression-test/db.new/db.0000103.c
-- test/fixtures/run-regression-test/db.new/db.001
-- test/fixtures/run-regression-test/db.new/db.conf
-- test/fixtures/run-regression-test/db.new/groonga.log
-- test/fixtures/run-regression-test/db.old/db
-- test/fixtures/run-regression-test/db.old/db.0000000
-- test/fixtures/run-regression-test/db.old/db.0000100
-- test/fixtures/run-regression-test/db.old/db.0000101
-- test/fixtures/run-regression-test/db.old/db.0000102
-- test/fixtures/run-regression-test/db.old/db.0000103
-- test/fixtures/run-regression-test/db.old/db.0000103.c
-- test/fixtures/run-regression-test/db.old/db.001
-- test/fixtures/run-regression-test/db.old/db.conf
-- test/fixtures/run-regression-test/db.old/groonga.log
 - test/fixtures/run-regression-test/indexes/indexes.grn
 - test/fixtures/run-regression-test/query-logs/query.log
-- test/fixtures/run-regression-test/results/query.log
 - test/fixtures/run-regression-test/schema/schema.grn
 - test/fixtures/target-commands.expected
 - test/fixtures/target-tables.expected
 - test/helper.rb
 - test/run-test.rb
-- test/test-analyzer.rb
 - test/test-incompatibility-detector.rb
 - test/test-parser.rb
 - test/test-replayer.rb
@@ -282,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Groonga-query-log is a collection of library and tools to process [Groonga](http://groonga.org/)'s
@@ -290,54 +300,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-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
-- test/fixtures/order/-start-time.expected
-- test/fixtures/order/elapsed.expected
-- test/fixtures/order/-elapsed.expected
-- test/fixtures/order/start-time.expected
-- test/fixtures/regression-test-logs/url-format.log
-- test/fixtures/regression-test-logs/command-format.log
-- test/fixtures/reporter/json.expected
-- test/fixtures/reporter/console.expected
-- test/fixtures/reporter/html.expected
-- test/fixtures/reporter/json-stream.expected
-- test/fixtures/run-regression-test/db.old/db.0000100
-- test/fixtures/run-regression-test/db.old/db.0000103
-- test/fixtures/run-regression-test/db.old/db.0000103.c
-- test/fixtures/run-regression-test/db.old/db.0000101
-- test/fixtures/run-regression-test/db.old/db
-- test/fixtures/run-regression-test/db.old/db.0000000
-- test/fixtures/run-regression-test/db.old/db.001
-- test/fixtures/run-regression-test/db.old/db.conf
-- test/fixtures/run-regression-test/db.old/db.0000102
-- test/fixtures/run-regression-test/db.old/groonga.log
-- test/fixtures/run-regression-test/query-logs/query.log
-- test/fixtures/run-regression-test/schema/schema.grn
-- test/fixtures/run-regression-test/data/data.grn
-- test/fixtures/run-regression-test/indexes/indexes.grn
-- test/fixtures/run-regression-test/db.new/db.0000100
-- test/fixtures/run-regression-test/db.new/db.0000103
-- test/fixtures/run-regression-test/db.new/db.0000103.c
-- test/fixtures/run-regression-test/db.new/db.0000101
-- test/fixtures/run-regression-test/db.new/db
-- test/fixtures/run-regression-test/db.new/db.0000000
-- test/fixtures/run-regression-test/db.new/db.001
-- test/fixtures/run-regression-test/db.new/db.conf
-- test/fixtures/run-regression-test/db.new/db.0000102
-- test/fixtures/run-regression-test/db.new/groonga.log
-- test/fixtures/run-regression-test/results/query.log
-- test/fixtures/no-report-summary.expected
+- test/run-test.rb
 - test/helper.rb
-- test/command/test-format-regression-test-logs.rb
 - test/command/test-extract.rb
+- test/command/test-format-regression-test-logs.rb
+- test/command/test-analyzer.rb
+- test/test-parser.rb
 - test/test-replayer.rb
 - test/test-incompatibility-detector.rb
-- test/run-test.rb
-- test/test-parser.rb
 - test/test-response-comparer.rb
+- test/fixtures/no-report-summary.expected
+- test/fixtures/regression-test-logs/command-format.log
+- test/fixtures/regression-test-logs/url-format.log
+- test/fixtures/target-tables.expected
+- test/fixtures/run-regression-test/query-logs/query.log
+- test/fixtures/run-regression-test/data/data.grn
+- test/fixtures/run-regression-test/schema/schema.grn
+- test/fixtures/run-regression-test/indexes/indexes.grn
+- test/fixtures/order/start-time.expected
+- test/fixtures/order/elapsed.expected
+- test/fixtures/order/-start-time.expected
+- test/fixtures/order/-elapsed.expected
+- test/fixtures/n_entries.expected
+- test/fixtures/reporter/console.expected
+- test/fixtures/reporter/json.expected
+- test/fixtures/reporter/json-stream.expected
+- test/fixtures/reporter/html.expected
+- test/fixtures/target-commands.expected
+- test/fixtures/other-query.log
+- test/fixtures/query.log
+- test/fixtures/multi.expected

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

@@ -1,194 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2012  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/command/parser"
-
-module Groonga
-  module QueryLog
-    class Analyzer
-      class Statistic
-        DEFAULT_SLOW_OPERATION_THRESHOLD = 0.1
-        DEFAULT_SLOW_RESPONSE_THRESHOLD = 0.2
-
-        attr_reader :context_id, :start_time, :raw_command
-        attr_reader :elapsed, :return_code
-        attr_accessor :slow_operation_threshold, :slow_response_threshold
-        def initialize(context_id)
-          @context_id = context_id
-          @start_time = nil
-          @command = nil
-          @raw_command = nil
-          @operations = []
-          @elapsed = nil
-          @return_code = 0
-          @slow_operation_threshold = DEFAULT_SLOW_OPERATION_THRESHOLD
-          @slow_response_threshold = DEFAULT_SLOW_RESPONSE_THRESHOLD
-        end
-
-        def start(start_time, command)
-          @start_time = start_time
-          @raw_command = command
-        end
-
-        def finish(elapsed, return_code)
-          @elapsed = elapsed
-          @return_code = return_code
-        end
-
-        def command
-          Groonga::Command::Parser.parse(@raw_command) do |status, command|
-            case status
-            when :on_load_start
-              @loading = false
-              @command ||= command
-            when :on_command
-              @command ||= command
-            end
-          end
-          @command
-        end
-
-        def elapsed_in_seconds
-          nano_seconds_to_seconds(@elapsed)
-        end
-
-        def last_time
-          @start_time + elapsed_in_seconds
-        end
-
-        def slow?
-          elapsed_in_seconds >= @slow_response_threshold
-        end
-
-        def each_operation
-          previous_elapsed = 0
-          ensure_parse_command
-          operation_context_context = {
-            :filter_index => 0,
-            :drilldown_index => 0,
-          }
-          @operations.each_with_index do |operation, i|
-            relative_elapsed = operation[:elapsed] - previous_elapsed
-            relative_elapsed_in_seconds = nano_seconds_to_seconds(relative_elapsed)
-            previous_elapsed = operation[:elapsed]
-            parsed_operation = {
-              :i => i,
-              :elapsed => operation[:elapsed],
-              :elapsed_in_seconds => nano_seconds_to_seconds(operation[:elapsed]),
-              :relative_elapsed => relative_elapsed,
-              :relative_elapsed_in_seconds => relative_elapsed_in_seconds,
-              :name => operation[:name],
-              :context => operation_context(operation[:name],
-                                    operation_context_context),
-              :n_records => operation[:n_records],
-              :slow? => slow_operation?(relative_elapsed_in_seconds),
-            }
-            yield parsed_operation
-          end
-        end
-
-        def add_operation(operation)
-          @operations << operation
-        end
-
-        def operations
-          _operations = []
-          each_operation do |operation|
-            _operations << operation
-          end
-          _operations
-        end
-
-        def select_command?
-          command.name == "select"
-        end
-
-        def to_hash
-          data = {
-            "start_time" => start_time.to_f,
-            "last_time" => last_time.to_f,
-            "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
-        end
-
-        def operation_context(label, context)
-          return nil if @select_command.nil?
-
-          case label
-          when "filter"
-            if @select_command.query and context[:query_used].nil?
-              context[:query_used] = true
-              "query: #{@select_command.query}"
-            else
-              index = context[:filter_index]
-              context[:filter_index] += 1
-              @select_command.conditions[index]
-            end
-          when "sort"
-            @select_command.sortby
-          when "score"
-            @select_command.scorer
-          when "output"
-            @select_command.output_columns
-          when "drilldown"
-            index = context[:drilldown_index]
-            context[:drilldown_index] += 1
-            @select_command.drilldowns[index]
-          else
-            nil
-          end
-        end
-
-        def ensure_parse_command
-          return unless select_command?
-          @select_command = Groonga::Command::Parser.parse(@raw_command)
-        end
-
-        def slow_operation?(elapsed)
-          elapsed >= @slow_operation_threshold
-        end
-      end
-    end
-  end
-end