norikra 0.0.8-java → 0.0.9-java

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in norikra.gemspec
 gemspec
-
-gem "norikra-udf-woothee", :git => "file:///Users/tagomoris/Documents/norikra-udf-woothee"

data/README.md

@@ -92,6 +92,12 @@ UDF as plugins over rubygems are available. For example, see 'norikra-udf-mock'
 
 TBD
 
+## Performance
+
+Threads option available with command line options.
+
+TBD
+
 ## Versions
 
 TBD

data/lib/norikra/cli.rb

@@ -4,20 +4,35 @@ require 'thor'
 module Norikra
   class CLI < Thor
     desc "start", "start Norikra server process"
+
+    ### Server options
     option :host, :type => :string, :default => '0.0.0.0', :aliases => "-H", :desc => 'host address that server listen [0.0.0.0]'
     option :port, :type => :numeric, :default => 26571, :aliases => "-P", :desc => 'port that server uses [26571]'
     # option :config, :type => :string, :default => nil, :aliases => "-c", :desc => 'configuration file to define target/query [none]'
 
+    ### Execution options
     option :daemonize, :type => :boolean, :default => false, :aliases => "-d", \
                        :desc => 'daemonize Norikra server [false (foreground)]'
     option :pidfile, :type => :string, :default => '/var/run/norikra.pid', :aliases => "-p", \
                      :desc => "pidfile path when daemonized [/var/run/norikra.pid]"
 
+    ### Performance options
+    option :'inbound-threads',  :type => :numeric, :default => 0, :desc => 'number of threads for inbound data'
+    option :'outbound-threads', :type => :numeric, :default => 0, :desc => 'number of threads for outbound data'
+    option :'route-threads',    :type => :numeric, :default => 0, :desc => 'number of threads for events routing for query execution'
+    option :'timer-threads',    :type => :numeric, :default => 0, :desc => 'number of threads for internal timers for query execution'
+    option :'inbound-thread-capacity',  :type => :numeric, :default => 0
+    option :'outbound-thread-capacity', :type => :numeric, :default => 0
+    option :'route-thread-capacity',    :type => :numeric, :default => 0
+    option :'timer-thread-capacity',    :type => :numeric, :default => 0
+
+    ### Logging options
     option :logdir, :type => :string, :default => nil, :aliases => "-l", \
                     :desc => "directory path of logfiles when daemonized [nil (console)]"
     option :'log-filesize', :type => :string, :default => '10MB'
     option :'log-backups' , :type => :numeric, :default => 10
 
+    ### Loglevel options
     option :'more-quiet',   :type => :boolean, :default => false,                   :desc => 'set loglevel as ERROR'
     option :quiet,          :type => :boolean, :default => false, :aliases => "-q", :desc => 'set loglevel as WARN'
     option :verbose,        :type => :boolean, :default => false, :aliases => "-v", :desc => 'set loglevel as DEBUG'
@@ -31,6 +46,13 @@ module Norikra
       raise NotImplementedError if options[:daemonize]
       #TODO: pidcheck if daemonize
 
+      conf[:thread] = {
+        inbound: {threads: options[:'inbound-threads'], capacity: options[:'inbound-thread-capacity']},
+        outbound: {threads: options[:'outbound-threads'], capacity: options[:'outbound-thread-capacity']},
+        route_exec: {threads: options[:'route-threads'], capacity: options[:'route-thread-capacity']},
+        timer_exec: {threads: options[:'timer-threads'], capacity: options[:'timer-thread-capacity']},
+      }
+
       conf[:loglevel] = case
                         when options[:'more-verbose'] then 'TRACE'
                         when options[:verbose]        then 'DEBUG'
@@ -41,6 +63,7 @@ module Norikra
       conf[:logdir] = options[:logdir]
       conf[:logfilesize] = options[:'log-filesize']
       conf[:logbackups] = options[:'log-backups']
+
       server = Norikra::Server.new( options[:host], options[:port], conf )
       server.run
       server.shutdown

data/lib/norikra/engine.rb

@@ -16,11 +16,12 @@ module Norikra
   class Engine
     attr_reader :targets, :queries, :output_pool, :typedef_manager
 
-    def initialize(output_pool, typedef_manager=nil)
+    def initialize(output_pool, typedef_manager, opts={})
       @output_pool = output_pool
-      @typedef_manager = typedef_manager || Norikra::TypedefManager.new()
+      @typedef_manager = typedef_manager
 
-      @service = com.espertech.esper.client.EPServiceProviderManager.getDefaultProvider
+      conf = configuration(opts)
+      @service = com.espertech.esper.client.EPServiceProviderManager.getDefaultProvider(conf)
       @config = @service.getEPAdministrator.getConfiguration
 
       @mutex = Mutex.new
@@ -34,6 +35,36 @@ module Norikra
       @waiting_queries = []
     end
 
+    def camelize(sym)
+      sym.to_s.split(/_/).map(&:capitalize).join
+    end
+
+    def configuration(opts)
+      conf = com.espertech.esper.client.Configuration.new
+      defaults = conf.getEngineDefaults
+
+      if opts[:thread]
+        t = opts[:thread]
+        threading = defaults.getThreading
+        [:inbound, :outbound, :route_exec, :timer_exec].each do |sym|
+          next unless t[sym] && t[sym][:threads] && t[sym][:threads] > 0
+
+          threads = t[sym][:threads].to_i
+          capacity = t[sym][:capacity].to_i
+          info "Engine #{sym} thread pool enabling", :threads => threads, :capacity => (capacity == 0 ? 'default' : capacity)
+
+          cam = camelize(sym)
+          threading.send("setThreadPool#{cam}".to_sym, true)
+          threading.send("setThreadPool#{cam}NumThreads".to_sym, threads)
+          if t[sym][:capacity] && t[sym][:capacity] > 0
+            threading.send("setThreadPool#{cam}Capacity".to_sym, capacity)
+          end
+        end
+      end
+
+      conf
+    end
+
     def start
       debug "norikra engine starting: creating esper runtime"
       @runtime = @service.getEPRuntime
@@ -135,9 +166,24 @@ module Norikra
         @output_pool = output_pool
       end
 
+      def type_convert(event)
+        event = (event.respond_to?(:getUnderlying) ? event.getUnderlying : event).to_hash
+        event.keys.each do |key|
+          trace "event content key:#{key}, value:#{event[key]}, value class:#{event[key].class}"
+          if event[key].respond_to?(:to_a)
+            event[key] = event[key].to_a
+          elsif event[key].respond_to?(:to_hash)
+            event[key] = event[key].to_hash
+          end
+        end
+        event
+      end
+
       def update(new_events, old_events)
-        trace "updated event", :query => @query_name, :event => new_events
-        @output_pool.push(@query_name, new_events)
+        t = Time.now.to_i
+        events = new_events.map{|e| [t, type_convert(e)]}
+        trace "updated event", :query => @query_name, :event => events
+        @output_pool.push(@query_name, events)
       end
     end
     ##### Unmatched events are simply ignored

data/lib/norikra/output_pool.rb

@@ -12,8 +12,6 @@ module Norikra
     end
 
     def push(query_name, events)
-      t = Time.now.to_i
-      events = events.map{|e| [t, (e.respond_to?(:getUnderlying) ? e.getUnderlying : e).to_hash]}
       @mutex.synchronize do
         @pool[query_name] ||= []
         @pool[query_name].push(events) if events.size > 0

data/lib/norikra/server.rb

@@ -26,7 +26,7 @@ module Norikra
 
       Norikra::Log.init(conf[:loglevel], conf[:logdir], {:filesize => conf[:logfilesize], :backups => conf[:logbackups]})
 
-      @engine = Norikra::Engine.new(@output_pool, @typedef_manager)
+      @engine = Norikra::Engine.new(@output_pool, @typedef_manager, {thread: conf[:thread]})
       @rpcserver = Norikra::RPC::HTTP.new(:engine => @engine, :port => port)
     end
 

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -2,14 +2,14 @@
 name: norikra
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.8
+  version: 0.0.9
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno