pampa 2.0.15 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8627e0b3e3f9d923c9dc750fde056078bfd202a74e3abd36eecfa27566c93f3
-  data.tar.gz: 27990d2b64539c229974280e5d80b630b7e6dfb05b4b6533ef8976031e791a7d
+  metadata.gz: fbbd19e65301b23d9e1ce78458528c5bdeecb73f2d54047e2546df8ad54f229d
+  data.tar.gz: aaea0b4f3b174b565cec083ff833c52b255aede1304757a2383f23057ea25f06
 SHA512:
-  metadata.gz: 71fb9a3ab3965c5aa591412c358ff6074b12d9e7ff6b8409d941ac28e42ba2ccb85288f1987a20758fd81c795d22323c597c2f15be040d5e1b628fed008aaecb
-  data.tar.gz: e33cfc7bca76c0a3031c4bfdc96417cfba6fadbcf7593b499a9eb2b5cefd996371b05548f159149ff2d204ae8035c524ac77c2dadbb081bde93693f0e64da1d9
+  metadata.gz: 26472faf3ef44736e06ea39351fcc4380c7ba94f282051df49f12d2572190daca659603866f6a4275dc793b1408c992fa20310500ae74d28f283d6d75eac97ee
+  data.tar.gz: 7893ba252991c1e5603b00372d5a719552a3134fdd1daed6ed168c28c9f6864ed8d36561fe531f8ffef11557c099f9340c14b8411177b96f6714e10c9f498250

data/lib/pampa.rb

@@ -23,6 +23,11 @@ module BlackStack
         # Connection string to the database. Example: mysql2://user:password@localhost:3306/database
         @@connection_string = nil
 
+        def self.now()
+          tz = 'America/Argentina/Buenos_Aires' #DB["SELECT current_setting('TIMEZONE') AS tz"].first[:tz]
+          DB["SELECT current_timestamp() at TIME ZONE '#{tz}' AS now"].first[:now]
+        end
+
         # @@integrate_with_blackstack_deployer
         def self.integrate_with_blackstack_deployer()
             @@integrate_with_blackstack_deployer
@@ -138,34 +143,6 @@ module BlackStack
           @@jobs
         end
 
-=begin
-        # return a hash descriptor of the whole configuration of the cluster.
-        def self.to_hash()
-            ret = {
-                :log_filename => self.log_filename,
-                :connection_string => self.connection_string,
-            }
-            #ret[:workers] = []
-            #@@workers.each do |w|
-            #    ret[:workers] << w.to_hash
-            #end
-            ret[:nodes] = []
-            @@nodes.each do |n|
-                ret[:nodes] << n.to_hash
-            end
-            ret[:jobs] = []
-            @@jobs.each do |j|
-                ret[:jobs] << j.to_hash
-            end
-            ret
-        end # def self.to_hash()
-
-        # setup from a whole hash descriptor
-        def self.initialize(h)
-            # TODO
-        end
-=end
-
         # get attached and unassigned workers. 
         # assign and unassign workers to jobs.
         #
@@ -199,6 +176,7 @@ module BlackStack
               l.logf("done (#{assigned.size.to_s})")
 
               l.logs("Getting total pending tasks... ")
+
               pendings = job.selecting(job.max_pending_tasks)
               l.logf("done (#{pendings.size.to_s})")
 
@@ -804,14 +782,11 @@ module BlackStack
         
             # returns an array of failed tasks for restarting.
             def relaunching_dataset(n)
-              #ds = DB[self.table.to_sym].where("#{self.field_time.to_s} < CURRENT_TIMESTAMP() - INTERVAL '#{self.max_job_duration_minutes.to_i} minutes'")
-              #ds = ds.filter("#{self.field_end_time.to_s} IS NULL") if !self.field_end_time.nil?  
-              #ds.limit(n).all
               q = "
                 SELECT * 
                 FROM #{self.table.to_s} 
                 WHERE #{self.field_time.to_s} IS NOT NULL 
-                AND #{self.field_time.to_s} < CURRENT_TIMESTAMP() - INTERVAL '#{self.max_job_duration_minutes.to_i} minutes' 
+                AND #{self.field_time.to_s} < CAST('#{BlackStack::Pampa.now}' AS TIMESTAMP) - INTERVAL '#{self.max_job_duration_minutes.to_i} minutes' 
                 AND #{self.field_id.to_s} IS NOT NULL 
                 AND #{self.field_end_time.to_s} IS NULL
                 AND COALESCE(#{self.field_times.to_s},0) < #{self.max_try_times.to_i}
@@ -830,19 +805,25 @@ module BlackStack
               end
             end
             
+            def update(o)
+              DB[self.table.to_sym].where(
+                self.field_primary_key.to_sym => o[self.field_primary_key.to_sym]
+              ).update(o)
+            end
+
             def relaunch(o)
               o[self.field_id.to_sym] = nil
               o[self.field_time.to_sym] = nil
               o[self.field_start_time.to_sym] = nil if !self.field_start_time.nil?
               o[self.field_end_time.to_sym] = nil if !self.field_end_time.nil?
-              DB[self.table.to_sym].where(self.field_primary_key.to_sym => o[self.field_primary_key.to_sym]).update(o)
+              self.update(o)
             end
         
             def start(o)
               if self.starter_function.nil?
-                o[self.field_start_time.to_sym] = DB["SELECT CURRENT_TIMESTAMP() AS dt"].first[:dt] if !self.field_start_time.nil? # IMPORTANT: use DB location to get current time.
+                o[self.field_start_time.to_sym] = DB["SELECT CAST('#{BlackStack::Pampa.now}' AS TIMESTAMP) AS dt"].first[:dt] if !self.field_start_time.nil? # IMPORTANT: use DB location to get current time.
                 o[self.field_times.to_sym] = o[self.field_times.to_sym].to_i + 1
-                DB[self.table.to_sym].where(self.field_primary_key.to_sym => o[self.field_primary_key.to_sym]).update(o)
+                self.update(o)
               else
                 self.starter_function.call(o, self)
               end
@@ -850,10 +831,10 @@ module BlackStack
         
             def finish(o, e=nil)
               if self.finisher_function.nil?
-                o[self.field_end_time.to_sym] = DB["SELECT CURRENT_TIMESTAMP() AS dt"].first[:dt] if !self.field_end_time.nil? && e.nil? # IMPORTANT: use DB location to get current time.
+                o[self.field_end_time.to_sym] = DB["SELECT CAST('#{BlackStack::Pampa.now}' AS TIMESTAMP) AS dt"].first[:dt] if !self.field_end_time.nil? && e.nil? # IMPORTANT: use DB location to get current time.
                 o[self.field_success.to_sym] = e.nil?
                 o[self.field_error_description.to_sym] = e.to_console if !e.nil? 
-                DB[self.table.to_sym].where(self.field_primary_key.to_sym => o[self.field_primary_key.to_sym]).update(o)
+                self.update(o)
               else
                 self.finisher_function.call(o, e, self)
               end
@@ -886,12 +867,12 @@ module BlackStack
                 self.selecting(n).each { |o|
                   # count the # of dispatched
                   i += 1
-                  # dispatch records
+                  # dispatch 
                   o[self.field_id.to_sym] = worker.id
-                  o[self.field_time.to_sym] = DB["SELECT CURRENT_TIMESTAMP() AS dt"].first[:dt] # IMPORTANT: use DB location to get current time.
+                  o[self.field_time.to_sym] = DB["SELECT CAST('#{BlackStack::Pampa.now}' AS TIMESTAMP) AS dt"].first[:dt] # IMPORTANT: use DB location to get current time.
                   o[self.field_start_time.to_sym] = nil if !self.field_start_time.nil?
                   o[self.field_end_time.to_sym] = nil if !self.field_end_time.nil?
-                  DB[self.table.to_sym].where(self.field_primary_key.to_sym => o[self.field_primary_key.to_sym]).update(o)
+                  self.update(o)
                   # release resources
                   DB.disconnect
                   GC.start        

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.17
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel