norikra 1.1.1-java → 1.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4eae89361b3c3818371a494f12743a92f35bee9
-  data.tar.gz: d1646809b16f1697fb8539c55492b9f673cf7b7a
+  metadata.gz: 90c6be383b83590b832fb6271a3642a42295ae6f
+  data.tar.gz: 23555f2d09692459ef6fa17b85a47af61129e769
 SHA512:
-  metadata.gz: b2c5171c76436c2ef9e43c3e17291f2e5de780c855416e070cf7c9c47bf1505ee48acb7a13f9de31694d8e6934ed4ebeffbc98cab7ac52bef9a2b857b3dd6d24
-  data.tar.gz: 6567dbcc6ab87147580c459a11ab985bd6b94d1cdd04c70000dc399a202c0ba064407039083e4ff38d7939a134f6b053fbd69a68289c8aeeb6e55b4990c23217
+  metadata.gz: b93442c3b3e202a880fa75f90065770b1b44b210789684b16889b24b7c10f91144488e6f2564b25e78ae0850c2a8f24c711e83c0c8b8d8a90608ee5c2e0b249e
+  data.tar.gz: b34e828cd14c7c4fb00a2d83c17131590be520e15559c9caef5e429d46a92b311e027a12a283721de81000efbb12d79b752df3e1559a4890bef4cabf93788b2d

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 rvm:
   - jruby-19mode
-  - jruby-head
+  # - jruby-head
 jdk:
   - oraclejdk8
   - oraclejdk7
   - openjdk7
   - openjdk6
-matrix:
-  exclude:
-    - rvm: jruby-head
-      jdk: openjdk6
+# matrix:
+#   exclude:
+#     - rvm: jruby-head
+#       jdk: openjdk6

data/Changes.md

@@ -3,6 +3,20 @@
 Changes of norikra.
 
 ## v1
+* v1.1.2
+  * Enable `-javaagent` option
+  * Fix default/pre-set threads
+  * Update RSpec dependency to latest
+  * Reject field names, starting with numeric characters
+  * Reject non-JSON object input events
+  * Fix Bug:
+    * to show wrong output events from queries
+    * missing header column of list of queries in WebUI
+* v1.1.1
+  * Fix bug not to sort suspended queries correctly
+* v1.1.0
+  * Add API/WebUI controls to suspend/resume queries
+  * Add `STDOUT()` query group to show query result easilly
 * v1.0.8:
   * Fix bug not to read command line options for time/route threads
 * v1.0.7:

data/README.md

@@ -70,6 +70,8 @@ See: http://norikra.github.io/
 
 ## Changes
 
+* v1.1
+  * Suspend/Resume queries
 * v1.0
   * Esper-5.0 bundle
   * Pattern support

data/lib/norikra/cli.rb

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

data/lib/norikra/engine.rb

@@ -4,6 +4,9 @@ require 'norikra/error'
 require 'norikra/target'
 require 'norikra/listener'
 
+require 'norikra/query'
+require 'norikra/suspended_query'
+
 require 'norikra/logger'
 include Norikra::Log
 
@@ -221,6 +224,23 @@ module Norikra
       remove_suspended_query(suspended_query)
     end
 
+    def event_filter(event)
+      unless event.is_a?(Hash)
+        error "Invalid input event: Non-Hash (JSON) object: #{event.class}"
+        return nil
+      end
+      event.keys.each do |k|
+        if ! k.is_a?(String)
+          warn "Invalid key in event: Non-String field key: #{k.class}"
+          event.delete(k)
+        elsif k =~ /^\d/
+          warn "Invalid key in event: Starting with numeric char: #{k.to_s}"
+          event.delete(k)
+        end
+      end
+      event
+    end
+
     def send(target_name, events)
       trace "send messages", :target => target_name, :events => events
 
@@ -236,8 +256,13 @@ module Norikra
 
       if @typedef_manager.lazy?(target.name)
         info "opening lazy target", :target => target
-        debug "generating base fieldset from event", :target => target.name, :event => events.first
-        base_fieldset = @typedef_manager.generate_base_fieldset(target.name, events.first)
+
+        first_event = event_filter(events.first)
+        if first_event.nil? # non-hash object
+          raise Norikra::ClientError, "Input data must be JSON object"
+        end
+        debug "generating base fieldset from event", :target => target.name, :event => first_event
+        base_fieldset = @typedef_manager.generate_base_fieldset(target.name, first_event)
 
         debug "registering base fieldset", :target => target.name, :base => base_fieldset
         register_base_fieldset(target.name, base_fieldset)
@@ -249,7 +274,10 @@ module Norikra
 
       strict_refer = (not target.auto_field?)
 
-      events.each do |event|
+      events.each do |input_event|
+        event = event_filter(input_event)
+        next if event.nil? # non-hash object
+
         fieldset = @typedef_manager.refer(target_name, event, strict_refer)
 
         unless registered_data_fieldset[fieldset.summary]

data/lib/norikra/field.rb

@@ -44,7 +44,7 @@ module Norikra
       when 'integer', 'int', 'long' then 'long'
       when 'float', 'double' then 'double'
       when 'hash', 'array'
-        raise Norikra::ArgumentError, "#{type} is norikra internal type, not for esper"
+        raise Norikra::ArgumentError, "#{type} is container field. Don't specify it at open, use it directly."
       when 'byte'
         raise Norikra::ArgumentError, "byte is not supported in Norikra"
       else

data/lib/norikra/query.rb

@@ -465,43 +465,4 @@ module Norikra
     def dup; self; end
     def dup_with_stream_name(actual_name); self; end
   end
-
-  class SuspendedQuery
-    attr_accessor :name, :group, :expression, :targets
-
-    def initialize(query)
-      @name = query.name
-      @group = query.group
-      @expression = query.expression
-      @targets = query.targets
-    end
-
-    def <=>(other)
-      if @group.nil? || other.group.nil?
-        if @group.nil? && other.group.nil?
-          @name <=> other.name
-        else
-          @group.to_s <=> other.group.to_s
-        end
-      else
-        if @group == other.group
-          self.name <=> other.name
-        else
-          self.group <=> other.group
-        end
-      end
-    end
-
-    def suspended?
-      true
-    end
-
-    def to_hash
-      {'name' => @name, 'group' => @group, 'expression' => @expression, 'targets' => @targets, 'suspended' => true}
-    end
-
-    def create
-      Query.new(name: @name, group: @group, expression: @expression)
-    end
-  end
 end

data/lib/norikra/server.rb

@@ -21,26 +21,26 @@ module Norikra
     MICRO_PREDEFINED = {
       :engine => { inbound:    { threads: 0, capacity: 0 }, outbound:   { threads: 0, capacity: 0 },
                    route_exec: { threads: 0, capacity: 0 }, timer_exec: { threads: 0, capacity: 0 }, },
-      :rpc => { threads: 2 },
+      :rpc => { threads: 2 }, # for desktop
       :web => { threads: 2 },
     }
     SMALL_PREDEFINED = {
-      :engine => { inbound:    { threads: 1, capacity: 0 }, outbound:   { threads: 1, capacity: 0 },
-                   route_exec: { threads: 1, capacity: 0 }, timer_exec: { threads: 1, capacity: 0 }, },
-      :rpc => { threads: 2 },
-      :web => { threads: 2 },
+      :engine => { inbound:    { threads: 2, capacity: 0 }, outbound:   { threads: 2, capacity: 0 },
+                   route_exec: { threads: 2, capacity: 0 }, timer_exec: { threads: 2, capacity: 0 }, },
+      :rpc => { threads: 9 }, # 4core HT
+      :web => { threads: 9 },
     }
     MIDDLE_PREDEFINED = {
-      :engine => { inbound:    { threads: 4, capacity: 0 }, outbound:   { threads: 2, capacity: 0 },
-                   route_exec: { threads: 2, capacity: 0 }, timer_exec: { threads: 2, capacity: 0 }, },
-      :rpc => { threads: 4 },
-      :web => { threads: 2 },
+      :engine => { inbound:    { threads: 4, capacity: 0 }, outbound:   { threads: 4, capacity: 0 },
+                   route_exec: { threads: 4, capacity: 0 }, timer_exec: { threads: 4, capacity: 0 }, },
+      :rpc => { threads: 17 }, # 4core HT 2CPU
+      :web => { threads: 17 },
     }
     LARGE_PREDEFINED = {
-      :engine => { inbound:    { threads: 6, capacity: 0 }, outbound:   { threads: 6, capacity: 0 },
-                   route_exec: { threads: 4, capacity: 0 }, timer_exec: { threads: 4, capacity: 0 }, },
-      :rpc => { threads: 8 },
-      :web => { threads: 2 },
+      :engine => { inbound:    { threads: 8, capacity: 0 }, outbound:   { threads: 8, capacity: 0 },
+                   route_exec: { threads: 8, capacity: 0 }, timer_exec: { threads: 8, capacity: 0 }, },
+      :rpc => { threads: 49 }, # 6core HT 4CPU
+      :web => { threads: 49 },
     }
 
     def self.threading_configuration(conf)

data/lib/norikra/suspended_query.rb

@@ -0,0 +1,43 @@
+require 'norikra/error'
+require 'norikra/query'
+
+module Norikra
+  class SuspendedQuery
+    attr_accessor :name, :group, :expression, :targets
+
+    def initialize(query)
+      @name = query.name
+      @group = query.group
+      @expression = query.expression
+      @targets = query.targets
+    end
+
+    def <=>(other)
+      if @group.nil? || other.group.nil?
+        if @group.nil? && other.group.nil?
+          @name <=> other.name
+        else
+          @group.to_s <=> other.group.to_s
+        end
+      else
+        if @group == other.group
+          self.name <=> other.name
+        else
+          self.group <=> other.group
+        end
+      end
+    end
+
+    def suspended?
+      true
+    end
+
+    def to_hash
+      {'name' => @name, 'group' => @group, 'expression' => @expression, 'targets' => @targets, 'suspended' => true}
+    end
+
+    def create
+      Query.new(name: @name, group: @group, expression: @expression)
+    end
+  end
+end

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/norikra/webui/handler.rb

@@ -67,8 +67,7 @@ class Norikra::WebUI::Handler < Sinatra::Base
       input_data,session[:input_data] = session[:input_data],nil
 
       queries = engine.queries.sort + engine.suspended_queries.sort
-      pooled_events = Hash[* queries.map{|q| [q.name, engine.output_pool.pool.fetch(q.name, []).size.to_s]}.flatten]
-
+      pooled_events = Hash[* queries.map{|q| [q.name, engine.output_pool.pool.fetch(q.name, []).map(&:size).reduce(&:+).to_s]}.flatten]
       engine_targets = engine.targets.sort
       targets = engine_targets.map{|t|
         {

data/norikra.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "spork"
   spec.add_development_dependency "pry"
 end

data/spec/field_spec.rb

@@ -64,15 +64,15 @@ describe Norikra::Field do
 
   describe '.container_type?' do
     it 'returns true for only "hash" and "array"' do
-      expect(Norikra::Field.container_type?('')).to be_false
-      expect(Norikra::Field.container_type?('string')).to be_false
-      expect(Norikra::Field.container_type?('int')).to be_false
-      expect(Norikra::Field.container_type?('long')).to be_false
-
-      expect(Norikra::Field.container_type?('Hash')).to be_true
-      expect(Norikra::Field.container_type?('hash')).to be_true
-      expect(Norikra::Field.container_type?('Array')).to be_true
-      expect(Norikra::Field.container_type?('array')).to be_true
+      expect(Norikra::Field.container_type?('')).to be_falsy
+      expect(Norikra::Field.container_type?('string')).to be_falsy
+      expect(Norikra::Field.container_type?('int')).to be_falsy
+      expect(Norikra::Field.container_type?('long')).to be_falsy
+
+      expect(Norikra::Field.container_type?('Hash')).to be_truthy
+      expect(Norikra::Field.container_type?('hash')).to be_truthy
+      expect(Norikra::Field.container_type?('Array')).to be_truthy
+      expect(Norikra::Field.container_type?('array')).to be_truthy
     end
   end
 

data/spec/fieldset_spec.rb

@@ -21,12 +21,12 @@ describe Norikra::FieldSet do
 
     it 'accepts second argument as optional specification' do
       set = Norikra::FieldSet.new({'x' => 'string', 'y' => 'long'}, false)
-      expect(set.fields['x'].optional?).to be_false
-      expect(set.fields['y'].optional?).to be_false
+      expect(set.fields['x'].optional?).to be_falsy
+      expect(set.fields['y'].optional?).to be_falsy
 
       set = Norikra::FieldSet.new({'x' => 'string', 'y' => 'long'}, true)
-      expect(set.fields['x'].optional?).to be_true
-      expect(set.fields['y'].optional?).to be_true
+      expect(set.fields['x'].optional?).to be_truthy
+      expect(set.fields['y'].optional?).to be_truthy
     end
 
     it 'sets summary as comma-separated labeled field-type string with sorted field order' do
@@ -57,11 +57,11 @@ describe Norikra::FieldSet do
         expect(q_set1.dup.instance_eval{ @query_unique_keys }).to eql(['set1', 'g1'])
         expect(q_set2.dup.instance_eval{ @query_unique_keys }).to eql(['set2', nil])
 
-        expect(q_set2 == q_set3).to be_false
+        expect(q_set2 == q_set3).to be_falsy
 
-        expect(q_set1 == q_set1.dup).to be_true
-        expect(q_set2 == q_set2.dup).to be_true
-        expect(q_set3 == q_set3.dup).to be_true
+        expect(q_set1 == q_set1.dup).to be_truthy
+        expect(q_set2 == q_set2.dup).to be_truthy
+        expect(q_set3 == q_set3.dup).to be_truthy
       end
     end
 
@@ -246,13 +246,13 @@ describe Norikra::FieldSet do
     describe '#subset?' do
       it 'returns true when other instance has all fields of self' do
         other = Norikra::FieldSet.new({'a' => 'boolean', 'x' => 'string'})
-        expect(set.subset?(other)).to be_false
+        expect(set.subset?(other)).to be_falsy
 
         other.update([Norikra::Field.new('y', 'long')], false)
-        expect(set.subset?(other)).to be_true
+        expect(set.subset?(other)).to be_truthy
 
         other.update([Norikra::Field.new('z', 'double')], false)
-        expect(set.subset?(other)).to be_true
+        expect(set.subset?(other)).to be_truthy
       end
     end
 

data/spec/output_pool_spec.rb

@@ -25,7 +25,7 @@ describe Norikra::OutputPool do
           t = Time.now.to_i
           pool.push('TestTable query1',nil,[[t, {'count'=>1}],[t ,{'count'=>2}]])
 
-          pool.pool.keys.should eql(['TestTable query1'])
+          expect(pool.pool.keys).to eql(['TestTable query1'])
           events = pool.pool['TestTable query1']
 
           expect(events.size).to eq(1) # pool event bucket size is equal to times of #push

data/spec/query_spec.rb

@@ -22,7 +22,7 @@ describe Norikra::Query do
           expect(q.fields('TestTable')).to eql(['param','path','size'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -89,7 +89,7 @@ describe Norikra::Query do
           expect(q.fields('TestTable')).to eql([])
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -108,7 +108,7 @@ describe Norikra::Query do
           expect(q.fields('TestTable')).to eql(['name.string', 'param','path','size'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -127,7 +127,7 @@ describe Norikra::Query do
           expect(q.fields('TestTable')).to eql(['path', 'size'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -146,7 +146,7 @@ describe Norikra::Query do
           expect(q.fields('StreamB')).to eql(['size','header'].sort)
           expect(q.fields(nil)).to eql(['product'])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
 
         it 'returns query instances collectly parsed, with field accessing views' do
@@ -163,7 +163,7 @@ describe Norikra::Query do
           expect(q.fields('StreamB')).to eql(['size','header','ts2'].sort)
           expect(q.fields(nil)).to eql(['product'])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -182,7 +182,7 @@ describe Norikra::Query do
           expect(q.fields('Zones')).to eql(['name','zoneName','zoneId'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -201,7 +201,7 @@ describe Norikra::Query do
           expect(q.fields('Zones')).to eql(['name','zoneName','zoneId'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -220,7 +220,7 @@ describe Norikra::Query do
           expect(q.fields('SMA20Stream')).to eql(['movAgv','ticker'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -239,7 +239,7 @@ describe Norikra::Query do
           expect(q.fields('TestTable')).to eql(['params.path', 'size', 'opts.$0'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -258,7 +258,7 @@ describe Norikra::Query do
           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
+          expect(q.invalid?).to be_falsy
         end
 
         it 'can parse with nested function calls correctly' do
@@ -272,7 +272,7 @@ describe Norikra::Query do
           q = Norikra::Query.new(:name => 'TestTable query8.2', :expression => expression)
           expect(q.fields).to eql(['path.f1'])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -284,7 +284,7 @@ describe Norikra::Query do
           expect(q.fields('TestTable')).to eql(['path.source', 'ts'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -304,7 +304,7 @@ describe Norikra::Query do
           expect(q.fields('EventA')).to eql(['name', 'content', 'type', 'source'].sort)
           expect(q.fields(nil)).to eql([])
 
-          expect(q.invalid?).to be_false
+          expect(q.invalid?).to be_falsy
         end
       end
 
@@ -314,7 +314,7 @@ describe Norikra::Query do
           q = Norikra::Query.new(
             name: 'Invalid query 1', expression: expression
           )
-          expect(q.invalid?).to be_true
+          expect(q.invalid?).to be_truthy
         end
       end
     end
@@ -340,11 +340,11 @@ describe Norikra::Query do
 
     describe '.stdout?' do
       it 'returns true if group name is "STDOUT()"' do
-        expect(Norikra::Query.stdout?(nil)).to be_false
-        expect(Norikra::Query.stdout?("")).to be_false
-        expect(Norikra::Query.stdout?("foo")).to be_false
-        expect(Norikra::Query.stdout?("STDOUT")).to be_false
-        expect(Norikra::Query.stdout?("STDOUT()")).to be_true
+        expect(Norikra::Query.stdout?(nil)).to be_falsy
+        expect(Norikra::Query.stdout?("")).to be_falsy
+        expect(Norikra::Query.stdout?("foo")).to be_falsy
+        expect(Norikra::Query.stdout?("STDOUT")).to be_falsy
+        expect(Norikra::Query.stdout?("STDOUT()")).to be_truthy
       end
     end
 
@@ -376,7 +376,7 @@ describe Norikra::Query do
       it 'returns false, always' do
         e1 = 'SELECT max(num) AS max FROM TestTable1.win:time(5 sec)'
         q1 = Norikra::Query.new(:name => 'q1', :group => nil, :expression => e1)
-        expect(q1.suspended?).to be_false
+        expect(q1.suspended?).to be_falsy
       end
     end
 
@@ -743,22 +743,20 @@ describe Norikra::Query do
 
   describe '.imported_java_class?' do
     it 'can do judge passed name exists under java package tree or not' do
-      expect(Norikra::Query.imported_java_class?('String')).to be_true
-      expect(Norikra::Query.imported_java_class?('Long')).to be_true
-      expect(Norikra::Query.imported_java_class?('Void')).to be_true
-      expect(Norikra::Query.imported_java_class?('BigDecimal')).to be_true
-      expect(Norikra::Query.imported_java_class?('Format')).to be_true
-      expect(Norikra::Query.imported_java_class?('Normalizer')).to be_true
-      expect(Norikra::Query.imported_java_class?('Date')).to be_true
-      expect(Norikra::Query.imported_java_class?('HashSet')).to be_true
-      expect(Norikra::Query.imported_java_class?('Random')).to be_true
-      expect(Norikra::Query.imported_java_class?('Timer')).to be_true
-
-      expect(Norikra::Query.imported_java_class?('unexpected')).to be_false
-      expect(Norikra::Query.imported_java_class?('parameter')).to be_false
-      expect(Norikra::Query.imported_java_class?('param')).to be_false
+      expect(Norikra::Query.imported_java_class?('String')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('Long')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('Void')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('BigDecimal')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('Format')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('Normalizer')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('Date')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('HashSet')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('Random')).to be_truthy
+      expect(Norikra::Query.imported_java_class?('Timer')).to be_truthy
+
+      expect(Norikra::Query.imported_java_class?('unexpected')).to be_falsy
+      expect(Norikra::Query.imported_java_class?('parameter')).to be_falsy
+      expect(Norikra::Query.imported_java_class?('param')).to be_falsy
     end
   end
 end
-
-#TODO: write specs about Norikra::SuspendedQuery

data/spec/suspended_query_spec.rb

@@ -0,0 +1,58 @@
+require_relative './spec_helper'
+
+require 'norikra/suspended_query'
+require 'norikra/query'
+
+include Norikra::SpecHelper
+
+describe Norikra::SuspendedQuery do
+  context 'when instanciate' do
+    describe '#initialize' do
+      it 'get query and just store its attributes' do
+        q1 = Norikra::Query.new(name: 'name1', group: nil, expression: 'SELECT n,m FROM t')
+        s1 = Norikra::SuspendedQuery.new(q1)
+        expect(s1.name).to eql(q1.name)
+        expect(s1.group).to eql(q1.group)
+        expect(s1.expression).to eql(q1.expression)
+        expect(s1.targets).to eql(q1.targets)
+
+        expect(q1.suspended?).to be_falsy
+        expect(s1.suspended?).to be_truthy
+
+        q2 = Norikra::Query.new(name: 'name2', group: 'testing', expression: 'SELECT n,m,q.a FROM t, q')
+        s2 = Norikra::SuspendedQuery.new(q2)
+        expect(s2.name).to eql(q2.name)
+        expect(s2.group).to eql(q2.group)
+        expect(s2.expression).to eql(q2.expression)
+        expect(s2.targets).to eql(q2.targets)
+
+        expect(q2.suspended?).to be_falsy
+        expect(s2.suspended?).to be_truthy
+      end
+    end
+
+    describe '.<=>' do
+      it 'returns sort order by group,name' do
+        q1 = Norikra::Query.new(:name => '211', :group => 'a1', :expression => 'select x from y')
+        q2 = Norikra::SuspendedQuery.new(Norikra::Query.new(:name => '111', :group => 'a1', :expression => 'select x from y'))
+        q3 = Norikra::Query.new(:name => '011', :group => 'b1', :expression => 'select x from y')
+        q4 = Norikra::Query.new(:name => '011', :group => 'a1', :expression => 'select x from y')
+        q5 = Norikra::SuspendedQuery.new(Norikra::Query.new(:name => '999', :group => nil, :expression => 'select x from y'))
+        q6 = Norikra::Query.new(:name => '899', :group => nil, :expression => 'select x from y')
+
+        expect([q1,q2,q3,q4,q5,q6].sort).to eql([q6,q5,q4,q2,q1,q3])
+      end
+
+      it 'must be stable for sort' do
+        q1 = Norikra::Query.new(name: "hoge", group: nil, expression: "select hoge from pos")
+        s1 = Norikra::SuspendedQuery.new(q1)
+        q2 = Norikra::Query.new(name: "test1", group: nil, expression: "select hoge,count(*)\r\nfrom pos\r\nwhere age >= 20\r\ngroup by hoge")
+        s2 = Norikra::SuspendedQuery.new(q2)
+        q3 = Norikra::Query.new(name: "test2", group: "sweep1", expression: "select moge\r\nfrom pos.win:time_batch(5 sec)\r\nwhere x=1\r\n")
+        s3 = Norikra::SuspendedQuery.new(q3)
+        expect([s1,s2,s3].sort).to eql([s1, s2, s3])
+      end
+    end
+
+  end
+end

data/spec/target_spec.rb

@@ -6,19 +6,19 @@ require 'norikra/target'
 describe Norikra::Target do
   describe '.valid?' do
     it 'raises Norikra::ArgumentError for invalid name' do
-      expect(Norikra::Target.valid?('foobar')).to be_true
-      expect(Norikra::Target.valid?('FooBar')).to be_true
-      expect(Norikra::Target.valid?('foo_bar')).to be_true
-      expect(Norikra::Target.valid?('foo_bar_baz')).to be_true
+      expect(Norikra::Target.valid?('foobar')).to be_truthy
+      expect(Norikra::Target.valid?('FooBar')).to be_truthy
+      expect(Norikra::Target.valid?('foo_bar')).to be_truthy
+      expect(Norikra::Target.valid?('foo_bar_baz')).to be_truthy
 
-      expect(Norikra::Target.valid?('')).to be_false
-      expect(Norikra::Target.valid?('.')).to be_false
-      expect(Norikra::Target.valid?('_')).to be_false
-      expect(Norikra::Target.valid?('_a_')).to be_false
-      expect(Norikra::Target.valid?('foo_')).to be_false
-      expect(Norikra::Target.valid?('_Foo')).to be_false
-      expect(Norikra::Target.valid?('foo bar')).to be_false
-      expect(Norikra::Target.valid?('_Foo')).to be_false
+      expect(Norikra::Target.valid?('')).to be_falsy
+      expect(Norikra::Target.valid?('.')).to be_falsy
+      expect(Norikra::Target.valid?('_')).to be_falsy
+      expect(Norikra::Target.valid?('_a_')).to be_falsy
+      expect(Norikra::Target.valid?('foo_')).to be_falsy
+      expect(Norikra::Target.valid?('_Foo')).to be_falsy
+      expect(Norikra::Target.valid?('foo bar')).to be_falsy
+      expect(Norikra::Target.valid?('_Foo')).to be_falsy
     end
   end
 
@@ -29,14 +29,14 @@ describe Norikra::Target do
       t3 = Norikra::Target.new("target3")
       tt = Norikra::Target.new("target1")
 
-      expect(t1 == tt).to be_true
-      expect(t2 == tt).to be_false
-      expect(t3 == tt).to be_false
+      expect(t1 == tt).to be_truthy
+      expect(t2 == tt).to be_falsy
+      expect(t3 == tt).to be_falsy
 
-      expect([t1, t2, t3].include?(tt)).to be_true
-      expect([t2, t3].include?(tt)).to be_false
+      expect([t1, t2, t3].include?(tt)).to be_truthy
+      expect([t2, t3].include?(tt)).to be_falsy
 
-      expect([t1, t2, t3].include?("target1")).to be_true
+      expect([t1, t2, t3].include?("target1")).to be_truthy
     end
   end
 end

data/spec/typedef_manager_spec.rb

@@ -11,7 +11,7 @@ describe Norikra::TypedefManager do
 
     describe '#lazy?' do
       it 'returns true' do
-        expect(manager.lazy?('sample')).to be_true
+        expect(manager.lazy?('sample')).to be_truthy
       end
     end
 
@@ -21,11 +21,11 @@ describe Norikra::TypedefManager do
         expect(r).to be_instance_of(Norikra::FieldSet)
 
         expect(r.fields['a'].type).to eql('string')
-        expect(r.fields['a'].optional?).to be_false
+        expect(r.fields['a'].optional?).to be_falsy
         expect(r.fields['b'].type).to eql('string')
-        expect(r.fields['b'].optional?).to be_false
+        expect(r.fields['b'].optional?).to be_falsy
         expect(r.fields['x'].type).to eql('string')
-        expect(r.fields['x'].optional?).to be_false
+        expect(r.fields['x'].optional?).to be_falsy
       end
     end
 
@@ -33,7 +33,7 @@ describe Norikra::TypedefManager do
       it 'does not fail, and target will become non-lazy status' do
         r = manager.generate_base_fieldset('sample', {'a'=>'foo','b'=>'bar','x'=>'yeeeees!'})
         manager.activate('sample', r)
-        expect(manager.lazy?('sample')).to be_false
+        expect(manager.lazy?('sample')).to be_falsy
       end
     end
   end
@@ -48,23 +48,23 @@ describe Norikra::TypedefManager do
 
     it 'three fields are defined as non-optional fields' do
       expect(manager.typedefs['sample'].fields['a'].type).to eql('string')
-      expect(manager.typedefs['sample'].fields['a'].optional?).to be_false
+      expect(manager.typedefs['sample'].fields['a'].optional?).to be_falsy
       expect(manager.typedefs['sample'].fields['b'].type).to eql('string')
-      expect(manager.typedefs['sample'].fields['b'].optional?).to be_false
+      expect(manager.typedefs['sample'].fields['b'].optional?).to be_falsy
       expect(manager.typedefs['sample'].fields['c'].type).to eql('float')
-      expect(manager.typedefs['sample'].fields['c'].optional?).to be_false
+      expect(manager.typedefs['sample'].fields['c'].optional?).to be_falsy
     end
 
     describe '#lazy?' do
       it 'returns false' do
-        expect(manager.lazy?('sample')).to be_false
+        expect(manager.lazy?('sample')).to be_falsy
       end
     end
     describe '#reserve' do
       it 'does not fail' do
         manager.reserve('sample', 'x', 'long')
         expect(manager.typedefs['sample'].fields['x'].type).to eql('integer')
-        expect(manager.typedefs['sample'].fields['x'].optional?).to be_true
+        expect(manager.typedefs['sample'].fields['x'].optional?).to be_truthy
       end
     end
 
@@ -72,25 +72,25 @@ describe Norikra::TypedefManager do
       context 'with query with single target' do
         it 'returns boolean which matches target or not' do
           q1 = Norikra::Query.new(:name => 'test', :expression => 'select a from sample.win:time(5 sec) where c > 1.0 and z')
-          expect(manager.ready?(q1)).to be_true
+          expect(manager.ready?(q1)).to be_truthy
           q2 = Norikra::Query.new(:name => 'test', :expression => 'select a from sample.win:time(5 sec) where c > 1.0 and d > 2.0')
-          expect(manager.ready?(q2)).to be_false
+          expect(manager.ready?(q2)).to be_falsy
           q3 = Norikra::Query.new(:name => 'test', :expression => 'select a from sample2.win:time(5 sec) where c > 1.0 and d > 2.0')
-          expect(manager.ready?(q3)).to be_false
+          expect(manager.ready?(q3)).to be_falsy
         end
       end
 
       context 'with query with multi targets, including unexisting target' do
         it 'returns false' do
           q = Norikra::Query.new(:name => 'test', :expression => 'select x.a,y.a from sample.win:time(5 sec) as x, sample2.win:time(5 sec) as y where x.c > 1.0 and y.d > 1.0')
-          expect(manager.ready?(q)).to be_false
+          expect(manager.ready?(q)).to be_falsy
         end
       end
 
       context 'with query with multi targets, all of them are exisitng' do
         it 'returns true' do
           q = Norikra::Query.new(:name => 'test', :expression => 'select x.a,d from sample.win:time(5 sec) as x, sample_next.win:time(5 sec) as y where x.c > 1.0 and y.d > 1.0')
-          expect(manager.ready?(q)).to be_true
+          expect(manager.ready?(q)).to be_truthy
         end
       end
     end
@@ -161,10 +161,10 @@ describe Norikra::TypedefManager do
         manager.bind_fieldset('sample', :query, set_query_base)
         expect(set_query_base.target).to eql('sample')
         expect(set_query_base.level).to eql(:query)
-        expect(manager.typedefs['sample'].queryfieldsets.include?(set_query_base)).to be_true
+        expect(manager.typedefs['sample'].queryfieldsets.include?(set_query_base)).to be_truthy
 
         manager.unbind_fieldset('sample', :query, set_query_base)
-        expect(manager.typedefs['sample'].queryfieldsets.include?(set_query_base)).to be_false
+        expect(manager.typedefs['sample'].queryfieldsets.include?(set_query_base)).to be_falsy
       end
     end
 
@@ -192,9 +192,9 @@ describe Norikra::TypedefManager do
 
         list = manager.subsets('sample', Norikra::FieldSet.new(base.merge({'d'=>'string','e'=>'string','g'=>'string'})))
         expect(list.size).to eql(3) # set_d, set_e, baseset
-        expect(list.include?(set_d)).to be_true
-        expect(list.include?(set_e)).to be_true
-        expect(list.include?(set_f)).to be_false
+        expect(list.include?(set_d)).to be_truthy
+        expect(list.include?(set_e)).to be_truthy
+        expect(list.include?(set_f)).to be_falsy
       end
     end
 
@@ -210,9 +210,9 @@ describe Norikra::TypedefManager do
 
         list = manager.supersets('sample', Norikra::FieldSet.new({'one'=>'int','three'=>'double'}))
         expect(list.size).to eql(2) # set_x, set_z
-        expect(list.include?(set_x)).to be_true
-        expect(list.include?(set_y)).to be_false
-        expect(list.include?(set_z)).to be_true
+        expect(list.include?(set_x)).to be_truthy
+        expect(list.include?(set_y)).to be_falsy
+        expect(list.include?(set_z)).to be_truthy
       end
     end
 

data/spec/typedef_spec.rb

@@ -23,7 +23,7 @@ describe Norikra::Typedef do
     describe '#lazy?' do
       it 'returns true' do
         t = Norikra::Typedef.new
-        expect(t.lazy?).to be_true
+        expect(t.lazy?).to be_truthy
       end
     end
 
@@ -33,11 +33,11 @@ describe Norikra::Typedef do
 
         t.reserve('k', 'string')
         expect(t.fields['k'].type).to eql('string')
-        expect(t.fields['k'].optional?).to be_true
+        expect(t.fields['k'].optional?).to be_truthy
 
         t.reserve('l', 'long', false)
         expect(t.fields['l'].type).to eql('integer')
-        expect(t.fields['l'].optional?).to be_false
+        expect(t.fields['l'].optional?).to be_falsy
       end
 
       it 'remove waiting field' do
@@ -60,7 +60,7 @@ describe Norikra::Typedef do
           set.level = :base
           t.activate(set)
           expect(t.fields.size).to eql(3)
-          expect(t.fields['a'].optional?).to be_false
+          expect(t.fields['a'].optional?).to be_falsy
           expect(t.fields.object_id).not_to eql(set.fields.object_id)
           expect(t.baseset.object_id).not_to eql(set.object_id)
         end
@@ -105,10 +105,10 @@ describe Norikra::Typedef do
       t = Norikra::Typedef.new({'a' => 'string', 'b' => 'long'})
 
       expect(t.fields['a'].type).to eql('string')
-      expect(t.fields['a'].optional?).to be_false
+      expect(t.fields['a'].optional?).to be_falsy
 
       expect(t.fields['b'].type).to eql('integer')
-      expect(t.fields['b'].optional?).to be_false
+      expect(t.fields['b'].optional?).to be_falsy
     end
 
     it 'has container fields with chained access fields' do
@@ -122,20 +122,20 @@ describe Norikra::Typedef do
     describe '#lazy?' do
       it 'returns false' do
         t = Norikra::Typedef.new({'a' => 'string', 'b' => 'long'})
-        expect(t.lazy?).to be_false
+        expect(t.lazy?).to be_falsy
       end
     end
 
     describe '#field_defined?' do
       it 'returns boolean to indicate all fields specified exists or not' do
         t = Norikra::Typedef.new({'a' => 'string', 'b' => 'long'})
-        expect(t.field_defined?(['a','b'])).to be_true
-        expect(t.field_defined?(['a'])).to be_true
-        expect(t.field_defined?(['b'])).to be_true
-        expect(t.field_defined?([])).to be_true
-        expect(t.field_defined?(['a','b','c'])).to be_false
-        expect(t.field_defined?(['a','c'])).to be_false
-        expect(t.field_defined?(['c'])).to be_false
+        expect(t.field_defined?(['a','b'])).to be_truthy
+        expect(t.field_defined?(['a'])).to be_truthy
+        expect(t.field_defined?(['b'])).to be_truthy
+        expect(t.field_defined?([])).to be_truthy
+        expect(t.field_defined?(['a','b','c'])).to be_falsy
+        expect(t.field_defined?(['a','c'])).to be_falsy
+        expect(t.field_defined?(['c'])).to be_falsy
       end
     end
 
@@ -148,12 +148,12 @@ describe Norikra::Typedef do
         t.reserve('b', 'boolean', false)
         expect(t.fields.size).to eql(2)
         expect(t.fields['b'].type).to eql('boolean')
-        expect(t.fields['b'].optional?).to be_false
+        expect(t.fields['b'].optional?).to be_falsy
 
         t.reserve('c', 'double', true)
         expect(t.fields.size).to eql(3)
         expect(t.fields['c'].type).to eql('float')
-        expect(t.fields['c'].optional?).to be_true
+        expect(t.fields['c'].optional?).to be_truthy
       end
     end
 
@@ -163,16 +163,16 @@ describe Norikra::Typedef do
           t = Norikra::Typedef.new({'a' => 'string', 'b' => 'long'})
 
           set = Norikra::FieldSet.new({'a' => 'string', 'b' => 'long'})
-          expect(t.consistent?(set)).to be_true
+          expect(t.consistent?(set)).to be_truthy
 
           set = Norikra::FieldSet.new({'a' => 'string', 'b' => 'long', 'c' => 'double'})
-          expect(t.consistent?(set)).to be_true
+          expect(t.consistent?(set)).to be_truthy
 
           set = Norikra::FieldSet.new({'a' => 'string', 'b' => 'int'})
-          expect(t.consistent?(set)).to be_true
+          expect(t.consistent?(set)).to be_truthy
 
           set = Norikra::FieldSet.new({'a' => 'string'})
-          expect(t.consistent?(set)).to be_false
+          expect(t.consistent?(set)).to be_falsy
         end
       end
 
@@ -183,19 +183,19 @@ describe Norikra::Typedef do
           t.reserve('d', 'boolean', true) # optional
 
           set = Norikra::FieldSet.new({'a' => 'string', 'b' => 'long'})
-          expect(t.consistent?(set)).to be_false
+          expect(t.consistent?(set)).to be_falsy
 
           set = Norikra::FieldSet.new({'a' => 'string', 'b' => 'long', 'c' => 'double'})
-          expect(t.consistent?(set)).to be_true
+          expect(t.consistent?(set)).to be_truthy
 
           set = Norikra::FieldSet.new({'a' => 'string', 'b' => 'long', 'c' => 'double', 'd' => 'boolean'})
-          expect(t.consistent?(set)).to be_true
+          expect(t.consistent?(set)).to be_truthy
 
           set = Norikra::FieldSet.new({'a' => 'string', 'b' => 'long', 'c' => 'double', 'd' => 'string'})
-          expect(t.consistent?(set)).to be_false
+          expect(t.consistent?(set)).to be_falsy
 
           set = Norikra::FieldSet.new({'a' => 'string', 'b' => 'long', 'c' => 'double', 'd' => 'boolean', 'e' => 'string'})
-          expect(t.consistent?(set)).to be_true
+          expect(t.consistent?(set)).to be_truthy
         end
       end
     end
@@ -220,12 +220,12 @@ describe Norikra::Typedef do
         t.push(:data, set_a)
         expect(t.fields.size).to eql(3)
         expect(t.fields['c'].type).to eql('float')
-        expect(t.fields['c'].optional?).to be_true
+        expect(t.fields['c'].optional?).to be_truthy
 
         t.push(:query, Norikra::FieldSet.new({'a'=>'string','b'=>'long','d'=>'string'}))
         expect(t.fields.size).to eql(4)
         expect(t.fields['d'].type).to eql('string')
-        expect(t.fields['d'].optional?).to be_true
+        expect(t.fields['d'].optional?).to be_truthy
       end
 
       it 'deletes waiting fields' do
@@ -438,7 +438,7 @@ describe Norikra::Typedef do
           t.reserve('d','double',true)
 
           r = t.refer({'a'=>'hoge','b'=>'2000','c'=>'true','d'=>'3.14'})
-          expect(t.datafieldsets.include?(r)).to be_false
+          expect(t.datafieldsets.include?(r)).to be_falsy
 
           expect(r.fields['a'].type).to eql('string')
           expect(r.fields['b'].type).to eql('integer')
@@ -451,7 +451,7 @@ describe Norikra::Typedef do
           t = Norikra::Typedef.new({'a' => 'string', 'b' => 'long'})
 
           r = t.refer({'a'=>'hoge','b'=>'2000','c'=>'true','d'=>'3.14'})
-          expect(t.datafieldsets.include?(r)).to be_false
+          expect(t.datafieldsets.include?(r)).to be_falsy
 
           expect(r.fields['a'].type).to eql('string')
           expect(r.fields['b'].type).to eql('integer')
@@ -479,7 +479,7 @@ describe Norikra::Typedef do
           t.reserve('d','double',true)
 
           r = t.refer({'a'=>'hoge','b'=>'2000','c'=>'true','d'=>'3.14'}, true)
-          expect(t.datafieldsets.include?(r)).to be_false
+          expect(t.datafieldsets.include?(r)).to be_falsy
 
           expect(r.fields['a'].type).to eql('string')
           expect(r.fields['b'].type).to eql('integer')
@@ -492,14 +492,14 @@ describe Norikra::Typedef do
           t = Norikra::Typedef.new({'a' => 'string', 'b' => 'long'})
 
           r1 = t.refer({'a'=>'hoge','b'=>'2000','c'=>'true','d'=>'3.14'}, true)
-          expect(t.datafieldsets.include?(r1)).to be_false
+          expect(t.datafieldsets.include?(r1)).to be_falsy
 
           expect(r1.fields['a'].type).to eql('string')
           expect(r1.fields['b'].type).to eql('integer')
           expect(r1.summary).to eql('a:string,b:integer')
 
           r2 = t.refer({'a'=>'hoge','b'=>'2000','c'=>'true','d'=>'3.14', 'e' => 'yeeeeeees!'}, true)
-          expect(t.datafieldsets.include?(r2)).to be_false
+          expect(t.datafieldsets.include?(r2)).to be_falsy
 
           expect(r2.fields['a'].type).to eql('string')
           expect(r2.fields['b'].type).to eql('integer')
@@ -511,7 +511,7 @@ describe Norikra::Typedef do
           t.waiting_fields = ['d']
 
           r1 = t.refer({'a'=>'hoge','b'=>'2000','c'=>'true','d'=>'3.14'}, true)
-          expect(t.datafieldsets.include?(r1)).to be_false
+          expect(t.datafieldsets.include?(r1)).to be_falsy
 
           expect(r1.fields['a'].type).to eql('string')
           expect(r1.fields['b'].type).to eql('integer')
@@ -519,7 +519,7 @@ describe Norikra::Typedef do
           expect(r1.summary).to eql('a:string,b:integer,d:string')
 
           r2 = t.refer({'a'=>'hoge','b'=>'2000','c'=>'true','d'=>'3.14', 'e' => 'yeeeeeees!'}, true)
-          expect(t.datafieldsets.include?(r2)).to be_false
+          expect(t.datafieldsets.include?(r2)).to be_falsy
 
           expect(r2.fields['a'].type).to eql('string')
           expect(r2.fields['b'].type).to eql('integer')

data/views/index.erb

@@ -66,7 +66,7 @@
 <% if queries.size > 0 %>
 <table class="table">
   <tr>
-    <th>Group</th><th>Query name</th><th>Targets</th><th>Query</th><th style="text-align:right;">Events</th><th></th><th></th><th></th>
+    <th>Group</th><th>Query name</th><th>Targets</th><th></th><th>Query</th><th style="text-align:right;">Events</th><th></th><th></th><th></th>
   </tr>
   <% queries.each_with_index do |query, index| %>
   <tr class="<%= query.suspended? ? "suspended" : "" %>">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno
@@ -154,14 +154,14 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -245,6 +245,7 @@ files:
 - lib/norikra/rubyudf.rb
 - lib/norikra/server.rb
 - lib/norikra/stats.rb
+- lib/norikra/suspended_query.rb
 - lib/norikra/target.rb
 - lib/norikra/typedef.rb
 - lib/norikra/typedef_manager.rb
@@ -280,6 +281,7 @@ files:
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/stats_spec.rb
+- spec/suspended_query_spec.rb
 - spec/target_spec.rb
 - spec/typedef_manager_spec.rb
 - spec/typedef_spec.rb
@@ -319,6 +321,7 @@ test_files:
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/stats_spec.rb
+- spec/suspended_query_spec.rb
 - spec/target_spec.rb
 - spec/typedef_manager_spec.rb
 - spec/typedef_spec.rb