groonga-query-log 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f5ad917944ca7bd674f39986f174b4654fd66ec
-  data.tar.gz: 47e5fd5e81acda2018b453db2544653564d858b7
+  metadata.gz: ecc113262236c80addf12b23cf930c1d85cee8ae
+  data.tar.gz: b168f92861f723e4ede99f5b023a48050b52e8d3
 SHA512:
-  metadata.gz: da229bc1ca6774432310b71320f295735ad0e755cb66e42fde36876465ad61989a2593f3f796df65d00dfea6551991fb49c0c847e78eca3376ed241d8c3913d8
-  data.tar.gz: a1e34feb150710f80a0f9a49082285d195fb18948a148b76f8a25368ecddd0617a5c3c767fecf6adde9c7fb8823a046c43dc96efe43843e3c2ae160702817928
+  metadata.gz: 6bdb3eabb1ad973af6a1f820ddf8263f14e05543db0864523b41a44e25ff4e84f220ec073778575067308677b41380adc4056e7f99141e51ad6c79b79d5c2fcd
+  data.tar.gz: a4712efb262754f0563b3458d7e25788a2844b4483d0cbb3cb31ba371402ce5aece3ec5e1c2ade38a5644340e6da91e800edcb03463e62add6d411b28d1b62f2

data/bin/groonga-query-log-extract

@@ -17,7 +17,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-require "groonga/query-log/extractor"
+require "groonga/query-log/command/extract"
 
-extracter = Groonga::QueryLog::Extractor.new
-exit(extracter.run(*ARGV))
+extract = Groonga::QueryLog::Command::Extract.new
+exit(extract.run(ARGV))

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 1.1.5: 2015-08-12
+
+### Improvements
+
+  * groonga-query-log-run-regression-test: Changed to use `--file`
+    command line option of `groonga` instead of redirect to specify
+    input.
+
+### Fixes
+
+  * groonga-query-log-extract: Fixed a bug that it fails to boot.
+
 ## 1.1.4: 2015-06-11
 
 ### Improvements

data/lib/groonga/query-log.rb

@@ -18,7 +18,6 @@
 
 require "groonga/query-log/version"
 require "groonga/query-log/analyzer"
-require "groonga/query-log/extractor"
 require "groonga/query-log/parser"
 require "groonga/query-log/replayer"
 require "groonga/query-log/server-verifier"

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

@@ -120,8 +120,8 @@ module Groonga
 
         def to_hash
           data = {
-            "start_time" => start_time.to_i,
-            "last_time" => last_time.to_i,
+            "start_time" => start_time.to_f,
+            "last_time" => last_time.to_f,
             "elapsed" => elapsed_in_seconds,
             "return_code" => return_code,
             "slow" => slow?,

data/lib/groonga/query-log/{extractor.rb → command/extract.rb}

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
@@ -20,12 +19,14 @@
 require "ostruct"
 require "optparse"
 require "pathname"
+
+require "groonga/query-log"
 require "groonga/query-log/command-line-utils"
-require "groonga/query-log/parser"
 
 module Groonga
   module QueryLog
-    class Extractor
+    module Command
+    class Extract
       include CommandLineUtils
 
       class Error < StandardError
@@ -44,7 +45,7 @@ module Groonga
       # "groonga-query-log-extract" command runs this method.
       #
       # @example
-      #   extractor = Groonga::QueryLog::Extractor.new
+      #   extractor = Groonga::QueryLog::Command::Extract.new
       #   extractor.run("--output", "commands.output",
       #                 "--command", "select",
       #                 "query.log")
@@ -97,19 +98,19 @@ module Groonga
 
           available_formats = ["uri", "command"]
           parser.on("--unify-format=FORMAT",
-                 available_formats,
-                 "Unify command format to FORMAT.",
-                 "(#{available_formats.join(', ')})",
-                 "[not unify]") do |format|
+                    available_formats,
+                    "Unify command format to FORMAT.",
+                    "(#{available_formats.join(', ')})",
+                    "[not unify]") do |format|
             @options.unify_format = format
           end
 
           parser.on("--command=COMMAND",
-                 "Extract only COMMAND.",
-                 "To extract one or more commands,",
-                 "specify this command a number of times.",
-                 "Use /.../ as COMMAND to match command with regular expression.",
-                 "[all commands]") do |command|
+                    "Extract only COMMAND.",
+                    "To extract one or more commands,",
+                    "specify this command a number of times.",
+                    "Use /.../ as COMMAND to match command with regular expression.",
+                    "[all commands]") do |command|
             case command
             when /\A\/(.*)\/(i)?\z/
               @options.commands << Regexp.new($1, $2 == "i")
@@ -119,11 +120,11 @@ module Groonga
           end
 
           parser.on("--exclude-command=COMMAND",
-                 "Don't extract COMMAND.",
-                 "To ignore one or more commands,",
-                 "specify this command a number of times.",
-                 "Use /.../ as COMMAND to match command with regular expression.",
-                 "[no commands]") do |command|
+                    "Don't extract COMMAND.",
+                    "To ignore one or more commands,",
+                    "specify this command a number of times.",
+                    "Use /.../ as COMMAND to match command with regular expression.",
+                    "[no commands]") do |command|
             case command
             when /\A\/(.*)\/(i)?\z/
               @options.exclude_commands << Regexp.new($1, $2 == "i")
@@ -133,8 +134,8 @@ module Groonga
           end
 
           parser.on("--output=PATH",
-                 "Output to PATH.",
-                 "[standard output]") do |path|
+                    "Output to PATH.",
+                    "[standard output]") do |path|
             @options.output_path = path
           end
         end
@@ -186,5 +187,6 @@ module Groonga
         true
       end
     end
+    end
   end
 end

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

@@ -245,11 +245,12 @@ module Groonga
               command = [
                 @groonga,
                 "--log-path", log_path.to_s,
+                "--file", grn_file.to_s,
                 @database_path.to_s,
               ]
-              command_line = "#{command.join(' ')} < #{grn_file}"
+              command_line = command.join(" ")
               puts("Running...: #{command_line}")
-              pid = spawn(*command, :in => grn_file.to_s)
+              pid = spawn(*command)
               begin
                 pid, status = Process.waitpid2(pid)
               rescue Interrupt

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

@@ -18,6 +18,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.1.4"
+    VERSION = "1.1.5"
   end
 end

data/test/test-analyzer.rb

@@ -96,8 +96,8 @@ class AnalyzerTest < Test::Unit::TestCase
   end
 
   def normalize_json(json)
-    json = json.gsub(/("start_time"):\d+/, "\\1:START_TIME")
-    json.gsub(/("last_time"):\d+/, "\\1:LAST_TIME")
+    json = json.gsub(/("start_time"):\d+(?:\.\d+)/, "\\1:START_TIME")
+    json.gsub(/("last_time"):\d+(?:\.\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.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -198,12 +198,12 @@ files:
 - lib/groonga/query-log/command-version-compatibility-checker.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/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/incompatibility-detector.rb
 - lib/groonga/query-log/memory-leak-detector.rb
 - lib/groonga/query-log/parser.rb