norikra 0.0.4-java → 0.0.5-java

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.3
+jruby-1.7.4

data/README.md

@@ -52,12 +52,8 @@ https://github.com/tagomoris/norikra-client
 
 For example, think about event streams related with one web service (ex: 'www'). At first, define `target` with mandantory fields (in other words, minimal fields set for variations of 'www' events).
 
-    norikra-client table add www path:string status:integer referer:string agent:string userid:integer
-    norikra-client table list
-
-Fields not defined in 'table add' are automatically defined when events arrived at Norikra. You should not worry about it, but optional fields are defined as 'string' field. If you want to define as 'long' or 'double' or 'boolean', define field for each.
-
-    norikra-client field define www age:integer
+    norikra-client target add www path:string status:integer referer:string agent:string userid:integer
+    norikra-client target list
 
 You can register queries when you want.
 
@@ -96,7 +92,6 @@ TBD
 
 ## TODO
 
-* logging
 * daemonize
 * performance parameters
 * query unregister

data/lib/norikra/cli.rb

@@ -7,18 +7,43 @@ module Norikra
     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]'
-    # option :daemonize, :type => :boolean, :default => false, :aliases => "-d", :desc => 'daemonize Norikra server [false]'
-    # option :pidfile, :type => :string, :default => '/var/run/norikra.pid', :aliases => "-p", :desc => "pidfile path when daemonized [/var/run/norikra.pid]"
-    # option :logfile, :type => :string, :default => '/var/log/norikra.log', :aliases => "-l", :desc => "logfile path when daemonized [/var/log/norikra.log]"
+
+    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]"
+
+    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
+
+    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'
+    option :'more-verbose', :type => :boolean, :default => false,                   :desc => 'set loglevel as TRACE'
 
     #TODO: configuration file to init
-    #TODO: daemonize
-    #  TODO: pidcheck
-    #  TODO: open logfile & write
-    #  TODO: logfile reopen
     def start
-      server = Norikra::Server.new(options[:host], options[:port])
+      conf = {}
+
+      #TODO: daemonize
+      raise NotImplementedError if options[:daemonize]
+      #TODO: pidcheck if daemonize
+
+      conf[:loglevel] = case
+                        when options[:'more-verbose'] then 'TRACE'
+                        when options[:verbose]        then 'DEBUG'
+                        when options[:quiet]          then 'WARN'
+                        when options[:'more-quiet']   then 'ERROR'
+                        else nil # for default (assumed as 'INFO')
+                        end
+      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
     end
   end
 end

data/lib/norikra/engine.rb

@@ -1,4 +1,8 @@
 require 'java'
+
+require 'norikra/logger'
+include Norikra::Log
+
 require 'esper-4.9.0.jar'
 require 'esper/lib/commons-logging-1.1.1.jar'
 require 'esper/lib/antlr-runtime-3.2.jar'
@@ -37,11 +41,13 @@ module Norikra
     end
 
     def open(target, fields=nil)
-      return if @targets.include?(target)
+      info "opening target", :target => target, :fields => fields
+      return false if @targets.include?(target)
       open_target(target, fields)
     end
 
     def close(target)
+      info "closing target", :target => target
       #TODO: write
       raise NotImplementedError
     end
@@ -51,6 +57,7 @@ module Norikra
     end
 
     def register(query)
+      info "registering query", :name => query.name, :targets => query.targets, :expression => query.expression
       unless @targets.include?(query.targets.first)
         open(query.targets.first) # open as lazy defined target
       end
@@ -58,19 +65,30 @@ module Norikra
     end
 
     def deregister(query_name)
+      info "de-registering query", :name => query_name
       #TODO: write
       raise NotImplementedError
     end
 
     def send(target, events)
-      #TODO: trace log
-      #p events
-      return unless @targets.include?(target) # discard events for target not registered
+      trace "send messages", :target => target, :events => events
+      unless @targets.include?(target) # discard events for target not registered
+        trace "messages skipped for non-opened target", :target => target
+        return
+      end
       return if events.size < 1
 
       if @typedef_manager.lazy?(target)
+        info "opening lazy target", :target => target
+        debug "generating base fieldset from event", :target => target, :event => events.first
+
         base_fieldset = @typedef_manager.generate_base_fieldset(target, events.first)
+
+        debug "registering base fieldset", :target => target, :base => base_fieldset
+
         register_base_fieldset(target, base_fieldset)
+
+        info "target successfully opened with fieldset", :target => target, :base => base_fieldset
       end
 
       registered_data_fieldset = @registered_fieldsets[target][:data]
@@ -80,10 +98,14 @@ module Norikra
 
         unless registered_data_fieldset[fieldset.summary]
           # register waiting queries including this fieldset, and this fieldset itself
+          debug "registering unknown fieldset", :target => target, :fieldset => fieldset
+
           register_fieldset(target, fieldset)
+
+          debug "successfully registered"
         end
-        #TODO: trace log
-        #p "sendEvent eventType:#{fieldset.event_type_name}, event:#{event.inspect}"
+
+        trace "calling sendEvent", :target => target, :fieldset => fieldset, :event_type_name => fieldset.event_type_name, :event => event
         @runtime.sendEvent(@typedef_manager.format(target, event).to_java, fieldset.event_type_name)
       end
       nil
@@ -117,7 +139,7 @@ module Norikra
     def open_target(target, fields)
       # from open
       @mutex.synchronize do
-        return if @targets.include?(target)
+        return false if @targets.include?(target)
         @typedef_manager.add_target(target, fields)
         @registered_fieldsets[target] = {:base => {}, :query => {}, :data => {}}
 
@@ -130,17 +152,17 @@ module Norikra
 
         @targets.push(target)
       end
+      true
     end
 
     def register_base_fieldset(target, fieldset)
       # for lazy target, with generated fieldset from sent events.first
       @mutex.synchronize do
-        return unless @typedef_manager.lazy?(target)
-
-        @typedef_manager.bind_fieldset(target, :base, fieldset)
-        register_fieldset_actually(target, fieldset, :base)
+        return false unless @typedef_manager.lazy?(target)
 
         @typedef_manager.activate(target, fieldset)
+        # @typedef_manager.bind_fieldset(target, :base, fieldset)
+        register_fieldset_actually(target, fieldset, :base)
       end
       nil
     end
@@ -160,7 +182,8 @@ module Norikra
 
           # replace registered data fieldsets with new fieldset inherits this query fieldset
           @typedef_manager.supersets(target, query_fieldset).each do |set|
-            rebound = set.rebind
+            rebound = set.rebind(true) # update event_type_name with new inheritations
+
             register_fieldset_actually(target, rebound, :data, true) # replacing
             @typedef_manager.replace_fieldset(target, set, rebound)
             remove_fieldset_actually(target, set, :data)

data/lib/norikra/logger.rb

@@ -0,0 +1,219 @@
+require 'java'
+require 'esper/lib/commons-logging-1.1.1.jar'
+
+require 'monitor'
+
+#### To use this logger
+# require 'norikra/logger'
+# include Norikra::Log
+# # and
+## info "message..."
+## debug "debugging...", :args => parameters, :status => 'status'
+
+module Norikra
+  # 2013-06-21 15:49:30 +0900 [INFO](main) : this is error log, status:'404', message:'content not found'
+
+  # devmode
+  # 2013-06-21 15:49:30 +0900 [INFO](main) /path/of/logger.rb:27(method): this is error log, status:'404', message:'content not found'
+
+  # 2013-06-21 15:49:30 +0900 [info](main) MESSAGE
+  LOG_LOG4J_FORMAT = '%d{yyyy-MM-dd HH:mm:ss Z} [%p] %m%n'
+  LOG_FORMAT = '%s: %s%s'
+
+  LOG_LOG4J_BUILTIN_FORMAT =  '%d{yyyy-MM-dd HH:mm:ss Z} [%p](%t)<%c> %m%n'
+
+  LOGFILE_DEFAULT_MAX_SIZE = '10MB'
+  LOGFILE_DEFAULT_MAX_BACKUP_INDEX = 10
+
+  LOG_LEVELS = ['TRACE','DEBUG','INFO','WARN','ERROR','FATAL'].freeze
+  LOG_LEVEL_DEFAULT = 'INFO'
+
+  LEVEL_TRACE = LOG_LEVELS.index('TRACE')
+  LEVEL_DEBUG = LOG_LEVELS.index('DEBUG')
+  LEVEL_INFO  = LOG_LEVELS.index('INFO')
+  LEVEL_WARN  = LOG_LEVELS.index('WARN')
+  LEVEL_ERROR = LOG_LEVELS.index('ERROR')
+
+  module Log
+    @@logger = nil
+
+    @@level = nil
+    @@levelnum = nil
+    @@devmode = false
+
+    @@mon = Monitor.new
+
+    def self.init(level, logdir, opts, devmode=false)
+      level ||= LOG_LEVEL_DEFAULT
+      # logdir: nil => ConsoleAppender
+      #         else => RollingFileAppender (output: directory path)
+      # http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/RollingFileAppender.html
+
+      @@level = level.upcase
+      raise ArgumentError, "unknown log level: #{@@level}" unless LOG_LEVELS.include?(@@level)
+      @@levelnum = LOG_LEVELS.index(@@level)
+
+      p = java.util.Properties.new
+      p.setProperty('log4j.appender.default.layout', 'org.apache.log4j.PatternLayout')
+      p.setProperty('log4j.appender.default.layout.ConversionPattern', LOG_LOG4J_FORMAT)
+
+      # for esper epl & mizuno jetty
+      esper_log_limit = 'WARN'
+      p.setProperty('log4j.logger.com.espertech.esper', "#{esper_log_limit}, builtin")
+      mizuno_log_limit = 'WARN'
+      p.setProperty('log4j.logger.ruby', "#{mizuno_log_limit}, builtin")
+      p.setProperty('log4j.logger.org.eclipse.jetty', "#{mizuno_log_limit}, builtin")
+
+      p.setProperty('log4j.appender.builtin.layout', 'org.apache.log4j.PatternLayout')
+      p.setProperty('log4j.appender.builtin.layout.ConversionPattern', LOG_LOG4J_BUILTIN_FORMAT)
+
+      if logdir.nil?
+        p.setProperty('log4j.appender.default', 'org.apache.log4j.ConsoleAppender')
+        p.setProperty('log4j.appender.builtin', 'org.apache.log4j.ConsoleAppender')
+      else
+        # DailyRollingFileAppender ?
+        # http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/DailyRollingFileAppender.html
+        norikra_log = File.join(logdir, 'norikra.log')
+        p.setProperty('log4j.appender.default', 'org.apache.log4j.RollingFileAppender')
+        p.setProperty('log4j.appender.default.File', norikra_log)
+        p.setProperty('log4j.appender.default.MaxFileSize', opts[:filesize] || LOGFILE_DEFAULT_MAX_SIZE)
+        p.setProperty('log4j.appender.default.MaxBackupIndex', opts[:backups].to_s || LOGFILE_DEFAULT_MAX_BACKUP_INDEX.to_s)
+
+        builtin_log = File.join(logdir, 'builtin.log')
+        p.setProperty('log4j.appender.builtin', 'org.apache.log4j.RollingFileAppender')
+        p.setProperty('log4j.appender.builtin.File', builtin_log)
+        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")
+      org.apache.log4j.PropertyConfigurator.configure(p)
+
+      @@logger = Logger.new('norikra.log')
+
+      @@devmode = devmode
+    end
+
+    def self.swap(logger) # for tests
+      @@mon.synchronize do
+        original,@@logger = @@logger, logger
+        yield
+        @@logger = original
+      end
+    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
+
+    def fatal(message, data=nil)
+      from = @@devmode ? caller_locations(1,1) : nil
+      @@logger.fatal(message, data, from)
+    end
+  end
+
+  class Logger
+    def initialize(name)
+      @log4j = org.apache.commons.logging.LogFactory.getLog(name)
+    end
+
+    def trace(message, data=nil, from=nil)
+      @log4j.trace(format(from, message, data))
+    end
+
+    def debug(message, data=nil, from=nil)
+      @log4j.debug(format(from, message, data))
+    end
+
+    def info(message, data=nil, from=nil)
+      @log4j.info(format(from, message, data))
+    end
+
+    def warn(message, data=nil, from=nil)
+      @log4j.warn(format(from, message, data))
+    end
+
+    def error(message, data=nil, from=nil)
+      @log4j.error(format(from, message, data))
+    end
+
+    def fatal(message, data=nil, from=nil)
+      @log4j.fatal(format(from, message, data))
+    end
+
+    def format_location(locations)
+      return '' if locations.nil?
+      c = locations.first
+      "#{c.path}:#{c.lineno}(#{c.label})"
+    end
+
+    def format_data(data=nil)
+      return '' if data.nil?
+
+      #, status:404, message:'content not found'
+      if data.is_a?(Proc)
+        ', ' + format_data(data.call)
+      elsif data.is_a?(Hash)
+        ', ' + data.map{|k,v| "#{k}:#{v.inspect}"}.join(', ')
+      else
+        ', ' + data.inspect
+      end
+    end
+
+    def format(from, message, data)
+      # LOG_FORMAT = '%s: %s%s'
+      LOG_FORMAT % [format_location(from), message, format_data(data)]
+    end
+  end
+
+  class DummyLogger < Logger # for tests
+    # LOG_LOG4J_FORMAT = '%d{yyyy-MM-dd HH:mm:ss Z} [%p] %m%n'
+    # LOG_FORMAT = '%s: %s%s'
+    FORMAT_SIMULATED = "%s [%s] %s\n"
+    FORMAT_SIMULATED_TIME = '%Y-%m-%d %H:%M:%S %z'
+    attr_accessor :logs, :output
+    def initialize
+      @logs = { :TRACE => [], :DEBUG => [], :INFO => [], :WARN => [], :ERROR => [], :FATAL => [] }
+      @output = []
+    end
+    def log(level, message, data, from)
+      @logs[level].push({:message => message, :data => data, :from => from})
+      formatted = sprintf(FORMAT_SIMULATED, Time.now.strftime(FORMAT_SIMULATED_TIME), level.to_s, format(from, message, data))
+      @output.push(formatted)
+    end
+    def trace(m,d,f); self.log(:TRACE,m,d,f); end
+    def debug(m,d,f); self.log(:DEBUG,m,d,f); end
+    def info(m,d,f) ; self.log(:INFO, m,d,f); end
+    def warn(m,d,f) ; self.log(:WARN, m,d,f); end
+    def error(m,d,f); self.log(:ERROR,m,d,f); end
+    def fatal(m,d,f); self.log(:FATAL,m,d,f); end
+  end
+end
+
+require_relative './logger_mizuno_patch'

data/lib/norikra/logger_mizuno_patch.rb

@@ -0,0 +1,27 @@
+require 'java'
+require 'esper/lib/log4j-1.2.16.jar'
+require 'mizuno/logger'
+
+module Mizuno
+  class Logger
+    def Logger.configure(options = {})
+      return if @options
+      @options = options
+
+      ### built-in jetty log level is fixed as 'WARN' for Norikra
+      ### Base logging configuration.
+      # mizuno_log_limit = "WARN"
+      # config = <<-END
+      #   log4j.logger.ruby = #{mizuno_log_limit}
+      #   log4j.logger.org.eclipse.jetty.util.log = #{mizuno_log_limit}, ruby
+      # END
+
+      ### appender configuration will be done out of mizuno
+
+      # Create the default logger that gets used everywhere.
+      @logger = new
+    end
+  end
+end
+
+

data/lib/norikra/rpc/handler.rb

@@ -1,56 +1,99 @@
+require 'norikra/logger'
+include Norikra::Log
+
 class Norikra::RPC::Handler
   def initialize(engine)
     @engine = engine
   end
 
+  def logging(type, handler, *args)
+    if type == :manage
+      debug "RPC", :handler => handler.to_s, :args => args
+    else
+      trace "RPC", :handler => handler.to_s, :args => args
+    end
+
+    begin
+      yield
+    rescue => e
+      error "Exception #{e.class}: #{e.message}"
+      e.backtrace.each do |t|
+        error "  " + t
+      end
+      nil
+    end
+  end
+
   def targets
-    @engine.targets
+    logging(:show, :targets){
+      @engine.targets
+    }
   end
 
   def open(target, fields)
-    r = @engine.open(target, fields)
-    !!r
+    logging(:manage, :open, target, fields){
+      r = @engine.open(target, fields)
+      !!r
+    }
   end
 
   def close(target)
-    r = @engine.close(target)
-    !!r
+    logging(:manage, :close, target){
+      r = @engine.close(target)
+      !!r
+    }
   end
 
   def queries
-    @engine.queries.map(&:to_hash)
+    logging(:show, :queries){
+      @engine.queries.map(&:to_hash)
+    }
   end
 
   def register(query_name, expression)
-    r = @engine.register(Norikra::Query.new(:name => query_name, :expression => expression))
-    !!r
+    logging(:manage, :register, query_name, expression){
+      r = @engine.register(Norikra::Query.new(:name => query_name, :expression => expression))
+      !!r
+    }
   end
 
   def deregister(query_name)
-    #TODO: write!
-    raise NotImplementedError
+    logging(:manage, :deregister, query_name){
+      #TODO: write!
+      raise NotImplementedError
+    }
   end
 
   def fields(target)
-    @engine.typedef_manager.field_list(target)
+    logging(:show, :fields, target){
+      @engine.typedef_manager.field_list(target)
+    }
   end
 
   def reserve(target, fieldname, type)
-    r = @engine.reserve(target, fieldname, type)
-    !!r
+    logging(:manage, :reserve, target, fieldname, type){
+      r = @engine.reserve(target, fieldname, type)
+      !!r
+    }
   end
 
   def send(target, events)
-    r = @engine.send(target, events)
-    !!r
+    logging(:data, :send, target, events){
+      r = @engine.send(target, events)
+      !!r
+    }
   end
 
   def event(query_name)
-    @engine.output_pool.pop(query_name)
+    logging(:show, :event, query_name){
+      @engine.output_pool.pop(query_name)
+    }
   end
 
   def sweep
-    @engine.output_pool.sweep
+    logging(:show, :sweep){
+      @engine.output_pool.sweep
+    }
   end
 
   # post('/listen') # get all events as stream, during connection keepaliving

data/lib/norikra/server.rb

@@ -1,5 +1,8 @@
 require 'norikra/engine'
 
+require 'norikra/logger'
+include Norikra::Log
+
 require 'norikra/typedef_manager'
 require 'norikra/output_pool'
 require 'norikra/typedef'
@@ -13,12 +16,15 @@ module Norikra
     RPC_DEFAULT_PORT = 26571
     # 26571 = 3026 + 3014 + 2968 + 2950 + 2891 + 2896 + 2975 + 2979 + 2872
 
-    def initialize(host=RPC_DEFAULT_HOST, port=RPC_DEFAULT_PORT, configuration={})
-      #TODO: initial configuration
-      @typedef_manager = Norikra::TypedefManager.new
+    attr_accessor :running
 
+    def initialize(host=RPC_DEFAULT_HOST, port=RPC_DEFAULT_PORT, conf={})
+      #TODO: initial configuration (targets/queries)
+      @typedef_manager = Norikra::TypedefManager.new
       @output_pool = Norikra::OutputPool.new
 
+      Norikra::Log.init(conf[:loglevel], conf[:logdir], {:filesize => conf[:logfilesize], :backups => conf[:logbackups]})
+
       @engine = Norikra::Engine.new(@output_pool, @typedef_manager)
       @rpcserver = Norikra::RPC::HTTP.new(:engine => @engine, :port => port)
     end
@@ -26,16 +32,22 @@ module Norikra
     def run
       @engine.start
       @rpcserver.start
-      p "Norikra server started."
-      #TODO: main loop and signal traps
-      #TODO: loggings
-      sleep 50
+      info "Norikra server started."
+      @running = true
+
+      Signal.trap(:INT){ @running = false }
+      #TODO: more signal traps (dumps of query/fields? or other handler?)
+
+      while @running
+        sleep 1
+      end
     end
 
     def shutdown
-      #TODO: stop order
+      info "Norikra server shutting down."
       @rpcserver.stop
       @engine.stop
+      info "Norikra server shutdown complete."
     end
   end
 end

data/lib/norikra/typedef.rb

@@ -73,7 +73,7 @@ module Norikra
     attr_accessor :summary, :fields
     attr_accessor :target, :level
 
-    def initialize(fields, default_optional=nil)
+    def initialize(fields, default_optional=nil, rebounds=0)
       @fields = {}
       fields.keys.each do |key|
         data = fields[key]
@@ -90,16 +90,21 @@ module Norikra
 
       @target = nil
       @level = nil
+      @rebounds = rebounds
       @event_type_name = nil
     end
 
     def dup
       fields = Hash[@fields.map{|key,field| [key, {:type => field.type, :optional => field.optional}]}]
-      self.class.new(fields)
+      self.class.new(fields, nil, @rebounds)
+    end
+
+    def self.field_names_key(data)
+      data.keys.sort.join(',')
     end
 
     def field_names_key
-      @fields.keys.sort.join(',')
+      self.class.field_names_key(@fields)
     end
 
     def update_summary
@@ -116,7 +121,7 @@ module Norikra
 
     #TODO: have a bug?
     def ==(other)
-      return false unless self.class != other.class
+      return false if self.class != other.class
       self.summary == other.summary
     end
 
@@ -136,20 +141,24 @@ module Norikra
       @event_type_name.dup
     end
 
-    def bind(target, level)
+    def bind(target, level, update_type_name=false)
       @target = target
       @level = level
       prefix = case level
                when :base then 'b_'
                when :query then 'q_'
-               else 'e_'
+               when :data then 'e_' # event
+               else
+                 raise ArgumentError, "unknown fieldset bind level: #{level}, for target #{target}"
                end
-      @event_type_name = prefix + Digest::MD5.hexdigest([target, level.to_s, self.object_id.to_s, @summary].join("\t"))
+      @rebounds += 1 if update_type_name
+
+      @event_type_name = prefix + Digest::MD5.hexdigest([target, level.to_s, @rebounds.to_s, @summary].join("\t"))
       self
     end
 
-    def rebind
-      self.dup.bind(@target, @level)
+    def rebind(update_type_name)
+      self.dup.bind(@target, @level, update_type_name)
     end
 
     def self.simple_guess(data, optional=true)
@@ -197,7 +206,7 @@ module Norikra
     attr_accessor :fields, :baseset, :queryfieldsets, :datafieldsets
 
     def initialize(fields=nil)
-      if fields
+      if fields && !fields.empty?
         @baseset = FieldSet.new(fields, false) # all fields are required
         @fields = @baseset.fields.dup
       else
@@ -208,7 +217,7 @@ module Norikra
       @queryfieldsets = []
       @datafieldsets = []
 
-      @set_map = {} # fieldname.sort.join(',') => data_fieldset
+      @set_map = {} # FieldSet.field_names_key(data_fieldset) => data_fieldset
 
       @mutex = Mutex.new
     end
@@ -223,7 +232,7 @@ module Norikra
 
     def activate(fieldset)
       @mutex.synchronize do
-        set = fieldset.dup
+        set = fieldset.rebind(false) # base fieldset rebinding must not update event_type_name
         fieldset.fields.dup.each do |fieldname, field|
           set.fields[fieldname] = field.dup(false)
         end
@@ -294,15 +303,15 @@ module Norikra
         raise ArgumentError, "try to replace different field name sets"
       end
       @mutex.synchronize do
-        @datafieldsets.push(fieldset)
-        @set_map[fieldset.field_names_key] = fieldset
         @datafieldsets.delete(old_fieldset)
+        @set_map[fieldset.field_names_key] = fieldset
+        @datafieldsets.push(fieldset)
       end
       true
     end
 
     def refer(data)
-      field_names_key = data.keys.sort.join(',')
+      field_names_key = FieldSet.field_names_key(data)
       return @set_map[field_names_key] if @set_map.has_key?(field_names_key)
 
       guessed = FieldSet.simple_guess(data)

data/lib/norikra/typedef_manager.rb

@@ -16,7 +16,7 @@ module Norikra
     end
 
     def add_target(target, fields)
-      # fields nil => lazy
+      # fields nil || [] => lazy
       # fields {'fieldname' => 'type'}
       @mutex.synchronize do
         raise RuntimeError, "target #{target} already exists" if @typedefs[target]
@@ -29,6 +29,7 @@ module Norikra
     end
 
     def activate(target, fieldset)
+      fieldset.bind(target, :base)
       @typedefs[target].activate(fieldset)
     end
 

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/norikra.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "mizuno", "~> 0.6"
   spec.add_runtime_dependency "rack"
-  spec.add_runtime_dependency "msgpack-rpc-over-http-jruby", ">= 0.0.5.jruby1"
+  spec.add_runtime_dependency "msgpack-rpc-over-http-jruby", ">= 0.0.5"
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "norikra-client-jruby", ">= 0.0.3"
+  spec.add_runtime_dependency "norikra-client-jruby", ">= 0.0.4"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/fieldset_spec.rb

@@ -71,8 +71,14 @@ describe Norikra::FieldSet do
       end
     end
 
+    describe '.field_names_key' do
+      it 'returns comma-separated sorted field names of argument hash' do
+        expect(Norikra::FieldSet.field_names_key({'x1'=>1,'y3'=>2,'xx'=>3,'xx1'=>4,'a'=>5})).to eql('a,x1,xx,xx1,y3')
+      end
+    end
+
     describe '#field_names_key' do
-      it 'returns comman-separeted sorted field names' do
+      it 'returns comma-separeted sorted field names' do
         expect(set.field_names_key).to eql('a,x,y')
       end
     end
@@ -160,11 +166,25 @@ describe Norikra::FieldSet do
     end
 
     describe '#rebind' do
-      it 'returns duplicated object, but these event_type_name are same' do
+      it 'returns duplicated object, but these event_type_name are same with false argument' do
+        x = set.dup
+        x.bind('TargetExample', :data)
+
+        y = x.rebind(false)
+        expect(y.summary).to eql(x.summary)
+        expect(y.fields.values.map(&:to_hash)).to eql(x.fields.values.map(&:to_hash))
+        expect(y.target).to eql(x.target)
+        expect(y.level).to eql(x.level)
+        expect(y.field_names_key).to eql(x.field_names_key)
+
+        expect(y.event_type_name).to eql(x.event_type_name)
+      end
+
+      it 'returns duplicated object, and these event_type_name should be updated with true argument' do
         x = set.dup
         x.bind('TargetExample', :data)
 
-        y = x.rebind
+        y = x.rebind(true)
         expect(y.summary).to eql(x.summary)
         expect(y.fields.values.map(&:to_hash)).to eql(x.fields.values.map(&:to_hash))
         expect(y.target).to eql(x.target)

data/spec/typedef_spec.rb

@@ -45,6 +45,8 @@ describe Norikra::Typedef do
         it 'stores all fields in specified fieldset' do
           t = Norikra::Typedef.new
           set = Norikra::FieldSet.new({'a'=>'string','b'=>'long','c'=>'double'})
+          set.target = 'testing'
+          set.level = :base
           t.activate(set)
           expect(t.fields.size).to eql(3)
           expect(t.fields['a'].optional?).to be_false
@@ -198,7 +200,7 @@ describe Norikra::Typedef do
         expect(t.instance_eval{ @set_map['a,b'].event_type_name }).to eql(set1.event_type_name)
         expect(t.instance_eval{ @datafieldsets.size }).to eql(1)
 
-        set2 = set1.rebind
+        set2 = set1.rebind(true) # replacing needs updated event_type_name
         t.replace(:data, set1, set2)
         expect(t.instance_eval{ @datafieldsets.size }).to eql(1)
         expect(t.instance_eval{ @set_map['a,b'].event_type_name }).not_to eql(set1.event_type_name)

metadata

@@ -2,26 +2,26 @@
 name: norikra
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.4
+  version: 0.0.5
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
     none: false
@@ -31,17 +31,15 @@ dependencies:
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -49,15 +47,15 @@ dependencies:
   name: msgpack-rpc-over-http-jruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5.jruby1
+        version: 0.0.5
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5.jruby1
+        version: 0.0.5
     none: false
   prerelease: false
   type: :runtime
@@ -65,17 +63,15 @@ dependencies:
   name: thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -83,15 +79,15 @@ dependencies:
   name: norikra-client-jruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
     none: false
   prerelease: false
   type: :runtime
@@ -99,13 +95,13 @@ dependencies:
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
     none: false
@@ -115,17 +111,15 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -133,13 +127,13 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
     none: false
@@ -149,17 +143,15 @@ dependencies:
   name: spork
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -167,21 +159,19 @@ dependencies:
   name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
-description: ! 'CEP: Complex Event Processor with Esper EPL qeury language, messagepack
+description: 'CEP: Complex Event Processor with Esper EPL qeury language, messagepack
   rpc for inbound event data'
 email:
 - tagomoris@gmail.com
@@ -191,8 +181,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
+- .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
@@ -272,6 +262,8 @@ files:
 - lib/norikra.rb
 - lib/norikra/cli.rb
 - lib/norikra/engine.rb
+- lib/norikra/logger.rb
+- lib/norikra/logger_mizuno_patch.rb
 - lib/norikra/output_pool.rb
 - lib/norikra/query.rb
 - lib/norikra/rpc.rb
@@ -300,17 +292,15 @@ require_paths:
 - esper
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: