groonga-query-log 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddc27e0fcae0618400de2f9d3283dfe2b2cb11c6
-  data.tar.gz: b2a3ed1b2a07396d10d2b810f6c621edbe71a8ad
+  metadata.gz: eb5671eabd420c831e66da0a0ecb8c76788e6b7a
+  data.tar.gz: 635098f7db2bb18cea3a3f5626c85ef5a924c643
 SHA512:
-  metadata.gz: 81cad11fafb5f09332077f8c9b50da20d1d8e674d96e1675f872a17539d0696b177db31f02990f70fd798d5d7caf943950dbcb30822d482d6a0922f4a0a840a7
-  data.tar.gz: 9fa93309d8bf11f63a0214d464fe632eabde8ce72449a9d8dc0faef93064ba9d027bc84aaa99a23a6263535fb3cb64f917df80dccd25f924ea8095a0495e2531
+  metadata.gz: fb4900d64685c1d444756c1fcc10aa02300ae5c198dd8d8998c979158e06d31be0b45c48da74b6152a38408a78bd2ffad1fa961fd70fe94952c30b02049abb1a
+  data.tar.gz: 27d9c1647ce24ec881e51fbf774dab77f9fd718cb8c7e81f9d1c017a4e6332b9fbff7884266a4efdfa38624376a7955635ea1047b9d617bc4ad413853cdb40a9

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 1.1.2: 2014-11-20
+
+### Fixes
+
+  * groonga-query-log-format-regression-test-logs: Fixed a bug
+    that the command doesn't work in normal usage.
+
 ## 1.1.1: 2014-11-06
 
 ### Improvements

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

@@ -158,6 +158,30 @@ 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`.
 
+### Confirm
+
+You can show details of different between the current Groonga and the
+new Groonga by `groonga-query-log-format-regression-test-logs` command:
+
+    % groonga-query-log-format-regression-test-logs results/*.log
+
+Here is a sample output:
+
+    select Logs
+    Name: select
+    Arguments:
+      table: Logs
+    --- old
+    +++ new
+    @@ -1,4 +1,5 @@
+    -[[[2],
+    +[[[3],
+       [["_id", "UInt32"], ["message", "Text"]],
+       [1, "log message1"],
+    -  [2, "log message2"]]]
+    +  [2, "log message2"],
+    +  [3, "log message3"]]]
+
 ## Advanced usage
 
 There are some advanced usages. This section describes about them.

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

@@ -21,6 +21,8 @@ require "pp"
 require "optparse"
 require "json"
 
+require "groonga/command/parser"
+
 require "groonga/query-log/version"
 
 module Groonga
@@ -60,8 +62,8 @@ module Groonga
         private
         def format_log(input, path)
           command = nil
-          response1 = nil
-          response2 = nil
+          response_old = nil
+          response_new = nil
 
           input.each_line do |line|
             unless line.valid_encoding?
@@ -73,32 +75,32 @@ module Groonga
             when /\Acommand: /
               command = $POSTMATCH.chomp
             when /\Aresponse1: /
-              response1 = $POSTMATCH.chomp
+              response_old = $POSTMATCH.chomp
             when /\Aresponse2: /
-              response2 = $POSTMATCH.chomp
-              next unless valid_entry?(command, response1, response2)
-              report_diff(command, repsponse1, response2)
+              response_new = $POSTMATCH.chomp
+              next unless valid_entry?(command, response_old, response_new)
+              report_diff(command, response_old, response_new)
             end
           end
         end
 
-        def valid_entry?(command, response1, response2)
+        def valid_entry?(command, response_old, response_new)
           valid = true
 
           begin
-            JSON.parse(response1)
+            JSON.parse(response_old)
           rescue JSON::ParserError
             puts(command)
-            puts("failed to parse response1: #{$!.message}")
+            puts("failed to parse old response: #{$!.message}")
             puts(response1)
             valid = false
           end
 
           begin
-            JSON.parse(response2)
+            JSON.parse(response_new)
           rescue JSON::ParserError
             puts(command)
-            puts("failed to parse response2: #{$!.message}")
+            puts("failed to parse new response: #{$!.message}")
             puts(response2)
             valid = false
           end
@@ -106,23 +108,37 @@ module Groonga
           valid
         end
 
-        def report_diff(command, response1, response2)
-          return if response1 == response2
+        def report_diff(command, response_old, response_new)
+          return if response_old == response_new
 
-          base_name = File.basename(path, ".*")
-          Tempfile.open("response1-#{base_name}") do |response1_file|
-            PP.pp(JSON.parse(response1), response1_file)
-            response1_file.flush
-            Tempfile.open("response2-#{base_name}") do |response2_file|
-              PP.pp(JSON.parse(response2), response2_file)
-              response2_file.flush
-              puts(command)
+          Tempfile.open("response-old") do |response_old_file|
+            PP.pp(JSON.parse(response_old), response_old_file)
+            response_old_file.flush
+            Tempfile.open("response-new") do |response_new_file|
+              PP.pp(JSON.parse(response_new), response_new_file)
+              response_new_file.flush
+              report_command(command)
               system("diff",
+                     "--label=old",
+                     "--label=new",
                      "-u",
-                     response1_file.path, response2_file.path)
+                     response_old_file.path, response_new_file.path)
             end
           end
         end
+
+        def report_command(command)
+          puts(command)
+          parsed_command = Groonga::Command::Parser.parse(command)
+          puts("Name: #{parsed_command.name}")
+          puts("Arguments:")
+          sorted_arguments = parsed_command.arguments.sort_by do |key, value|
+            key
+          end
+          sorted_arguments.each do |key, value|
+            puts("  #{key}: #{value}")
+          end
+        end
       end
     end
   end

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

@@ -18,6 +18,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

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

@@ -0,0 +1,88 @@
+# -*- 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/format-regression-test-logs"
+
+class FormatRegressionTestLogsCommandTest < Test::Unit::TestCase
+  include Path
+
+  def setup
+    @command = Groonga::QueryLog::Command::FormatRegressionTestLogs.new
+  end
+
+  def run_command(command_line)
+    stdout = $stdout.dup
+    output = Tempfile.open("output")
+    $stdout.reopen(output)
+    succees = @command.run(command_line)
+    output.rewind
+    [succees, output.read]
+  ensure
+    $stdout.reopen(stdout)
+  end
+
+  def fixture_path(*components)
+    super("regression-test-logs", *components)
+  end
+
+  def test_nothing
+    input = Tempfile.new("format-regression-test-logs")
+    assert_equal([true, ""],
+                 run_command([input.path]))
+  end
+
+  def test_command_format
+    output = <<-OUTPUT
+select Logs
+Name: select
+Arguments:
+  table: Logs
+--- old
++++ new
+@@ -1,4 +1,4 @@
+ [[[2],
+   [[\"_id\", \"UInt32\"], [\"message\", \"Text\"]],
+   [1, \"log message1\"],
+-  [2, \"log message2\"]]]
++  [3, \"log message3\"]]]
+    OUTPUT
+    assert_equal([true, output],
+                 run_command([fixture_path("command-format.log")]))
+  end
+
+  def test_url_format
+    output = <<-OUTPUT
+/d/select?table=Logs&match_columns=message&query=%E7%84%BC%E8%82%89
+Name: select
+Arguments:
+  match_columns: message
+  query: 焼肉
+  table: Logs
+--- old
++++ new
+@@ -1,4 +1,4 @@
+ [[[2],
+   [[\"_id\", \"UInt32\"], [\"message\", \"Text\"]],
+   [1, \"log message1: 焼肉\"],
+-  [2, \"log message2: 焼肉\"]]]
++  [3, \"log message3: 焼肉\"]]]
+    OUTPUT
+    assert_equal([true, output],
+                 run_command([fixture_path("url-format.log")]))
+  end
+end

data/test/fixtures/regression-test-logs/command-format.log

@@ -0,0 +1,3 @@
+command: select Logs
+response1: [[[2], [["_id", "UInt32"], ["message", "Text"]], [1, "log message1"], [2, "log message2"]]]
+response2: [[[2], [["_id", "UInt32"], ["message", "Text"]], [1, "log message1"], [3, "log message3"]]]

data/test/fixtures/regression-test-logs/url-format.log

@@ -0,0 +1,3 @@
+command: /d/select?table=Logs&match_columns=message&query=%E7%84%BC%E8%82%89
+response1: [[[2], [["_id", "UInt32"], ["message", "Text"]], [1, "log message1: 焼肉"], [2, "log message2: 焼肉"]]]
+response2: [[[2], [["_id", "UInt32"], ["message", "Text"]], [1, "log message1: 焼肉"], [3, "log message3: 焼肉"]]]

data/test/helper.rb

@@ -0,0 +1,30 @@
+# -*- 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 "cgi"
+require "stringio"
+
+require "groonga/command"
+
+require "groonga/query-log"
+
+module Path
+  def fixture_path(*components)
+    File.join(File.dirname(__FILE__), "fixtures", *components)
+  end
+end

data/test/run-test.rb

@@ -47,7 +47,7 @@ Test::Unit::Priority.enable
 $LOAD_PATH.unshift(lib_dir.to_s)
 
 $LOAD_PATH.unshift(test_dir.to_s)
-require "groonga-query-log-test-utils"
+require "helper"
 
 Dir.glob("#{base_dir}/test/**/test{_,-}*.rb") do |file|
   require file.sub(/\.rb\z/, '')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -211,7 +211,7 @@ files:
 - lib/groonga/query-log/response-comparer.rb
 - lib/groonga/query-log/server-verifier.rb
 - lib/groonga/query-log/version.rb
-- test/command/test-select.rb
+- test/command/test-format-regression-test-logs.rb
 - test/fixtures/multi.expected
 - test/fixtures/n_entries.expected
 - test/fixtures/no-report-summary.expected
@@ -221,11 +221,13 @@ files:
 - test/fixtures/order/start-time.expected
 - test/fixtures/other-query.log
 - test/fixtures/query.log
+- test/fixtures/regression-test-logs/command-format.log
+- test/fixtures/regression-test-logs/url-format.log
 - test/fixtures/reporter/console.expected
 - test/fixtures/reporter/html.expected
 - test/fixtures/reporter/json-stream.expected
 - test/fixtures/reporter/json.expected
-- test/groonga-query-log-test-utils.rb
+- test/helper.rb
 - test/run-test.rb
 - test/test-analyzer.rb
 - test/test-extractor.rb
@@ -263,9 +265,8 @@ summary: Groonga-query-log is a collection of library and tools to process [Groo
 test_files:
 - test/test-analyzer.rb
 - test/test-parser.rb
-- test/groonga-query-log-test-utils.rb
 - test/test-response-comparer.rb
-- test/command/test-select.rb
+- test/command/test-format-regression-test-logs.rb
 - test/fixtures/other-query.log
 - test/fixtures/reporter/console.expected
 - test/fixtures/reporter/html.expected
@@ -274,11 +275,14 @@ test_files:
 - test/fixtures/query.log
 - test/fixtures/multi.expected
 - test/fixtures/no-report-summary.expected
+- test/fixtures/regression-test-logs/url-format.log
+- test/fixtures/regression-test-logs/command-format.log
 - test/fixtures/n_entries.expected
 - test/fixtures/order/-start-time.expected
 - test/fixtures/order/elapsed.expected
 - test/fixtures/order/start-time.expected
 - test/fixtures/order/-elapsed.expected
+- test/helper.rb
 - test/run-test.rb
 - test/test-incompatibility-detector.rb
 - test/test-extractor.rb

data/test/command/test-select.rb

@@ -1,162 +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
-
-class SelectCommandTest < Test::Unit::TestCase
-  module ParseTests
-    def test_parameters
-      select = parse("select",
-                     :table => "Users",
-                     :filter => "age<=30")
-      assert_equal(command("select",
-                           "table" => "Users",
-                           "filter" => "age<=30",
-                           "output_type" => "json"),
-                   select)
-    end
-
-    def test_scorer
-      select = parse("select",
-                     :table => "Users",
-                     :filter => "age<=30",
-                     :scorer => "_score = random()")
-      assert_equal("_score = random()", select.scorer)
-    end
-
-    def test_to_uri_format
-      select = parse("select",
-                     :table => "Users",
-                     :filter => "age<=30")
-      assert_equal("/d/select.json?filter=age%3C%3D30&table=Users",
-                   select.to_uri_format)
-    end
-
-    def test_to_command_format
-      select = parse("select",
-                     :table => "Users",
-                     :filter => "age<=30")
-      assert_equal("select --filter \"age<=30\" " +
-                   "--output_type \"json\" --table \"Users\"",
-                   select.to_command_format)
-    end
-  end
-
-  module ParseFilterTests
-    def test_parenthesis
-      filter = 'geo_in_rectangle(location,' +
-                                '"35.73360x139.7394","62614x139.7714") && ' +
-               '((type == "たいやき" || type == "和菓子")) && ' +
-               'keyword @ "たいやき" &! keyword @ "白" &! keyword @ "養殖"'
-      select = parse("select",
-                     :table => "Users",
-                     :filter => filter)
-      assert_equal(['geo_in_rectangle(location,' +
-                                     '"35.73360x139.7394","62614x139.7714")',
-                     'type == "たいやき"',
-                     'type == "和菓子"',
-                     'keyword @ "たいやき"',
-                     'keyword @ "白"',
-                     'keyword @ "養殖"'],
-                   select.conditions)
-    end
-
-    def test_to_uri_format
-      filter = 'geo_in_rectangle(location,' +
-                                '"35.73360x139.7394","62614x139.7714") && ' +
-               '((type == "たいやき" || type == "和菓子")) && ' +
-               'keyword @ "たいやき" &! keyword @ "白" &! keyword @ "養殖"'
-      select = parse("select",
-                     :table => "Users",
-                     :filter => filter)
-      assert_equal("/d/select.json?filter=geo_in_rectangle%28location%2C" +
-                   "%2235.73360x139.7394%22%2C%2262614x139.7714%22%29+" +
-                   "%26%26+%28%28type+" +
-                   "%3D%3D+%22%E3%81%9F%E3%81%84%E3%82%84%E3%81%8D%22+" +
-                   "%7C%7C+type+%3D%3D+" +
-                   "%22%E5%92%8C%E8%8F%93%E5%AD%90%22%29%29+" +
-                   "%26%26+keyword+%40+" +
-                   "%22%E3%81%9F%E3%81%84%E3%82%84%E3%81%8D%22+%26%21+" +
-                   "keyword+%40+%22%E7%99%BD%22+%26%21+" +
-                   "keyword+%40+%22%E9%A4%8A%E6%AE%96%22&table=Users",
-                   select.to_uri_format)
-    end
-
-    def test_to_command_format
-      filter = 'geo_in_rectangle(location,' +
-                                '"35.73360x139.7394","62614x139.7714") && ' +
-               '((type == "たいやき" || type == "和菓子")) && ' +
-               'keyword @ "たいやき" &! keyword @ "白" &! keyword @ "養殖"'
-      select = parse("select",
-                     :table => "Users",
-                     :filter => filter)
-      assert_equal("select " +
-                   "--filter " +
-                     "\"geo_in_rectangle(location," +
-                     "\\\"35.73360x139.7394\\\",\\\"62614x139.7714\\\") && " +
-                     "((type == \\\"たいやき\\\" || " +
-                       "type == \\\"和菓子\\\")) && " +
-                     "keyword @ \\\"たいやき\\\" &! keyword @ \\\"白\\\" &! " +
-                     "keyword @ \\\"養殖\\\"\" " +
-                   "--output_type \"json\" --table \"Users\"",
-                   select.to_command_format)
-    end
-  end
-
-  class HTTPTest < self
-    include GroongaQueryLogTestUtils::HTTPCommandParser
-
-    def test_uri_format?
-      command = parse("status")
-      assert_predicate(command, :uri_format?)
-    end
-
-    def test_command_format?
-      command = parse("status")
-      assert_not_predicate(command, :command_format?)
-    end
-
-    class ParseTest < self
-      include ParseTests
-    end
-
-    class ParseFilterTest < self
-      include ParseFilterTests
-    end
-  end
-
-  class CommandLineTest < self
-    include GroongaQueryLogTestUtils::CommandLineCommandParser
-
-    def test_uri_format?
-      command = parse("status")
-      assert_not_predicate(command, :uri_format?)
-    end
-
-    def test_command_format?
-      command = parse("status")
-      assert_predicate(command, :command_format?)
-    end
-
-    class ParseTest < self
-      include ParseTests
-    end
-
-    class ParseFilterTest < self
-      include ParseFilterTests
-    end
-  end
-end

data/test/groonga-query-log-test-utils.rb

@@ -1,79 +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 "cgi"
-require "stringio"
-
-require "groonga/command"
-
-require "groonga/query-log"
-
-module GroongaQueryLogTestUtils
-  module CommandParser
-    private
-    def command(name, parameters)
-      command_class = Groonga::Command.find(name)
-      command = command_class.new(name, parameters)
-      command.original_format = :command
-      command
-    end
-
-    def parse_http_path(command, parameters)
-      path = "/d/#{command}.json"
-      unless parameters.empty?
-        uri_parameters = parameters.collect do |key, value|
-          [CGI.escape(key.to_s), CGI.escape(value.to_s)].join("=")
-        end
-        path << "?"
-        path << uri_parameters.join("&")
-      end
-      Groonga::Command::Parser.parse(path)
-    end
-
-    def parse_command_line(command, parameters)
-      command_line = "#{command} --output_type json"
-      parameters.each do |key, value|
-        if /"| / =~ value
-          escaped_value = '"' + value.gsub(/"/, '\"') + '"'
-        else
-          escaped_value = value
-        end
-        command_line << " --#{key} #{escaped_value}"
-      end
-      Groonga::Command::Parser.parse(command_line)
-    end
-  end
-
-  module HTTPCommandParser
-    include CommandParser
-
-    private
-    def parse(command, parameters={})
-      parse_http_path(command, parameters)
-    end
-  end
-
-  module CommandLineCommandParser
-    include CommandParser
-
-    private
-    def parse(command, parameters={})
-      parse_command_line(command, parameters)
-    end
-  end
-end