norikra 0.1.5-java → 0.1.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a26c93805e62b832b47ade931907e800c35c01
-  data.tar.gz: f8fe030eacb414c84aeebd01b40351965391a53b
+  metadata.gz: 0250e9866cf7d804dee32f348e8aa7832fbf5ef2
+  data.tar.gz: a91fb11a6ed74fd8bc2bc56108c62e4a4d3e8b0e
 SHA512:
-  metadata.gz: 243a44cf8003f1843df7137c4c78c9e72765e3da51f7f33e961531cd9017c612389d44051fdf2a1cf98c57149b97a9978c250dacc98a4cd324206e9866d4cdbd
-  data.tar.gz: 7351f6ee5139a5323adfb9708abe8291f253e47a783d2efcc4fdf682c35f706ea48ae7c179dcfa8bb6bea73137eb95bdd2b578c164ec4af4de24e237cb2efe9b
+  metadata.gz: 506b88f4cb736f441566f9ee02d34fbe7d2c990cddcf8bf8c30c2ebe907010a8dc44fc5586db57985d86fcf8f6aa784f09b80e12d8211147315621d230fbd8b6
+  data.tar.gz: 5913062545c129fcdd227260c1c0081ed8f7ff3682103f833f03e41740571be637ca35968e6264d94690900e62b499b0460270a14a1fcb2a5e5c6c9a0ab80f87

data/README.md

@@ -69,37 +69,39 @@ See: http://norikra.github.io/
 
 ## Changes
 
+* v0.1.6:
+  * Fix bug: Wrong escape for java instance method calls
 * v0.1.5:
- * Add RPC port monitoring handler (GET /)
- * Add `Pattern` support
- * Changes for GC/JVM
-   * Server starts with default(recommended) JVM options for GC configurations
-   * Add option not to use default JVM options
-   * Add option to configure JVM to print GC logs
- * Stats file changes
-   * Changed to use SIGUSR2 (SIGUSR1 is used by JVM on linux platform)
-   * Changed no to contain server process configurations (ports, threads, logs ...)
- * WebUI improvements
-   * Add button to close target on WebUI
-   * Add link to download stats file
- * Fix bugs
-   * Fieldname handlings about names with non-alphabetic chars
-   * Query parser bug for some built-in functions (ex: `rate(10)`)
-   * Write stats file in more safe way
-   * WebUI: Incorrect memory bar
+  * Add RPC port monitoring handler (GET /)
+  * Add `Pattern` support
+  * Changes for GC/JVM
+    * Server starts with default(recommended) JVM options for GC configurations
+    * Add option not to use default JVM options
+    * Add option to configure JVM to print GC logs
+  * Stats file changes
+    * Changed to use SIGUSR2 (SIGUSR1 is used by JVM on linux platform)
+    * Changed no to contain server process configurations (ports, threads, logs ...)
+  * WebUI improvements
+    * Add button to close target on WebUI
+    * Add link to download stats file
+  * Fix bugs
+    * Fieldname handlings about names with non-alphabetic chars
+    * Query parser bug for some built-in functions (ex: `rate(10)`)
+    * Write stats file in more safe way
+    * WebUI: Incorrect memory bar
 * v0.1.4:
- * Stat dump option on runtime per specified intervals (`--dump-stat-interval`)
- * Stat dump on demand by SIGUSR1
- * `norikra-client event see` command (and API call) to get query results, but not remove it
- * Last modified time for each target on WebUI
+  * Stat dump option on runtime per specified intervals (`--dump-stat-interval`)
+  * Stat dump on demand by SIGUSR1
+  * `norikra-client event see` command (and API call) to get query results, but not remove it
+  * Last modified time for each target on WebUI
 * v0.1.3:
- * Fix critical bug about query de-registration
+  * Fix critical bug about query de-registration
 * v0.1.2:
- * Fix CLI start command to detect jruby path collectly (behind rbenv/rvm and others)
+  * Fix CLI start command to detect jruby path collectly (behind rbenv/rvm and others)
 * v0.1.1:
- * Fix types more explicitly for users ('int/long' -> 'integer', 'float/double' -> 'float')
+  * Fix types more explicitly for users ('int/long' -> 'integer', 'float/double' -> 'float')
 * v0.1.0:
- * First release for production
+  * First release for production
 
 ## Copyright
 

data/lib/norikra/query.rb

@@ -215,7 +215,24 @@ module Norikra
           else
             raise Norikra::QueryError, "target cannot be determined for field '#{name}'"
           end
-          encoded = (prefix ? "#{prefix}." : "") + Norikra::Field.escape_name(body)
+          #### 'field.javaMethod("args")' MUST NOT be escaped....
+          # 'getPropertyName' returns a String "path.index(\".\")" for java method calling,
+          #  and other optional informations are not provided.
+          # We seems that '.camelCase(ANYTHING)' should be a method calling, not nested field accesses.
+          # This is ugly, but works.
+          #
+          # 'path.substring(0, path.indexOf(path.substring(1,1)))' is parsed as 3-times-nested LIB_FUNCTION_CHAIN,
+          #  so does not make errors.
+          #
+          method_chains = []
+          body_chains = body.split('.')
+          while body_chains.size > 0
+            break unless body_chains.last =~ /^[a-z][a-zA-Z]*\(.*\)$/
+            method_chains.unshift body_chains.pop
+          end
+
+          escaped_body = Norikra::Field.escape_name(body_chains.join('.'))
+          encoded = (prefix ? "#{prefix}." : "") + escaped_body + (method_chains.size > 0 ? '.' + method_chains.join('.') : '' )
           node.send(setter, encoded)
         end
       }

data/lib/norikra/query/ast.rb

@@ -207,6 +207,8 @@ module Norikra
       # "bbb"           => ["EVENT_PROP_EXPR", ["EVENT_PROP_SIMPLE", "bbb"]]
       # "fraud.aaa"     => ["EVENT_PROP_EXPR", ["EVENT_PROP_SIMPLE", "fraud"], ["EVENT_PROP_SIMPLE", "aaa"]]
       # "size.$0.bytes" => ["EVENT_PROP_EXPR", ["EVENT_PROP_SIMPLE", "size"],  ["EVENT_PROP_SIMPLE", "$0"], ["EVENT_PROP_SIMPLE", "bytes"]]
+      # "field.index("?")" => ["EVENT_PROP_EXPR", ["EVENT_PROP_SIMPLE", "path"], ["EVENT_PROP_MAPPED", "index", "\"?\""]]
+      # "field.f1.index(".")" => ["EVENT_PROP_EXPR", ["EVENT_PROP_SIMPLE", "path"], ["EVENT_PROP_SIMPLE", "q1"], ["EVENT_PROP_MAPPED", "index", "\".\""]]
 
       def nodetype?(*sym)
         sym.include?(:prop) || sym.include?(:property)
@@ -214,7 +216,7 @@ module Norikra
 
       def fields(default_target=nil, known_targets_aliases=[])
         props = self.listup('EVENT_PROP_SIMPLE')
-        if props.size > 1 # alias.fieldname or container_fieldname.key.$1
+        if props.size > 1 # alias.fieldname or container_fieldname.key.$1 or fieldname.method(...)
           if known_targets_aliases.include?(props[0].child.name)
             [ {:f => props[1..-1].map{|n| n.child.name}.join("."), :t => props[0].child.name} ]
           else

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/query_spec.rb

@@ -175,6 +175,18 @@ describe Norikra::Query do
           expect(q.fields('TestTable')).to eql(['params.$$path.$1', 'size.$0.bytes', 'opts.num.$0'].sort)
           expect(q.fields(nil)).to eql([])
         end
+
+        it 'can parse with nested function calls correctly' do
+          expression = 'SELECT path.substring(0, path.index("?")) AS urlpath, COUNT(*) AS count FROM TestTable.win:time_batch(60 seconds) GROUP BY path.substring(0, path.index("?"))'
+          q = Norikra::Query.new(:name => 'TestTable query8.1', :expression => expression)
+          expect(q.fields).to eql(['path'])
+        end
+
+        it 'can parse with nested function calls w/ nested fields correctly' do
+          expression = 'SELECT path.f1.substring(0, path.f1.index("?")) AS urlpath, COUNT(*) AS count FROM TestTable.win:time_batch(60 seconds) GROUP BY path.f1.substring(0, path.f1.index("?"))'
+          q = Norikra::Query.new(:name => 'TestTable query8.2', :expression => expression)
+          expect(q.fields).to eql(['path.f1'])
+        end
       end
 
       context 'with query with patterns' do
@@ -333,60 +345,85 @@ describe Norikra::Query do
     describe '.rewrite_query' do
       it 'rewrites all of targets and container-field-accesses' do
         with_engine do
+          # single simple query
           e1 = 'select count(*) as cnt from TestTable.win:time_batch(10 seconds) where path = "/" and size > 100 and (param.length()) > 0'
           x1 = 'select count(*) as cnt from T1.win:time_batch(10 seconds) where path = "/" and size > 100 and (param.length()) > 0'
           model = administrator.compileEPL(e1)
           mapping = {'TestTable' => 'T1'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x1)
 
+          # nested container field access
           e2 = 'select max(result.$0.size) as cnt from TestTable.win:time_batch(10 seconds) where req.path = "/" and result.$0.size > 100 and (req.param.length()) > 0'
           x2 = 'select max(result$$0$size) as cnt from T1.win:time_batch(10 seconds) where req$path = "/" and result$$0$size > 100 and (req$param.length()) > 0'
           model = administrator.compileEPL(e2)
           mapping = {'TestTable' => 'T1'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x2)
 
+          # nested container field access w/ function call and alias
           e3 = 'select product, max(sta.param.size) as maxsize from StreamA.win:keepall() as sta, StreamB(size > 10).win:time(20 seconds) as stb where (sta.data.$0.$$body.substr(0, 8)) = stb.header and (Math.abs(sta.size)) > 3'
           x3 = 'select product, max(sta.param$size) as maxsize from S1.win:keepall() as sta, S2(size > 10).win:time(20 seconds) as stb where (sta.data$$0$$$body.substr(0, 8)) = stb.header and (Math.abs(sta.size)) > 3'
           model = administrator.compileEPL(e3)
           mapping = {'StreamA' => 'S1', 'StreamB' => 'S2'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x3)
 
+          # nested function call
+          e3a = 'select path.substring(0, path.index("?")) as urlpath, count(*) as count from TestTable.win:time_batch(60 seconds) group by path.substring(0, path.index("?"))'
+          x3a = 'select path.substring(0, path.index("?")) as urlpath, count(*) as count from T1.win:time_batch(60 seconds) group by path.substring(0, path.index("?"))'
+          model = administrator.compileEPL(e3a)
+          mapping = {'TestTable' => 'T1'}
+          expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x3a)
+
+          # nested function call w/ container field access
+          e3b = 'select path.f1.substring(0, path.f1.index("?")) as urlpath, count(*) as count from TestTable.win:time_batch(60 seconds) group by path.f1.substring(0, path.f1.index("?"))'
+          x3b = 'select path$f1.substring(0, path$f1.index("?")) as urlpath, count(*) as count from T1.win:time_batch(60 seconds) group by path$f1.substring(0, path$f1.index("?"))'
+          model = administrator.compileEPL(e3b)
+          mapping = {'TestTable' => 'T1'}
+          expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x3b)
+
+
+          # Fully-qualified field access
           e4 = 'select count(*) as cnt from TestTable.win:time_batch(10 seconds) where path = "/" and TestTable.size > 100 and (param.length()) > 0'
           x4 = 'select count(*) as cnt from T1.win:time_batch(10 seconds) where path = "/" and T1.size > 100 and (param.length()) > 0'
           model = administrator.compileEPL(e4)
           mapping = {'TestTable' => 'T1'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x4)
 
+          # Fully-qualified field access w/ container field access
           e5 = 'select RfidEvent.zoneId.$0, (select name.x from Zones.std:unique(zoneName) where zoneId = RfidEvent.zoneId.$0) as name from RfidEvent'
           x5 = 'select R1.zoneId$$0, (select name$x from Z1.std:unique(zoneName) where zoneId = R1.zoneId$$0) as name from R1'
           model = administrator.compileEPL(e5)
           mapping = {'RfidEvent' => 'R1', 'Zones' => 'Z1'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x5)
 
+          # Fully-qualified field access w/ container field access and function calls, JOINs
           e6 = 'select StreamA.product, max(sta.param.size) as maxsize from StreamA.win:keepall() as sta, StreamB(size > 10).win:time(20 seconds) as stb where (sta.data.$0.$$body.substr(0, 8)) = StreamB.header.$0 and (Math.abs(StreamA.size.$0.$$abs)) > 3'
           x6 = 'select S1.product, max(sta.param$size) as maxsize from S1.win:keepall() as sta, S2(size > 10).win:time(20 seconds) as stb where (sta.data$$0$$$body.substr(0, 8)) = S2.header$$0 and (Math.abs(S1.size$$0$$$abs)) > 3'
           model = administrator.compileEPL(e6)
           mapping = {'StreamA' => 'S1', 'StreamB' => 'S2'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x6)
 
+          # ??? simple query
           e7 = 'select count(*) as cnt from TestTable.win:time_batch(10 seconds) where path = "/" and size > 100 and (param.length()) > 0'
           x7 = 'select count(*) as cnt from T1.win:time_batch(10 seconds) where path = "/" and size > 100 and (param.length()) > 0'
           model = administrator.compileEPL(e7)
           mapping = {'TestTable' => 'T1'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x7)
 
+          # subquery
           e8 = 'select RfidEvent.zoneId.$0, (select name.x from Zones.std:unique(zoneName) where zoneId = RfidEvent.zoneId.$0) as name from RfidEvent'
           x8 = 'select R1.zoneId$$0, (select name$x from Z1.std:unique(zoneName) where zoneId = R1.zoneId$$0) as name from R1'
           model = administrator.compileEPL(e8)
           mapping = {'Zones' => 'Z1', 'RfidEvent' => 'R1'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x8)
 
+          # filters and subquery
           e9 = 'select * from BarData(ticker = "MSFT" and (sub(closePrice, (select movAgv from SMA20Stream(ticker = "MSFT").std:lastevent())) > 0))'
           x9 = 'select * from B1(ticker = "MSFT" and (sub(closePrice, (select movAgv from S1(ticker = "MSFT").std:lastevent()))) > 0)'
           model = administrator.compileEPL(e9)
           mapping = {'BarData' => 'B1', 'SMA20Stream' => 'S1'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x9)
 
+          # JOINs
           e10 = 'select product, max(sta.size) as maxsize from StreamA.win:keepall() as sta, StreamB(size > 10).win:time(20 seconds) as stb where (sta.data.substr(0, 8)) = stb.header and (Math.abs(sta.size)) > 3'
           x10 = 'select product, max(sta.size) as maxsize from S1.win:keepall() as sta, S2(size > 10).win:time(20 seconds) as stb where (sta.data.substr(0, 8)) = stb.header and (Math.abs(sta.size)) > 3'
           model = administrator.compileEPL(e10)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno