groonga-query-log 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7240ad397522c036f76e50dc18eedc0f78e46f30195ba5be597ff815e2ac0e60
-  data.tar.gz: 7a1f61f1aae8f991880088b0e0ef342f5c2525283ccf67405eb3cc41fae16226
+  metadata.gz: faeaa6fd86742d02ee7dd26056139a4cc4d267d10e5d18ae70bfb343ab946439
+  data.tar.gz: 4288f0e864a772a278d01bfd0d818d8d7f342234c883e2945025e4a8c881935f
 SHA512:
-  metadata.gz: 6fea044a3f892b6ac10b0ebc6166461378056503208678b15891cd0e4cf0debcf37e6f07e4318c7e07f213c6078dc7bf35e538dbbc4ab7354a39d28cae80947b
-  data.tar.gz: f884e0485c054211b6384ae85ea5a8724b31a2902f02034970b018ba104eaa0b118c12f1f1aae871dac251a4109b3d79a582fe5e7f6057cf41d80f365c0c73ff
+  metadata.gz: de6b0181aa230461a7cfc90aa611587d5458aef929c8c6b85dfacb176f9052ac3ae62525ae86797338f629e330998c60712b6e7f604765cfaddeb2a0c321c648
+  data.tar.gz: 6cdb79c3619951d64ede9dabbce9c136a19bc4b6e7bc23ecfe07c92696be633217478ee7e7dac2c3fc9fd99ab496f6001c085dc956921508fe49a98a63fc6ac3

data/doc/text/news.md

@@ -1,5 +1,20 @@
 # News
 
+## 1.4.4: 2019-08-05
+
+### Improvements
+
+  * `groonga-query-log-run-regression-test`:
+
+    * Added support for rewriting `"&& !" operator`.
+      Specify --rewrite-and-not-operator option to enable it.
+
+### Fixes
+
+  * `rewrite-filter`:
+
+    * Fix a wrong rewrite value.
+
 ## 1.4.3: 2019-05-22
 
 ### Fixes

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

@@ -55,6 +55,7 @@ module GroongaQueryLog
         @rewrite_nullable_reference_number = false
         @nullable_reference_number_accessors = []
         @rewrite_not_or_regular_expression = false
+        @rewrite_and_not_operator = false
 
         @care_order = true
         @ignored_drilldown_keys = []
@@ -220,6 +221,14 @@ module GroongaQueryLog
                   "(#{@rewrite_not_or_regular_expression})") do |boolean|
           @rewrite_not_or_regular_expression = boolean
         end
+        parser.on("--[no-]rewrite-and-not-operator",
+                  "Rewrite '(column1 @ \"keyword1\") && !(column2 @ " +
+                  "\"keyword2\")' " +
+                  "with '(column1 @ \"keyword1\") &! (column2 @ " +
+                  "\"keyword2\")'",
+                  "(#{@rewrite_and_not_operator})") do |boolean|
+          @rewrite_and_not_operator = boolean
+        end
 
         parser.separator("")
         parser.separator("Comparisons:")
@@ -329,6 +338,8 @@ module GroongaQueryLog
             @nullable_reference_number_accessors,
           :rewrite_not_or_regular_expression =>
             @rewrite_not_or_regular_expression,
+          :rewite_and_not_operator =>
+            @rewrite_and_not_operator,
           :target_command_names => @target_command_names,
           :read_timeout => @read_timeout,
         }
@@ -627,6 +638,9 @@ module GroongaQueryLog
           if @options[:rewrite_not_or_regular_expression]
             command_line << "--rewrite-not-or-regular-expression"
           end
+          if @options[:rewrite_and_not_operator]
+            command_line << "--rewrite-and-not-operator"
+          end
           if @options[:target_command_names]
             command_line << "--target-command-names"
             command_line << @options[:target_command_names].join(",")

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

@@ -239,6 +239,15 @@ module GroongaQueryLog
           @options.rewrite_not_or_regular_expression = boolean
         end
 
+        parser.on("--[no-]rewrite-and-not-operator",
+                  "Rewrite '(column1 @ \"keyword1\") && !(column2 @ " +
+                  "\"keyword2\")' " +
+                  "with '(column1 @ \"keyword1\") &! (column2 @ " +
+                  "\"keyword2\")'",
+                  "(#{@options.rewrite_and_not_operator?})") do |boolean|
+          @options.rewrite_and_not_operator = boolean
+        end
+
         parser.on("--nullable-reference-number-accessor=ACCESSOR",
                   "Mark ACCESSOR as rewrite nullable reference number targets",
                   "You can specify multiple accessors by",

data/lib/groonga-query-log/filter-rewriter.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019  Horimoto Yasuhiro <horimoto@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
@@ -38,6 +39,9 @@ module GroongaQueryLog
       if @options[:rewrite_not_or_regular_expression]
         rewritten = rewrite_not_or_regular_expression(rewritten)
       end
+      if @options[:rewrite_and_not_operator]
+        rewritten = rewrite_and_not_operator(rewritten)
+      end
       rewritten
     end
 
@@ -74,7 +78,7 @@ module GroongaQueryLog
         accessor = $1
         if @nullable_reference_number_accessors.include?(accessor)
           sub_accessor = accessor.split(".")[0..-2].join(".")
-          "(#{sub_accessor}._key == null ? 0 : #{accessor})"
+          "(#{sub_accessor}._key == \"\" ? 0 : #{accessor})"
         else
           matched
         end
@@ -100,5 +104,9 @@ module GroongaQueryLog
         end
       end
     end
+
+    def rewrite_and_not_operator(filter)
+      filter.gsub(/&& *!/, "&!")
+    end
   end
 end

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

@@ -241,6 +241,7 @@ module GroongaQueryLog
       attr_writer :rewrite_nullable_reference_number
       attr_accessor :nullable_reference_number_accessors
       attr_writer :rewrite_not_or_regular_expression
+      attr_writer :rewrite_and_not_operator
       def initialize
         @groonga1 = GroongaOptions.new
         @groonga2 = GroongaOptions.new
@@ -270,6 +271,7 @@ module GroongaQueryLog
         @rewrite_nullable_reference_number = false
         @nullable_reference_number_accessors = []
         @rewrite_not_or_regular_expression = false
+        @rewrite_and_not_operator = false
       end
 
       def request_queue_size
@@ -304,6 +306,10 @@ module GroongaQueryLog
         @rewrite_not_or_regular_expression
       end
 
+      def rewrite_and_not_operator?
+        @rewrite_and_not_operator
+      end
+
       def target_command_name?(name)
         return false if name.nil?
 
@@ -333,7 +339,8 @@ module GroongaQueryLog
         rewrite_vector_equal? or
           rewrite_vector_not_equal_empty_string? or
           rewrite_nullable_reference_number? or
-          rewrite_not_or_regular_expression?
+          rewrite_not_or_regular_expression? or
+          rewrite_and_not_operator?
       end
 
       def to_filter_rewriter_options
@@ -348,6 +355,8 @@ module GroongaQueryLog
             nullable_reference_number_accessors,
           :rewrite_not_or_regular_expression =>
             rewrite_not_or_regular_expression?,
+          :rewrite_and_not_operator =>
+            rewrite_and_not_operator?,
         }
       end
     end

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

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaQueryLog
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

data/test/test-filter-rewriter.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019  Horimoto Yasuhiro <horimoto@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
@@ -99,13 +100,13 @@ class FilterRewriterTest < Test::Unit::TestCase
     end
 
     def test_parenthesis
-      assert_equal("(((reference._key == null ? 0 : reference.number)) < 1000)",
+      assert_equal("(((reference._key == \"\" ? 0 : reference.number)) < 1000)",
                    rewrite("((reference.number) < 1000)",
                            ["reference.number"]))
     end
 
     def test_under_score
-      assert_equal("(ref_column._key == null ? 0 : ref_column.number) < 1000",
+      assert_equal("(ref_column._key == \"\" ? 0 : ref_column.number) < 1000",
                    rewrite("ref_column.number < 1000",
                            ["ref_column.number"]))
     end
@@ -137,4 +138,21 @@ class FilterRewriterTest < Test::Unit::TestCase
                    rewrite("column1 @ \"value1\" && column2 @~ \"^(?!.*value2 | value3 | value4).+$\""))
     end
   end
+
+  class AndNotOperatorTest < self
+    def rewrite(filter, enabled = true)
+      super(filter,
+            :rewrite_and_not_operator => enabled)
+    end
+
+    def test_one
+      assert_equal("(column1 @ \"value1\") &! (column2 @ \"value2\")",
+                   rewrite("(column1 @ \"value1\") && ! (column2 @ \"value2\")"))
+    end
+
+    def test_multiple
+      assert_equal("(column1 @ \"value1\") &! (column2 @ \"value2\") &! (column2 @ \"value3\")",
+                   rewrite("(column1 @ \"value1\") && ! (column2 @ \"value2\") && ! (column2 @ \"value3\")"))
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
@@ -154,17 +154,17 @@ description: ''
 email:
 - kou@clear-code.com
 executables:
-- groonga-query-log-detect-memory-leak
-- groonga-query-log-analyze
+- groonga-query-log-format-regression-test-logs
+- groonga-query-log-run-regression-test
 - groonga-query-log-check-crash
 - groonga-query-log-replay
-- groonga-query-log-extract
-- groonga-query-log-show-running-queries
 - groonga-query-log-check-command-version-compatibility
-- groonga-query-log-run-regression-test
 - groonga-query-log-verify-server
+- groonga-query-log-show-running-queries
+- groonga-query-log-analyze
+- groonga-query-log-extract
+- groonga-query-log-detect-memory-leak
 - groonga-query-log-analyze-load
-- groonga-query-log-format-regression-test-logs
 extensions: []
 extra_rdoc_files: []
 files:
@@ -289,36 +289,36 @@ summary: Groonga-query-log is a collection of library and tools to process [Groo
   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/run-test.rb
-- test/fixtures/n_entries.expected
-- test/fixtures/target-tables.expected
-- test/fixtures/no-report-summary.expected
+- test/fixtures/reporter/console.expected
+- test/fixtures/reporter/html.expected
+- test/fixtures/reporter/json-stream.expected
+- test/fixtures/reporter/json.expected
+- test/fixtures/order/start-time.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/regression-test-logs/url-format.log
-- test/fixtures/regression-test-logs/command-format.log
-- test/fixtures/regression-test-logs/error.log
-- test/fixtures/multi.expected
-- test/fixtures/query.log
-- test/fixtures/other-query.log
-- test/fixtures/reporter/json-stream.expected
-- test/fixtures/reporter/console.expected
-- test/fixtures/reporter/json.expected
-- test/fixtures/reporter/html.expected
-- test/fixtures/run-regression-test/schema/schema.grn
+- test/fixtures/no-report-summary.expected
+- test/fixtures/target-commands.expected
 - test/fixtures/run-regression-test/data/data.grn
-- test/fixtures/run-regression-test/indexes/indexes.grn
 - test/fixtures/run-regression-test/query-logs/query.log
-- test/fixtures/target-commands.expected
-- test/test-parser.rb
-- test/helper.rb
-- test/test-replayer.rb
-- test/test-response-comparer.rb
+- test/fixtures/run-regression-test/indexes/indexes.grn
+- test/fixtures/run-regression-test/schema/schema.grn
+- test/fixtures/other-query.log
+- test/fixtures/query.log
+- test/fixtures/target-tables.expected
+- test/fixtures/n_entries.expected
+- test/fixtures/multi.expected
+- test/fixtures/regression-test-logs/command-format.log
+- test/fixtures/regression-test-logs/url-format.log
+- test/fixtures/regression-test-logs/error.log
 - test/command/test-run-regression-test.rb
 - test/command/test-format-regression-test-logs.rb
 - test/command/test-analyzer.rb
 - test/command/test-extract.rb
+- test/test-response-comparer.rb
+- test/test-replayer.rb
 - test/test-incompatibility-detector.rb
 - test/test-filter-rewriter.rb
+- test/test-parser.rb
+- test/helper.rb
+- test/run-test.rb