norikra 1.0.8-java → 1.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917e9b3428179553a0f1d8bbc55281efa8cc00d5
-  data.tar.gz: 95fa55e7b1918aad040c11bbd6b4b949fd3b9ab9
+  metadata.gz: 2ba35f8ca734eabab40ce673fcc67c6ad96bbba4
+  data.tar.gz: ebad6924402dfe676a74e6ee3b97762c30c9f060
 SHA512:
-  metadata.gz: 21d08b2da70b8515c6d0b3aca18b1f62e3b29656a33a641ad8eabb4cef12789c1c94ffc7a2c35e7fa6a01257c2159b35c6bbdcd7a8d5a69dedd45b81118c2a4a
-  data.tar.gz: fe5f74066d60bf5bf87b061293cc95ab6ac4f6bd35bd1811a4e4dfe3c0d5bb4287d74ada2d5e12b9c208765e768c97cb193bb5c448625f96eaaa5156d1c3edfa
+  metadata.gz: be637b070e42b213a675aac50e1ec38f180f1aa1dbb5b03e6b68e14d4275466ea4b69b2f5cdfb6a6fe75efa0b04105aeb33f3b8806179e6db47586837409c1ea
+  data.tar.gz: de613937a954073acaf0c8493a16844109148e71584b6aa3730f9e4208326db921f87203e5bf8a6d5b1f13c90216d95d540b92ae7a7192fe85f429f13eaf691b

data/lib/norikra/engine.rb

@@ -16,7 +16,7 @@ require 'norikra/typedef_manager'
 
 module Norikra
   class Engine
-    attr_reader :targets, :queries, :output_pool, :typedef_manager
+    attr_reader :targets, :queries, :suspended_queries, :output_pool, :typedef_manager
 
     def initialize(output_pool, typedef_manager, opts={})
       @statistics = {
@@ -38,6 +38,7 @@ module Norikra
 
       @targets = []
       @queries = []
+      @suspended_queries = []
 
       @waiting_queries = []
     end
@@ -169,6 +170,7 @@ module Norikra
     def register(query)
       info "registering query", :name => query.name, :targets => query.targets, :expression => query.expression
       raise Norikra::ClientError, "query name '#{query.name}' already exists" if @queries.select{|q| q.name == query.name }.size > 0
+      raise Norikra::ClientError, "query name '#{query.name}' already exists in suspended" if @suspended_queries.select{|q| q.name == query.name }.size > 0
       raise Norikra::ClientError, "query '#{query.name}' is invalid query for Norikra" if query.invalid?
 
       query.targets.each do |target_name|
@@ -180,9 +182,43 @@ module Norikra
     def deregister(query_name)
       info "de-registering query", :name => query_name
       queries = @queries.select{|q| q.name == query_name }
+      s_queries = @suspended_queries.select{|q| q.name == query_name }
+
+      if queries.size == 1
+        deregister_query(queries.first)
+      elsif s_queries.size == 1
+        @suspended_queries.delete(s_queries.first)
+        true
+      else
+        nil # just ignore for 'not found'
+      end
+    end
+
+    def suspend(query_name)
+      info "suspending query", name: query_name
+      queries = @queries.select{|q| q.name == query_name }
       return nil unless queries.size == 1 # just ignore for 'not found'
 
-      deregister_query(queries.first)
+      suspending_query = queries.first
+      suspended_query = Norikra::SuspendedQuery.new(suspending_query)
+
+      deregister_query(suspending_query)
+      add_suspended_query(suspended_query)
+    end
+
+    def resume(query_name)
+      info "resuming query", name: query_name
+      queries = @suspended_queries.select{|q| q.name == query_name }
+      return nil unless queries.size == 1 # just ignore
+
+      suspended_query = queries.first
+      query = suspended_query.create # suspended query -> query object
+
+      query.targets.each do |target_name|
+        open(target_name) unless @targets.any?{|t| t.name == target_name}
+      end
+      register_query(query)
+      remove_suspended_query(suspended_query)
     end
 
     def send(target_name, events)
@@ -359,6 +395,21 @@ module Norikra
       true
     end
 
+    def add_suspended_query(query)
+      @mutex.synchronize do
+        return nil if @suspended_queries.include?(query)
+        @suspended_queries << query
+      end
+      true
+    end
+
+    def remove_suspended_query(query)
+      @mutex.synchronize do
+        @suspended_queries.delete(query)
+      end
+      true
+    end
+
     def register_waiting_queries
       ready = []
       not_ready = []
@@ -421,6 +472,8 @@ module Norikra
 
       listener = if Norikra::Query.loopback(query.group)
                    Norikra::LoopbackListener.new(self, query.name, query.group, @statistics[:events])
+                 elsif Norikra::Query.stdout?(query.group)
+                   Norikra::StdoutListener.new(self, query.name, query.group, @statistics[:events])
                  else
                    Norikra::Listener.new(query.name, query.group, @output_pool, @statistics[:events])
                  end

data/lib/norikra/listener.rb

@@ -7,6 +7,8 @@ require 'esper/lib/cglib-nodep-3.1.jar'
 require 'norikra/field'
 require 'norikra/query'
 
+require 'json'
+
 module Norikra
   class Listener
     include com.espertech.esper.client.UpdateListener
@@ -67,6 +69,29 @@ module Norikra
     end
   end
 
+  class StdoutListener < Listener
+    def initialize(engine, query_name, query_group, events_statistics)
+      raise "BUG: query group is not 'STDOUT()'" unless query_group == 'STDOUT()'
+
+      @engine = engine
+      @query_name = query_name
+      @query_group = query_group
+      @events_statistics = events_statistics
+
+      @stdout = STDOUT
+    end
+
+    def update(new_events, old_events)
+      event_list = new_events.map{|e| type_convert(e) }
+      trace "stdout event", :query => @query_name, :event => event_list
+      @events_statistics[:output] += event_list.size
+
+      event_list.each do |e|
+        @stdout.puts @query_name + "\t" + JSON.dump(e)
+      end
+    end
+  end
+
   ##### Unmatched events are simply ignored
   # class UnmatchedListener
   #   include com.espertech.esper.client.UnmatchedListener

data/lib/norikra/query.rb

@@ -49,18 +49,26 @@ module Norikra
       group && group =~ /^LOOPBACK\((.+)\)$/ && $1
     end
 
+    def self.stdout?(group)
+      group && group == "STDOUT()"
+    end
+
     def dup
       self.class.new(:name => @name, :group => @group, :expression => @expression.dup)
     end
 
     def to_hash
-      {'name' => @name, 'group' => @group, 'expression' => @expression, 'targets' => self.targets}
+      {'name' => @name, 'group' => @group, 'expression' => @expression, 'targets' => self.targets, 'suspended' => false}
     end
 
     def dump
       {name: @name, group: @group, expression: @expression}
     end
 
+    def suspended?
+      false
+    end
+
     def invalid?
       # check query is invalid as Norikra query or not
       self.ast.listup('selectionListElement').any?{|node| node.children.map(&:name).any?{|name| name == '*' } }
@@ -457,4 +465,27 @@ 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 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/rpc/handler.rb

@@ -61,7 +61,7 @@ class Norikra::RPC::Handler
 
   def queries
     logging(:show, :queries){
-      @engine.queries.map(&:to_hash)
+      @engine.queries.map(&:to_hash) + @engine.suspended_queries.map(&:to_hash)
     }
   end
 
@@ -79,6 +79,20 @@ class Norikra::RPC::Handler
     }
   end
 
+  def suspend(query_name)
+    logging(:manage, :suspend, [query_name]){
+      r = @engine.suspend(query_name)
+      !!r
+    }
+  end
+
+  def resume(query_name)
+    logging(:manage, :suspend, [query_name]){
+      r = @engine.resume(query_name)
+      !!r
+    }
+  end
+
   def fields(target)
     logging(:show, :fields, [target]){
       @engine.typedef_manager.field_list(target)

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "1.0.8"
+  VERSION = "1.1.0"
 end

data/lib/norikra/webui/handler.rb

@@ -66,7 +66,7 @@ class Norikra::WebUI::Handler < Sinatra::Base
 
       input_data,session[:input_data] = session[:input_data],nil
 
-      queries = engine.queries.sort
+      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]
 
       engine_targets = engine.targets.sort
@@ -130,6 +130,22 @@ class Norikra::WebUI::Handler < Sinatra::Base
     end
   end
 
+  post '/suspend' do
+    query_name = params[:query_name]
+    logging(:manage, :suspend, [query_name]) do
+      engine.suspend(query_name)
+      redirect '/#queries'
+    end
+  end
+
+  post '/resume' do
+    query_name = params[:query_name]
+    logging(:manage, :resume, [query_name]) do
+      engine.resume(query_name)
+      redirect '/#queries'
+    end
+  end
+
   get '/logs' do
     logging(:show, :logs) do
       json Norikra::Log.logger.buffer
@@ -149,6 +165,9 @@ class Norikra::WebUI::Handler < Sinatra::Base
     query_name = params[:name]
     logging(:show, :json_query, [query_name]) do
       query = engine.queries.select{|q| q.name == query_name}.first
+      unless query
+        query = engine.suspended_queries.select{|q| q.name == query_name}.first
+      end
       if query
         content = {
           name: query.name,

data/norikra.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rack"
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "msgpack-rpc-over-http-jruby", ">= 0.0.6"
-  spec.add_runtime_dependency "norikra-client-jruby", ">= 1.0.0"
+  spec.add_runtime_dependency "norikra-client-jruby", ">= 1.1.0"
   spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "sinatra-contrib"
   spec.add_runtime_dependency "erubis"

data/public/css/norikra.css

@@ -20,6 +20,10 @@ body {
   margin: 5px 0;
 }
 
+tr.suspended {
+  background-color: gray;
+}
+
 tr.logline.trace > td {
   color: silver;
 }

data/spec/listener_spec.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require_relative './spec_helper'
 
+require 'json'
 require 'norikra/listener'
 
 class DummyOutputPool
@@ -161,3 +162,39 @@ describe Norikra::LoopbackListener do
     end
   end
 end
+
+describe Norikra::StdoutListener do
+  it 'should be initialized' do
+    dummy_engine = DummyEngine.new
+    statistics = {output: 0}
+    expect { Norikra::StdoutListener.new(dummy_engine, 'name', 'STDOUT()', statistics) }.not_to raise_error
+  end
+
+  describe '#update' do
+    dummy_engine = DummyEngine.new
+    statistics = {output: 0}
+    listener = Norikra::StdoutListener.new(dummy_engine, 'name', 'STDOUT()', statistics)
+    dummyio = StringIO.new
+    listener.instance_eval{ @stdout = dummyio }
+
+    it 'sends events into engine with target name' do
+      dummyio.truncate(0)
+
+      events1 = [{"n1" => 100, "s" => "string one"}, {"n1" => 101, "s" => "string two"}]
+      listener.update(events1, [])
+      expect(statistics[:output]).to eql(2)
+
+      events2 = [{"n1" => 102, "s" => "string three"}]
+      listener.update(events2, [])
+      expect(statistics[:output]).to eql(3)
+
+      results = []
+      dummyio.string.split("\n").each do |line|
+        query_name, json = line.split("\t")
+        expect(query_name).to eql("name")
+        results << JSON.parse(json) if json && json != ''
+      end
+      expect(results).to eql(events1 + events2)
+    end
+  end
+end

data/spec/query_spec.rb

@@ -338,6 +338,16 @@ describe Norikra::Query do
       end
     end
 
+    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
+      end
+    end
+
     describe '#dup' do
       context 'for queries without group (default group)' do
         it 'returns query object with default group' do
@@ -362,6 +372,14 @@ describe Norikra::Query do
       end
     end
 
+    describe '#suspended?' 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
+      end
+    end
+
     describe '.rewrite_event_field_name' do
       context 'without any container field access' do
         expression = 'select count(*) as cnt from TestTable.win:time_batch(10 seconds) where path="/" and size>100 and (param.length())>0'
@@ -742,3 +760,5 @@ describe Norikra::Query do
     end
   end
 end
+
+#TODO: write specs about Norikra::SuspendedQuery

data/views/index.erb

@@ -65,12 +65,15 @@
 
 <% 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></tr>
-  <% queries.each_with_index do |query, index| %>
   <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>
+  </tr>
+  <% queries.each_with_index do |query, index| %>
+  <tr class="<%= query.suspended? ? "suspended" : "" %>">
     <td><%= query.group || "(default)" %></td>
     <td><%= query.name %></td>
     <td><%= query.targets.join(", ") %></td>
+    <td><%= query.suspended? ? "suspended" : "" %></td>
     <td>
       <button class="btn btn-default btn-xs show-query-expression" data-load="/json/query/<%= query.name %>">show query</button>
     </td>
@@ -82,6 +85,63 @@
       </button>
       <% end %>
     </td>
+    <td>
+      <% if query.suspended? %>
+        <a class="btn btn-info btn-xs" data-toggle="modal" href="#resumeQuery<%= index %>">
+          <span class="glyphicon glyphicon-play"></span>
+        </a>
+        <div class="modal fade"
+          id="resumeQuery<%= index %>"
+          tabindex="-1" role="dialog" aria-labelledby="resumeQueryLabel<%= index %>" aria-hidden="true">
+          <div class="modal-dialog">
+            <div class="modal-content">
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">Resume Query <%= query.name %></h4>
+              </div>
+              <div class="modal-body">
+                <p>name: <%= query.name %>, group: <%= query.group || "(default)" %></p>
+              <pre><%= query.expression %></pre>
+              </div>
+              <div class="modal-footer">
+                <form class="form-inline" action="/resume" method="POST">
+                  <input type="hidden" name="query_name" value="<%= query.name %>" />
+                  <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                  <button type="submit" class="btn btn-primary">Resume</button>
+                </form>
+              </div>
+            </div><!-- /.modal-content -->
+          </div><!-- /.modal-dialog -->
+        </div><!-- /.modal -->
+      <% else %>
+        <a class="btn btn-warning btn-xs" data-toggle="modal" href="#suspendQuery<%= index %>">
+          <span class="glyphicon glyphicon-pause"></span>
+        </a>
+        <div class="modal fade"
+          id="suspendQuery<%= index %>"
+          tabindex="-1" role="dialog" aria-labelledby="suspendQueryLabel<%= index %>" aria-hidden="true">
+          <div class="modal-dialog">
+            <div class="modal-content">
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">Suspend Query <%= query.name %></h4>
+              </div>
+              <div class="modal-body">
+                <p>name: <%= query.name %>, group: <%= query.group || "(default)" %></p>
+              <pre><%= query.expression %></pre>
+              </div>
+              <div class="modal-footer">
+                <form class="form-inline" action="/suspend" method="POST">
+                  <input type="hidden" name="query_name" value="<%= query.name %>" />
+                  <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                  <button type="submit" class="btn btn-danger">Suspend</button>
+                </form>
+              </div>
+            </div><!-- /.modal-content -->
+          </div><!-- /.modal-dialog -->
+        </div><!-- /.modal -->
+      <% end %>
+    </td>
     <td>
       <a class="btn btn-danger btn-xs" data-toggle="modal" href="#removeQuery<%= index %>">
         <span class="glyphicon glyphicon-trash"></span>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno
@@ -72,12 +72,12 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency