groonga-query-log 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb08906bfcd75b268d3a3bed4ba2768e81ab3c9b
-  data.tar.gz: cc8b5b02688f467c69a99bf768e0549dec253dae
+  metadata.gz: d2eefbe93d2c19b8bbcd1bb9500431012c363f7a
+  data.tar.gz: dae8822afd3dc89125f8739f81f375c120416143
 SHA512:
-  metadata.gz: d6467ae4182b3d7e4c56a2b3652e241a83e9ffb9f969109941ad730ab11c2e957d97b773e4b1fb02b9dddbfaa6ccbe028f0ffacf321f4be3a19042cc0493a68b
-  data.tar.gz: 53d25ad095f97d429b32c5269f73c6d686702f5308bfeed50a79ce214acc81313271c7447a316ac8a615c6ae0ce473e0354ecfe4071cb9c90b3b1e82bbe526d1
+  metadata.gz: 66d45d79027aaf124b7bf470451c832163685b6debed1f24f8a997876066df2795dbfb9bbdda694874b5436c9855782a05057060e3ebca66e0deb6304cff57fe
+  data.tar.gz: acecf0d714ab9f5de1c61feb57f6f1a9795aa68655e2ee3a016eb03052f7ee1b138fc5449747d136c5d365b798fa13e9308ad820d4acb419270071167c3564ac

data/bin/groonga-query-log-show-running-queries

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+# -*- 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/command/show-running-queries"
+
+command = Groonga::QueryLog::Command::ShowRunningQueries.new
+exit(command.run(ARGV))

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.0.7: 2014-06-23
+
+### Improvements
+
+  * groonga-query-log-show-running-queries: Added a command that shows
+    running queries on the specified base time. It will be useful to
+    find a query that causes a problem.
+
 ## 1.0.6: 2014-06-02
 
 ### Improvements

data/lib/groonga/query-log/command/show-running-queries.rb

@@ -0,0 +1,80 @@
+# 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 "optparse"
+require "time"
+
+require "groonga/query-log/version"
+require "groonga/query-log/parser"
+
+module Groonga
+  module QueryLog
+    module Command
+      class ShowRunningQueries
+        def initialize
+          @base_time = nil
+        end
+
+        def run(command_line)
+          input_paths = create_parser.parse(command_line)
+          each_parsing_statistic(input_paths) do |statistic|
+            timestamp = statistic.start_time.strftime("%Y-%m-%d %H:%M:%S.%6N")
+            puts("#{timestamp}:#{statistic.raw_command}")
+          end
+          true
+        end
+
+        private
+        def create_parser
+          parser = OptionParser.new
+          parser.version = VERSION
+          parser.banner += " QUERY_LOG"
+
+          parser.separator("")
+          parser.separator("Options:")
+
+          parser.on("--base-time=TIME",
+                    "Show running queries at TIME",
+                    "You can use popular time format for TIME such as W3C-DTF",
+                    "(now)") do |base_time|
+            @base_time = Time.parse(base_time)
+          end
+        end
+
+        def each_parsing_statistic(input_paths)
+          parser = Parser.new
+          catch do |tag|
+            input_paths.each do |input_path|
+              File.open(input_path) do |input|
+                parser.parse(input) do |statistic|
+                  next if @base_time.nil?
+                  next if statistic.start_time < @base_time
+                  if statistic.start_time == @base_time
+                    yield(statistic)
+                  end
+                  throw(tag)
+                end
+              end
+            end
+          end
+          parser.parsing_statistics.each do |statistic|
+            yield(statistic)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -27,6 +27,7 @@ module Groonga
         @options = options
         @slow_operation_threshold = options[:slow_operation_threshold]
         @slow_response_threshold = options[:slow_response_threshold]
+        @parsing_statistics = {}
       end
 
       # Parses query-log file as stream to
@@ -39,7 +40,6 @@ module Groonga
       # @yieldparam [Groonga::QueryLog::Analyzer::Statistic] statistic
       #   statistics of each query in log files.
       def parse(input, &block)
-        current_statistics = {}
         input.each_line do |line|
           next unless line.valid_encoding?
           case line
@@ -51,26 +51,28 @@ module Groonga
             rest = $POSTMATCH.strip
             time_stamp = Time.local(year, month, day, hour, minutes, seconds,
                                     micro_seconds)
-            parse_line(current_statistics,
-                       time_stamp, context_id, type, rest, &block)
+            parse_line(time_stamp, context_id, type, rest, &block)
           end
         end
       end
 
+      def parsing_statistics
+        @parsing_statistics.values
+      end
+
       private
-      def parse_line(current_statistics,
-                     time_stamp, context_id, type, rest, &block)
+      def parse_line(time_stamp, context_id, type, rest, &block)
         case type
         when ">"
           statistic = create_statistic(context_id)
           statistic.start(time_stamp, rest)
-          current_statistics[context_id] = statistic
+          @parsing_statistics[context_id] = statistic
         when ":"
           return unless /\A(\d+) (.+)\((\d+)\)/ =~ rest
           elapsed = $1
           name = $2
           n_records = $3.to_i
-          statistic = current_statistics[context_id]
+          statistic = @parsing_statistics[context_id]
           return if statistic.nil?
           statistic.add_operation(:name => name,
                                   :elapsed => elapsed.to_i,
@@ -79,7 +81,7 @@ module Groonga
           return unless /\A(\d+) rc=(-?\d+)/ =~ rest
           elapsed = $1
           return_code = $2
-          statistic = current_statistics.delete(context_id)
+          statistic = @parsing_statistics.delete(context_id)
           return if statistic.nil?
           statistic.finish(elapsed.to_i, return_code.to_i)
           block.call(statistic)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -159,6 +159,7 @@ executables:
 - groonga-query-log-extract
 - groonga-query-log-run-regression-test
 - groonga-query-log-replay
+- groonga-query-log-show-running-queries
 - groonga-query-log-detect-memory-leak
 - groonga-query-log-analyze
 extensions: []
@@ -174,6 +175,7 @@ files:
 - bin/groonga-query-log-format-regression-test-logs
 - bin/groonga-query-log-replay
 - bin/groonga-query-log-run-regression-test
+- bin/groonga-query-log-show-running-queries
 - bin/groonga-query-log-verify-server
 - doc/text/lgpl-2.1.txt
 - doc/text/news.md
@@ -194,6 +196,7 @@ files:
 - 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/extractor.rb
 - lib/groonga/query-log/memory-leak-detector.rb