Merge commit '2f72cc9e87eb920e246145b8c4c78b8238266eb6' into PGPROEE9_6_scheduler

Vladimir Ershov · Vladimir Ershov · commit 88d014aa7b10 · 2017-03-02T19:27:56.000+03:00
diff --git a/contrib/pgpro_scheduler/src/scheduler_manager.c b/contrib/pgpro_scheduler/src/scheduler_manager.c
@@ -378,7 +378,7 @@ scheduler_task_t *scheduler_get_active_tasks(scheduler_manager_ctx_t *ctx, int *
 
 	*nt = 0;
 	initStringInfo(&sql);
-	appendStringInfo(&sql, "select id, rule, postpone, _next_exec_time, next_time_statement from cron where active and not broken and (start_date <= 'now' or start_date is null) and (end_date >= 'now' or end_date is null) and node = '%s'", ctx->nodename);
+	appendStringInfo(&sql, "select id, rule, postpone, _next_exec_time, next_time_statement, start_date, end_date from cron where active and not broken and (start_date <= 'now' or start_date is null) and (end_date >= 'now' or end_date is null) and node = '%s'", ctx->nodename);
 
 	pgstat_report_activity(STATE_RUNNING, "select 'at' tasks");
 
@@ -413,6 +413,8 @@ scheduler_task_t *scheduler_get_active_tasks(scheduler_manager_ctx_t *ctx, int *
 				{
 					tasks[i].has_next_time_statement = false;
 				}
+				tasks[i].date1 = get_timestamp_from_spi(NULL, i, 6, 0);
+				tasks[i].date2 = get_timestamp_from_spi(NULL, i, 7, 0);
 			}
 			*nt = processed;
 		}
@@ -622,6 +624,11 @@ TimestampTz *scheduler_calc_next_task_time(scheduler_task_t *task, TimestampTz s
 
 	*ntimes = 0;
 
+	if(task->date1 > 0 && task->date1 > stop) return NULL; 
+	if(task->date1 > 0 && task->date1 > start) start = task->date1;
+	if(task->date2 > 0 && task->date2 < start) return NULL;
+	if(task->date2 > 0 && task->date2 < stop) stop = task->date2;
+
 	if(first_time && jsonb_has_key(task->rule, "onstart"))
 	{
 		*ntimes  = 1;
@@ -643,6 +650,8 @@ TimestampTz *scheduler_calc_next_task_time(scheduler_task_t *task, TimestampTz s
 		return NULL;
 	}
 
+
+
 /* to avoid to set job on minute has already passed  we add 1 minute */
 	curr = start;
 #ifdef HAVE_INT64_TIMESTAMP
diff --git a/contrib/pgpro_scheduler/src/scheduler_manager.h b/contrib/pgpro_scheduler/src/scheduler_manager.h
@@ -23,6 +23,8 @@ typedef struct {
 	TimestampTz postpone;
 	TimestampTz next;
 	bool has_next_time_statement;
+	TimestampTz date1;
+	TimestampTz date2;
 } scheduler_task_t;
 
 typedef enum {

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ scheduler_task_t scheduler_get_active_tasks(scheduler_manager_ctx_t ctx, int *`
`378`	`378`
`379`	`379`	`*nt = 0;`
`380`	`380`	`initStringInfo(&sql);`
`381`		`- appendStringInfo(&sql, "select id, rule, postpone, _next_exec_time, next_time_statement from cron where active and not broken and (start_date <= 'now' or start_date is null) and (end_date >= 'now' or end_date is null) and node = '%s'", ctx->nodename);`
	`381`	`+ appendStringInfo(&sql, "select id, rule, postpone, _next_exec_time, next_time_statement, start_date, end_date from cron where active and not broken and (start_date <= 'now' or start_date is null) and (end_date >= 'now' or end_date is null) and node = '%s'", ctx->nodename);`
`382`	`382`
`383`	`383`	`pgstat_report_activity(STATE_RUNNING, "select 'at' tasks");`
`384`	`384`
`@@ -413,6 +413,8 @@ scheduler_task_t scheduler_get_active_tasks(scheduler_manager_ctx_t ctx, int *`
`413`	`413`	`{`
`414`	`414`	`tasks[i].has_next_time_statement = false;`
`415`	`415`	`}`
	`416`	`+ tasks[i].date1 = get_timestamp_from_spi(NULL, i, 6, 0);`
	`417`	`+ tasks[i].date2 = get_timestamp_from_spi(NULL, i, 7, 0);`
`416`	`418`	`}`
`417`	`419`	`*nt = processed;`
`418`	`420`	`}`
`@@ -622,6 +624,11 @@ TimestampTz scheduler_calc_next_task_time(scheduler_task_t task, TimestampTz s`
`622`	`624`
`623`	`625`	`*ntimes = 0;`
`624`	`626`
	`627`	`+ if(task->date1 > 0 && task->date1 > stop) return NULL;`
	`628`	`+ if(task->date1 > 0 && task->date1 > start) start = task->date1;`
	`629`	`+ if(task->date2 > 0 && task->date2 < start) return NULL;`
	`630`	`+ if(task->date2 > 0 && task->date2 < stop) stop = task->date2;`
	`631`	`+`
`625`	`632`	`if(first_time && jsonb_has_key(task->rule, "onstart"))`
`626`	`633`	`{`
`627`	`634`	`*ntimes = 1;`
`@@ -643,6 +650,8 @@ TimestampTz scheduler_calc_next_task_time(scheduler_task_t task, TimestampTz s`
`643`	`650`	`return NULL;`
`644`	`651`	`}`
`645`	`652`
	`653`	`+`
	`654`	`+`
`646`	`655`	`/* to avoid to set job on minute has already passed we add 1 minute */`
`647`	`656`	`curr = start;`
`648`	`657`	`#ifdef HAVE_INT64_TIMESTAMP`