@pgpm/jobs 0.4.0 → 0.6.0

package/sql/{launchql-jobs--0.4.6.sql → launchql-jobs--0.5.0.sql}

@@ -6,6 +6,53 @@ GRANT USAGE ON SCHEMA app_jobs TO administrator;
 ALTER DEFAULT PRIVILEGES IN SCHEMA app_jobs
   GRANT EXECUTE ON FUNCTIONS TO administrator;
 
+CREATE FUNCTION app_jobs.tg_update_timestamps() RETURNS trigger AS $EOFCODE$
+BEGIN
+  IF TG_OP = 'INSERT' THEN
+    NEW.created_at = NOW();
+    NEW.updated_at = NOW();
+  ELSIF TG_OP = 'UPDATE' THEN
+    NEW.created_at = OLD.created_at;
+    NEW.updated_at = greatest (now(), OLD.updated_at + interval '1 millisecond');
+  END IF;
+  RETURN NEW;
+END;
+$EOFCODE$ LANGUAGE plpgsql;
+
+CREATE FUNCTION app_jobs.tg_add_job_with_row_id() RETURNS trigger AS $EOFCODE$
+BEGIN
+  IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
+    PERFORM
+      app_jobs.add_job (tg_argv[0], json_build_object('id', NEW.id));
+    RETURN NEW;
+  END IF;
+  IF (TG_OP = 'DELETE') THEN
+    PERFORM
+      app_jobs.add_job (tg_argv[0], json_build_object('id', OLD.id));
+    RETURN OLD;
+  END IF;
+END;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+
+COMMENT ON FUNCTION app_jobs.tg_add_job_with_row_id IS 'Useful shortcut to create a job on insert or update. Pass the task name as the trigger argument, and the record id will automatically be available on the JSON payload.';
+
+CREATE FUNCTION app_jobs.tg_add_job_with_row() RETURNS trigger AS $EOFCODE$
+BEGIN
+  IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
+    PERFORM
+      app_jobs.add_job (TG_ARGV[0], to_json(NEW));
+    RETURN NEW;
+  END IF;
+  IF (TG_OP = 'DELETE') THEN
+    PERFORM
+      app_jobs.add_job (TG_ARGV[0], to_json(OLD));
+    RETURN OLD;
+  END IF;
+END;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+
+COMMENT ON FUNCTION app_jobs.tg_add_job_with_row IS 'Useful shortcut to create a job on insert or update. Pass the task name as the trigger argument, and the record data will automatically be available on the JSON payload.';
+
 CREATE FUNCTION app_jobs.json_build_object_apply(arguments text[]) RETURNS pg_catalog.json AS $EOFCODE$
 DECLARE
   arg text;
@@ -26,19 +73,58 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql;
 
-CREATE TABLE app_jobs.jobs (
+CREATE FUNCTION app_jobs.trigger_job_with_fields() RETURNS trigger AS $EOFCODE$
+DECLARE
+  arg text;
+  fn text;
+  i int;
+  args text[];
+BEGIN
+  FOR i IN
+  SELECT
+    *
+  FROM
+    generate_series(1, TG_NARGS) g (i)
+    LOOP
+      IF (i = 1) THEN
+        fn = TG_ARGV[i - 1];
+      ELSE
+        args = array_append(args, TG_ARGV[i - 1]);
+        IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
+          EXECUTE format('SELECT ($1).%s::text', TG_ARGV[i - 1])
+          USING NEW INTO arg;
+        END IF;
+        IF (TG_OP = 'DELETE') THEN
+          EXECUTE format('SELECT ($1).%s::text', TG_ARGV[i - 1])
+          USING OLD INTO arg;
+        END IF;
+        args = array_append(args, arg);
+      END IF;
+    END LOOP;
+  PERFORM
+    app_jobs.add_job (fn, app_jobs.json_build_object_apply (args));
+  IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
+    RETURN NEW;
+  END IF;
+  IF (TG_OP = 'DELETE') THEN
+    RETURN OLD;
+  END IF;
+END;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+
+CREATE TABLE app_jobs.scheduled_jobs (
   id bigserial PRIMARY KEY,
   queue_name text DEFAULT public.gen_random_uuid()::text,
   task_identifier text NOT NULL,
   payload pg_catalog.json DEFAULT '{}'::json NOT NULL,
   priority int DEFAULT 0 NOT NULL,
-  run_at timestamptz DEFAULT now() NOT NULL,
-  attempts int DEFAULT 0 NOT NULL,
   max_attempts int DEFAULT 25 NOT NULL,
   key text,
-  last_error text,
   locked_at timestamptz,
   locked_by text,
+  schedule_info pg_catalog.json NOT NULL,
+  last_scheduled timestamptz,
+  last_scheduled_id bigint,
   CHECK (length(key) < 513),
   CHECK (length(task_identifier) < 127),
   CHECK (max_attempts > 0),
@@ -47,71 +133,39 @@ CREATE TABLE app_jobs.jobs (
   UNIQUE (key)
 );
 
-CREATE TABLE app_jobs.job_queues (
-  queue_name text NOT NULL PRIMARY KEY,
-  job_count int DEFAULT 0 NOT NULL,
-  locked_at timestamptz,
-  locked_by text
-);
-
-CREATE FUNCTION app_jobs.add_job(identifier text, payload pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, run_at timestamptz DEFAULT now(), max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.jobs AS $EOFCODE$
-DECLARE
-  v_job app_jobs.jobs;
+CREATE FUNCTION app_jobs.do_notify() RETURNS trigger AS $EOFCODE$
 BEGIN
-  IF job_key IS NOT NULL THEN
-    -- Upsert job	
-    INSERT INTO app_jobs.jobs (task_identifier, payload, queue_name, run_at, max_attempts, KEY, priority)	
-      VALUES (identifier, coalesce(payload, '{}'::json), queue_name, coalesce(run_at, now()), coalesce(max_attempts, 25), job_key, coalesce(priority, 0))	
-    ON CONFLICT (KEY)	
-      DO UPDATE SET	
-        task_identifier = excluded.task_identifier, payload = excluded.payload, queue_name = excluded.queue_name, max_attempts = excluded.max_attempts, run_at = excluded.run_at, priority = excluded.priority,	
-        -- always reset error/retry state	
-        attempts = 0, last_error = NULL	
-      WHERE	
-        jobs.locked_at IS NULL	
-      RETURNING	
-        * INTO v_job;	
+  PERFORM
+    pg_notify(TG_ARGV[0], '');
+  RETURN NEW;
+END;
+$EOFCODE$ LANGUAGE plpgsql;
 
-    -- If upsert succeeded (insert or update), return early	
-    
-    IF NOT (v_job IS NULL) THEN	
-      RETURN v_job;	
-    END IF;	
+CREATE TRIGGER _900_notify_scheduled_job
+  AFTER INSERT
+  ON app_jobs.scheduled_jobs
+  FOR EACH ROW
+  EXECUTE PROCEDURE app_jobs.do_notify('scheduled_jobs:insert');
 
-    -- Upsert failed -> there must be an existing job that is locked. Remove	
-    -- existing key to allow a new one to be inserted, and prevent any	
-    -- subsequent retries by bumping attempts to the max allowed.
+CREATE INDEX scheduled_jobs_priority_id_idx ON app_jobs.scheduled_jobs (priority, id);
 
-    UPDATE	
-      app_jobs.jobs	
-    SET	
-      KEY = NULL,	
-      attempts = jobs.max_attempts	
-    WHERE	
-      KEY = job_key;	
-  END IF;
+CREATE INDEX scheduled_jobs_locked_by_idx ON app_jobs.scheduled_jobs (locked_by);
 
-  INSERT INTO app_jobs.jobs (task_identifier, payload, queue_name, run_at, max_attempts, priority)
-    VALUES (identifier, payload, queue_name, run_at, max_attempts, priority)
-  RETURNING
-    * INTO v_job;
-  RETURN v_job;
-END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+GRANT SELECT, INSERT, UPDATE, DELETE ON app_jobs.scheduled_jobs TO administrator;
 
-CREATE TABLE app_jobs.scheduled_jobs (
+CREATE TABLE app_jobs.jobs (
   id bigserial PRIMARY KEY,
   queue_name text DEFAULT public.gen_random_uuid()::text,
   task_identifier text NOT NULL,
   payload pg_catalog.json DEFAULT '{}'::json NOT NULL,
   priority int DEFAULT 0 NOT NULL,
+  run_at timestamptz DEFAULT now() NOT NULL,
+  attempts int DEFAULT 0 NOT NULL,
   max_attempts int DEFAULT 25 NOT NULL,
   key text,
+  last_error text,
   locked_at timestamptz,
   locked_by text,
-  schedule_info pg_catalog.json NOT NULL,
-  last_scheduled timestamptz,
-  last_scheduled_id bigint,
   CHECK (length(key) < 513),
   CHECK (length(task_identifier) < 127),
   CHECK (max_attempts > 0),
@@ -120,116 +174,267 @@ CREATE TABLE app_jobs.scheduled_jobs (
   UNIQUE (key)
 );
 
-CREATE FUNCTION app_jobs.add_scheduled_job(identifier text, payload pg_catalog.json DEFAULT '{}'::json, schedule_info pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.scheduled_jobs AS $EOFCODE$
-DECLARE
-  v_job app_jobs.scheduled_jobs;
-BEGIN
-  IF job_key IS NOT NULL THEN
+ALTER TABLE app_jobs.jobs 
+  ADD COLUMN created_at timestamptz;
 
-    -- Upsert job	
-    INSERT INTO app_jobs.scheduled_jobs (task_identifier, payload, queue_name, schedule_info, max_attempts, KEY, priority)	
-      VALUES (identifier, coalesce(payload, '{}'::json), queue_name, schedule_info, coalesce(max_attempts, 25), job_key, coalesce(priority, 0))	
-    ON CONFLICT (KEY)	
-      DO UPDATE SET	
-        task_identifier = excluded.task_identifier,
-        payload = excluded.payload,
-        queue_name = excluded.queue_name,
-        max_attempts = excluded.max_attempts,
-        schedule_info = excluded.schedule_info,
-        priority = excluded.priority
-      WHERE	
-        scheduled_jobs.locked_at IS NULL	
-      RETURNING	
-        * INTO v_job;	
+ALTER TABLE app_jobs.jobs 
+  ALTER COLUMN created_at SET DEFAULT now();
 
-    -- If upsert succeeded (insert or update), return early	
-    
-    IF NOT (v_job IS NULL) THEN	
-      RETURN v_job;	
-    END IF;	
+ALTER TABLE app_jobs.jobs 
+  ADD COLUMN updated_at timestamptz;
 
-    -- Upsert failed -> there must be an existing scheduled job that is locked. Remove	
-    -- and allow a new one to be inserted
+ALTER TABLE app_jobs.jobs 
+  ALTER COLUMN updated_at SET DEFAULT now();
 
-    DELETE FROM	
-      app_jobs.scheduled_jobs	
-    WHERE	
-      KEY = job_key;	
-  END IF;
+CREATE TRIGGER _100_update_jobs_modtime_tg
+  BEFORE INSERT OR UPDATE
+  ON app_jobs.jobs
+  FOR EACH ROW
+  EXECUTE PROCEDURE app_jobs.tg_update_timestamps();
 
-  INSERT INTO app_jobs.scheduled_jobs (task_identifier, payload, queue_name, schedule_info, max_attempts, priority)
-    VALUES (identifier, payload, queue_name, schedule_info, max_attempts, priority)
-  RETURNING
-    * INTO v_job;
-  RETURN v_job;
+CREATE FUNCTION app_jobs.tg_increase_job_queue_count() RETURNS trigger AS $EOFCODE$
+BEGIN
+  INSERT INTO app_jobs.job_queues (queue_name, job_count)
+    VALUES (NEW.queue_name, 1)
+  ON CONFLICT (queue_name)
+    DO UPDATE SET
+      job_count = job_queues.job_count + 1;
+  RETURN NEW;
 END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE;
 
-CREATE FUNCTION app_jobs.complete_job(worker_id text, job_id bigint) RETURNS app_jobs.jobs LANGUAGE plpgsql AS $EOFCODE$
+CREATE TRIGGER _500_increase_job_queue_count_on_insert
+  AFTER INSERT
+  ON app_jobs.jobs
+  FOR EACH ROW
+  WHEN (new.queue_name IS NOT NULL)
+  EXECUTE PROCEDURE app_jobs.tg_increase_job_queue_count();
+
+CREATE TRIGGER _500_increase_job_queue_count_on_update
+  AFTER UPDATE OF queue_name
+  ON app_jobs.jobs
+  FOR EACH ROW
+  WHEN (new.queue_name IS DISTINCT FROM old.queue_name
+    AND new.queue_name IS NOT NULL)
+  EXECUTE PROCEDURE app_jobs.tg_increase_job_queue_count();
+
+CREATE TRIGGER _900_notify_worker
+  AFTER INSERT
+  ON app_jobs.jobs
+  FOR EACH ROW
+  EXECUTE PROCEDURE app_jobs.do_notify('jobs:insert');
+
+CREATE FUNCTION app_jobs.tg_decrease_job_queue_count() RETURNS trigger AS $EOFCODE$
 DECLARE
-  v_row app_jobs.jobs;
+  v_new_job_count int;
 BEGIN
-  DELETE FROM app_jobs.jobs
-  WHERE id = job_id
+  UPDATE
+    app_jobs.job_queues
+  SET
+    job_count = job_queues.job_count - 1
+  WHERE
+    queue_name = OLD.queue_name
   RETURNING
-    * INTO v_row;
-  IF v_row.queue_name IS NOT NULL THEN
-    UPDATE
-      app_jobs.job_queues
-    SET
-      locked_by = NULL,
-      locked_at = NULL
+    job_count INTO v_new_job_count;
+  IF v_new_job_count <= 0 THEN
+    DELETE FROM app_jobs.job_queues
+    WHERE queue_name = OLD.queue_name
+      AND job_count <= 0;
+  END IF;
+  RETURN OLD;
+END;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE;
+
+CREATE TRIGGER decrease_job_queue_count_on_delete
+  AFTER DELETE
+  ON app_jobs.jobs
+  FOR EACH ROW
+  WHEN (old.queue_name IS NOT NULL)
+  EXECUTE PROCEDURE app_jobs.tg_decrease_job_queue_count();
+
+CREATE TRIGGER decrease_job_queue_count_on_update
+  AFTER UPDATE OF queue_name
+  ON app_jobs.jobs
+  FOR EACH ROW
+  WHEN (new.queue_name IS DISTINCT FROM old.queue_name
+    AND old.queue_name IS NOT NULL)
+  EXECUTE PROCEDURE app_jobs.tg_decrease_job_queue_count();
+
+CREATE INDEX priority_run_at_id_idx ON app_jobs.jobs (priority, run_at, id);
+
+CREATE INDEX jobs_locked_by_idx ON app_jobs.jobs (locked_by);
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON app_jobs.jobs TO administrator;
+
+CREATE TABLE app_jobs.job_queues (
+  queue_name text NOT NULL PRIMARY KEY,
+  job_count int DEFAULT 0 NOT NULL,
+  locked_at timestamptz,
+  locked_by text
+);
+
+CREATE INDEX job_queues_locked_by_idx ON app_jobs.job_queues (locked_by);
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON app_jobs.job_queues TO administrator;
+
+CREATE FUNCTION app_jobs.run_scheduled_job(id bigint, job_expiry interval DEFAULT '1 hours') RETURNS app_jobs.jobs AS $EOFCODE$
+DECLARE
+  j app_jobs.jobs;
+  last_id bigint;
+  lkd_by text;
+BEGIN
+  -- check last scheduled
+  SELECT
+    last_scheduled_id
+  FROM
+    app_jobs.scheduled_jobs s
+  WHERE
+    s.id = run_scheduled_job.id INTO last_id;
+  -- if it's been scheduled check if it's been run
+  IF (last_id IS NOT NULL) THEN
+    SELECT
+      locked_by
+    FROM
+      app_jobs.jobs js
     WHERE
-      queue_name = v_row.queue_name
-      AND locked_by = worker_id;
+      js.id = last_id
+      AND (js.locked_at IS NULL -- never been run
+        OR js.locked_at >= (NOW() - job_expiry)
+        -- still running within a safe interval
+) INTO lkd_by;
+    IF (FOUND) THEN
+      RAISE EXCEPTION 'ALREADY_SCHEDULED';
+    END IF;
   END IF;
-  RETURN v_row;
+  -- insert new job
+  INSERT INTO app_jobs.jobs (queue_name, task_identifier, payload, priority, max_attempts, key)
+  SELECT
+    queue_name,
+    task_identifier,
+    payload,
+    priority,
+    max_attempts,
+    key
+  FROM
+    app_jobs.scheduled_jobs s
+  WHERE
+    s.id = run_scheduled_job.id
+  RETURNING
+    * INTO j;
+  -- update the scheduled job
+  UPDATE
+    app_jobs.scheduled_jobs s
+  SET
+    last_scheduled = NOW(),
+    last_scheduled_id = j.id
+  WHERE
+    s.id = run_scheduled_job.id;
+  RETURN j;
 END;
-$EOFCODE$;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE;
 
-CREATE FUNCTION app_jobs.complete_jobs(job_ids bigint[]) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
-  DELETE FROM app_jobs.jobs
-  WHERE id = ANY (job_ids)
+CREATE FUNCTION app_jobs.reschedule_jobs(job_ids bigint[], run_at timestamptz DEFAULT NULL, priority int DEFAULT NULL, attempts int DEFAULT NULL, max_attempts int DEFAULT NULL) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
+  UPDATE
+    app_jobs.jobs
+  SET
+    run_at = coalesce(reschedule_jobs.run_at, jobs.run_at),
+    priority = coalesce(reschedule_jobs.priority, jobs.priority),
+    attempts = coalesce(reschedule_jobs.attempts, jobs.attempts),
+    max_attempts = coalesce(reschedule_jobs.max_attempts, jobs.max_attempts)
+  WHERE
+    id = ANY (job_ids)
     AND (locked_by IS NULL
       OR locked_at < NOW() - interval '4 hours')
   RETURNING
     *;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.do_notify() RETURNS trigger AS $EOFCODE$
+CREATE FUNCTION app_jobs.release_scheduled_jobs(worker_id text, ids bigint[] DEFAULT NULL) RETURNS void AS $EOFCODE$
+DECLARE
 BEGIN
-  PERFORM
-    pg_notify(TG_ARGV[0], '');
-  RETURN NEW;
+  -- clear the scheduled job
+  UPDATE
+    app_jobs.scheduled_jobs s
+  SET
+    locked_at = NULL,
+    locked_by = NULL
+  WHERE
+    locked_by = worker_id
+    AND (ids IS NULL
+      OR s.id = ANY (ids));
 END;
-$EOFCODE$ LANGUAGE plpgsql;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE;
 
-CREATE FUNCTION app_jobs.fail_job(worker_id text, job_id bigint, error_message text) RETURNS app_jobs.jobs LANGUAGE plpgsql STRICT AS $EOFCODE$
+CREATE FUNCTION app_jobs.release_jobs(worker_id text) RETURNS void AS $EOFCODE$
 DECLARE
-  v_row app_jobs.jobs;
 BEGIN
+  -- clear the job
   UPDATE
     app_jobs.jobs
   SET
-    last_error = error_message,
-    run_at = greatest (now(), run_at) + (exp(least (attempts, 10))::text || ' seconds')::interval,
+    locked_at = NULL,
     locked_by = NULL,
-    locked_at = NULL
+    attempts = GREATEST (attempts - 1, 0)
   WHERE
-    id = job_id
-    AND locked_by = worker_id
+    locked_by = worker_id;
+  -- clear the queue
+  UPDATE
+    app_jobs.job_queues
+  SET
+    locked_at = NULL,
+    locked_by = NULL
+  WHERE
+    locked_by = worker_id;
+END;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE;
+
+CREATE FUNCTION app_jobs.permanently_fail_jobs(job_ids bigint[], error_message text DEFAULT NULL) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
+  UPDATE
+    app_jobs.jobs
+  SET
+    last_error = coalesce(error_message, 'Manually marked as failed'),
+    attempts = max_attempts
+  WHERE
+    id = ANY (job_ids)
+    AND (locked_by IS NULL
+      OR locked_at < NOW() - interval '4 hours')
   RETURNING
-    * INTO v_row;
-  IF v_row.queue_name IS NOT NULL THEN
-    UPDATE
-      app_jobs.job_queues
-    SET
-      locked_by = NULL,
-      locked_at = NULL
-    WHERE
-      queue_name = v_row.queue_name
-      AND locked_by = worker_id;
+    *;
+$EOFCODE$;
+
+CREATE FUNCTION app_jobs.get_scheduled_job(worker_id text, task_identifiers text[] DEFAULT NULL) RETURNS app_jobs.scheduled_jobs LANGUAGE plpgsql AS $EOFCODE$
+DECLARE
+  v_job_id bigint;
+  v_row app_jobs.scheduled_jobs;
+BEGIN
+  IF worker_id IS NULL THEN
+    RAISE exception 'INVALID_WORKER_ID';
+  END IF;
+  SELECT
+    scheduled_jobs.id INTO v_job_id
+  FROM
+    app_jobs.scheduled_jobs
+  WHERE (scheduled_jobs.locked_at IS NULL)
+    AND (task_identifiers IS NULL
+      OR task_identifier = ANY (task_identifiers))
+  ORDER BY
+    priority ASC,
+    id ASC
+  LIMIT 1
+  FOR UPDATE
+    SKIP LOCKED;
+  IF v_job_id IS NULL THEN
+    RETURN NULL;
   END IF;
+  UPDATE
+    app_jobs.scheduled_jobs
+  SET
+    locked_by = worker_id,
+    locked_at = NOW()
+  WHERE
+    id = v_job_id
+  RETURNING
+    * INTO v_row;
   RETURN v_row;
 END;
 $EOFCODE$;
@@ -301,358 +506,153 @@ BEGIN
 END;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.get_scheduled_job(worker_id text, task_identifiers text[] DEFAULT NULL) RETURNS app_jobs.scheduled_jobs LANGUAGE plpgsql AS $EOFCODE$
+CREATE FUNCTION app_jobs.fail_job(worker_id text, job_id bigint, error_message text) RETURNS app_jobs.jobs LANGUAGE plpgsql STRICT AS $EOFCODE$
 DECLARE
-  v_job_id bigint;
-  v_row app_jobs.scheduled_jobs;
+  v_row app_jobs.jobs;
 BEGIN
-  IF worker_id IS NULL THEN
-    RAISE exception 'INVALID_WORKER_ID';
-  END IF;
-  SELECT
-    scheduled_jobs.id INTO v_job_id
-  FROM
-    app_jobs.scheduled_jobs
-  WHERE (scheduled_jobs.locked_at IS NULL)
-    AND (task_identifiers IS NULL
-      OR task_identifier = ANY (task_identifiers))
-  ORDER BY
-    priority ASC,
-    id ASC
-  LIMIT 1
-  FOR UPDATE
-    SKIP LOCKED;
-  IF v_job_id IS NULL THEN
-    RETURN NULL;
-  END IF;
   UPDATE
-    app_jobs.scheduled_jobs
+    app_jobs.jobs
   SET
-    locked_by = worker_id,
-    locked_at = NOW()
+    last_error = error_message,
+    run_at = greatest (now(), run_at) + (exp(least (attempts, 10))::text || ' seconds')::interval,
+    locked_by = NULL,
+    locked_at = NULL
   WHERE
-    id = v_job_id
+    id = job_id
+    AND locked_by = worker_id
   RETURNING
     * INTO v_row;
-  RETURN v_row;
-END;
-$EOFCODE$;
-
-CREATE FUNCTION app_jobs.permanently_fail_jobs(job_ids bigint[], error_message text DEFAULT NULL) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
-  UPDATE
-    app_jobs.jobs
-  SET
-    last_error = coalesce(error_message, 'Manually marked as failed'),
-    attempts = max_attempts
-  WHERE
-    id = ANY (job_ids)
-    AND (locked_by IS NULL
-      OR locked_at < NOW() - interval '4 hours')
-  RETURNING
-    *;
-$EOFCODE$;
-
-CREATE FUNCTION app_jobs.release_jobs(worker_id text) RETURNS void AS $EOFCODE$
-DECLARE
-BEGIN
-  -- clear the job
-  UPDATE
-    app_jobs.jobs
-  SET
-    locked_at = NULL,
-    locked_by = NULL,
-    attempts = GREATEST (attempts - 1, 0)
-  WHERE
-    locked_by = worker_id;
-  -- clear the queue
-  UPDATE
-    app_jobs.job_queues
-  SET
-    locked_at = NULL,
-    locked_by = NULL
-  WHERE
-    locked_by = worker_id;
-END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE;
-
-CREATE FUNCTION app_jobs.release_scheduled_jobs(worker_id text, ids bigint[] DEFAULT NULL) RETURNS void AS $EOFCODE$
-DECLARE
-BEGIN
-  -- clear the scheduled job
-  UPDATE
-    app_jobs.scheduled_jobs s
-  SET
-    locked_at = NULL,
-    locked_by = NULL
-  WHERE
-    locked_by = worker_id
-    AND (ids IS NULL
-      OR s.id = ANY (ids));
+  IF v_row.queue_name IS NOT NULL THEN
+    UPDATE
+      app_jobs.job_queues
+    SET
+      locked_by = NULL,
+      locked_at = NULL
+    WHERE
+      queue_name = v_row.queue_name
+      AND locked_by = worker_id;
+  END IF;
+  RETURN v_row;
 END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE;
+$EOFCODE$;
 
-CREATE FUNCTION app_jobs.reschedule_jobs(job_ids bigint[], run_at timestamptz DEFAULT NULL, priority int DEFAULT NULL, attempts int DEFAULT NULL, max_attempts int DEFAULT NULL) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
-  UPDATE
-    app_jobs.jobs
-  SET
-    run_at = coalesce(reschedule_jobs.run_at, jobs.run_at),
-    priority = coalesce(reschedule_jobs.priority, jobs.priority),
-    attempts = coalesce(reschedule_jobs.attempts, jobs.attempts),
-    max_attempts = coalesce(reschedule_jobs.max_attempts, jobs.max_attempts)
-  WHERE
-    id = ANY (job_ids)
+CREATE FUNCTION app_jobs.complete_jobs(job_ids bigint[]) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
+  DELETE FROM app_jobs.jobs
+  WHERE id = ANY (job_ids)
     AND (locked_by IS NULL
       OR locked_at < NOW() - interval '4 hours')
   RETURNING
     *;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.run_scheduled_job(id bigint, job_expiry interval DEFAULT '1 hours') RETURNS app_jobs.jobs AS $EOFCODE$
+CREATE FUNCTION app_jobs.complete_job(worker_id text, job_id bigint) RETURNS app_jobs.jobs LANGUAGE plpgsql AS $EOFCODE$
 DECLARE
-  j app_jobs.jobs;
-  last_id bigint;
-  lkd_by text;
+  v_row app_jobs.jobs;
 BEGIN
-  -- check last scheduled
-  SELECT
-    last_scheduled_id
-  FROM
-    app_jobs.scheduled_jobs s
-  WHERE
-    s.id = run_scheduled_job.id INTO last_id;
-  -- if it's been scheduled check if it's been run
-  IF (last_id IS NOT NULL) THEN
-    SELECT
-      locked_by
-    FROM
-      app_jobs.jobs js
+  DELETE FROM app_jobs.jobs
+  WHERE id = job_id
+  RETURNING
+    * INTO v_row;
+  IF v_row.queue_name IS NOT NULL THEN
+    UPDATE
+      app_jobs.job_queues
+    SET
+      locked_by = NULL,
+      locked_at = NULL
     WHERE
-      js.id = last_id
-      AND (js.locked_at IS NULL -- never been run
-        OR js.locked_at >= (NOW() - job_expiry)
-        -- still running within a safe interval
-) INTO lkd_by;
-    IF (FOUND) THEN
-      RAISE EXCEPTION 'ALREADY_SCHEDULED';
-    END IF;
+      queue_name = v_row.queue_name
+      AND locked_by = worker_id;
   END IF;
-  -- insert new job
-  INSERT INTO app_jobs.jobs (queue_name, task_identifier, payload, priority, max_attempts, key)
-  SELECT
-    queue_name,
-    task_identifier,
-    payload,
-    priority,
-    max_attempts,
-    key
-  FROM
-    app_jobs.scheduled_jobs s
-  WHERE
-    s.id = run_scheduled_job.id
-  RETURNING
-    * INTO j;
-  -- update the scheduled job
-  UPDATE
-    app_jobs.scheduled_jobs s
-  SET
-    last_scheduled = NOW(),
-    last_scheduled_id = j.id
-  WHERE
-    s.id = run_scheduled_job.id;
-  RETURN j;
+  RETURN v_row;
 END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE;
-
-GRANT SELECT, INSERT, UPDATE, DELETE ON app_jobs.job_queues TO administrator;
-
-CREATE INDEX job_queues_locked_by_idx ON app_jobs.job_queues (locked_by);
-
-GRANT SELECT, INSERT, UPDATE, DELETE ON app_jobs.jobs TO administrator;
-
-CREATE INDEX jobs_locked_by_idx ON app_jobs.jobs (locked_by);
-
-CREATE INDEX priority_run_at_id_idx ON app_jobs.jobs (priority, run_at, id);
+$EOFCODE$;
 
-CREATE FUNCTION app_jobs.tg_decrease_job_queue_count() RETURNS trigger AS $EOFCODE$
+CREATE FUNCTION app_jobs.add_scheduled_job(identifier text, payload pg_catalog.json DEFAULT '{}'::json, schedule_info pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.scheduled_jobs AS $EOFCODE$
 DECLARE
-  v_new_job_count int;
-BEGIN
-  UPDATE
-    app_jobs.job_queues
-  SET
-    job_count = job_queues.job_count - 1
-  WHERE
-    queue_name = OLD.queue_name
-  RETURNING
-    job_count INTO v_new_job_count;
-  IF v_new_job_count <= 0 THEN
-    DELETE FROM app_jobs.job_queues
-    WHERE queue_name = OLD.queue_name
-      AND job_count <= 0;
-  END IF;
-  RETURN OLD;
-END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE;
-
-CREATE TRIGGER decrease_job_queue_count_on_delete
-  AFTER DELETE
-  ON app_jobs.jobs
-  FOR EACH ROW
-  WHEN (old.queue_name IS NOT NULL)
-  EXECUTE PROCEDURE app_jobs.tg_decrease_job_queue_count();
-
-CREATE TRIGGER decrease_job_queue_count_on_update
-  AFTER UPDATE OF queue_name
-  ON app_jobs.jobs
-  FOR EACH ROW
-  WHEN (new.queue_name IS DISTINCT FROM old.queue_name
-    AND old.queue_name IS NOT NULL)
-  EXECUTE PROCEDURE app_jobs.tg_decrease_job_queue_count();
-
-CREATE FUNCTION app_jobs.tg_increase_job_queue_count() RETURNS trigger AS $EOFCODE$
+  v_job app_jobs.scheduled_jobs;
 BEGIN
-  INSERT INTO app_jobs.job_queues (queue_name, job_count)
-    VALUES (NEW.queue_name, 1)
-  ON CONFLICT (queue_name)
-    DO UPDATE SET
-      job_count = job_queues.job_count + 1;
-  RETURN NEW;
-END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE;
+  IF job_key IS NOT NULL THEN
 
-CREATE TRIGGER _500_increase_job_queue_count_on_insert
-  AFTER INSERT
-  ON app_jobs.jobs
-  FOR EACH ROW
-  WHEN (new.queue_name IS NOT NULL)
-  EXECUTE PROCEDURE app_jobs.tg_increase_job_queue_count();
+    -- Upsert job	
+    INSERT INTO app_jobs.scheduled_jobs (task_identifier, payload, queue_name, schedule_info, max_attempts, KEY, priority)	
+      VALUES (identifier, coalesce(payload, '{}'::json), queue_name, schedule_info, coalesce(max_attempts, 25), job_key, coalesce(priority, 0))	
+    ON CONFLICT (KEY)	
+      DO UPDATE SET	
+        task_identifier = excluded.task_identifier,
+        payload = excluded.payload,
+        queue_name = excluded.queue_name,
+        max_attempts = excluded.max_attempts,
+        schedule_info = excluded.schedule_info,
+        priority = excluded.priority
+      WHERE	
+        scheduled_jobs.locked_at IS NULL	
+      RETURNING	
+        * INTO v_job;	
 
-CREATE TRIGGER _500_increase_job_queue_count_on_update
-  AFTER UPDATE OF queue_name
-  ON app_jobs.jobs
-  FOR EACH ROW
-  WHEN (new.queue_name IS DISTINCT FROM old.queue_name
-    AND new.queue_name IS NOT NULL)
-  EXECUTE PROCEDURE app_jobs.tg_increase_job_queue_count();
+    -- If upsert succeeded (insert or update), return early	
+    
+    IF NOT (v_job IS NULL) THEN	
+      RETURN v_job;	
+    END IF;	
 
-CREATE TRIGGER _900_notify_worker
-  AFTER INSERT
-  ON app_jobs.jobs
-  FOR EACH ROW
-  EXECUTE PROCEDURE app_jobs.do_notify('jobs:insert');
+    -- Upsert failed -> there must be an existing scheduled job that is locked. Remove	
+    -- and allow a new one to be inserted
 
-CREATE FUNCTION app_jobs.tg_update_timestamps() RETURNS trigger AS $EOFCODE$
-BEGIN
-  IF TG_OP = 'INSERT' THEN
-    NEW.created_at = NOW();
-    NEW.updated_at = NOW();
-  ELSIF TG_OP = 'UPDATE' THEN
-    NEW.created_at = OLD.created_at;
-    NEW.updated_at = greatest (now(), OLD.updated_at + interval '1 millisecond');
+    DELETE FROM	
+      app_jobs.scheduled_jobs	
+    WHERE	
+      KEY = job_key;	
   END IF;
-  RETURN NEW;
-END;
-$EOFCODE$ LANGUAGE plpgsql;
-
-ALTER TABLE app_jobs.jobs 
-  ADD COLUMN created_at timestamptz;
-
-ALTER TABLE app_jobs.jobs 
-  ALTER COLUMN created_at SET DEFAULT now();
-
-ALTER TABLE app_jobs.jobs 
-  ADD COLUMN updated_at timestamptz;
-
-ALTER TABLE app_jobs.jobs 
-  ALTER COLUMN updated_at SET DEFAULT now();
-
-CREATE TRIGGER _100_update_jobs_modtime_tg
-  BEFORE INSERT OR UPDATE
-  ON app_jobs.jobs
-  FOR EACH ROW
-  EXECUTE PROCEDURE app_jobs.tg_update_timestamps();
-
-GRANT SELECT, INSERT, UPDATE, DELETE ON app_jobs.scheduled_jobs TO administrator;
-
-CREATE INDEX scheduled_jobs_locked_by_idx ON app_jobs.scheduled_jobs (locked_by);
-
-CREATE INDEX scheduled_jobs_priority_id_idx ON app_jobs.scheduled_jobs (priority, id);
-
-CREATE TRIGGER _900_notify_scheduled_job
-  AFTER INSERT
-  ON app_jobs.scheduled_jobs
-  FOR EACH ROW
-  EXECUTE PROCEDURE app_jobs.do_notify('scheduled_jobs:insert');
 
-CREATE FUNCTION app_jobs.trigger_job_with_fields() RETURNS trigger AS $EOFCODE$
-DECLARE
-  arg text;
-  fn text;
-  i int;
-  args text[];
-BEGIN
-  FOR i IN
-  SELECT
-    *
-  FROM
-    generate_series(1, TG_NARGS) g (i)
-    LOOP
-      IF (i = 1) THEN
-        fn = TG_ARGV[i - 1];
-      ELSE
-        args = array_append(args, TG_ARGV[i - 1]);
-        IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
-          EXECUTE format('SELECT ($1).%s::text', TG_ARGV[i - 1])
-          USING NEW INTO arg;
-        END IF;
-        IF (TG_OP = 'DELETE') THEN
-          EXECUTE format('SELECT ($1).%s::text', TG_ARGV[i - 1])
-          USING OLD INTO arg;
-        END IF;
-        args = array_append(args, arg);
-      END IF;
-    END LOOP;
-  PERFORM
-    app_jobs.add_job (fn, app_jobs.json_build_object_apply (args));
-  IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
-    RETURN NEW;
-  END IF;
-  IF (TG_OP = 'DELETE') THEN
-    RETURN OLD;
-  END IF;
+  INSERT INTO app_jobs.scheduled_jobs (task_identifier, payload, queue_name, schedule_info, max_attempts, priority)
+    VALUES (identifier, payload, queue_name, schedule_info, max_attempts, priority)
+  RETURNING
+    * INTO v_job;
+  RETURN v_job;
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
 
-CREATE FUNCTION app_jobs.tg_add_job_with_row_id() RETURNS trigger AS $EOFCODE$
+CREATE FUNCTION app_jobs.add_job(identifier text, payload pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, run_at timestamptz DEFAULT now(), max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.jobs AS $EOFCODE$
+DECLARE
+  v_job app_jobs.jobs;
 BEGIN
-  IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
-    PERFORM
-      app_jobs.add_job (tg_argv[0], json_build_object('id', NEW.id));
-    RETURN NEW;
-  END IF;
-  IF (TG_OP = 'DELETE') THEN
-    PERFORM
-      app_jobs.add_job (tg_argv[0], json_build_object('id', OLD.id));
-    RETURN OLD;
-  END IF;
-END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+  IF job_key IS NOT NULL THEN
+    -- Upsert job	
+    INSERT INTO app_jobs.jobs (task_identifier, payload, queue_name, run_at, max_attempts, KEY, priority)	
+      VALUES (identifier, coalesce(payload, '{}'::json), queue_name, coalesce(run_at, now()), coalesce(max_attempts, 25), job_key, coalesce(priority, 0))	
+    ON CONFLICT (KEY)	
+      DO UPDATE SET	
+        task_identifier = excluded.task_identifier, payload = excluded.payload, queue_name = excluded.queue_name, max_attempts = excluded.max_attempts, run_at = excluded.run_at, priority = excluded.priority,	
+        -- always reset error/retry state	
+        attempts = 0, last_error = NULL	
+      WHERE	
+        jobs.locked_at IS NULL	
+      RETURNING	
+        * INTO v_job;	
 
-COMMENT ON FUNCTION app_jobs.tg_add_job_with_row_id IS 'Useful shortcut to create a job on insert or update. Pass the task name as the trigger argument, and the record id will automatically be available on the JSON payload.';
+    -- If upsert succeeded (insert or update), return early	
+    
+    IF NOT (v_job IS NULL) THEN	
+      RETURN v_job;	
+    END IF;	
 
-CREATE FUNCTION app_jobs.tg_add_job_with_row() RETURNS trigger AS $EOFCODE$
-BEGIN
-  IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
-    PERFORM
-      app_jobs.add_job (TG_ARGV[0], to_json(NEW));
-    RETURN NEW;
-  END IF;
-  IF (TG_OP = 'DELETE') THEN
-    PERFORM
-      app_jobs.add_job (TG_ARGV[0], to_json(OLD));
-    RETURN OLD;
+    -- Upsert failed -> there must be an existing job that is locked. Remove	
+    -- existing key to allow a new one to be inserted, and prevent any	
+    -- subsequent retries by bumping attempts to the max allowed.
+
+    UPDATE	
+      app_jobs.jobs	
+    SET	
+      KEY = NULL,	
+      attempts = jobs.max_attempts	
+    WHERE	
+      KEY = job_key;	
   END IF;
-END;
-$EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
 
-COMMENT ON FUNCTION app_jobs.tg_add_job_with_row IS 'Useful shortcut to create a job on insert or update. Pass the task name as the trigger argument, and the record data will automatically be available on the JSON payload.';
+  INSERT INTO app_jobs.jobs (task_identifier, payload, queue_name, run_at, max_attempts, priority)
+    VALUES (identifier, payload, queue_name, run_at, max_attempts, priority)
+  RETURNING
+    * INTO v_job;
+  RETURN v_job;
+END;
+$EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;