marty 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddef9c94cc142b0d56475fd47ce2d8a91bdc988e
-  data.tar.gz: 46e3879a1402abf89018c5ac88323109d83ce905
+  metadata.gz: ace581b64a26ea52006a992b316d6fcbc116182a
+  data.tar.gz: 3b011c6884664a254934baed99a2ef959381fb79
 SHA512:
-  metadata.gz: 7cf2b4a830eb713c974a60909d6e777eacbcbcb773f6bfa217ae00d0a87d1df17ab982c8f725be17d4e5932f723c2afa11a83a58dbc1c048b77380a1b5acfbe8
-  data.tar.gz: 15ac135cf790bd8eb3bd8cb5f8bdda2c2930be1b62c9d880eb9e770bdc1ed0d835f6dcbf0f67cdd3ef78bea0c422e3cd50bc5a1bf58786c872b0265061d15ac4
+  metadata.gz: 717f673b5b71f9d4b0e1c5605cdf84e6ecb4c1e06cf508f495ea642f55c96f5edef84f13cbb79cb490cb5329856cbc0b36a344e83f993eba1ffac741a3d13a70
+  data.tar.gz: 1d49e5c28c8783ed3bbae741d9701b74f3ef75389f8c6c1dd0ccc59f343cfab061f3b649834fd90587273853356fd3f4c67052704e63bbdeb98193afa413bc41

data/app/models/marty/event.rb

@@ -88,6 +88,7 @@ SQL
   end
 
   def self.lookup_event(klass, subject_id, operation)
+    update_start_and_end
     get_data("#{BASE_QUERY}
               WHERE klass = '#{klass}'
               AND subject_id = #{subject_id}
@@ -133,12 +134,72 @@ SQL
               ORDER BY end_dt desc").first
   end
 
+  def self.last_event_multi(klass, subject_ids_arg, operation=nil)
+    subject_ids = subject_ids_arg.map(&:to_i)
+    events = all_running.select do |pm|
+      pm["klass"] == klass && subject_ids.include?(pm["subject_id"]) &&
+        (operation.nil? || pm["enum_event_operation"] == operation)
+    end.group_by { |ev| ev["subject_id"] }.each_with_object({}) do
+      |(id, evs), h|
+      h[id] = evs.sort { |a, b| a["start_dt"] <=> b["start_dt"] }.first
+    end
+
+    running_ids = events.keys
+    check_fin = subject_ids - running_ids
+
+    if check_fin.present?
+      op_filt = "AND enum_event_operation = '#{operation}'" if operation
+      op_col = ", enum_event_operation" if operation
+
+      fins = get_data("SELECT klass,
+                              subject_id,
+                              enum_event_operation,
+                              comment,
+                              start_dt,
+                              end_dt,
+                              expire_secs,
+                              error
+                       FROM (SELECT klass,
+                                    subject_id,
+                                    enum_event_operation,
+                                    comment,
+                                    start_dt,
+                                    end_dt,
+                                    expire_secs,
+                                    error,
+                                    ROW_NUMBER() OVER (PARTITION BY klass,
+                                                                    subject_id
+                                                                    #{op_col}
+                                                       ORDER BY end_dt DESC) rnum
+                          FROM marty_events
+                          WHERE klass = '#{klass}'
+                            AND subject_id IN (#{check_fin.join(',')})
+                            #{op_filt}
+                            AND end_dt IS NOT NULL) sub
+                       WHERE rnum = 1")
+
+      fins.each do |fin|
+        events[fin["subject_id"]] = fin
+      end
+    end
+    events
+  end
+
   def self.currently_running(klass, subject_id)
     all_running.select do |pm|
       pm["klass"] == klass && pm["subject_id"] == subject_id.to_i
     end.map { |e| e["enum_event_operation"] }
   end
 
+  def self.currently_running_multi(klass, subject_id_raw)
+    subject_ids = [subject_id_raw].flatten.map(&:to_i)
+    all_running.select do |pm|
+      pm["klass"] == klass && subject_ids.include?(pm["subject_id"])
+    end.each_with_object({}) do |e, h|
+      (h[e["subject_id"]] ||= []) <<  e["enum_event_operation"]
+    end
+  end
+
   def self.update_comment(hash, comment)
     hid = hash.is_a?(Hash) ? hash['id'] : hash
     e = Marty::Event.find_by_id(hid)
@@ -158,7 +219,7 @@ SQL
   end
 
   def self.update_start_and_end
-    ActiveRecord::Base.connection.execute(UPDATE_SQL)
+    ActiveRecord::Base.connection.execute(UPDATE_SQL).cmd_tuples
   end
 
   def self.get_data(sql)
@@ -185,8 +246,9 @@ SQL
     time_now = Time.zone.now
     time_now_i = time_now.to_i
     time_now_s = time_now.strftime('%Y-%m-%d %H:%M:%S.%6N')
-    if time_now_i - @all_running[:timestamp] > @poll_secs
-      update_start_and_end
+    upd_count = update_start_and_end
+    if upd_count > 0 ||
+       time_now_i - @all_running[:timestamp] > @poll_secs
       @all_running[:data] = get_data(running_query(time_now_s))
       @all_running[:timestamp] = time_now_i
     end
@@ -204,8 +266,9 @@ SQL
     cutoff = Time.zone.at(@all_finished[:timestamp]).
              strftime('%Y-%m-%d %H:%M:%S.%6N')
 
-    if time_now_i - @all_finished[:timestamp] > @poll_secs
-      update_start_and_end
+    upd_count = update_start_and_end
+    if upd_count > 0 ||
+       time_now_i - @all_finished[:timestamp] > @poll_secs
       raw = get_data(
         "SELECT * FROM
             (SELECT ROW_NUMBER() OVER (PARTITION BY klass,

data/lib/marty/promise_job.rb

@@ -58,13 +58,21 @@ class Delorean::BaseModule::NodeCall
     promise.job_id = job.id
     promise.save!
 
-    event = Marty::Event.
-            create!(promise_id: promise.id,
-                    klass:      params["p_event"]["klass"],
-                    subject_id: params["p_event"]["id"],
-                    enum_event_operation:
-                      params["p_event"]["operation"]) if
-      params["p_event"]
+    evh = params["p_event"]
+    if evh
+      event, klass, subject_id, operation = evh.values_at("event", "klass",
+                                                          "id", "operation")
+      if event
+        event.promise_id = promise.id
+        event.save!
+      else
+        event = Marty::Event.
+                create!(promise_id: promise.id,
+                        klass:      klass,
+                        subject_id: subject_id,
+                        enum_event_operation: operation)
+      end
+    end
     Marty::PromiseProxy.new(promise.id, timeout, attr)
   end
 end
@@ -106,11 +114,10 @@ class Marty::PromiseJob < Struct.new(:promise,
 
       engine = Marty::ScriptSet.new(tag).get_engine(sname)
 
-      engine.evaluate_attrs(node, attrs, params)
-
-      res = attrs.each_with_object({}) { |attr, h|
-        h[attr] = engine.evaluate(node, attr, params)
-      }
+      attrs_eval = engine.evaluate_attrs(node, attrs, params)
+      res = attrs.zip(attrs_eval).each_with_object({}) do |(attr, val), h|
+        h[attr] = val
+      end
 
       # log "DONE #{Process.pid} #{promise.id} #{Time.now.to_f} #{res}"
     rescue => exc

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.17"
+  VERSION = "1.0.18"
 end

data/spec/models/event_spec.rb

@@ -29,6 +29,8 @@ describe Marty::Event do
       nil],
      ['testcl1',  123, @time + 4.seconds, nil,10000,     'PRICING', 'c comment',
       nil],
+     ['testcl1',  234, @time - 5.seconds, @time, nil,    'PRICING', 'c comment',
+      false],
      ['testcl2', 123, @time, nil,             2, 'AVM',     'e comment', nil],
      ['testcl2', 123, @time + 1.second, nil,  4, 'CRA',     'f comment', nil],
      ['testcl2', 123, Time.zone.parse(@old_start),
@@ -36,27 +38,27 @@ describe Marty::Event do
     ].each do
       |klass, subjid, startdt, enddt, expire, op, comment, error|
       Marty::Event.create!(klass: klass,
-                         subject_id: subjid,
-                         start_dt: startdt,
-                         end_dt: enddt,
-                         expire_secs: expire,
-                         comment: comment,
-                         enum_event_operation: op,
-                         error: error)
+                           subject_id: subjid,
+                           start_dt: startdt,
+                           end_dt: enddt,
+                           expire_secs: expire,
+                           comment: comment,
+                           enum_event_operation: op,
+                           error: error)
     end
 
 
     engine = Marty::ScriptSet.new.get_engine(NAME_I)
     res = engine.background_eval("SLEEPER", {"secs" => 5}, ["a"],
-                                {klass: "testcl3",
-                                 id: 987,
-                                 operation: 'PRICING'})
+                                 {klass: "testcl3",
+                                  id: 987,
+                                  operation: 'PRICING'})
     res.force
     engine = Marty::ScriptSet.new.get_engine(NAME_J)
     res = engine.background_eval("FAILER", {"dummy" => "dummy"}, ["a"],
-                                {klass: "testcl3",
-                                 id: 654,
-                                 operation: 'PRICING'})
+                                 {klass: "testcl3",
+                                  id: 654,
+                                  operation: 'PRICING'})
     res.force rescue nil
     sleep 5
     save_clean_db(@save_file)
@@ -75,46 +77,46 @@ describe Marty::Event do
 
 
   it "reports currently running" do
-    expect(Marty::Event.currently_running('testcl1', 123)).to eq(
-      ['AVM', 'CRA', 'PRICING'])
+    expect(Marty::Event.currently_running('testcl1', 123)).
+      to eq(['AVM', 'CRA', 'PRICING'])
     expect(Marty::Event.currently_running('testcl2', 123)).to eq([])
     expect(Marty::Event.currently_running('testcl3', 987)).to eq([])
-    expect(Marty::Event.last_event('testcl1', 123)).to include(
-      {"klass"=>"testcl1",
-       "subject_id"=>123,
-       "enum_event_operation"=>"PRICING",
-       "comment"=>"c comment", "expire_secs"=>10000})
-    expect(Marty::Event.last_event('testcl2', 123)).to include(
-      {"klass"=>"testcl2",
-       "subject_id"=>123,
-       "enum_event_operation"=>"PRICING",
-       "comment"=>"old event"})
-    expect(Marty::Event.last_event('testcl3', 987)).to include(
-      {"klass"=>"testcl3",
-        "subject_id"=>987,
-        "enum_event_operation"=>"PRICING",
-        "comment"=>nil,
-        "expire_secs"=>nil})
+    expect(Marty::Event.last_event('testcl1', 123)).
+      to include(
+           {"klass"=>"testcl1",
+            "subject_id"=>123,
+            "enum_event_operation"=>"PRICING",
+            "comment"=>"c comment", "expire_secs"=>10000})
+    expect(Marty::Event.last_event('testcl2', 123)).
+      to include(
+           {"klass"=>"testcl2",
+            "subject_id"=>123,
+            "enum_event_operation"=>"PRICING",
+            "comment"=>"old event"})
+    expect(Marty::Event.last_event('testcl3', 987)).
+      to include(
+           {"klass"=>"testcl3",
+            "subject_id"=>987,
+            "enum_event_operation"=>"PRICING",
+            "comment"=>nil,
+            "expire_secs"=>nil})
 
     Timecop.freeze(@time+1.second)
     Marty::Event.clear_cache
-    expect(Marty::Event.currently_running('testcl1', 123)).to eq(
-      ['AVM', 'CRA', 'PRICING'])
-    expect(Marty::Event.currently_running('testcl2', 123)).to eq(
-      ['AVM', 'CRA'])
+    expect(Marty::Event.currently_running('testcl1', 123)).
+      to eq(['AVM', 'CRA', 'PRICING'])
+    expect(Marty::Event.currently_running('testcl2', 123)).to eq(['AVM', 'CRA'])
 
     Timecop.freeze(@time+3.seconds)
     Marty::Event.clear_cache
-    expect(Marty::Event.currently_running('testcl1', 123)).to eq(
-      ['AVM', 'CRA', 'PRICING'])
-    expect(Marty::Event.currently_running('testcl2', 123)).to eq(
-      ['CRA'])
+    expect(Marty::Event.currently_running('testcl1', 123)).
+      to eq(['AVM', 'CRA', 'PRICING'])
+    expect(Marty::Event.currently_running('testcl2', 123)).to eq(['CRA'])
 
     Timecop.freeze(@time+6.seconds)
-    expect(Marty::Event.currently_running('testcl1', 123)).to eq(
-      ['AVM', 'CRA', 'PRICING'])
-    expect(Marty::Event.currently_running('testcl2', 123)).to eq(
-      [])
+    expect(Marty::Event.currently_running('testcl1', 123)).
+      to eq(['AVM', 'CRA', 'PRICING'])
+    expect(Marty::Event.currently_running('testcl2', 123)).to eq([])
     Timecop.return
 
   end
@@ -142,7 +144,7 @@ describe Marty::Event do
     expect(ev4.end_dt).not_to be_nil
     expect(ev4.error).to be_truthy
 
-    expect(af.count).to eq(3)
+    expect(af.count).to eq(4)
     expect(af).to include(['testcl3', 987])
     expect(af).to include(['testcl2', 123])
     expect(af[['testcl3', 987]]).to include('PRICING')
@@ -150,13 +152,16 @@ describe Marty::Event do
     expect(af[['testcl2', 123]]).to include('PRICING')
     expect(af[['testcl2', 123]]['PRICING']).to eq(@old_end)
 
-    expect(Marty::Event.currently_running('testcl1', 123)).to eq(
-      ['AVM', 'CRA', 'PRICING'])
+    expect(Marty::Event.currently_running('testcl1', 123)).
+      to eq(['AVM', 'CRA', 'PRICING'])
     expect(Marty::Event.op_is_running?('testcl1', 123, 'AVM')).to be_truthy
     Marty::Event.finish_event('testcl1', 123, 'AVM', false, 'wassup')
     Marty::Event.clear_cache
-    expect(Marty::Event.currently_running('testcl1', 123)).to eq(
-      ['CRA', 'PRICING'])
+    expect(Marty::Event.currently_running('testcl1', 123)).
+      to eq(['CRA', 'PRICING'])
+    expect(Marty::Event.currently_running_multi('testcl1', [123])).
+      to eq({123 => ['CRA', 'PRICING']})
+
     expect(Marty::Event.op_is_running?('testcl1', 123, 'AVM')).to be_falsey
     expect(Marty::Event.op_is_running?('testcl1', 123, 'CRA')).to be_truthy
 
@@ -175,9 +180,22 @@ describe Marty::Event do
     expect(Marty::Event.pretty_op(ev.first)).to eq('Avm')
     ev = Marty::Event.lookup_event('testcl1', 123, 'PRICING').first
     expect(Marty::Event.pretty_op(ev)).to eq('Pricing')
+    evs = Marty::Event.last_event_multi('testcl1', [123, 234])
+    expect(evs[123]).to include({"klass"=>"testcl1",
+                                 "subject_id"=>123,
+                                 "enum_event_operation"=>"CRA",
+                                 "comment"=>"b comment",
+                                 "expire_secs"=>nil,
+                                 "error"=>nil})
+    expect(evs[234]).to include({"klass"=>"testcl1",
+                                 "subject_id"=>234,
+                                 "enum_event_operation"=>"PRICING",
+                                 "comment"=>"c comment",
+                                 "expire_secs"=>nil,
+                                 "error"=>"f"})
 
     af = Marty::Event.all_finished
-    expect(af.count).to eq(4)
+    expect(af.count).to eq(5)
     expect(af[['testcl3', 987]]).to include('PRICING')
     expect(af[['testcl1', 123]]).to include('AVM')
     expect(af[['testcl1', 123]]['AVM']).to start_with(@date_string)
@@ -191,7 +209,7 @@ describe Marty::Event do
                                       "the comment") }.
       to raise_error(%r!AVM is already running for testcl/1234!)
     expect {Marty::Event.create_event('testcl', 2345, 'AVM', Time.zone.now, 600,
-                                     "the comment") }.not_to raise_error
+                                      "the comment") }.not_to raise_error
     expect {Marty::Event.finish_event('testcl', 1234, 'AVM', false,
                                       "new comment") }.
       not_to raise_error
@@ -209,7 +227,7 @@ describe Marty::Event do
       to raise_error(%r!PG::.*invalid input value for enum.*"AMV"!)
     Marty::Event.clear_cache
     af = Marty::Event.all_finished
-    expect(af.count).to eq(5)
+    expect(af.count).to eq(6)
     expect(af).to include(['testcl', 1234])
     expect(af).to include(['testcl', 2345])
     expect(af[['testcl', 1234]]).to include('AVM')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg