norikra 1.2.0-java → 1.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e969ece3deb5788c7e7e76c9d6cc4961b4307c
-  data.tar.gz: bbfdc5a4056935c355082877e6ef347b7ded54ec
+  metadata.gz: 0e2938132b83a49bb328d060517750c5cb9d7e95
+  data.tar.gz: 7c20e09c3795b209946f08f49d3503ccccec3caf
 SHA512:
-  metadata.gz: 4ea0f4f04ba875e2432db51a179d75e3ae18e3a05fc03e945b14fdce187b61da969cd334e11d67aaf8a49b0a032b389f2f57a6c385c98f284b4ecd5bd3156156
-  data.tar.gz: 0add6a6f2539d188f2de82856f1d8cc222f9e6dd60b31b96acbc10167f047d9395c71273dde65a97d23b9b0838d30e0c7661b899d226077def93301e272515da
+  metadata.gz: 6a684145944825a6c813ec8695a7eee3ee6411de5654af120a90a77f7ee4e0fae9becef6535c476b5afce4754a7923d9188a8feca8c912a0c55393f2a6989794
+  data.tar.gz: 4140d210916fcb7d575527fce40f9b3bda7d7fc3a9f7af9d88b2ef1c6202678d63b28c7369f71d227df399548d708486ccfea5aca2b7bfeb6f771acfda88e773

data/Changes.md

@@ -3,6 +3,8 @@
 Changes of norikra.
 
 ## v1
+* v1.2.1
+  * Fix bug to fail to rewrite nullable fields
 * v1.2.0
   * Add `NULLABLE(...)` field to query NULL explicitly
   * Pluggable listener and user defined listener gems

data/lib/norikra/query.rb

@@ -261,16 +261,39 @@ module Norikra
     def self.rewrite_nullable_fields(statement_model)
       # NULLABLE(field) -> field
       ## NOTICE: NULLABLE(...) cannot be used in view parameters. ex: target.std:unique(NULLABLE(a)) -> x
+      check_nullable = lambda {|exp|
+        # top-level lib function
+        # exp.getChain[0] #=> Java::ComEspertechEsperClientSoda::DotExpressionItem
+        exp &&
+        exp.is_a?(Java::ComEspertechEsperClientSoda::DotExpression) &&
+        exp.getChain.size == 1 &&
+        exp.getChain[0].name.upcase == 'NULLABLE'
+      }
+      fetch_field = lambda {|exp| exp.getChain[0].getParameters[0] }
+
       rewriter = lambda {|node|
-        if node.respond_to?(:getExpression)
-          exp = node.getExpression
-          if exp && exp.is_a?(Java::ComEspertechEsperClientSoda::DotExpression) && exp.getChain.size == 1
-            # top-level lib function
-            # exp.getChain[0] #=> Java::ComEspertechEsperClientSoda::DotExpressionItem
-            if exp.getChain[0].name.upcase == 'NULLABLE'
-              node.setExpression(exp.getChain[0].getParameters[0])
-            end
-          end
+        # without loop of parameters because this code shows which parameter cause errors in user's environment
+        if node.respond_to?(:getExpression) && check_nullable.(node.getExpression)
+          node.setExpression(fetch_field.(node.getExpression))
+        end
+
+        if node.respond_to?(:getFilter) && check_nullable.(node.getFilter)
+          node.setFilter(fetch_field.(node.getFilter))
+        end
+
+        if node.respond_to?(:getChildren) && node.getChildren.any?{|exp| check_nullable.(exp) }
+          node.setChildren(node.getChildren.map{|e| check_nullable.(e) ? fetch_field.(e) : e })
+        end
+
+        if node.respond_to?(:getParameters) && node.getParameters.any?{|exp| check_nullable.(exp) }
+          node.setParameters(node.getParameters.map{|e| check_nullable.(e) ? fetch_field.(e) : e })
+        end
+        if node.respond_to?(:getChain) && node.getChain.any?{|exp| check_nullable.(exp) }
+          node.setChain(node.getChain.map{|e| check_nullable.(e) ? fetch_field.(e) : e })
+        end
+
+        if node.respond_to?(:getExpressions) && node.getExpressions.any?{|exp| check_nullable.(exp) }
+          node.setExpressions(node.getExpressions.map{|e| check_nullable.(e) ? fetch_field.(e) : e })
         end
       }
       recaller = lambda {|node|

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/query_spec.rb

@@ -158,6 +158,27 @@ describe Norikra::Query do
 
           expect(q.invalid?).to be_falsy
         end
+
+        it 'returns query instances correctly parsed, with built-in NULLABLE() in CASE' do
+          expression = 'SELECT CASE WHEN eventType = 1 AND NULLABLE(detail.type) = 1 THEN 1 ELSE 0 END AS type, COUNT(*) AS c FROM TestTable.win:time_batch(10 sec) GROUP BY CASE WHEN eventType = 1 AND NULLABLE(detail.type) = 1 THEN 1 ELSE 0 END'
+          q = Norikra::Query.new(
+            :name => 'TestTable query1', :expression => expression
+          )
+          expect(q.name).to eql('TestTable query1')
+          expect(q.group).to be_nil
+          expect(q.expression).to eql(expression)
+          expect(q.targets).to eql(['TestTable'])
+
+          expect(q.fields).to eql(['detail.type', 'eventType'])
+          expect(q.fields('TestTable')).to eql(['detail.type', 'eventType'])
+          expect(q.fields(nil)).to eql([])
+
+          expect(q.nullable_fields).to eql(['detail.type'])
+          expect(q.nullable_fields('TestTable')).to eql(['detail.type'])
+          expect(q.nullable_fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_falsy
+        end
       end
 
       context 'with order by' do
@@ -491,7 +512,7 @@ describe Norikra::Query do
         it 'returns query without NULLABLE()' do
           with_engine do
             model = administrator.compileEPL(expression)
-            expect(Norikra::Query.rewrite_event_field_name(model, {'TestTable' => 'T1'}).toEPL).to eql(expression)
+            expect(Norikra::Query.rewrite_nullable_fields(model).toEPL).to eql(expected)
           end
         end
       end
@@ -502,18 +523,29 @@ describe Norikra::Query do
         it 'returns query without NULLABLE()' do
           with_engine do
             model = administrator.compileEPL(expression)
-            expect(Norikra::Query.rewrite_event_field_name(model, {'TestTable' => 'T1'}).toEPL).to eql(expression)
+            expect(Norikra::Query.rewrite_nullable_fields(model).toEPL).to eql(expected)
+          end
+        end
+      end
+
+      context 'with NULLABLE() in CASE' do
+        expression = 'select case when eventType=1 and nullable(detail.type)=1 then 1 else 0 end as type, count(*) AS c from TestTable.win:time_batch(10 seconds) group by case when eventType=1 and nullable(detail.type)=1 then 1 else 0 end'
+        expected =   'select case when eventType=1 and detail.type=1 then 1 else 0 end as type, count(*) as c from TestTable.win:time_batch(10 seconds) group by case when eventType=1 and detail.type=1 then 1 else 0 end'
+        it 'returns query without NULLABLE()' do
+          with_engine do
+            model = administrator.compileEPL(expression)
+            expect(Norikra::Query.rewrite_nullable_fields(model).toEPL).to eql(expected)
           end
         end
       end
 
       context 'with some NULLABLE()' do
         expression = 'select a, NULLABLE(b), NULLABLE(c), count(*) as cnt from TestTable.win:time_batch(10 seconds) where c>0 group by a, b, c'
-        expected   = 'select a, b, c, count(*) AS cnt from TestTable.win:time_batch(10 seconds) where c>0 group by a, b, c'
+        expected   = 'select a, b, c, count(*) as cnt from TestTable.win:time_batch(10 seconds) where c>0 group by a, b, c'
         it 'returns query without NULLABLE()' do
           with_engine do
             model = administrator.compileEPL(expression)
-            expect(Norikra::Query.rewrite_event_field_name(model, {'TestTable' => 'T1'}).toEPL).to eql(expression)
+            expect(Norikra::Query.rewrite_nullable_fields(model).toEPL).to eql(expected)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno