norikra 0.0.15-java → 0.0.16-java

data/lib/norikra/engine.rb

@@ -193,15 +193,19 @@ module Norikra
 
       def type_convert(event)
         event = (event.respond_to?(:getUnderlying) ? event.getUnderlying : event).to_hash
+        converted = {}
         event.keys.each do |key|
           trace "event content key:#{key}, value:#{event[key]}, value class:#{event[key].class}"
+          unescaped_key = Norikra::Field.unescape_name(key)
           if event[key].respond_to?(:to_hash)
-            event[key] = event[key].to_hash
+            converted[unescaped_key] = event[key].to_hash
           elsif event[key].respond_to?(:to_a)
-            event[key] = event[key].to_a
+            converted[unescaped_key] = event[key].to_a
+          else
+            converted[unescaped_key] = event[key]
           end
         end
-        event
+        converted
       end
 
       def update(new_events, old_events)

data/lib/norikra/field.rb

@@ -76,6 +76,14 @@ module Norikra
       parts.join('$')
     end
 
+    def self.unescape_name(name)
+      if name.index('$')
+        name.split(/(?<!\$)\$/).join('.')
+      else
+        name
+      end
+    end
+
     def self.regulate_key_chain(keys)
       keys.map{|key|
         case

data/lib/norikra/query/ast.rb

@@ -88,6 +88,8 @@ module Norikra
       case tree.text
       when 'EVENT_PROP_EXPR'
         ASTEventPropNode.new(tree.text, children)
+      when 'SELECTION_ELEMENT_EXPR'
+        ASTSelectionElementNode.new(tree.text, children)
       when 'LIB_FUNCTION'
         ASTLibFunctionNode.new(tree.text, children)
       when 'STREAM_EXPR'
@@ -169,6 +171,18 @@ module Norikra
       end
     end
 
+    class ASTSelectionElementNode < ASTNode # SELECTION_ELEMENT_EXPR
+      # "count(*) AS cnt"  => ["SELECTION_ELEMENT_EXPR", "count", "cnt"]
+      # "n.s as s"         => ["SELECTION_ELEMENT_EXPR", ["EVENT_PROP_EXPR", ["EVENT_PROP_SIMPLE", "n"], ["EVENT_PROP_SIMPLE", "s"]], "s"]
+      def nodetype?(*sym)
+        sym.include?(:selection)
+      end
+
+      def alias
+        @children.size == 2 ? @children[1].name : nil
+      end
+    end
+
     class ASTLibFunctionNode < ASTNode # LIB_FUNCTION
       # "now()"            => ["LIB_FUNCTION", "now", "("]
       # "hoge.length()"    => ["LIB_FUNCTION", "hoge", "length", "("]

data/lib/norikra/query.rb

@@ -80,9 +80,14 @@ module Norikra
         field_bag.push(subquery.explore(fields.keys, alias_map))
       end
 
+      # names of 'AS'
+      field_aliases = self.ast.listup(:selection).map(&:alias).compact
+
       known_targets_aliases = fields.keys + alias_map.keys
       self.ast.fields(default_target, known_targets_aliases).each do |field_def|
         f = field_def[:f]
+        next if field_aliases.include?(f)
+
         all.push(f)
 
         if field_def[:t]
@@ -249,12 +254,12 @@ module Norikra
     # :getFireAndForgetClause,
     # :getForClause,
     # (*) :getFromClause,
-    # :getGroupByClause,
+    # (*) :getGroupByClause,
     # :getHavingClause,
     # :getInsertInto,
     # :getMatchRecognizeClause,
     # :getOnExpr,
-    # :getOrderByClause,
+    # (*) :getOrderByClause,
     # :getOutputLimitClause,
     # :getRowLimitClause,
     # :getScriptExpressions,
@@ -265,7 +270,7 @@ module Norikra
 
     def self.traverse_fields(rewriter, recaller, statement_model)
       #NOTICE: SQLStream is not supported yet.
-      #TODO: other clauses with fields, especially: OrderBy, Having, GroupBy, For
+      #TODO: other clauses with fields, especially: Having, For
 
       dig = lambda {|node|
         rewriter.call(node)
@@ -326,6 +331,20 @@ module Norikra
         end
       end
 
+      if statement_model.getGroupByClause
+        statement_model.getGroupByClause.getGroupByExpressions.each do |child|
+          dig.call(child)
+        end
+      end
+
+      if statement_model.getOrderByClause
+        statement_model.getOrderByClause.getOrderByExpressions.each do |item|
+          if item.respond_to?(:getExpression)
+            dig.call(item.getExpression)
+          end
+        end
+      end
+
       statement_model
     end
   end

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/field_spec.rb

@@ -32,6 +32,14 @@ describe Norikra::Field do
     end
   end
 
+  describe '.unescape_name' do
+    it 're_make dotted pattern fieldname for container access chain' do
+      expect(Norikra::Field.unescape_name("part1$part2")).to eql('part1.part2')
+      expect(Norikra::Field.unescape_name("part1$$0")).to eql('part1.$0')
+      expect(Norikra::Field.unescape_name("part1$$$0")).to eql('part1.$$0')
+    end
+  end
+
   describe '.regulate_key_chain' do
     it 'escape String chain items and returns by array which started with numeric, with "$$", and joins keys with separator "$"' do
       expect(Norikra::Field.regulate_key_chain(["part1", "part2"])).to eql(['part1','part2'])

data/spec/query_spec.rb

@@ -24,6 +24,23 @@ describe Norikra::Query do
         end
       end
 
+      context 'with order by' do
+        it 'returns query instances, collectly parsed, without AS_names for fields' do
+          expression = 'SELECT name.string, count(*) AS cnt FROM TestTable.win:time_batch(10 sec) WHERE path="/" AND size > 100 and param.length() > 0 GROUP BY name.string ORDER BY cnt'
+          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(['name.string', 'param', 'path', 'size'].sort)
+          expect(q.fields('TestTable')).to eql(['name.string', 'param','path','size'].sort)
+          expect(q.fields(nil)).to eql([])
+        end
+      end
+
       context 'with query including Static lib call' do
         it 'returns query instances collectly parsed' do
           expression = 'SELECT count(*) AS cnt FROM TestTable.win:time_batch(10 sec) AS source WHERE source.path="/" AND Math.abs(-1 * source.size) > 3'
@@ -340,6 +357,18 @@ describe Norikra::Query do
           model = administrator.compileEPL(e10)
           mapping = {'StreamA' => 'S1', 'StreamB' => 'S2'}
           expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x10)
+
+          e11 = 'select campaign.id as campaign_id, member.region as region, member.lang as lang, count(*) as click, count(distinct member.id) as uu from applog_linereward.win:time_batch(1 minutes) where type = "click" group by campaign.id, member.region, member.lang'
+          x11 = 'select campaign$id as campaign_id, member$region as region, member$lang as lang, count(*) as click, count(distinct member$id) as uu from A1.win:time_batch(1 minutes) where type = "click" group by campaign$id, member$region, member$lang'
+          model = administrator.compileEPL(e11)
+          mapping = {'applog_linereward' => 'A1'}
+          expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x11)
+
+          e11 = 'select campaign.id, member.region as region, member.lang as lang, count(*) as click, count(distinct member.id) as uu from applog_linereward.win:time_batch(1 minutes) where type = "click" group by campaign.id, member.region, member.lang order by campaign.id'
+          x11 = 'select campaign$id, member$region as region, member$lang as lang, count(*) as click, count(distinct member$id) as uu from A1.win:time_batch(1 minutes) where type = "click" group by campaign$id, member$region, member$lang order by campaign$id'
+          model = administrator.compileEPL(e11)
+          mapping = {'applog_linereward' => 'A1'}
+          expect(Norikra::Query.rewrite_query(model, mapping).toEPL).to eql(x11)
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: norikra
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.15
+  version: 0.0.16
 platform: java
 authors:
 - TAGOMORI Satoshi