postjob 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be82d81ed82917e5d476d559a18fa3c6946d7041
-  data.tar.gz: 382982f885ea11cf7dea7bc8a7086e29a637bc0d
+  metadata.gz: 375c8b8cb2b29ba963463113fa303d53374222fd
+  data.tar.gz: 5feceb4be5f5c97eba91caffd55f73d70469aa0c
 SHA512:
-  metadata.gz: b403fcb4a9a0caebeaadab7845062e696219d119a40cffaf97ccf1b8071960dd0b1aad32a3628532fddb7adf3b980018118c74ddb97fa70c9beff1f5126b5303
-  data.tar.gz: f8ab70060f8287a4d5a742647662568e4bba5a104b1d21796a327245742f61a2b4a7ff3f98aa569fa91618e2102c564cca408baeb3497bd5e455321f29828456
+  metadata.gz: 02cb7b0d90750a13f859c925fccb9fea90af194cd71efcff329be0aa9274195531e2c2892ebaa0a549bc66f470c648b848fab6c697781fc8273265c55ebf09ae
+  data.tar.gz: e663a86782d31c2c84e8039bd373103151fb38685b2973d362ddff5b6bd7dd15943c374ecbe94106c04c16d2519bb084556159418f8aa382442b73c52994674b

data/lib/postjob/migrations/005_helpers.sql

@@ -6,23 +6,23 @@ CREATE OR REPLACE FUNCTION {SCHEMA_NAME}._wakeup_runners() RETURNS TRIGGER AS $$
 $$ LANGUAGE plpgsql;
 
 BEGIN;
-  DROP TRIGGER IF EXISTS _wakeup_runners ON {TABLE_NAME};
+  DROP TRIGGER IF EXISTS _wakeup_runners ON {SCHEMA_NAME}.postjobs;
 
   CREATE TRIGGER _wakeup_runners AFTER INSERT OR UPDATE
-    ON {TABLE_NAME}
+    ON {SCHEMA_NAME}.postjobs
     FOR EACH STATEMENT
     EXECUTE PROCEDURE {SCHEMA_NAME}._wakeup_runners();
 COMMIT;
 
 CREATE OR REPLACE FUNCTION {SCHEMA_NAME}._wakeup_parent_job(job_id BIGINT) RETURNS VOID AS $$
 BEGIN
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET
     status='ready',
     next_run_at=(now() at time zone 'utc'),
     updated_at=(now() at time zone 'utc')
   WHERE
     status='sleep'
-    AND id=(SELECT parent_id FROM postjobs WHERE id=job_id);
+    AND id=(SELECT parent_id FROM {SCHEMA_NAME}.postjobs WHERE id=job_id);
 END;
 $$ LANGUAGE plpgsql;

data/lib/postjob/migrations/006_enqueue.sql

@@ -31,14 +31,14 @@ AS $$
     ) RETURNING {SCHEMA_NAME}.postjobs.id INTO job_id;
 
     -- fill in root_id and full_id ------------------------------------
-    UPDATE postjobs
+    UPDATE {SCHEMA_NAME}.postjobs
     SET
-      root_id=COALESCE((SELECT root_id FROM postjobs s WHERE s.id=postjobs.parent_id), id),
-      full_id=COALESCE((SELECT full_id FROM postjobs s WHERE s.id=postjobs.parent_id) || '.' || id, id::varchar)
+      root_id=COALESCE((SELECT root_id FROM {SCHEMA_NAME}.postjobs s WHERE s.id=postjobs.parent_id), id),
+      full_id=COALESCE((SELECT full_id FROM {SCHEMA_NAME}.postjobs s WHERE s.id=postjobs.parent_id) || '.' || id, id::varchar)
     WHERE id=job_id;
 
     -- return the job -------------------------------------------------
     RETURN QUERY
-      SELECT * FROM postjobs WHERE id=job_id;
+      SELECT * FROM {SCHEMA_NAME}.postjobs WHERE id=job_id;
   END;
 $$ LANGUAGE plpgsql;

data/lib/postjob/migrations/006a_processing.sql

@@ -20,7 +20,7 @@ DECLARE
 BEGIN
   v_pid := pg_backend_pid();
 
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET
     status='processing',
     processing_client=(SELECT client_addr || ':' || client_port FROM pg_stat_activity WHERE pid = v_pid),
@@ -37,7 +37,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION {SCHEMA_NAME}._reset_job_processing(job_id BIGINT) RETURNS VOID AS $$
 BEGIN
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET
     processing_client=NULL,
     processing_client_identifier=NULL,

data/lib/postjob/migrations/007_job_results.sql

@@ -1,7 +1,7 @@
 CREATE OR REPLACE FUNCTION {SCHEMA_NAME}._update_job_version(job_id BIGINT, p_version VARCHAR) RETURNS VOID AS $$
 BEGIN
   IF p_version IS NOT NULL THEN
-    UPDATE postjobs
+    UPDATE {SCHEMA_NAME}.postjobs
     SET
       workflow_version=p_version,
       updated_at=(now() at time zone 'utc')
@@ -12,10 +12,10 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.set_job_result(job_id BIGINT, p_results JSONB, p_version VARCHAR) RETURNS VOID AS $$
 BEGIN
-  PERFORM _update_job_version(job_id, p_version);
-  PERFORM _reset_job_processing(job_id);
+  PERFORM {SCHEMA_NAME}._update_job_version(job_id, p_version);
+  PERFORM {SCHEMA_NAME}._reset_job_processing(job_id);
 
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET
     results=p_results,
     error=NULL,
@@ -25,16 +25,16 @@ BEGIN
     next_run_at=NULL
   WHERE id=job_id;
 
-  PERFORM _wakeup_parent_job(job_id);
+  PERFORM {SCHEMA_NAME}._wakeup_parent_job(job_id);
 END;
 $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.set_job_pending(job_id BIGINT, p_version VARCHAR) RETURNS VOID AS $$
 BEGIN
-  PERFORM _update_job_version(job_id, p_version);
-  PERFORM _reset_job_processing(job_id);
+  PERFORM {SCHEMA_NAME}._update_job_version(job_id, p_version);
+  PERFORM {SCHEMA_NAME}._reset_job_processing(job_id);
 
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET status='sleep', next_run_at=NULL
   WHERE id=job_id;
 END;
@@ -56,7 +56,7 @@ BEGIN
 
   -- If this is a recoverable error we check if we have any remaining attempts.
   IF p_status = 'err' THEN
-    IF (SELECT max_attempts - failed_attempts FROM postjobs WHERE id=job_id) > 0 THEN
+    IF (SELECT max_attempts - failed_attempts FROM {SCHEMA_NAME}.postjobs WHERE id=job_id) > 0 THEN
       p_status = 'err';
     ELSE
       p_status = 'failed';
@@ -64,7 +64,7 @@ BEGIN
   END IF;
 
   -- set status, clear next_run_at
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET
     status=p_status,
     next_run_at=NULL
@@ -74,7 +74,7 @@ BEGIN
   IF p_status != 'failed' AND p_status != 'timeout' THEN
     next_run_at_basetime := CASE WHEN p_fast_mode THEN 0.01 ELSE 10 END;
 
-    UPDATE postjobs
+    UPDATE {SCHEMA_NAME}.postjobs
     SET
       next_run_at=(now() at time zone 'utc') + next_run_at_basetime * pow(1.5, failed_attempts) * interval '1 second'
     WHERE id=job_id;
@@ -91,11 +91,11 @@ CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.set_job_error(
   p_version VARCHAR,
   p_fast_mode BOOLEAN) RETURNS VOID AS $$
 BEGIN
-  PERFORM _update_job_version(job_id, p_version);
-  PERFORM _reset_job_processing(job_id);
+  PERFORM {SCHEMA_NAME}._update_job_version(job_id, p_version);
+  PERFORM {SCHEMA_NAME}._reset_job_processing(job_id);
 
   -- write error info
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET
     error=p_error,
     error_message=p_error_message,
@@ -105,8 +105,8 @@ BEGIN
   WHERE id=job_id;
 
   -- prepare next run, if any
-  PERFORM _prepare_next_run(job_id, p_status, p_fast_mode);
-  PERFORM _wakeup_parent_job(job_id);
+  PERFORM {SCHEMA_NAME}._prepare_next_run(job_id, p_status, p_fast_mode);
+  PERFORM {SCHEMA_NAME}._wakeup_parent_job(job_id);
 END;
 $$ LANGUAGE plpgsql;
 
@@ -114,10 +114,10 @@ CREATE OR REPLACE FUNCTION {SCHEMA_NAME}._set_job_timeout(
   job_id BIGINT,
   p_fast_mode BOOLEAN) RETURNS VOID AS $$
 BEGIN
-  PERFORM _reset_job_processing(job_id);
+  PERFORM {SCHEMA_NAME}._reset_job_processing(job_id);
 
   -- write error info
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET
     error='Timeout',
     error_message='timeout',
@@ -127,8 +127,8 @@ BEGIN
   WHERE id=job_id;
 
   -- prepare next run, if any
-  PERFORM _prepare_next_run(job_id, 'timeout', p_fast_mode);
-  PERFORM _wakeup_parent_job(job_id);
+  PERFORM {SCHEMA_NAME}._prepare_next_run(job_id, 'timeout', p_fast_mode);
+  PERFORM {SCHEMA_NAME}._wakeup_parent_job(job_id);
 END;
 $$ LANGUAGE plpgsql;
 
@@ -136,12 +136,12 @@ CREATE OR REPLACE FUNCTION {SCHEMA_NAME}._set_job_zombie(
   job_id BIGINT,
   p_fast_mode BOOLEAN) RETURNS VOID AS $$
 BEGIN
-  PERFORM _reset_job_processing(job_id);
+  PERFORM {SCHEMA_NAME}._reset_job_processing(job_id);
 
   RAISE NOTICE 'job % is a zombie', job_id;
 
   -- write error info
-  UPDATE postjobs
+  UPDATE {SCHEMA_NAME}.postjobs
   SET
     error='Zombie',
     error_message='zombie',
@@ -151,7 +151,7 @@ BEGIN
   WHERE id=job_id;
 
   -- prepare next run, if any
-  PERFORM _prepare_next_run(job_id, 'err', p_fast_mode);
-  PERFORM _wakeup_parent_job(job_id);
+  PERFORM {SCHEMA_NAME}._prepare_next_run(job_id, 'err', p_fast_mode);
+  PERFORM {SCHEMA_NAME}._wakeup_parent_job(job_id);
 END;
 $$ LANGUAGE plpgsql;

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

@@ -6,15 +6,15 @@ DECLARE
 BEGIN
   SELECT MIN(processable_at) INTO p_processable_at FROM (
       SELECT MIN(processing_started_at + processing_max_duration * interval '1 second') AS processable_at
-      FROM {TABLE_NAME}
+      FROM {SCHEMA_NAME}.postjobs
       WHERE status IN ('processing')
     UNION
       SELECT MIN(timing_out_at) AS processable_at
-      FROM {TABLE_NAME}
+      FROM {SCHEMA_NAME}.postjobs
       WHERE status IN ('ready', 'err', 'sleep')
     UNION
       SELECT MIN(next_run_at) AS processable_at
-      FROM {TABLE_NAME}
+      FROM {SCHEMA_NAME}.postjobs
       WHERE status IN ('ready', 'err')
         AND workflow || workflow_version = ANY ($1)
   ) sq;
@@ -24,16 +24,16 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.checkout(workflows_with_versions varchar[], p_fast_mode BOOLEAN)
-  RETURNS SETOF {TABLE_NAME}
+  RETURNS SETOF {SCHEMA_NAME}.postjobs
 AS $$
 DECLARE
-  job {TABLE_NAME};
+  job {SCHEMA_NAME}.postjobs;
 BEGIN
   LOOP
     -- try to checkout a job. Each of the conditions here is matching
     -- one of the CASE .. WHEN clauses below.
     SELECT INTO job *
-    FROM {TABLE_NAME} s
+    FROM {SCHEMA_NAME}.postjobs s
     WHERE
       (
         s.status IN ('processing')
@@ -69,8 +69,8 @@ BEGIN
         CONTINUE;
       ELSE
         -- set job to processing
-        PERFORM _set_job_processing(job.id);
-        RETURN QUERY SELECT * FROM {TABLE_NAME} WHERE id=job.id;
+        PERFORM {SCHEMA_NAME}._set_job_processing(job.id);
+        RETURN QUERY SELECT * FROM {SCHEMA_NAME}.postjobs WHERE id=job.id;
         EXIT;
     END CASE;
   END LOOP;

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

@@ -2,7 +2,7 @@ CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.childjobs(v_parent_id BIGINT)
   RETURNS SETOF {SCHEMA_NAME}.postjobs AS $$
 BEGIN
   RETURN QUERY
-    SELECT {TABLE_NAME}.* FROM {TABLE_NAME}
+    SELECT {SCHEMA_NAME}.postjobs.* FROM {SCHEMA_NAME}.postjobs
     WHERE parent_id=v_parent_id
     ORDER BY id;
 END;
@@ -12,7 +12,7 @@ CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.next_unresolved_childjob(v_parent_id BI
   RETURNS SETOF {SCHEMA_NAME}.postjobs AS $$
 BEGIN
   RETURN QUERY
-    SELECT {TABLE_NAME}.* FROM {TABLE_NAME}
+    SELECT {SCHEMA_NAME}.postjobs.* FROM {SCHEMA_NAME}.postjobs
     WHERE status NOT IN ('ok', 'failed') AND parent_id=v_parent_id
     ORDER BY next_run_at;
 END;
@@ -38,7 +38,7 @@ BEGIN
   END IF;
 
   IF v_parent_id IS NOT NULL THEN
-    SELECT INTO parent * FROM {TABLE_NAME} WHERE id=v_parent_id;
+    SELECT INTO parent * FROM {SCHEMA_NAME}.postjobs WHERE id=v_parent_id;
     IF parent.id IS NULL THEN
       RAISE 'No such job: %', v_parent_id;
     END IF;
@@ -47,7 +47,7 @@ BEGIN
   -- check for existing child record
 
   -- IF v_parent_id IS NOT NULL THEN
-    SELECT id INTO child_id FROM {TABLE_NAME}
+    SELECT id INTO child_id FROM {SCHEMA_NAME}.postjobs
     WHERE parent_id=v_parent_id
       AND workflow=v_workflow
       AND workflow_method=v_workflow_method
@@ -58,7 +58,7 @@ BEGIN
       -- note that RETURN QUERY does not return the function here. It 'only'
       -- adds the specified query to the result set.
       RETURN QUERY
-        SELECT * FROM {TABLE_NAME} WHERE id=child_id
+        SELECT * FROM {SCHEMA_NAME}.postjobs WHERE id=child_id
       ;
     ELSE
       IF v_tags IS NOT NULL THEN
@@ -66,7 +66,7 @@ BEGIN
       END IF;
 
       RETURN QUERY
-        SELECT * FROM enqueue(
+        SELECT * FROM {SCHEMA_NAME}.enqueue(
           COALESCE(v_queue, parent.queue),  -- queue VARCHAR,
           v_workflow,                       -- workflow VARCHAR,
           v_workflow_method,                -- workflow_method VARCHAR,

data/lib/postjob/migrations/009_tokens.sql

@@ -18,8 +18,8 @@ CREATE OR REPLACE FUNCTION {SCHEMA_NAME}.postjobs_by_token(v_token UUID)
   RETURNS SETOF {SCHEMA_NAME}.postjobs AS $$
 BEGIN
   RETURN QUERY
-    SELECT {TABLE_NAME}.* FROM {TABLE_NAME}
-    INNER JOIN {SCHEMA_NAME}.tokens ON {SCHEMA_NAME}.tokens.postjob_id={TABLE_NAME}.id
+    SELECT {SCHEMA_NAME}.postjobs.* FROM {SCHEMA_NAME}.postjobs
+    INNER JOIN {SCHEMA_NAME}.tokens ON {SCHEMA_NAME}.tokens.postjob_id={SCHEMA_NAME}.postjobs.id
     WHERE {SCHEMA_NAME}.tokens.token=v_token;
 END;
 $$ LANGUAGE plpgsql;

data/lib/postjob/migrations.rb

@@ -12,8 +12,6 @@ module Postjob
     # below drops that schema, and we don't want to drop the default schema.
     expect! SCHEMA_NAME != "public"
 
-    TABLE_NAME = "#{SCHEMA_NAME}.postjobs"
-
     def unmigrate!
       SQL.exec "DROP SCHEMA IF EXISTS #{SCHEMA_NAME} CASCADE"
     end
@@ -29,6 +27,8 @@ module Postjob
     private
 
     def run_migration(file)
+      STDERR.puts "[#{file}] Running migration"
+
       case file
       when /\.rb$/  then run_migration_ruby(file)
       when /\.sql$/ then run_migration_sql(file)

data/lib/postjob/queue.rb

@@ -9,8 +9,6 @@ module Postjob::Queue
   extend self
 
   SCHEMA_NAME = "postjob"
-  TABLE_NAME  = "#{SCHEMA_NAME}.postjobs"
-
   SQL         = ::Simple::SQL
 end
 
@@ -119,7 +117,7 @@ module Postjob::Queue
     # within a single run of a job (all within the same transaction and therefore
     # invisible to the outside).
     SQL.ask <<~SQL, job.id, status
-      UPDATE #{TABLE_NAME}
+      UPDATE #{SCHEMA_NAME}.postjobs
       SET workflow_status=$2
       WHERE id=$1
     SQL

data/spec/postjob/run_spec.rb

@@ -32,7 +32,7 @@ describe "Postjob.process_all" do
   context "when scheduled to run in the future" do
     before do
       Simple::SQL.ask <<~SQL, id
-        UPDATE postjobs
+        UPDATE postjob.postjobs
         SET next_run_at=next_run_at + interval '10 seconds'
         WHERE id=$1
         SQL
@@ -49,7 +49,7 @@ describe "Postjob.process_all" do
   context "when scheduled to time out" do
     before do
       Simple::SQL.ask <<~SQL, id
-        UPDATE postjobs
+        UPDATE postjob.postjobs
         SET timing_out_at=next_run_at
         WHERE id=$1
         SQL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postjob
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - radiospiel