norikra 1.0.1-java → 1.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6647d0732102c2599115e2bfb9c455de92995c8b
-  data.tar.gz: a7880bbb4b929fc44b4b22e83604153e024c3e19
+  metadata.gz: 484ecce14e3035444d000c902c7172bc66aa0f21
+  data.tar.gz: f964401ccd096def82fc7d2b0e980fcb634d05c9
 SHA512:
-  metadata.gz: f42c58bf9d933ce6c3feb58c221a7e3144455b91c00b53bc41b75937aea889d85a82ee39a452c3897f8c6b3067c777bedf920396ba1c5a6436f55ae7c83e0ff0
-  data.tar.gz: 55e6450e6c30993f92c2dca499cfcc98d1009d1f520e39c8506b37d6b1d5e760954e1bf39b528295367863cc0bdad33d50495592084db3541b39a7d3cadbcf34
+  metadata.gz: 968258b7e2456018e8c557d22802514a198dad763529a40f73edf94c39614ebac3879d9469435899bd353a44b2704615ef47b30516d1609e36136a37f148787e
+  data.tar.gz: 427efc15c89693c0750147176be8105e7d9bec03a7537fada0e8b612f1e1540274b9ea4d011585a2846e4ebcdfbe61addada81d102070ccf7b524f5f648736ad

data/Changes.md

@@ -0,0 +1,64 @@
+# Changes
+
+Changes of norikra.
+
+## v1
+* v1.0.2:
+  * Fix bug:
+    * to handle encoding of input strings
+    * to set encoding of nested output values
+    * to handle wrong query groups in error which previously registered
+* v1.0.1:
+  * String encoding in norikra is fixed as UTF-8
+* v1.0.0:
+  * Update esper version (4.9.0 -> 5.0.0)
+    * Support Group By ROLLUP, Grouping Sets and CUBE
+    * Support Group By clause in subqueries
+    * Support subqueries that select multiple columns to provide input to enumeration methods
+    * Support Having clause to have subquery
+  * Add loopback query group to connect query output into targets directly
+  * RPC:
+    * Add JSON RPC API (/api on port 26578)
+    * Add API to fetch norikra server logs
+  * Add `--stats-secondary` option to store versioned stats files
+  * Fix bug:
+    * to return `[]` for NULL query output (fixed to `nil`)
+    * to handle container value for simple value field (exception -> NULL)
+
+## v0.1
+
+* v0.1.7:
+  * Fix `Pattern` support bug
+* v0.1.6:
+  * Fix bug: Wrong escape for java instance method calls
+* v0.1.5:
+  * Add RPC port monitoring handler (GET /)
+  * Add `Pattern` support
+  * Changes for GC/JVM
+    * Server starts with default(recommended) JVM options for GC configurations
+    * Add option not to use default JVM options
+    * Add option to configure JVM to print GC logs
+  * Stats file changes
+    * Changed to use SIGUSR2 (SIGUSR1 is used by JVM on linux platform)
+    * Changed no to contain server process configurations (ports, threads, logs ...)
+  * WebUI improvements
+    * Add button to close target on WebUI
+    * Add link to download stats file
+  * Fix bugs
+    * Fieldname handlings about names with non-alphabetic chars
+    * Query parser bug for some built-in functions (ex: `rate(10)`)
+    * Write stats file in more safe way
+    * WebUI: Incorrect memory bar
+* v0.1.4:
+  * Stat dump option on runtime per specified intervals (`--dump-stat-interval`)
+  * Stat dump on demand by SIGUSR1
+  * `norikra-client event see` command (and API call) to get query results, but not remove it
+  * Last modified time for each target on WebUI
+* v0.1.3:
+  * Fix critical bug about query de-registration
+* v0.1.2:
+  * Fix CLI start command to detect jruby path collectly (behind rbenv/rvm and others)
+* v0.1.1:
+  * Fix types more explicitly for users ('int/long' -> 'integer', 'float/double' -> 'float')
+* v0.1.0:
+  * First release for production

data/README.md

@@ -70,55 +70,17 @@ See: http://norikra.github.io/
 
 ## Changes
 
-* v1.0.0:
-  * Update esper version (4.9.0 -> 5.0.0)
-    * Support Group By ROLLUP, Grouping Sets and CUBE
-    * Support Group By clause in subqueries
-    * Support subqueries that select multiple columns to provide input to enumeration methods
-    * Support Having clause to have subquery
-  * Add loopback query group to connect query output into targets directly
-  * RPC:
-    * Add JSON RPC API (/api on port 26578)
-    * Add API to fetch norikra server logs
-  * Add `--stats-secondary` option to store versioned stats files
-  * Fix bug:
-    * to return `[]` for NULL query output (fixed to `nil`)
-    * to handle container value for simple value field (exception -> NULL)
-* v0.1.7:
-  * Fix `Pattern` support bug
-* v0.1.6:
-  * Fix bug: Wrong escape for java instance method calls
-* v0.1.5:
-  * Add RPC port monitoring handler (GET /)
-  * Add `Pattern` support
-  * Changes for GC/JVM
-    * Server starts with default(recommended) JVM options for GC configurations
-    * Add option not to use default JVM options
-    * Add option to configure JVM to print GC logs
-  * Stats file changes
-    * Changed to use SIGUSR2 (SIGUSR1 is used by JVM on linux platform)
-    * Changed no to contain server process configurations (ports, threads, logs ...)
-  * WebUI improvements
-    * Add button to close target on WebUI
-    * Add link to download stats file
-  * Fix bugs
-    * Fieldname handlings about names with non-alphabetic chars
-    * Query parser bug for some built-in functions (ex: `rate(10)`)
-    * Write stats file in more safe way
-    * WebUI: Incorrect memory bar
-* v0.1.4:
-  * Stat dump option on runtime per specified intervals (`--dump-stat-interval`)
-  * Stat dump on demand by SIGUSR1
-  * `norikra-client event see` command (and API call) to get query results, but not remove it
-  * Last modified time for each target on WebUI
-* v0.1.3:
-  * Fix critical bug about query de-registration
-* v0.1.2:
-  * Fix CLI start command to detect jruby path collectly (behind rbenv/rvm and others)
-* v0.1.1:
-  * Fix types more explicitly for users ('int/long' -> 'integer', 'float/double' -> 'float')
-* v0.1.0:
-  * First release for production
+* v1.0
+  * Esper-5.0 bundle
+  * Pattern support
+  * Nested object support
+  * Built-in default JVM options
+  * JSON APIs
+  * Many more features
+* v0.1
+  * First release for production usage
+
+See Changes.md for details.
 
 ## Copyright
 

data/lib/norikra/engine.rb

@@ -249,25 +249,22 @@ module Norikra
         @events_statistics = events_statistics
       end
 
-      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].nil?
-            converted[unescaped_key] = nil
-          elsif event[key].respond_to?(:to_hash)
-            converted[unescaped_key] = event[key].to_hash
-          elsif event[key].respond_to?(:to_a)
-            converted[unescaped_key] = event[key].to_a
-          elsif event[key].respond_to?(:force_encoding)
-            converted[unescaped_key] = event[key].force_encoding('UTF-8')
-          else
-            converted[unescaped_key] = event[key]
-          end
+      def type_convert(value)
+        if value.respond_to?(:getUnderlying)
+          value = value.getUnderlying
+        end
+
+        trace "converting", :value => value
+
+        if value.respond_to?(:to_a)
+          value.to_a.map{|v| type_convert(v) }
+        elsif value.respond_to?(:to_hash)
+          Hash[ value.to_hash.map{|k,v| [ Norikra::Field.unescape_name(k), type_convert(v)] } ]
+        elsif value.respond_to?(:force_encoding)
+          value.force_encoding('UTF-8')
+        else
+          value
         end
-        converted
       end
 
       def update(new_events, old_events)
@@ -508,6 +505,7 @@ module Norikra
       epl = administrator.getStatement(query.statement_name)
       return unless epl
 
+      @output_pool.remove(query.name, query.group)
       epl.stop unless epl.isStopped
       epl.destroy unless epl.isDestroyed
     end

data/lib/norikra/field.rb

@@ -178,7 +178,7 @@ module Norikra
       return nil if value.nil? || value.is_a?(Hash) || value.is_a?(Array)
 
       case @type
-      when 'string'  then value.to_s
+      when 'string'  then value.to_s.force_encoding('UTF-8')
       when 'boolean'
         if value.is_a?(TrueClass) || value.is_a?(FalseClass)
           value

data/lib/norikra/output_pool.rb

@@ -14,6 +14,18 @@ module Norikra
       @pool.keys
     end
 
+    def remove(query_name, query_group)
+      @mutex.synchronize do
+        group = @groups[query_group]
+        if group
+          group.delete(query_name)
+        end
+        @groups.delete(query_name)
+      @pool.delete(query_name)
+      end
+      nil
+    end
+
     def push(query_name, query_group, events) # events must be [time(int), event_record]
       # called with blank events for window leavings (and/or other situations)
       return if events.size < 1

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/field_spec.rb

@@ -150,6 +150,13 @@ describe Norikra::Field do
         expect(f.format({})).to be_nil
         expect(f.format([])).to be_nil
       end
+
+      it 'changes encoding of string values as UTF-8 forcely' do
+        f = Norikra::Field.new('x', 'string')
+        val = '乗鞍'
+        val.force_encoding('ASCII-8BIT')
+        expect(f.format(val).encoding.to_s).to eql("UTF-8")
+      end
     end
   end
 

data/spec/output_pool_spec.rb

@@ -45,6 +45,25 @@ describe Norikra::OutputPool do
   end
 
   context 'with events in pool' do
+    describe '#remove' do
+      it 'remove query from pool, and from group-query mapping' do
+        pool = Norikra::OutputPool.new
+        t = Time.now.to_i
+        pool.push('TestTable query1', 'group1', [[t,{'count'=>1}],[t,{'count'=>2}],[t,{'count'=>3}]])
+        pool.push('TestTable query2', 'group2', [[t,{'count'=>4}]])
+
+        pool.pop('TestTable query1')
+        pool.remove('TestTable query1', 'group1')
+
+        pool.push('TestTable query1', 'group3', [[t,{'count'=>1}],[t,{'count'=>2}],[t,{'count'=>3}]])
+
+        r1 = pool.sweep('group1') #=> {}
+        r3 = pool.sweep('group3')
+        expect(r1['TestTable query1']).to be_nil
+        expect(r3['TestTable query1'].size).to eql(3)
+      end
+    end
+
     describe '#pop' do
       it 'returns all events of specified query in pool' do
         pool = Norikra::OutputPool.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno
@@ -204,6 +204,7 @@ files:
 - .gitignore
 - .ruby-version
 - .travis.yml
+- Changes.md
 - Gemfile
 - LICENSE
 - README.md