fluent-plugin-filter_where 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e758b04ade2bd2cff6ff9e2ed181a5e621493fc
-  data.tar.gz: e9c2b7cedb2c2d5cbdcb07f3536ff6bf559b7458
+  metadata.gz: 755d2162c27bded3c029e34aecdb63f931f4e00f
+  data.tar.gz: 28bc4cb1e1ae126f3ae0a7b47662b145c3dcc6d4
 SHA512:
-  metadata.gz: e4be09bba4b267d18a125314fa6499ce05a368c13278c390f3bd44acd587d316fcfa18c211a0dff6aa188375aeeda571ace5a8bb4d8310472656ca22bec98869
-  data.tar.gz: c5cba7efd6332ba53083e0732918a83919b883257973f07c8a0417f24e792fc0feafba96a2cf39ec82cb2fa64b17f26a59df2e2155be1c92e9d27fbc32468e61
+  metadata.gz: eef617fe16e6981af9d8853b9c5fdaca3f78b5aad81f70f01473291bae16cd3fdd994fe04f6a6bafc653181b4337a8ee51370607ad779a417ea0ddf4cb8bc58d
+  data.tar.gz: 787fda5c049763e1eedd4dd6f18dccb18127c5d8e8447382136b9e9037771b3b36c36197f895a8d5dfc50f62b0378b3133eaea4cf0ebcbdac3f6d099d7573ab4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.3 (2017-05-23)
+
+Enhancements:
+
+* Support `<>` operator
+
 ## 1.0.2 (2017-05-23)
 
 Enhancements:

data/README.md

@@ -36,7 +36,7 @@ Use RubyGems:
 Example:
 
 ```sql
-where (string_key START_WITH 'str' AND number_key > 1.0) OR ("true_key" = true AND string_key REGEXP '^reg')
+where (string_key START_WITH 'str' AND number_key > 1.0) OR ("true_key" = true AND NOT (string_key REGEXP '^reg'))
 ```
 
 ## Literals
@@ -65,22 +65,22 @@ Characters matching with a regular expression `[a-zA-Z_][a-zA-z0-9_]*` such as `
 
 ### Boolean Operator
 
-* `=`
-* `!=`
+* `=`: Equal operator
+* `!=`, `<>`: Not equal operator
 
 ### Number Operator (Long and Double)
 
-* `=`
-* `!=`
-* `>`
-* `>=`
-* `<=`
-* `<`
+* `=`: Equal operator
+* `!=`, `<>`: Not equal operator
+* `>`: Greater than operator
+* `>=`: Greater than or equal operator
+* `<=`: Less than or equal operator
+* `<`: Less than operator
 
 ### String Operator
 
-* `=`
-* `!=`
+* `=`: Equal operator
+* `!=`, `<>`: Not equal operator
 * `START_WITH`
 * `END_WITH`
 * `INCLUDE`
@@ -90,11 +90,14 @@ Characters matching with a regular expression `[a-zA-Z_][a-zA-z0-9_]*` such as `
 
 Not supported yet
 
-### unary operator
+### Negate Operator
 
-* "xxx IS NULL"
-* "xxx IS NOT NULL"
-* "NOT xxx"
+* `NOT xxx`
+
+### NULL Operator
+
+* `IS NULL`
+* `IS NOT NULL`
 
 ## ChangeLog
 

data/fluent-plugin-filter_where.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-filter_where"
-  gem.version     = "1.0.2"
+  gem.version     = "1.0.3"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-filter_where"

data/lib/fluent/plugin/filter_where/parser.rex

@@ -86,6 +86,7 @@ rule
 :STRING       \\                      { @string << "\\"; nil }
 
 inner
+  require 'logger'
   attr_reader :log
   def initialize(log: nil)
     @log = log || ::Logger.new(nil)
@@ -93,6 +94,6 @@ inner
   end
 
   def on_error(error_token_id, error_value, value_stack)
-    raise Fluent::ConfigError.new("filter_where: failed to parse where value_stack:#{value_stack} error_value:#{error_value.inspect}")
+    raise Fluent::ConfigError.new("filter_where: failed to parse \"where\" value_stack:#{value_stack} error_value:#{error_value.inspect}")
   end
 end

data/lib/fluent/plugin/filter_where/parser.rex.rb

@@ -200,12 +200,13 @@ class Fluent::FilterWhere::Parser < Racc::Parser
     token
   end  # def _next_token
 
+  require 'logger'
   attr_reader :log
   def initialize(log: nil)
     @log = log || ::Logger.new(nil)
     super()
   end
   def on_error(error_token_id, error_value, value_stack)
-    raise Fluent::ConfigError.new("filter_where: failed to parse where value_stack:#{value_stack} error_value:#{error_value.inspect}")
+    raise Fluent::ConfigError.new("filter_where: failed to parse \"where\" value_stack:#{value_stack} error_value:#{error_value.inspect}")
   end
 end # class

data/test/test_where_parser.rb

@@ -53,6 +53,8 @@ class WhereParserTest < Test::Unit::TestCase
     assert_true(result.eval(record))
     result = parser.scan(%q[boolean != false])
     assert_true(result.eval(record))
+    result = parser.scan(%q[boolean <> false])
+    assert_true(result.eval(record))
     assert_raise(Fluent::ConfigError) { parser.scan(%q[boolean > false]) }
   end
 
@@ -61,6 +63,8 @@ class WhereParserTest < Test::Unit::TestCase
     assert_true(result.eval(record))
     result = parser.scan(%q[integer != 0])
     assert_true(result.eval(record))
+    result = parser.scan(%q[integer <> 0])
+    assert_true(result.eval(record))
     result = parser.scan(%q[integer > 0])
     assert_true(result.eval(record))
     result = parser.scan(%q[integer >= 0])
@@ -76,6 +80,8 @@ class WhereParserTest < Test::Unit::TestCase
     assert_true(result.eval(record))
     result = parser.scan(%q[string != 'foobar'])
     assert_true(result.eval(record))
+    result = parser.scan(%q[string <> 'foobar'])
+    assert_true(result.eval(record))
     result = parser.scan(%q[string start_with'str'])
     assert_true(result.eval(record))
     result = parser.scan(%q[string end_with 'ing'])
@@ -100,4 +106,9 @@ class WhereParserTest < Test::Unit::TestCase
     result = parser.scan(%q[boolean = true OR string = 'foobar'])
     assert_true(result.eval(record))
   end
+
+  def test_negate_op
+    result = parser.scan(%q[NOT boolean = true])
+    assert_false(result.eval(record))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter_where
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Naotoshi Seo