groonga-query-log 1.2.8 → 1.2.9

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 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
@@ -14,67 +14,5 @@
 # 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
+require "groonga/query-log"
+require "groonga-query-log/command/show-running-queries"

data/lib/groonga/query-log/command/verify-server.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 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
@@ -14,140 +14,5 @@
 # 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 "groonga/query-log"
-
-module Groonga
-  module QueryLog
-    module Command
-      class VerifyServer
-        def initialize
-          @options = ServerVerifier::Options.new
-        end
-
-        def run(command_line, &callback)
-          input_paths = create_parser.parse(command_line)
-          verifier = ServerVerifier.new(@options)
-          if input_paths.empty?
-            verifier.verify($stdin, &callback)
-          else
-            input_paths.each do |input_path|
-              File.open(input_path) do |input|
-                verifier.verify(input, &callback)
-              end
-            end
-          end
-          true
-        end
-
-        private
-        def create_parser
-          parser = OptionParser.new
-          parser.version = VERSION
-          parser.banner += " QUERY_LOG1 QUERY_LOG2 ..."
-
-          parser.separator("")
-          parser.separator("Options:")
-
-          available_protocols = [:gqtp, :http]
-          available_protocols_label = "[#{available_protocols.join(', ')}]"
-
-          parser.on("--groonga1-host=HOST",
-                    "Host name or IP address of Groonga server 1",
-                    "[#{@options.groonga1.host}]") do |host|
-            @options.groonga1.host = host
-          end
-
-          parser.on("--groonga1-port=PORT", Integer,
-                    "Port number of Groonga server 1",
-                    "[#{@options.groonga1.port}]") do |port|
-            @options.groonga1.port = port
-          end
-
-          parser.on("--groonga1-protocol=PROTOCOL", available_protocols,
-                    "Protocol of Groonga server 1",
-                    available_protocols_label) do |protocol|
-            @options.groonga1.protocol = protocol
-          end
-
-          parser.on("--groonga2-host=HOST",
-                    "Host name or IP address of Groonga server 2",
-                    "[#{@options.groonga2.host}]") do |host|
-            @options.groonga2.host = host
-          end
-
-          parser.on("--groonga2-port=PORT", Integer,
-                    "Port number of Groonga server 2",
-                    "[#{@options.groonga2.port}]") do |port|
-            @options.groonga2.port = port
-          end
-
-          parser.on("--groonga2-protocol=PROTOCOL", available_protocols,
-                    "Protocol of Groonga server 2",
-                    available_protocols_label) do |protocol|
-            @options.groonga2.protocol = protocol
-          end
-
-          parser.on("--n-clients=N", Integer,
-                    "The max number of concurrency",
-                    "[#{@options.n_clients}]") do |n_clients|
-            @options.n_clients = n_clients
-          end
-
-          parser.on("--request-queue-size=SIZE", Integer,
-                    "The size of request queue",
-                    "[auto]") do |size|
-            @options.request_queue_size = size
-          end
-
-          parser.on("--disable-cache",
-                    "Add 'cache=no' parameter to request",
-                    "[#{@options.disable_cache?}]") do
-            @options.disable_cache = true
-          end
-
-          parser.on("--target-command-name=NAME",
-                    "Add NAME to target command names",
-                    "You can specify this option zero or more times",
-                    "See also --target-command-names") do |name|
-            @options.target_command_names << name
-          end
-
-          target_command_names_label = @options.target_command_names.join(", ")
-          parser.on("--target-command-names=NAME1,NAME2,...", Array,
-                    "Replay only NAME1,NAME2,... commands",
-                    "You can use glob to choose command name",
-                    "[#{target_command_names_label}]") do |names|
-            @options.target_command_names = names
-          end
-
-          parser.on("--no-care-order",
-                    "Don't care order of select response records") do
-            @options.care_order = false
-          end
-
-          parser.on("--output=PATH",
-                    "Output results to PATH",
-                    "[stdout]") do |path|
-            @options.output_path = path
-          end
-
-          parser.on("--[no-]verify-cache",
-                    "Verify cache for each query.",
-                    "[#{@options.verify_cache?}]") do |verify_cache|
-            @options.verify_cache = verify_cache
-          end
-
-          parser.separator("Debug options:")
-          parser.separator("")
-
-          parser.on("--abort-on-exception",
-                    "Abort on exception in threads") do
-            Thread.abort_on_exception = true
-          end
-        end
-      end
-    end
-  end
-end
+require "groonga-query-log/command/verify-server"

data/test/{test-analyzer.rb → command/test-analyzer.rb}

@@ -1,5 +1,5 @@
-# Copyright (C) 2014-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright (C) 2014-2018  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
@@ -17,17 +17,19 @@
 
 require "tempfile"
 require "pathname"
-require "groonga/query-log/analyzer"
+require "groonga-query-log/command/analyzer"
+
+class AnalyzerCommandTest < Test::Unit::TestCase
+  include Helper::Command
 
-class AnalyzerTest < Test::Unit::TestCase
   setup
   def setup_fixtures
-    @fixtures_path = File.join(File.dirname(__FILE__), "fixtures")
+    @fixtures_path = File.join(__dir__, "..", "fixtures")
     @query_log_path = File.join(@fixtures_path, "query.log")
   end
 
   def setup
-    @analyzer = Groonga::QueryLog::Analyzer.new
+    @analyzer = GroongaQueryLog::Command::Analyzer.new
   end
 
   class TestInputFile < self
@@ -40,9 +42,8 @@ class AnalyzerTest < Test::Unit::TestCase
     end
 
     def test_no_specified
-      assert_raise(Groonga::QueryLog::Analyzer::NoInputError) do
-        run_analyzer
-      end
+      assert_equal("Error: Please specify input log files.\n",
+                   run_analyzer)
     end
   end
 
@@ -101,9 +102,14 @@ class AnalyzerTest < Test::Unit::TestCase
   private
   def run_analyzer(*arguments)
     Tempfile.open("output.actual") do |output|
-      arguments << "--output" << output.path
-      @analyzer.run(arguments)
-      File.read(output.path)
+      open_error_output do |error|
+        arguments << "--output" << output.path
+        if @analyzer.run(arguments)
+          File.read(output.path)
+        else
+          File.read(error.path)
+        end
+      end
     end
   end
 

data/test/command/test-extract.rb

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2018  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
@@ -19,9 +18,11 @@
 
 require "stringio"
 require "groonga/command"
-require "groonga/query-log/command/extract"
+require "groonga-query-log/command/extract"
 
 class ExtractCommandTest < Test::Unit::TestCase
+  include Helper::Command
+
   setup
   def setup_fixtures
     @fixtures_path = File.join(File.dirname(__FILE__), "..", "fixtures")
@@ -29,7 +30,7 @@ class ExtractCommandTest < Test::Unit::TestCase
   end
 
   def setup
-    @extract_command = Groonga::QueryLog::Command::Extract.new
+    @extract_command = GroongaQueryLog::Command::Extract.new
   end
 
   class TestInputFile < self
@@ -112,19 +113,6 @@ EOC
     end
   end
 
-  def open_error_output
-    Tempfile.open("extract.error") do |error|
-      error.sync = true
-      original_stderr = $stderr.dup
-      $stderr.reopen(error)
-      begin
-        yield(error)
-      ensure
-        $stderr.reopen(original_stderr)
-      end
-    end
-  end
-
   class TestExtract < self
     def setup
       super
@@ -163,8 +151,11 @@ EOL
 
     private
     def extract
+      input = Tempfile.new(["groonga-query", ".log"])
+      input.puts(@log)
+      input.close
       output = StringIO.new
-      @extract_command.send(:extract, @log, output)
+      @extract_command.send(:extract, [input.path], output)
       output.string
     end
   end

data/test/command/test-format-regression-test-logs.rb

@@ -16,13 +16,13 @@
 # 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/format-regression-test-logs"
+require "groonga-query-log/command/format-regression-test-logs"
 
 class FormatRegressionTestLogsCommandTest < Test::Unit::TestCase
-  include Path
+  include Helper::Path
 
   def setup
-    @command = Groonga::QueryLog::Command::FormatRegressionTestLogs.new
+    @command = GroongaQueryLog::Command::FormatRegressionTestLogs.new
   end
 
   def run_command(command_line)

data/test/fixtures/reporter/html.expected

@@ -39,7 +39,8 @@ div.statistics
 
 td.elapsed,
 td.ratio,
-td.n
+td.n,
+td.n-records
 {
   text-align: right;
 }
@@ -144,8 +145,19 @@ td.name
       </div>
       <div class="statistic-operations">
         <h3>Operations</h3>
-        <ol>
-        </ol>
+        <table>
+          <thead>
+            <tr>
+              <th>Nth</th>
+              <th>Elapsed(sec)</th>
+              <th>Name</th>
+              <th>N records</th>
+              <th>Context</th>
+            </tr>
+          </thead>
+          <tbody>
+          </tbody>
+        </table>
       </div>
       <div class="statistic-heading">
         <h3>Command</h3>
@@ -173,23 +185,46 @@ td.name
       </div>
       <div class="statistic-operations">
         <h3>Operations</h3>
-        <ol>
-          <li>
-            <span class="elapsed">0.00084295</span>:
-            <span class="name">filter</span>:
-            <span class="context">query: follower:@groonga</span>
-          </li>
-          <li>
-            <span class="elapsed">0.00002795</span>:
-            <span class="name">select</span>:
-            <span class="context"></span>
-          </li>
-          <li>
-            <span class="elapsed">0.00019585</span>:
-            <span class="name">output</span>:
-            <span class="context">_key,name</span>
-          </li>
-        </ol>
+        <table>
+          <thead>
+            <tr>
+              <th>Nth</th>
+              <th>Elapsed(sec)</th>
+              <th>Name</th>
+              <th>N records</th>
+              <th>Context</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td class="n">1</td>
+              <td class="elapsed">
+                <span class="elapsed">0.00084295</span>
+              </td>
+              <td class="name">filter</td>
+              <td class="n-records">2</td>
+              <td class="context">query: follower:@groonga</td>
+            </tr>
+            <tr>
+              <td class="n">2</td>
+              <td class="elapsed">
+                <span class="elapsed">0.00002795</span>
+              </td>
+              <td class="name">select</td>
+              <td class="n-records">2</td>
+              <td class="context"></td>
+            </tr>
+            <tr>
+              <td class="n">3</td>
+              <td class="elapsed">
+                <span class="elapsed">0.00019585</span>
+              </td>
+              <td class="name">output</td>
+              <td class="n-records">2</td>
+              <td class="context">_key,name</td>
+            </tr>
+          </tbody>
+        </table>
       </div>
     </div>
   </body>