postjob 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 375c8b8cb2b29ba963463113fa303d53374222fd
-  data.tar.gz: 5feceb4be5f5c97eba91caffd55f73d70469aa0c
+  metadata.gz: 19ac068f3a63b97556c7ce6aefe07e10ead759f1
+  data.tar.gz: 003e5725fa65129288ddc34eac9625a751cc252e
 SHA512:
-  metadata.gz: 02cb7b0d90750a13f859c925fccb9fea90af194cd71efcff329be0aa9274195531e2c2892ebaa0a549bc66f470c648b848fab6c697781fc8273265c55ebf09ae
-  data.tar.gz: e663a86782d31c2c84e8039bd373103151fb38685b2973d362ddff5b6bd7dd15943c374ecbe94106c04c16d2519bb084556159418f8aa382442b73c52994674b
+  metadata.gz: 3874859c70f5c0182189acbb7cbf6e16130497b6ea5783658f280f2355a6e205a020724100c293f0fe427fa146251e1fc57756af6ad892ed08b24b68c9745745
+  data.tar.gz: 9f040743503861a3aaa2571a56d4081c4c915649b558990f201218e9207c2dc8e3576332ed7793c6a13835db66bbdaeab2687d02a8d5ff14adb0f8c284e9a945

data/lib/postjob/cli/ps.rb

@@ -87,10 +87,14 @@ module Postjob::CLI
     print_sql limit: limit, query: query
   end
 
-  def ps_top(*ids, limit: "100", tags: nil)
+  def ps_top(*ids, limit: "100", tags: nil, full: false)
     loop do
       system "clear"
-      ps(*ids, limit: limit, tags: tags)
+      if full
+        ps_full(*ids, limit: limit, tags: tags)
+      else
+        ps(*ids, limit: limit, tags: tags)
+      end
       sleep 1
     end
   rescue Interrupt
@@ -138,7 +142,7 @@ module Postjob::CLI
   end
 
   def print_sql(limit:, query:)
-    records = Simple::SQL.records("#{query} LIMIT $1+1", limit)
+    records = Simple::SQL.all("#{query} LIMIT $1+1", limit, into: Hash)
 
     tp records[0, limit]
     if records.length > limit

data/lib/postjob/migrations/008a_childjobs.sql

@@ -8,7 +8,7 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.next_unresolved_childjob(v_parent_id BIGINT)
+CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.unresolved_childjobs(v_parent_id BIGINT)
   RETURNS SETOF {SCHEMA_NAME}.postjobs AS $$
 BEGIN
   RETURN QUERY

data/lib/postjob/migrations.rb

@@ -27,7 +27,7 @@ module Postjob
     private
 
     def run_migration(file)
-      STDERR.puts "[#{file}] Running migration"
+      STDERR.puts "[postjob] Running migration in #{file}"
 
       case file
       when /\.rb$/  then run_migration_ruby(file)

data/lib/postjob/queue.rb

@@ -48,7 +48,7 @@ module Postjob::Queue
     # a) a limitation in Simple::SQL which would not be able to unpack a
     #    "SELECT function()" usefully when the return value is a record;
     # b) and/or my inability to write better SQL functions;
-    SQL.record "SELECT * FROM #{SCHEMA_NAME}.enqueue($1, $2, $3, $4, $5, $6, $7, $8, $9)",
+    SQL.ask "SELECT * FROM #{SCHEMA_NAME}.enqueue($1, $2, $3, $4, $5, $6, $7, $8, $9)",
                   options[:queue],
                   workflow,
                   workflow_method,
@@ -79,12 +79,12 @@ module Postjob::Queue
 
   def childjobs(parent)
     expect! parent => Job
-    SQL.records "SELECT * FROM #{SCHEMA_NAME}.childjobs($1)", parent.id, into: Job
+    SQL.all "SELECT * FROM #{SCHEMA_NAME}.childjobs($1)", parent.id, into: Job
   end
 
-  def next_unresolved_childjob(parent)
+  def unresolved_childjobs(parent)
     expect! parent => Job
-    SQL.records "SELECT * FROM #{SCHEMA_NAME}.next_unresolved_childjob($1)", parent.id, into: Job
+    SQL.ask "SELECT COUNT(*) FROM #{SCHEMA_NAME}.unresolved_childjobs($1)", parent.id
   end
 
   def find_or_create_childjob(parent, workflow, args, timeout:, max_attempts:, queue: nil)
@@ -97,7 +97,7 @@ module Postjob::Queue
     # a) a limitation in Simple::SQL which would not be able to unpack a
     #    "SELECT function()" usefully when the return value is a record;
     # b) and/or my inability to write better SQL functions;
-    return SQL.record "SELECT * FROM #{SCHEMA_NAME}.find_or_create_childjob($1, $2, $3, $4, $5, $6, $7, $8, $9)",
+    return SQL.ask "SELECT * FROM #{SCHEMA_NAME}.find_or_create_childjob($1, $2, $3, $4, $5, $6, $7, $8, $9)",
                   queue,
                   workflow,
                   workflow_method,
@@ -138,7 +138,7 @@ module Postjob::Queue
   public
 
   def checkout(workflows_with_versions)
-    SQL.record "SELECT * FROM #{SCHEMA_NAME}.checkout($1, $2)",
+    SQL.ask "SELECT * FROM #{SCHEMA_NAME}.checkout($1, $2)",
       workflows_with_versions, Postjob.fast_mode, into: Job
   end
 
@@ -147,6 +147,6 @@ module Postjob::Queue
   end
 
   def find_job_by_token(token)
-    SQL.record "SELECT * FROM #{SCHEMA_NAME}.postjobs_by_token($1)", token, into: Job
+    SQL.ask "SELECT * FROM #{SCHEMA_NAME}.postjobs_by_token($1)", token, into: Job
   end
 end

data/lib/postjob/runner.rb

@@ -55,8 +55,9 @@ module Postjob::Runner
   def await(job, *args, timeout: nil, max_attempts: nil)
     case job
     when :all
-      if Postjob::Queue.next_unresolved_childjob(current_job)
-        Postjob.logger.debug "await :all: Found an unresolved childjob"
+      unresolved_childjobs = Postjob::Queue.unresolved_childjobs(current_job)
+      if unresolved_childjobs > 0
+        Postjob.logger.debug "await :all: Found #{unresolved_childjobs} unresolved childjobs"
         throw :pending, :pending
       else
         childjobs = Postjob::Queue.childjobs(current_job)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postjob
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec