norikra 1.3.1-java → 1.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287542701c924a59dd86b206f843168325e7a84f
-  data.tar.gz: df280e4dbb55bfe37d0432e458855fb3368c44b3
+  metadata.gz: 594b7ff8b47b9244aec8b1c1557118398d38cd6f
+  data.tar.gz: a175ef83ae11f3253337b3c827b74e96a6cade22
 SHA512:
-  metadata.gz: d1932ce34bd6190a92947298516c5ec9b99abc267602d1d87d563e7f51f61e8c02edccdc93b8cc9d5a55cc09363f66e23b629be644ad4dafc2dfd746d15e1d84
-  data.tar.gz: fc4cf79e10f3b53662969a31719a948b8070a79045d65f3f13baf58169516d1bac1b3d01003542abcc3b97e2b5a2461ca0190a7f972a0c15227760f33f892c97
+  metadata.gz: 2157ac962cee967607c357c065039c1b6c8844703a1d5023ffd91415c021741427c442d6689b5de1a6fc2b399c7a4faf5de65ad56b2980ab303c1fadb6af0848
+  data.tar.gz: 0cdeb1f5572a3909ecdce291ab3638793db913bacd88ae8e3fceca02ffd47c26c484c0b11d3adcbf447213c713dc757b3c1193e9ce29bc569d88489e3fee4503

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.19
+jruby-1.7.20

data/Changes.md

@@ -3,6 +3,11 @@
 Changes of norikra.
 
 ## v1
+* v1.4.0
+  * Add `-D` option handling to pass JVM system properties
+  * Add `-agentlib` option handling to pass it to JVM
+  * Dependency update for msgpack.gem
+  * Fix Bug to raise error for queries using irstream
 * v1.3.1
   * Fix to enable SO_REUSEPORT for listening ports to help "address already in use" exception in restarts
 * v1.3.0

data/README.md

@@ -64,6 +64,8 @@ See: http://norikra.github.io/
 
 ## Changes
 
+* v1.4
+  * Dependency update for msgpack.gem
 * v1.3
   * Dynamic plugin reloading by SIGHUP
   * Esper-5.2 bundle

data/lib/norikra/cli.rb

@@ -152,6 +152,10 @@ module Norikra
           jruby_options.push('-J-verbose:gc')
         elsif arg =~ /^-javaagent:(.+)$/
           jruby_options.push('-J-javaagent:' + $1)
+        elsif arg =~ /^-agentlib:(.+)$/
+          jruby_options.push('-J-agentlib:' + $1)
+        elsif arg =~ /^-D(.+)$/
+          jruby_options.push('-J-D' + $1)
         else
           argv.push(arg)
         end

data/lib/norikra/listener.rb

@@ -158,18 +158,24 @@ module Norikra
         end
       end
 
+      def apply_type_convert_to_events(events)
+        if events.respond_to?(:map)
+          events.map{|e| type_convert(e) }
+        else
+          type_convert(events)
+        end
+      end
+
       def update(new_events, old_events)
         t = Time.now.to_i
         if @mode == :sync
-          news = new_events.map{|e| type_convert(e) }
-          olds = if old_events.respond_to?(:map)
-                   old_events.map{|e| type_convert(e) }
-                 else
-                   type_convert(old_events)
-                 end
+          news = apply_type_convert_to_events(new_events)
+          olds = apply_type_convert_to_events(old_events)
           trace("produced events"){ { listener: self.class, query: @query_name, group: @query_group, news: news, olds: olds } }
           process_sync(news, olds)
-          @events_statistics[:output] += news.size
+          if news.respond_to?(:size)
+            @events_statistics[:output] += news.size
+          end
         else # async
           events = new_events.map{|e| [t, type_convert(e)]}
           trace("pushed events"){ { listener: self.class, query: @query_name, group: @query_group, event: events } }
@@ -188,8 +194,10 @@ module Norikra
 
       def process_sync(news, olds)
         t = Time.now.to_i
-        events = news.map{|e| [t, e]}
-        @output_pool.push(@query_name, @query_group, events)
+        if news.respond_to?(:map)
+          events = news.map{|e| [t, e]}
+          @output_pool.push(@query_name, @query_group, events)
+        end
       end
     end
 
@@ -224,7 +232,9 @@ module Norikra
         # We does NOT convert 'container.$0' into container['field'].
         # Use escaped names like 'container__0'. That is NOT so confused.
         trace("loopback event"){ { query: @query_name, group: @query_group, event: news } }
-        @engine.send(@argument, news)
+        if news.respond_to?(:each)
+          @engine.send(@argument, news)
+        end
       end
     end
 
@@ -241,8 +251,10 @@ module Norikra
       end
 
       def process_sync(news, olds)
-        news.each do |e|
-          @stdout.puts @query_name + "\t" + JSON.dump(e)
+        if news.respond_to?(:each)
+          news.each do |e|
+            @stdout.puts @query_name + "\t" + JSON.dump(e)
+          end
         end
       end
     end

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/norikra.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "mizuno", ">= 0.6.10"
   spec.add_runtime_dependency "rack"
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "msgpack-rpc-over-http", ">= 0.0.7"
-  spec.add_runtime_dependency "norikra-client", "~> 1.3.0"
+  spec.add_runtime_dependency "msgpack-rpc-over-http", "~> 0.1.0"
+  spec.add_runtime_dependency "norikra-client", "~> 1.4.0"
   spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "sinatra-contrib"
   spec.add_runtime_dependency "erubis"

data/public/js/norikra.webui.js

@@ -60,6 +60,7 @@ $(function(){
           button.popover({
             placement: 'top',
             html: true,
+            template: '<div class="popover" role="tooltip" style="height: 50%; overflow-y: scroll;"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
             content: table_html
           }).popover('toggle');
           $('table.target-fields').closest('div').css('padding', '0');

data/spec/listener_spec.rb

@@ -96,6 +96,61 @@ describe Norikra::Listener::Base do
     end
   end
 
+  describe '#apply_type_convert_to_events' do
+    statistics = {output: 0}
+    listener = DummySyncListener.new('', 'name', 'group')
+    listener.events_statistics = statistics
+
+    it 'returns value itself for nil' do
+      val = nil
+      expect(listener.apply_type_convert_to_events(val)).to eq(val)
+    end
+
+    it 'returns type_convert-ed events for non-nil events' do
+      s1 = "乗鞍".force_encoding("ASCII-8BIT")
+      events = [
+          [100, 100.01, false, true, nil, s1],
+          {
+            "100" => 100,
+            "100_01" => 100.01,
+            "bool$false" => false,
+            "bool$true" => true,
+            "object$$0" => nil,
+            "string" => s1,
+            "list" => [0, 1, 2],
+            "percentiles" => {
+                "10" => 0.1,
+                "50" => 0.5,
+                "99" => 0.99
+            }
+          }
+      ]
+      revents = listener.apply_type_convert_to_events(events)
+      expect(revents).to be_a(Array)
+      expect(revents.size).to eql(2)
+
+      expect(revents[0]).to be_a(Array)
+      expect(revents[0][0]).to eql(100)
+      expect(revents[0][1]).to eql(100.01)
+      expect(revents[0][2]).to eq(false)
+      expect(revents[0][3]).to eq(true)
+      expect(revents[0][4]).to be_nil
+      expect(revents[0][5].encoding.to_s).to eql("UTF-8")
+      expect(revents[0][5]).to eql("乗鞍")
+
+      expect(revents[1]).to be_a(Hash)
+      expect(revents[1]["100"]).to eql(100)
+      expect(revents[1]["100_01"]).to eql(100.01)
+      expect(revents[1]["bool.false"]).to eq(false)
+      expect(revents[1]["bool.true"]).to eq(true)
+      expect(revents[1]["object.$0"]).to be_nil
+      expect(revents[1]["string"].encoding.to_s).to eql("UTF-8")
+      expect(revents[1]["string"]).to eql("乗鞍")
+      expect(revents[1]["list"]).to eql([0,1,2])
+      expect(revents[1]["percentiles"]).to eql({"10" => 0.1, "50" => 0.5, "99" => 0.99})
+    end
+  end
+
   ### TODO: add specs of .parse, #start, #shutdown, #push and #update
 end
 
@@ -108,9 +163,9 @@ describe Norikra::Listener::MemoryPool do
 
   describe '#process_sync' do
     listener = Norikra::Listener::MemoryPool.new(nil, 'name', 'group')
-    listener.output_pool = dummy_pool = Norikra::ListenerSpecHelper::DummyOutputPool.new
 
     it 'pushs events into pool, with current time' do
+      listener.output_pool = dummy_pool = Norikra::ListenerSpecHelper::DummyOutputPool.new
       listener.process_sync([{"n1" => 100, "s" => "string one"}, {"n1" => 101, "s" => "string two"}], [])
       expect(dummy_pool.pool['group']['name'].size).to eql(2)
       expect(dummy_pool.pool['group']['name'][0][0]).to be_a(Fixnum)
@@ -120,6 +175,12 @@ describe Norikra::Listener::MemoryPool do
       listener.process_sync([{"n1" => 102, "s" => "string three"}], [])
       expect(dummy_pool.pool['group']['name'].size).to eql(3)
     end
+
+    it 'sends nil events into pool with current time' do
+      listener.output_pool = dummy_pool = Norikra::ListenerSpecHelper::DummyOutputPool.new
+      listener.process_sync(nil, nil)
+      expect(dummy_pool.pool['group']).to be_nil
+    end
   end
 end
 
@@ -138,9 +199,9 @@ describe Norikra::Listener::Loopback do
 
   describe '#process_sync' do
     listener = Norikra::Listener::Loopback.new('target1', 'name', 'LOOPBACK(target1)')
-    listener.engine = dummy_engine = Norikra::ListenerSpecHelper::DummyEngine.new
 
     it 'sends events into engine with target name' do
+      listener.engine = dummy_engine = Norikra::ListenerSpecHelper::DummyEngine.new
       listener.process_sync([{"n1" => 100, "s" => "string one"}, {"n1" => 101, "s" => "string two"}], [])
       expect(dummy_engine.events['target1'].size).to eql(2)
       expect(dummy_engine.events['target1'][0]).to eql({"n1" => 100, "s" => "string one"})
@@ -149,6 +210,12 @@ describe Norikra::Listener::Loopback do
       listener.process_sync([{"n1" => 102, "s" => "string three"}], [])
       expect(dummy_engine.events['target1'].size).to eql(3)
     end
+
+    it 'sends nil events into engine with target name' do
+      listener.engine = dummy_engine = Norikra::ListenerSpecHelper::DummyEngine.new
+      listener.process_sync(nil, nil)
+      expect(dummy_engine.events).to be_empty
+    end
   end
 end
 
@@ -187,5 +254,11 @@ describe Norikra::Listener::Stdout do
       end
       expect(results).to eql(events1 + events2)
     end
+
+    it 'sends nil events into engine with target name' do
+      dummyio.truncate(0)
+      listener.process_sync(nil, nil)
+      expect(dummyio.string).to eql('')
+    end
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: norikra
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.10
   name: mizuno
@@ -21,13 +21,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.10
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: rack
@@ -35,13 +35,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: thor
@@ -49,41 +49,41 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
   name: msgpack-rpc-over-http
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   name: norikra-client
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: sinatra
@@ -91,13 +91,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: sinatra-contrib
@@ -105,13 +105,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: erubis
@@ -119,13 +119,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   name: bundler
@@ -133,13 +133,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
@@ -147,13 +147,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: rspec
@@ -161,13 +161,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: pry
@@ -175,7 +175,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Norikra is a open source server software provides "Schema-les Stream Processing" with SQL, written in JRuby, runs on JVM, licensed under GPLv2.
@@ -186,9 +186,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Changes.md
 - Gemfile
 - LICENSE
@@ -285,17 +285,17 @@ require_paths:
 - esper
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Schema-less stream processing server with SQL