groonga-query-log 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05b507ee733fc255cabbb5cf09e7d050460ed282
-  data.tar.gz: 18b939521cb5c1568f7a3cb7d5cce3aee9042bd8
+  metadata.gz: 7baac32f5f72c344206d735fa04ab18fad813424
+  data.tar.gz: b81cf03d7eac23d3b6701b2539baddb6a794bf2b
 SHA512:
-  metadata.gz: 102d611f9a0ca59eaef084a138849cd4ee13cf9b7e7fca2ee9921b3cbe3a9b33fd0024aaa6b3ce80e9996ab9f3e8c0e948d1fd081b1e60fe74f237f6bd9be3ad
-  data.tar.gz: 5e59087eca3bda7a8488be18c9b747ef08e90ad47bc2a24f22fee0d71ebdf78a249f3da4030ee04893f189600cc2343ac860a26643506fd39e257bd613a3f839
+  metadata.gz: a945b55c42cb1b483a178fc8e0d5f3ee87392bd16775df48599498d26cfcefcce66e7a7b4eae5ce7ed0ca4f41cb0ecc4ef74fa332fb05dbcba0b6fcc480548b8
+  data.tar.gz: 886297948bbe6b312cd88258498564701cfdf218124d14c68bf8313941b6e01efd7fdab9d4ee53c95e4fe2714a506cee204db0ea01fccaa5829759a300f18175

data/README.md

@@ -9,9 +9,9 @@ groonga-query-log
 ## Description
 
 Groonga-query-log is a collection of library and tools to process
-[groonga](http://groonga.org/)'s query log. You can write a program to
+[Groonga](http://groonga.org/)'s query log. You can write a program to
 process query log by using groonga-query-log as a library. You can
-analyze your groonga's queries and test with your groonga's query log
+analyze your Groonga's queries and test with your Groonga's query log
 by using groonga-query-log as a tool.
 
 ## Install
@@ -20,28 +20,52 @@ by using groonga-query-log as a tool.
 
 ## Usage
 
+### groonga-query-log-analyze
+
+TODO...
+
+### groonga-query-log-detect-memory-leak
+
 TODO...
 
-## Examples
+### groonga-query-log-extract
 
 TODO...
 
+### groonga-query-log-replay
+
+TODO...
+
+### groonga-query-log-run-regression-test
+
+TODO...
+
+### groonga-query-log-verify-server
+
+TODO...
+
+### groonga-query-log-run-regression-test
+
+  * [doc/text/run-regression-test.md](doc/text/run-regression-test.md)
+
 ## Dependencies
 
-* Ruby
+  * Ruby
+  * [groonga-command-parser](http://rubygems.org/gems/groonga-command-parser)
+  * [groonga-client](http://rubygems.org/gems/groonga-client)
 
 ## Mailing list
 
-* English: [groonga-talk@lists.sourceforge.net](https://lists.sourceforge.net/lists/listinfo/groonga-talk)
-* Japanese: [groonga-dev@lists.sourceforge.jp](http://lists.sourceforge.jp/mailman/listinfo/groonga-dev)
+  * English: [groonga-talk@lists.sourceforge.net](https://lists.sourceforge.net/lists/listinfo/groonga-talk)
+  * Japanese: [groonga-dev@lists.sourceforge.jp](http://lists.sourceforge.jp/mailman/listinfo/groonga-dev)
 
 ## Thanks
 
-* ...
+  * ...
 
 ## Authors
 
-* Kouhei Sutou \<kou@clear-code.com\>
+  * Kouhei Sutou \<kou@clear-code.com\>
 
 ## License
 

data/bin/groonga-query-log-run-regression-test

@@ -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/run-regression-test"
+
+command = Groonga::QueryLog::Command::RunRegressionTest.new
+command.run(*ARGV)

data/doc/text/news.md

@@ -1,5 +1,14 @@
 # News
 
+## 1.0.5: 2014-05-12
+
+### Improvements
+
+  * groonga-query-log-verify-server: Supported `groonga-client` 0.0.8.
+  * groonga-query-log-verify-server: Supported comparing errors.
+  * groonga-query-log-run-regression-test: Added a command that
+    runs regression test. It is based on groonga-query-log-verify-server.
+
 ## 1.0.4: 2014-02-09
 
 ### Improvements

data/doc/text/run-regression-test.md

@@ -0,0 +1,189 @@
+# `groonga-query-log-run-regression-test`
+
+`groonga-query-log-run-regression-test` is a regression test tool for
+Groonga. It is useful when you upgrade Groonga. You can compare search
+results by old Groonga and new Groonga by
+`groonga-query-log-run-regression-test`. Test queries are read from
+query logs. You can use query logs on production environment as is.
+
+## Flow
+
+Here is a work flow to run regression test with
+`groonga-query-log-run-regression-test`:
+
+  1. Prepare schema.
+  2. Prepare data.
+  3. Prepare query logs.
+  4. Load schema into both old Groonga and new Groonga.
+  5. Load data into both old Groonga and new Groonga.
+  6. Send a request extracted from a query log to both old Groonga and
+     new Groonga.
+  7. Compare responses from old Groonga and new Groonga.
+  8. Repeat 6. and 7. for all request in query logs.
+
+If there is any regression, you can find it by the 7. step.
+
+## Usage
+
+This section describe how to use
+`groonga-query-log-run-regression-test`.
+
+First, you need to prepare input data. Then you can run regression
+test.
+
+### Prepare
+
+This section describes how to prepare to run regression test.
+
+Create a directory that has the following structure:
+
+    .
+    |-- schema/
+    |-- indexes/
+    |-- data/
+    `-- query-logs/
+
+The following sections describe how to prepare the directories.
+
+#### `schema/`
+
+Put database schema definitions to `schema/` directory. Each file must
+have `.grn` extension such as `ddl.grn`.
+
+You can generate a file to be placed into `schema/` from an existing
+Groonga database by `grndump` command:
+
+    % grndump --no-dump-indexes --no-dump-tables /groonga/db > schema/ddl.grn
+
+Note that `grndump` command is provided by Rroonga. You can install
+Rroonga by the following command:
+
+    % gem install rroonga
+
+#### `indexes/`
+
+Put index definitions to `indexes/` directory. Each file must have
+`.grn` extension such as `indexes.grn`.
+
+You can put index definitions to `schema/` directory. But it is better
+that put index definitions to `indexes/` directory rather than
+`schema/` directory. Because it is faster.
+
+If you use `indexes/` directory, you can use
+[offline index construction][]. Offline index construction is 10 times
+faster than [online index construction][].
+
+You can generate a file to be placed into `indexes/` from an existing
+Groonga database by `grndump` command:
+
+    % grndump --no-dump-schema --no-dump-tables /groonga/db > indexes/indexes.grn
+
+#### `data/`
+
+Put data to `data/` directory. Each file must have `.grn` extension
+such as `data.grn`.
+
+You can generate a file to be placed into `data/` from an existing
+Groonga database by `grndump` command:
+
+    % grndump --no-dump-schema --no-dump-indexes /groonga/db > data/data.grn
+
+#### `query-logs/`
+
+Put query logs to `query-logs/` directory. Each file must have `.log`
+extension such as `query.log`.
+
+You can put multiple log files like the following:
+
+    query-logs/
+    |-- query-20140506.log
+    |-- query-20140507.log
+    `-- query-20140508.log
+
+Here are links to documents that describe how to create a query log:
+
+  * Groonga server users: You can create a query log file by using
+    `--query-log-path` option. See [groonga command][] documentation
+    for details.
+  * Groonga HTTPD users: You can create a query log file by using
+    `groonga_query_log_path` directive. See [groonga_query_log_path][] documentation
+    for details.
+
+### Run
+
+Now, you can run regression test.
+
+Let the followings:
+
+  * Use `~/groonga/test` as the working directory to run
+    regression test.
+  * There is the current Groonga database at `/var/lib/groonga/db`.
+  * There are the current query logs at `/var/log/groonga/query-*.log`.
+  * The current Groonga is installed at `/opt/groonga-current/bin/groonga`.
+  * The new Groonga is installed at `/opt/groonga-new/bin/groonga`.
+
+Install required packages:
+
+    % gem install rroonga groonga-query-log
+
+Prepare the working directory:
+
+    % mkdir -p ~/groonga/test/{schema,indexes,data,query-logs}
+    % cd ~/groonga/test/
+
+Extract needed data from the current database:
+
+    % grndump --no-dump-indexes --no-dump-tables /var/lib/groonga/db > schema/ddl.grn
+    % grndump --no-dump-schema --no-dump-tables /var/lib/groonga/db > indexes/indexes.grn
+    % grndump --no-dump-schema --no-dump-indexes /var/lib/groonga/db > data/data.grn
+    % cp /var/log/groonga/query-*.log query-logs/
+
+Run regression test:
+
+    % groonga-query-log-run-regression-test \
+        --old-groonga=/opt/groonga-current/bin/groonga \
+        --new-groonga=/opt/groonga-new/bin/groonga
+
+It creates new two databases from input data. One is created by the
+current Groonga. Another is created by the new Groonga.
+
+It starts to send requests in a query log to both Groonga servers
+after databases are created. If responses don't have difference, the
+request isn't a problem. If responses have any difference, the request
+may be a problem.
+
+You can find details about requests that generate different response in test
+result logs. You can find test result logs under `results/`
+directory. Test result log file name is the same as input query log
+file name. If query log file is `query-logs/query-20140508.log`, test
+result log file is `results/query-20140508.log`.
+
+## Advanced usage
+
+There are some advanced usages. This section describes about them.
+
+### `--n-clients`
+
+If your machine has free resource, you can speed up a regression test.
+
+Use `--n-clients` option to send multiple requests concurrently. It
+will reduce execution time.
+
+Here is a sample command line to use `--n-clients`:
+
+    % groonga-query-log-run-regression-test \
+        --n-clients=4 \
+        --old-groonga=/opt/groonga-current/bin/groonga \
+        --new-groonga=/opt/groonga-new/bin/groonga
+
+## Conclusion
+
+You can run regression test with
+`groonga-query-log-run-regression-test`. It helps you to upgrade
+Groonga safely by confirming a new Groonga doesn't have problem with
+your data.
+
+  [online index construction]: http://groonga.org/docs/reference/indexing.html#online-index-construction
+  [offline index construction]: http://groonga.org/docs/reference/indexing.html#offline-index-construction
+  [groonga command]: http://groonga.org/docs/reference/executables/groonga.html
+  [groonga_query_log_path]: http://groonga.org/docs/reference/executables/groonga-httpd.html#groonga-query-log-path

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

@@ -0,0 +1,375 @@
+# 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 "rbconfig"
+require "optparse"
+require "socket"
+require "fileutils"
+require "pathname"
+require "net/http"
+
+require "groonga/query-log"
+require "groonga/query-log/command/verify-server"
+
+module Groonga
+  module QueryLog
+    module Command
+      class RunRegressionTest
+        def initialize
+          @input_directory = Pathname.new(".")
+          @working_directory = Pathname.new(".")
+
+          @old_groonga = "groonga"
+          @old_database = "db.old/db"
+
+          @new_groonga = "groonga"
+          @new_database = "db.new/db"
+
+          @recreate_database = false
+          @load_data = true
+          @run_queries = true
+          @skip_finished_queries = false
+        end
+
+        def run(*command_line)
+          option_parser = create_option_parser
+          begin
+            option_parser.parse!(command_line)
+          rescue OptionParser::ParseError => error
+            $stderr.puts(error.message)
+            return false
+          end
+
+          tester = Tester.new(old_groonga_server,
+                              new_groonga_server,
+                              tester_options)
+          tester.run
+        end
+
+        private
+        def create_option_parser
+          parser = OptionParser.new
+          parser.version = VERSION
+
+          parser.separator("")
+          parser.separator("Path:")
+          parser.on("--input-directory=DIRECTORY",
+                    "Load schema and data from DIRECTORY.",
+                    "(#{@input_directory})") do |directory|
+            @input_directory = Pathname.new(directory)
+          end
+          parser.on("--working-directory=DIRECTORY",
+                    "Use DIRECTORY as working directory.",
+                    "(#{@working_directory})") do |directory|
+            @working_directory = Pathname.new(directory)
+          end
+
+          parser.separator("")
+          parser.separator("Throughput:")
+          parser.on("--n-clients=N", Integer,
+                    "Use N clients concurrently.",
+                    "(#{@n_clients})") do |n|
+            @n_clients = n
+          end
+
+          parser.separator("")
+          parser.separator("Old Groonga:")
+          parser.on("--old-groonga=GROONGA",
+                    "Old groonga command",
+                    "(#{@old_groonga})") do |groonga|
+            @old_groonga = groonga
+          end
+
+          parser.separator("")
+          parser.separator("New Groonga:")
+          parser.on("--new-groonga=GROONGA",
+                    "New groonga command",
+                    "(#{@new_groonga})") do |groonga|
+            @new_groonga = groonga
+          end
+
+          parser.separator("")
+          parser.separator("Operations:")
+          parser.on("--recreate-database",
+                    "Always recreate Groonga database") do
+            @recreate_database = true
+          end
+          parser.on("--no-load-data",
+                    "Don't load data. Just loads schema to Groonga database") do
+            @load_data = false
+          end
+          parser.on("--no-run-queries",
+                    "Don't run queries. Just creates Groonga database") do
+            @run_queries = false
+          end
+          parser.on("--skip-finished-queries",
+                    "Don't run finished query logs.") do
+            @skip_finished_queries = true
+          end
+
+          parser
+        end
+
+        def directory_options
+          {
+            :input_directory   => @input_directory,
+            :working_directory => @working_directory,
+          }
+        end
+
+        def server_options
+          options = {
+            :load_data             => @load_data,
+            :run_queries           => @run_queries,
+            :recreate_database     => @recreate_database,
+            :skip_finished_queries => @skip_finished_queries,
+          }
+          directory_options.merge(options)
+        end
+
+        def tester_options
+          options = {
+            :n_clients => @n_clients,
+          }
+          directory_options.merge(options)
+        end
+
+        def old_groonga_server
+          GroongaServer.new(@old_groonga,
+                            @old_database,
+                            server_options)
+        end
+
+        def new_groonga_server
+          GroongaServer.new(@new_groonga,
+                            @new_database,
+                            server_options)
+        end
+
+        class GroongaServer
+          attr_reader :host, :port
+          def initialize(groonga, database_path, options)
+            @input_directory = options[:input_directory] || Pathname.new(".")
+            @working_directory = options[:working_directory] || Pathname.new(".")
+            @groonga = groonga
+            @database_path = @working_directory + database_path
+            @host = "127.0.0.1"
+            @port = find_unused_port
+            @options = options
+          end
+
+          def run
+            ensure_database
+            return unless @options[:run_queries]
+
+            @pid = spawn(@groonga,
+                         "--bind-address", @host,
+                         "--port", @port.to_s,
+                         "--log-path", log_path.to_s,
+                         "--query-log-path", query_log_path.to_s,
+                         "--protocol", "http",
+                         "-s",
+                         @database_path.to_s)
+
+            n_retries = 10
+            begin
+              send_command("status")
+            rescue SystemCallError
+              sleep(1)
+              n_retries -= 1
+              raise if n_retries.zero?
+              retry
+            end
+
+            yield
+          end
+
+          def shutdown
+            begin
+              send_command("shutdown")
+            rescue SystemCallError
+            end
+            Process.waitpid(@pid)
+          end
+
+          private
+          def find_unused_port
+            server = TCPServer.new(@host, 0)
+            begin
+              server.addr[1]
+            ensure
+              server.close
+            end
+          end
+
+          def log_path
+            @database_path.dirname + "groonga.log"
+          end
+
+          def query_log_path
+            @database_path.dirname + "query.log"
+          end
+
+          def ensure_database
+            if @options[:recreate_database]
+              FileUtils.rm_rf(@database_path.dirname.to_s)
+            end
+
+            return if @database_path.exist?
+            FileUtils.mkdir_p(@database_path.dirname.to_s)
+            system(@groonga, "-n", @database_path.to_s, "quit")
+            grn_files.each do |grn_file|
+              command = [@groonga, @database_path.to_s]
+              command_line = "#{command.join(' ')} < #{grn_file}"
+              puts("Running...: #{command_line}")
+              pid = spawn(*command, :in => grn_file.to_s)
+              begin
+                pid, status = Process.waitpid2(pid)
+              rescue Interrupt
+                Process.kill(:TERM, pid)
+                pid, status = Process.waitpid2(pid)
+              end
+              unless status.success?
+                raise "Failed to run: #{command_line}"
+              end
+            end
+          end
+
+          def send_command(name)
+            Net::HTTP.start(@host, @port) do |http|
+              response = http.get("/d/#{name}")
+              response.body
+            end
+          end
+
+          def grn_files
+            files = schema_files
+            files += data_files if @options[:load_data]
+            files += index_files
+            files
+          end
+
+          def schema_files
+            Pathname.glob("#{@input_directory}/schema/**/*.grn").sort
+          end
+
+          def index_files
+            Pathname.glob("#{@input_directory}/indexes/**/*.grn").sort
+          end
+
+          def data_files
+            Pathname.glob("#{@input_directory}/data/**/*.grn").sort
+          end
+        end
+
+        class Tester
+          def initialize(old, new, options)
+            @old = old
+            @new = new
+            @input_directory = options[:input_directory] || Pathname.new(".")
+            @working_directory = options[:working_directory] || Pathname.new(".")
+            @n_clients = options[:n_clients] || 1
+            @options = options
+            @n_ready_waits = 2
+            @clone_pids = []
+          end
+
+          def run
+            old_thread = Thread.new do
+              @old.run do
+                run_test
+              end
+            end
+            new_thread = Thread.new do
+              @new.run do
+                run_test
+              end
+            end
+
+            old_thread.join
+            new_thread.join
+          end
+
+          private
+          def run_test
+            @n_ready_waits -= 1
+            return unless @n_ready_waits.zero?
+
+            @clone_pids.each do |pid|
+              Process.waitpid(pid)
+            end
+
+            query_log_paths.each do |query_log_path|
+              log_path = test_log_path(query_log_path)
+              if @options[:skip_finished_queries] and log_path.exist?
+                puts("Skip query log: #{query_log_path}")
+                next
+              else
+                puts("Running test against query log...: #{query_log_path}")
+              end
+              pid = fork do
+                verify_server(log_path, query_log_path)
+                exit!
+              end
+              begin
+                Process.waitpid(pid)
+              rescue Interrupt
+                Process.kill(:TERM, pid)
+                Process.waitpid(pid)
+              end
+            end
+
+            old_thread = Thread.new do
+              @old.shutdown
+            end
+            new_thread = Thread.new do
+              @new.shutdown
+            end
+            old_thread.join
+            new_thread.join
+
+            true
+          end
+
+          def verify_server(test_log_path, query_log_path)
+            command_line = [
+              "--n-clients=#{@n_clients}",
+              "--groonga1-host=#{@old.host}",
+              "--groonga1-port=#{@old.port}",
+              "--groonga1-protocol=http",
+              "--groonga2-host=#{@new.host}",
+              "--groonga2-port=#{@new.port}",
+              "--groonga2-protocol=http",
+              "--target-command-name=select",
+              "--output", test_log_path.to_s,
+              query_log_path.to_s,
+            ]
+            verify_serer = VerifyServer.new
+            verify_serer.run(*command_line)
+          end
+
+          def query_log_paths
+            Pathname.glob("#{@input_directory}/query-logs/**/*.log").sort
+          end
+
+          def test_log_path(query_log_path)
+            @working_directory + "results" + query_log_path.basename
+          end
+        end
+      end
+    end
+  end
+end

data/lib/groonga/query-log/response-comparer.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -26,23 +24,41 @@ module Groonga
       end
 
       def same?
-        case @command.name
-        when "select"
-          same_select_response?
+        if error_response?(@response1) or error_response?(@response2)
+          if error_response?(@response1) and error_response?(@response2)
+            same_error_response?
+          else
+            false
+          end
         else
-          same_response?
+          case @command.name
+          when "select"
+            same_select_response?
+          else
+            same_response?
+          end
         end
       end
 
       private
+      def error_response?(response)
+        response.is_a?(Client::Response::Error)
+      end
+
+      def same_error_response?
+        return_code1 = @response1.header[0]
+        return_code2 = @response2.header[0]
+        return_code1 == return_code2
+      end
+
       def same_response?
-        @response1 == @response2
+        @response1.body == @response2.body
       end
 
       def same_select_response?
         if random_sort?
-          records_result1 = @response1[0] || []
-          records_result2 = @response2[0] || []
+          records_result1 = @response1.body[0] || []
+          records_result2 = @response2.body[0] || []
           records_result1.size == records_result2.size and
             records_result1[0..1] == records_result2[0..1]
         else

data/lib/groonga/query-log/server-verifier.rb

@@ -60,15 +60,8 @@ module Groonga
       def run_consumers
         @options.n_clients.times.collect do
           Thread.new do
-            begin
-              loop do
-                break if run_consumer
-              end
-            rescue Groonga::Client::Connection::Error
-              # TODO: add error log mechanism
-              $stderr.puts(Time.now.iso8601)
-              $stderr.puts($!.raw_error.message)
-              $stderr.puts($!.raw_error.backtrace)
+            loop do
+              break if run_consumer
             end
           end
         end
@@ -83,12 +76,10 @@ module Groonga
               begin
                 verify_command(groonga1_client, groonga2_client,
                                statistic.command)
-              rescue Groonga::Client::Connection::Error
-                # TODO: add error log mechanism
-                $stderr.puts(Time.now.iso8601)
-                $stderr.puts(statistic.command.original_source)
-                $stderr.puts($!.raw_error.message)
-                $stderr.puts($!.raw_error.backtrace)
+              rescue Groonga::Client::Error
+                log_client_error($!) do
+                  $stderr.puts(statistic.command.original_source)
+                end
                 return false
               end
             end
@@ -116,7 +107,7 @@ module Groonga
         command["cache"] = "no" if @options.disable_cache?
         response1 = groonga1_client.execute(command)
         response2 = groonga2_client.execute(command)
-        comparer = ResponseComparer.new(command, response1.body, response2.body)
+        comparer = ResponseComparer.new(command, response1, response2)
         unless comparer.same?
           @different_results.push([command, response1, response2])
         end
@@ -129,6 +120,18 @@ module Groonga
         output.puts("response2: #{response2.body}")
       end
 
+      def log_client_error(error)
+        $stderr.puts(Time.now.iso8601)
+        yield if block_given?
+        if error.respond_to?(:raw_error)
+          target_error = error.raw_error
+        else
+          target_error = error
+        end
+        $stderr.puts("#{target_error.class}: #{target_error.message}")
+        $stderr.puts(target_error.backtrace)
+      end
+
       class Options
         attr_reader :groonga1
         attr_reader :groonga2
@@ -165,6 +168,7 @@ module Groonga
 
         def create_output(&block)
           if @output_path
+            FileUtils.mkdir_p(File.dirname(@output_path))
             File.open(@output_path, "w", &block)
           else
             yield($stdout)

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

@@ -18,6 +18,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

data/test/test-replayer.rb

@@ -33,8 +33,8 @@ class ReplayerTest < Test::Unit::TestCase
 
       def test_port
         port = 2929
-        @options.port = 2929
-        mock_client_open(:port => 2929)
+        @options.port = port
+        mock_client_open(:port => port)
         replay
       end
 

data/test/test-response-comparer.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -19,6 +17,8 @@
 class ResponseComparerTest < Test::Unit::TestCase
   private
   def comparer(response1, response2)
+    response1 = normalize_response(response1)
+    response2 = normalize_response(response2)
     Groonga::QueryLog::ResponseComparer.new(@command, response1, response2)
   end
 
@@ -26,6 +26,24 @@ class ResponseComparerTest < Test::Unit::TestCase
     comparer(response1, response2).same?
   end
 
+  def response(body)
+    header = [0, 0.0, 0.0]
+    response_class = Groonga::Client::Response.find(@command.name)
+    response_class.new(@command, header, body)
+  end
+
+  def error_response(header)
+    Groonga::Client::Response::Error.new(@command, header, [])
+  end
+
+  def normalize_response(response_or_body)
+    if response_or_body.is_a?(Groonga::Client::Response::Base)
+      response_or_body
+    else
+      response(response_or_body)
+    end
+  end
+
   class SelectTest < self
     def setup
       @command = Groonga::Command::Select.new("select", {})
@@ -63,7 +81,7 @@ class ResponseComparerTest < Test::Unit::TestCase
         private
         def random_score?(scorer)
           @command["scorer"] = scorer
-          comparer([], []).send(:random_score?)
+          comparer([[[0]]], [[[0]]]).send(:random_score?)
         end
       end
     end
@@ -73,7 +91,7 @@ class ResponseComparerTest < Test::Unit::TestCase
         private
         def score_sort?(sortby)
           @command["sortby"] = sortby
-          comparer([], []).send(:score_sort?)
+          comparer([[[0]]], [[[0]]]).send(:score_sort?)
         end
 
         class NoScoreTest < self
@@ -119,5 +137,26 @@ class ResponseComparerTest < Test::Unit::TestCase
         end
       end
     end
+
+    class ErrorTest < self
+      def test_with_location
+        response1_header = [
+          -63,
+          1.0,
+          0.1,
+          "Syntax error! ()",
+          [
+            ["yy_syntax_error", "ecmascript.lemon", 24],
+          ],
+        ]
+        response2_header = JSON.parse(response1_header.to_json)
+        response2_header[4][0][2] += 1
+        assert_not_equal(response1_header, response2_header)
+
+        response1 = error_response(response1_header)
+        response2 = error_response(response2_header)
+        assert_true(same?(response1, response2))
+      end
+    end
   end
 end

metadata

@@ -1,220 +1,224 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: groonga-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
 email:
 - kou@clear-code.com
 executables:
-- groonga-query-log-detect-memory-leak
-- groonga-query-log-verify-server
+- groonga-query-log-run-regression-test
 - groonga-query-log-analyze
+- groonga-query-log-detect-memory-leak
 - groonga-query-log-replay
 - groonga-query-log-extract
+- groonga-query-log-verify-server
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- Gemfile
 - README.md
 - Rakefile
-- Gemfile
+- bin/groonga-query-log-analyze
+- bin/groonga-query-log-detect-memory-leak
+- bin/groonga-query-log-extract
+- bin/groonga-query-log-replay
+- bin/groonga-query-log-run-regression-test
+- bin/groonga-query-log-verify-server
+- doc/text/lgpl-2.1.txt
+- doc/text/news.md
+- doc/text/run-regression-test.md
 - groonga-query-log.gemspec
 - lib/groonga/query-log.rb
-- lib/groonga/query-log/version.rb
-- lib/groonga/query-log/extractor.rb
-- lib/groonga/query-log/command/verify-server.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.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/detect-memory-leak.rb
 - lib/groonga/query-log/command/replay.rb
+- lib/groonga/query-log/command/run-regression-test.rb
+- lib/groonga/query-log/command/verify-server.rb
+- lib/groonga/query-log/extractor.rb
 - lib/groonga/query-log/memory-leak-detector.rb
 - lib/groonga/query-log/parser.rb
-- lib/groonga/query-log/analyzer.rb
+- lib/groonga/query-log/replayer.rb
 - lib/groonga/query-log/response-comparer.rb
-- lib/groonga/query-log/command-line-utils.rb
 - lib/groonga/query-log/server-verifier.rb
-- lib/groonga/query-log/replayer.rb
-- lib/groonga/query-log/analyzer/statistic.rb
-- lib/groonga/query-log/analyzer/streamer.rb
-- lib/groonga/query-log/analyzer/sized-statistics.rb
-- lib/groonga/query-log/analyzer/sized-grouped-operations.rb
-- lib/groonga/query-log/analyzer/reporter.rb
-- lib/groonga/query-log/analyzer/reporter/console.rb
-- lib/groonga/query-log/analyzer/reporter/json.rb
-- lib/groonga/query-log/analyzer/reporter/html.rb
-- doc/text/news.md
-- doc/text/lgpl-2.1.txt
-- .yardopts
-- test/test-replayer.rb
+- lib/groonga/query-log/version.rb
 - test/command/test-select.rb
-- test/test-response-comparer.rb
-- test/groonga-query-log-test-utils.rb
-- test/test-extractor.rb
-- test/run-test.rb
-- test/fixtures/n_entries.expected
-- test/fixtures/other-query.log
 - test/fixtures/multi.expected
+- test/fixtures/n_entries.expected
+- test/fixtures/no-report-summary.expected
+- test/fixtures/order/-elapsed.expected
 - test/fixtures/order/-start-time.expected
 - test/fixtures/order/elapsed.expected
 - test/fixtures/order/start-time.expected
-- test/fixtures/order/-elapsed.expected
-- test/fixtures/no-report-summary.expected
+- test/fixtures/other-query.log
 - test/fixtures/query.log
-- test/fixtures/reporter/json.expected
-- test/fixtures/reporter/html.expected
 - test/fixtures/reporter/console.expected
+- test/fixtures/reporter/html.expected
+- test/fixtures/reporter/json.expected
+- test/groonga-query-log-test-utils.rb
+- test/run-test.rb
 - test/test-analyzer.rb
+- test/test-extractor.rb
 - test/test-parser.rb
-- bin/groonga-query-log-detect-memory-leak
-- bin/groonga-query-log-verify-server
-- bin/groonga-query-log-analyze
-- bin/groonga-query-log-replay
-- bin/groonga-query-log-extract
+- test/test-replayer.rb
+- test/test-response-comparer.rb
 homepage: https://github.com/groonga/groonga-query-log
 licenses:
 - LGPLv2.1+
@@ -225,42 +229,42 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.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
+summary: Groonga-query-log is a collection of library and tools to process [Groonga](http://groonga.org/)'s
   query log. You can write a program to process query log by using groonga-query-log
-  as a library. You can analyze your groonga's queries and test with your groonga's
+  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-replayer.rb
-- test/command/test-select.rb
-- test/test-response-comparer.rb
-- test/groonga-query-log-test-utils.rb
-- test/test-extractor.rb
 - test/run-test.rb
-- test/fixtures/n_entries.expected
-- test/fixtures/other-query.log
-- test/fixtures/multi.expected
-- test/fixtures/order/-start-time.expected
+- test/test-extractor.rb
+- test/command/test-select.rb
+- test/test-analyzer.rb
+- test/test-replayer.rb
+- test/test-parser.rb
+- test/fixtures/no-report-summary.expected
 - test/fixtures/order/elapsed.expected
+- test/fixtures/order/-start-time.expected
 - test/fixtures/order/start-time.expected
 - test/fixtures/order/-elapsed.expected
-- test/fixtures/no-report-summary.expected
-- test/fixtures/query.log
+- test/fixtures/n_entries.expected
+- test/fixtures/other-query.log
 - test/fixtures/reporter/json.expected
-- test/fixtures/reporter/html.expected
 - test/fixtures/reporter/console.expected
-- test/test-analyzer.rb
-- test/test-parser.rb
+- test/fixtures/reporter/html.expected
+- test/fixtures/multi.expected
+- test/fixtures/query.log
+- test/groonga-query-log-test-utils.rb
+- test/test-response-comparer.rb
 has_rdoc: