very beginning

Vladimir Ershov · Vladimir Ershov · commit a4f01dad39f5 · 2017-02-07T18:43:12.000+03:00
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ OBJS = src/pgpro_scheduler.o src/cron_string.o src/sched_manager_poll.o \
 	src/scheduler_executor.o \
 	$(WIN32RES)
 EXTENSION = pgpro_scheduler
-DATA = pgpro_scheduler--1.0.sql
+DATA = pgpro_scheduler--2.0.sql
 REGRESS	= install_pgpro_scheduler cron_string
 #REGRESS_OPTS = --user=postgres
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
diff --git a/pgpro_scheduler--2.0.sql b/pgpro_scheduler--2.0.sql
@@ -3,6 +3,29 @@
 CREATE SCHEMA IF NOT EXISTS schedule;
 
 CREATE TYPE schedule.job_status AS ENUM ('working', 'done', 'error');
+CREATE TYPE schedule.at_job_status AS ENUM ('submitted', 'working', 'done', 'error');
+
+CREATE TABLE schedule.at_jobs(
+   id SERIAL PRIMARY KEY,
+   node text,
+   name text,
+   comments text,
+   at timestamp with time zone default now(),
+   do_sql text[],
+   same_transaction boolean DEFAULT false,
+   onrollback_statement text,
+   executor text,
+   owner text,
+   postpone interval,
+   max_run_time	interval,
+   max_instances integer default 1,
+   status at_job_status default 'submited',
+   submit_time timestamp with time zone default now(),
+   started timestamp with time zone,
+   finished timestamp with time zone,
+   reason text
+);
+CREATE INDEX at_jobs_status_node_at_idx on schedule.at (status, node,  at);
 
 CREATE TABLE schedule.cron(
    id SERIAL PRIMARY KEY,
diff --git a/pgpro_scheduler.control b/pgpro_scheduler.control
@@ -1,4 +1,4 @@
 comment = 'Postgres Pro Scheduler'
-default_version = '1.0'
+default_version = '2.0'
 module_pathname = '$libdir/pgpro_scheduler'
 relocatable = true
diff --git a/src/scheduler_job.c b/src/scheduler_job.c
@@ -11,11 +11,12 @@
 #include "memutils.h"
 #include "port.h"
 
-job_t *init_scheduler_job(job_t *j)
+job_t *init_scheduler_job(job_t *j, unsigned char type)
 {
 	if(j == NULL) j = worker_alloc(sizeof(job_t));
 	memset(j, 0, sizeof(job_t));
 	j->is_active = false;
+	j->type = type;
 
 	return j;
 }
@@ -61,7 +62,41 @@ job_t *get_jobs_to_do(char *nodename, int *n, int *is_error)
 	return jobs;
 }
 
-job_t *get_expired_jobs(char *nodename, int *n, int *is_error)
+job_t *get_expired_at_jobs(char *nodename, int *n, int *is_error)
+{
+	StringInfoData sql;
+	job_t *jobs = NULL;
+	int ret, got, i;
+	
+	*n = *is_error = 0;
+	initStringInfo(&sql);
+	appendStringInfo(&sql, "select at, last_start_available, id from at_jobs where last_start_available < 'now' and status = 'submitted' and node = '%s'", nodename);
+	ret = SPI_execute(sql.data, true, 0);
+	if(ret == SPI_OK_SELECT)
+	{
+		got  = SPI_processed;
+		if(got > 0)
+		{
+			*n = got;
+			jobs = worker_alloc(sizeof(job_t) * got);
+			for(i=0; i < got; i++)
+			{
+				init_scheduler_job(&(jobs[i]), 2);
+				jobs[i].start_at = get_timestamp_from_spi(i, 1, 0);
+				jobs[i].last_start_avail = get_timestamp_from_spi(i, 2, 0);
+				jobs[i].cron_id = get_int_from_spi(i, 3, 0);
+				jobs[i].node = _copy_string(nodename);
+			}
+		}
+	}
+	else
+	{
+		*is_error = 1;
+	}
+	return jobs;
+}
+
+job_t *get_expired_cron_jobs(char *nodename, int *n, int *is_error)
 {
 	StringInfoData sql;
 	job_t *jobs = NULL;
@@ -80,7 +115,7 @@ job_t *get_expired_jobs(char *nodename, int *n, int *is_error)
 			jobs = worker_alloc(sizeof(job_t) * got);
 			for(i=0; i < got; i++)
 			{
-				init_scheduler_job(&(jobs[i]));
+				init_scheduler_job(&(jobs[i]), 1);
 				jobs[i].start_at = get_timestamp_from_spi(i, 1, 0);
 				jobs[i].last_start_avail = get_timestamp_from_spi(i, 2, 0);
 				jobs[i].cron_id = get_int_from_spi(i, 3, 0);
diff --git a/src/scheduler_job.h b/src/scheduler_job.h
@@ -11,6 +11,7 @@
 #include "port.h"
 
 typedef struct {
+	unsigned char type; /* 1 - cron job, 2 - at job */
 	int cron_id;
 	TimestampTz start_at;
 	char *node;
@@ -30,7 +31,7 @@ typedef struct {
 } job_t;
 
 job_t *init_scheduler_job(job_t *j);
-job_t *get_expired_jobs(char *nodename, int *n, int *is_error);
+job_t *get_expired_cron_jobs(char *nodename, int *n, int *is_error);
 job_t *get_jobs_to_do(char *nodename, int *n, int *is_error);
 job_t *set_job_error(job_t *j, const char *fmt, ...) pg_attribute_printf(2, 3);
 int move_job_to_log(job_t *j, bool status);
diff --git a/src/scheduler_manager.c b/src/scheduler_manager.c
diff --git a/src/scheduler_manager.h b/src/scheduler_manager.h
