Merge commit '8dc4755a44ef549e6be85bc441657f6d2e4fc28f' into PGPROEE10_scheduler

Author: Vladimir Ershov

contrib/pgpro_scheduler/src/bit_array.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * bit_array.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include <stdlib.h>
 #include "bit_array.h"
 #include "postgres.h"

contrib/pgpro_scheduler/src/bit_array.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * bit_array.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef PGPRO_SCHEDULER_BITARRAY_H
 #define PGPRO_SCHEDULER_BITARRAY_H
 

contrib/pgpro_scheduler/src/char_array.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * char_array.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include "postgres.h"

contrib/pgpro_scheduler/src/char_array.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * char_array.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef CHAR_ARRAY_H
 #define CHAR_ARRAY_H
 

contrib/pgpro_scheduler/src/cron_string.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * cron_string.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

contrib/pgpro_scheduler/src/cron_string.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * cron_string.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef CRON_STRING_PARSE_H
 #define CRON_STRING_PARSE_H
 

contrib/pgpro_scheduler/src/memutils.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * memutils.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include "postgres.h"
 #include "utils/memutils.h"
 #include "memutils.h"

contrib/pgpro_scheduler/src/memutils.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * memutils.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef PGPRO_SCHEDULER_MEMUTILS_H
 #define PGPRO_SCHEDULER_MEMUTILS_H
 

contrib/pgpro_scheduler/src/pgpro_scheduler.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * pgpro_scheduler.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #define ENABLE_LIST_COMPAT	1
 
 #include "postgres.h"

contrib/pgpro_scheduler/src/pgpro_scheduler.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * pgpro_scheduler.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef PGPRO_SCHEDULER_H
 #define PGPRO_SCHEDULER_H
 

contrib/pgpro_scheduler/src/sched_manager_poll.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * sched_manager_poll.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include <stdlib.h>
 #include "postgres.h"
 #include "string.h"

contrib/pgpro_scheduler/src/sched_manager_poll.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * sched_manager_poll.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef PGPRO_SCHEDULER_MANAGER_POLL_H
 #define PGPRO_SCHEDULER_MANAGER_POLL_H
 

contrib/pgpro_scheduler/src/scheduler_executor.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_executor.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include <stdlib.h>
 #include <stdarg.h>
 #include "postgres.h"

contrib/pgpro_scheduler/src/scheduler_executor.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_executor.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef PGPRO_SCHEDULER_EXECUTOR_H
 #define PGPRO_SCHEDULER_EXECUTOR_H
 

contrib/pgpro_scheduler/src/scheduler_job.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_job.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -180,14 +188,15 @@ job_t *get_at_job_for_process(MemoryContext mem, char *nodename, char **error)
 	get_job_sql = makeStringInfo();
 	getNodesToSelect(&nodes, nodename);
 
-	appendStringInfo(get_job_sql, "select * from at_jobs_submitted s where \
-		((not exists ( select * from at_jobs_submitted s2 where \
-		s2.id = any(s.depends_on)) AND not exists \
-		( select * from at_jobs_process p where p.id = any(s.depends_on)) AND \
-		s.depends_on is NOT NULL and s.at IS NULL AND not exists \
-		( select * from at_jobs_done d where d.id = any(s.depends_on) and \
-		d.status=false)  AND coalesce(s.at, now()) <= now()) OR ( s.at IS NOT NULL AND  at <= now() and \
-		(last_start_available is NULL OR last_start_available > now()))) and \
+	appendStringInfo(get_job_sql, "select * \
+		from at_jobs_submitted s \
+ 		where (s.depends_on is null \
+		or not exists (select * from at_jobs_submitted s2 where s2.id = any(s.depends_on)) \
+		AND not exists(select * from at_jobs_process p where p.id = any(s.depends_on)) \
+		AND not exists(select * from at_jobs_done d where d.id = any(s.depends_on) and d.status=false) \
+		) \
+		and coalesce(s.at, now()) <= now() \
+		and (s.last_start_available is null or s.last_start_available>now()) and \
 		node %s and not canceled order by at,  submit_time \
 		limit 1 FOR UPDATE SKIP LOCKED ", nodes.cond);
 

contrib/pgpro_scheduler/src/scheduler_job.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_job.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef PGPRO_SCHEDULER_JOB_H
 #define PGPRO_SCHEDULER_JOB_H
 

contrib/pgpro_scheduler/src/scheduler_manager.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_manager.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include <stdlib.h>
 #include "postgres.h"
 

contrib/pgpro_scheduler/src/scheduler_manager.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_manager.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef PGPRO_SCHEDULER_MANAGER_H
 #define PGPRO_SCHEDULER_MANAGER_H
 

contrib/pgpro_scheduler/src/scheduler_mtm.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_mtm.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifdef _WITH_MTM
 
 /* This code is aimed to interact with Postgres Pro Multimaster extension

contrib/pgpro_scheduler/src/scheduler_mtm.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_mtm.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifdef _WITH_MTM
 #ifndef SCHEDULER_MTM_H
 #define SCHEDULER_MTM_H

contrib/pgpro_scheduler/src/scheduler_spi_utils.c

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_spi_utils.c
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #include "postgres.h"
 #include "fmgr.h"
 #include "executor/spi.h"

contrib/pgpro_scheduler/src/scheduler_spi_utils.h

@@ -1,3 +1,11 @@
+/*-------------------------------------------------------------------------
+ *
+ * scheduler_spi_utils.h
+ *
+ * Copyright (c) 2017-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef PGPRO_SCHEDULER_SPI_H
 #define PGPRO_SCHEDULER_SPI_H