norikra 1.0.4-java → 1.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ce8a8150bb6cbe05216febc333446432d42865e
-  data.tar.gz: 1af0f92f1dbde76cdf1f3647f324cb268c2e08a6
+  metadata.gz: 61894f524fea6b1a2baee5b6ded868b7b5897ad1
+  data.tar.gz: 07f714981b43d62258643265a8773e01077f5a4a
 SHA512:
-  metadata.gz: 13411deed106009ffc5e7006998213c6a2827c920de934a50254b35fca0adeae2bce86a888ea0b500339f84720973c1e25a6107769f2511d22a94e0ac47e80bc
-  data.tar.gz: c8735a94f2fe9e435418d23ce630ae7775e2db0e3a3934a7bdc564fb370aa84edcc5ad9e1850163e452fc3ed8a1a602baa46a7d6f45af544546dbec873d2623c
+  metadata.gz: 372de0fa852cd3de9ed4a3adaab4a1946d004728522856dba8b4aad70bdfc82d9601e4c08a043d367d61f824cd449c57af0bc5bdb33e88dc123e429485fe9efa
+  data.tar.gz: f396b95240f6aab7a660a1e31af55c8f904b9fbd8c793c11c3f2c96702f1b4f96de73643beafdf357a2fb5ba58c1ec8f70e04430e54a3de4fe17aa70e3ed83d8

data/lib/norikra/cli.rb

@@ -68,6 +68,7 @@ module Norikra
         option :'log-filesize', :type => :string, :default => nil, :desc => 'log rotation size [10MB]'
         option :'log-backups' , :type => :numeric, :default => nil, :desc => 'log rotation backups [10]'
         option :'log-buffer-lines', :type => :numeric, :default => nil, :desc => 'log lines to fetch from API [1000]'
+        option :'log4j-properties-path', :type => :string, :default => nil, :desc => 'path to log4j.properties. ignore other log* options when this option is present'
 
         ### Loglevel options
         option :'more-quiet',   :type => :boolean, :default => false,                   :desc => 'set loglevel as ERROR'
@@ -226,6 +227,7 @@ module Norikra
         filesize: options[:'log-filesize'], backups: options[:'log-backups'],
         bufferlines: options[:'log-buffer-lines'],
       }
+      conf[:log4j_properties_path] = options[:'log4j-properties-path']
 
       server_options = {
         host: options[:host],

data/lib/norikra/engine.rb

@@ -169,6 +169,7 @@ module Norikra
     def register(query)
       info "registering query", :name => query.name, :targets => query.targets, :expression => query.expression
       raise Norikra::ClientError, "query name '#{query.name}' already exists" if @queries.select{|q| q.name == query.name }.size > 0
+      raise Norikra::ClientError, "query '#{query.name}' is invalid query for Norikra" if query.invalid?
 
       query.targets.each do |target_name|
         open(target_name) unless @targets.any?{|t| t.name == target_name}
@@ -309,6 +310,7 @@ module Norikra
 
       @mutex.synchronize do
         raise Norikra::ClientError, "query '#{query.name}' already exists" unless @queries.select{|q| q.name == query.name }.empty?
+        raise Norikra::ClientError, "query '#{query.name}' is invalid query for Norikra" if query.invalid?
         if lo_target_name = Norikra::Query.loopback(query.group)
           raise Norikra::ClientError, "loopback target '#{lo_target_name}'" unless Norikra::Target.valid?(lo_target_name)
         end

data/lib/norikra/logger.rb

@@ -37,8 +37,6 @@ module Norikra
   module Log
     @@logger = nil
 
-    @@level = nil
-    @@levelnum = nil
     @@devmode = false
 
     @@test_flag = false
@@ -56,9 +54,8 @@ module Norikra
         @@test_flag = true
       end
 
-      @@level = level.upcase
-      raise ArgumentError, "unknown log level: #{@@level}" unless LOG_LEVELS.include?(@@level)
-      @@levelnum = LOG_LEVELS.index(@@level)
+      level = level.upcase
+      raise ArgumentError, "unknown log level: #{level}" unless LOG_LEVELS.include?(level)
 
       p = java.util.Properties.new
       p.setProperty('log4j.appender.default.layout', 'org.apache.log4j.PatternLayout')
@@ -93,7 +90,7 @@ module Norikra
           p.setProperty('log4j.appender.builtin.MaxFileSize', opts[:filesize] || LOGFILE_DEFAULT_MAX_SIZE)
           p.setProperty('log4j.appender.builtin.MaxBackupIndex', opts[:backups].to_s || LOGFILE_DEFAULT_MAX_BACKUP_INDEX.to_s)
         end
-        p.setProperty('log4j.rootLogger', "#{@@level},default")
+        p.setProperty('log4j.rootLogger', "#{level},default")
         org.apache.log4j.PropertyConfigurator.configure(p)
 
         @@logger = Logger.new('norikra.log', opts)
@@ -101,7 +98,7 @@ module Norikra
       else # for test(rspec)
         p.setProperty('log4j.appender.default', 'org.apache.log4j.varia.NullAppender')
         p.setProperty('log4j.appender.builtin', 'org.apache.log4j.varia.NullAppender')
-        p.setProperty('log4j.rootLogger', "#{@@level},default")
+        p.setProperty('log4j.rootLogger', "#{level},default")
         org.apache.log4j.PropertyConfigurator.configure(p)
         @@logger = opts[:logger]
       end
@@ -109,6 +106,12 @@ module Norikra
       @@devmode = devmode
     end
 
+    def self.init_with_log4j_properties_path(log4j_properties_path)
+      org.apache.log4j.PropertyConfigurator.configure(log4j_properties_path)
+      @@logger = Logger.new('norikra.log')
+      @@devmode = false
+    end
+
     def self.swap(logger) # for tests
       @@mon.synchronize do
         original,@@logger = @@logger, logger
@@ -120,31 +123,26 @@ module Norikra
     def self.logger; @@logger ; end
 
     def trace(message, data=nil)
-      return if LEVEL_TRACE < @@levelnum
       from = @@devmode ? caller_locations(1,1) : nil
       @@logger.trace(message, data, from)
     end
 
     def debug(message, data=nil)
-      return if LEVEL_DEBUG < @@levelnum
       from = @@devmode ? caller_locations(1,1) : nil
       @@logger.debug(message, data, from)
     end
 
     def info(message, data=nil)
-      return if LEVEL_INFO < @@levelnum
       from = @@devmode ? caller_locations(1,1) : nil
       @@logger.info(message, data, from)
     end
 
     def warn(message, data=nil)
-      return if LEVEL_WARN < @@levelnum
       from = @@devmode ? caller_locations(1,1) : nil
       @@logger.warn(message, data, from)
     end
 
     def error(message, data=nil)
-      return if LEVEL_ERROR < @@levelnum
       from = @@devmode ? caller_locations(1,1) : nil
       @@logger.error(message, data, from)
     end
@@ -175,36 +173,42 @@ module Norikra
     end
 
     def trace(message, data=nil, from=nil)
+      return unless @log4j.isTraceEnabled
       line = format(from, message, data)
       push('trace', line)
       @log4j.trace(line)
     end
 
     def debug(message, data=nil, from=nil)
+      return unless @log4j.isDebugEnabled
       line = format(from, message, data)
       push('debug', line)
       @log4j.debug(line)
     end
 
     def info(message, data=nil, from=nil)
+      return unless @log4j.isInfoEnabled
       line = format(from, message, data)
       push('info', line)
       @log4j.info(line)
     end
 
     def warn(message, data=nil, from=nil)
+      return unless @log4j.isWarnEnabled
       line = format(from, message, data)
       push('warn', line)
       @log4j.warn(line)
     end
 
     def error(message, data=nil, from=nil)
+      return unless @log4j.isErrorEnabled
       line = format(from, message, data)
       push('error', line)
       @log4j.error(line)
     end
 
     def fatal(message, data=nil, from=nil)
+      return unless @log4j.isFatalEnabled
       line = format(from, message, data)
       push('fatal', line)
       @log4j.fatal(line)

data/lib/norikra/query.rb

@@ -61,6 +61,11 @@ module Norikra
       {name: @name, group: @group, expression: @expression}
     end
 
+    def invalid?
+      # check query is invalid as Norikra query or not
+      self.ast.listup('selectionListElement').any?{|node| node.children.map(&:name).any?{|name| name == '*' } }
+    end
+
     def targets
       return @targets if @targets
       @targets = (self.ast.listup(:stream).map(&:targets).flatten + self.subqueries.map(&:targets).flatten).sort.uniq

data/lib/norikra/server.rb

@@ -96,8 +96,13 @@ module Norikra
 
       @thread_conf = self.class.threading_configuration(conf[:thread])
       @log_conf = self.class.log_configuration(conf[:log])
+      @log4j_properties_path = conf[:log4j_properties_path]
 
-      Norikra::Log.init(@log_conf[:level], @log_conf[:dir], {filesize: @log_conf[:filesize], backups: @log_conf[:backups], bufferlines: @log_conf[:bufferlines]})
+      if @log4j_properties_path
+        Norikra::Log.init_with_log4j_properties_path(@log4j_properties_path)
+      else
+        Norikra::Log.init(@log_conf[:level], @log_conf[:dir], {filesize: @log_conf[:filesize], backups: @log_conf[:backups], bufferlines: @log_conf[:bufferlines]})
+      end
 
       info "thread configurations", @thread_conf
       info "logging configurations", @log_conf

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/norikra/webui/api.rb

@@ -18,6 +18,16 @@ class Norikra::WebUI::API < Sinatra::Base
     @@engine = engine
   end
 
+  before do
+    content_type :json
+    headers 'Access-Control-Allow-Origin' => '*',
+      'Access-Control-Allow-Methods' => ['OPTIONS', 'GET', 'POST'],
+      'Access-Control-Allow-Headers' => 'Content-Type'
+    if request.request_method == 'OPTIONS'
+      halt 200
+    end
+  end
+
   def logging(type, handler, args=[], opts={})
     if type == :manage
       debug "WebAPI", :handler => handler.to_s, :args => args

data/spec/query_spec.rb

@@ -21,6 +21,8 @@ describe Norikra::Query do
           expect(q.fields).to eql(['param', 'path', 'size'].sort)
           expect(q.fields('TestTable')).to eql(['param','path','size'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -86,6 +88,8 @@ describe Norikra::Query do
           expect(q.fields).to eql([])
           expect(q.fields('TestTable')).to eql([])
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -103,6 +107,8 @@ describe Norikra::Query do
           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([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -120,6 +126,8 @@ describe Norikra::Query do
           expect(q.fields).to eql(['path', 'size'].sort)
           expect(q.fields('TestTable')).to eql(['path', 'size'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -137,6 +145,8 @@ describe Norikra::Query do
           expect(q.fields('StreamA')).to eql(['size','data'].sort)
           expect(q.fields('StreamB')).to eql(['size','header'].sort)
           expect(q.fields(nil)).to eql(['product'])
+
+          expect(q.invalid?).to be_false
         end
 
         it 'returns query instances collectly parsed, with field accessing views' do
@@ -152,12 +162,14 @@ describe Norikra::Query do
           expect(q.fields('StreamA')).to eql(['size','data','ts1'].sort)
           expect(q.fields('StreamB')).to eql(['size','header','ts2'].sort)
           expect(q.fields(nil)).to eql(['product'])
+
+          expect(q.invalid?).to be_false
         end
       end
 
       context 'with query with subquery (where clause)' do
         it 'returns query instances collectly parsed' do
-          expression = 'select * from RfidEvent as RFID where "Dock 1" = (select name from Zones.std:unique(zoneName) where zoneId = RFID.zoneId)'
+          expression = 'select zoneId from RfidEvent as RFID where "Dock 1" = (select name from Zones.std:unique(zoneName) where zoneId = RFID.zoneId)'
           q = Norikra::Query.new(
             :name => 'TestTable query4', :expression => expression
           )
@@ -169,6 +181,8 @@ describe Norikra::Query do
           expect(q.fields('RfidEvent')).to eql(['zoneId'])
           expect(q.fields('Zones')).to eql(['name','zoneName','zoneId'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -186,12 +200,14 @@ describe Norikra::Query do
           expect(q.fields('RfidEvent')).to eql(['zoneId'])
           expect(q.fields('Zones')).to eql(['name','zoneName','zoneId'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
       context 'with query with subquery (from clause)' do
         it 'returns query instances collectly parsed' do
-          expression = "select * from BarData(ticker='MSFT', sub(closePrice, (select movAgv from SMA20Stream(ticker='MSFT').std:lastevent())) > 0)"
+          expression = "select ticker, closePrice from BarData(ticker='MSFT', sub(closePrice, (select movAgv from SMA20Stream(ticker='MSFT').std:lastevent())) > 0)"
           q = Norikra::Query.new(
             :name => 'TestTable query6', :expression => expression
           )
@@ -203,6 +219,8 @@ describe Norikra::Query do
           expect(q.fields('BarData')).to eql(['ticker','closePrice'].sort)
           expect(q.fields('SMA20Stream')).to eql(['movAgv','ticker'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -220,6 +238,8 @@ describe Norikra::Query do
           expect(q.fields).to eql(['params.path', 'size', 'opts.$0'].sort)
           expect(q.fields('TestTable')).to eql(['params.path', 'size', 'opts.$0'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -237,6 +257,8 @@ describe Norikra::Query do
           expect(q.fields).to eql(['params.$$path.$1', 'size.$0.bytes', 'opts.num.$0'].sort)
           expect(q.fields('TestTable')).to eql(['params.$$path.$1', 'size.$0.bytes', 'opts.num.$0'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
 
         it 'can parse with nested function calls correctly' do
@@ -249,6 +271,8 @@ describe Norikra::Query 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'])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -259,6 +283,8 @@ describe Norikra::Query do
           expect(q.fields).to eql(['path.source', 'ts'].sort)
           expect(q.fields('TestTable')).to eql(['path.source', 'ts'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
         end
       end
 
@@ -277,6 +303,18 @@ describe Norikra::Query do
           expect(q.fields).to eql(['name', 'content', 'type', 'source'].sort)
           expect(q.fields('EventA')).to eql(['name', 'content', 'type', 'source'].sort)
           expect(q.fields(nil)).to eql([])
+
+          expect(q.invalid?).to be_false
+        end
+      end
+
+      context 'with "*" selection list' do
+        it 'returns query instance which is singed as invalid for norikra query' do
+          expression = "select * from target1 where key1=1"
+          q = Norikra::Query.new(
+            name: 'Invalid query 1', expression: expression
+          )
+          expect(q.invalid?).to be_true
         end
       end
     end

metadata

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