postgrespro
diff --git a/‎src/memutils.c
Lines changed: 1 addition & 0 deletions b/‎src/memutils.c
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/scheduler_job.c
Lines changed: 42 additions & 2 deletions b/‎src/scheduler_job.c
Lines changed: 42 additions & 2 deletions
diff --git a/‎src/scheduler_job.h
Lines changed: 2 additions & 1 deletion b/‎src/scheduler_job.h
Lines changed: 2 additions & 1 deletion
@@ -39,4 +39,5 @@ void delete_worker_mem_ctx(void)
 {
 	MemoryContextSwitchTo(TopMemoryContext);
 	MemoryContextDelete(SchedulerWorkerContext);
+	SchedulerWorkerContext = NULL;
 }
@@ -452,7 +452,7 @@ job_t *get_expired_cron_jobs(char *nodename, int *n, int *is_error)
 	return jobs;
 }
 
-job_t *set_job_error(job_t *j, const char *fmt, ...)
+job_t *set_job_error(MemoryContext mem, job_t *j, const char *fmt, ...)
 {
 	va_list arglist;
 	char buf[1024];
@@ -462,7 +462,7 @@ job_t *set_job_error(job_t *j, const char *fmt, ...)
 	va_end(arglist);
 
 	if(j->error) pfree(j->error);
-	j->error = my_copy_string(buf); 
+	j->error = _mcopy_string(mem, buf); 
 
 	return j;
 }
@@ -771,6 +771,46 @@ int _cron_move_job_to_log(job_t *j, bool status)
 	return ret;
 }
 
+void copy_job(MemoryContext mem, job_t *dst, job_t *src)
+{
+	int i;
+
+	memcpy(dst, src, sizeof(job_t));
+	if(src->node) dst->node = _mcopy_string(mem, src->node);
+	if(src->executor) dst->executor = _mcopy_string(mem, src->executor);
+	if(src->owner) dst->owner = _mcopy_string(mem, src->owner);
+	if(src->onrollback) dst->onrollback = _mcopy_string(mem, src->onrollback);
+	if(src->next_time_statement) dst->next_time_statement = _mcopy_string(mem, src->next_time_statement);
+	if(src->error) dst->error = _mcopy_string(mem, src->error);
+	if(src->dosql_n && src->dosql)
+	{
+		src->dosql = MemoryContextAlloc(mem, sizeof(char *) * src->dosql_n);
+		for(i=0; i < src->dosql_n; i++)
+		{
+			if(src->dosql[i])
+				dst->dosql[i] = _mcopy_string(mem, src->dosql[i]);
+			else
+				dst->dosql[i] = NULL;
+		}
+	}
+	if(src->sql_params_n && src->sql_params)
+	{
+		src->sql_params = MemoryContextAlloc(mem, sizeof(char *) * src->sql_params_n);
+		for(i=0; i < src->sql_params_n; i++)
+		{
+			if(src->sql_params[i])
+				dst->sql_params[i] = _mcopy_string(mem, src->sql_params[i]);
+			else
+				dst->sql_params[i] = NULL;
+		}
+	}
+	if(src->depends_on_n > 0)
+	{
+		dst->depends_on = MemoryContextAlloc(mem, sizeof(int64) * src->depends_on_n);
+		memcpy(dst->depends_on, src->depends_on, sizeof(int64) * src->depends_on_n);
+	}
+}
+
 void destroy_job(job_t *j, int selfdestroy)
 {
 	int i;
 
@@ -48,8 +48,9 @@ job_t *get_expired_at_jobs(char *nodename, int *n, int *is_error);
 job_t *_cron_get_jobs_to_do(MemoryContext mem, char *nodename, int *n, int *is_error, int limit);
 job_t *_at_get_jobs_to_do(MemoryContext mem, char *nodename, int *n, int *is_error, int limit);
 job_t *get_jobs_to_do(MemoryContext mem, char *nodename, task_type_t type, int *n, int *is_error, int limit);
-job_t *set_job_error(job_t *j, const char *fmt, ...) pg_attribute_printf(2, 3);
+job_t *set_job_error(MemoryContext mem, job_t *j, const char *fmt, ...) pg_attribute_printf(3, 4);
 int move_job_to_log(job_t *j, bool status, bool processed);
+void copy_job(MemoryContext mem, job_t *dst, job_t *src);
 void destroy_job(job_t *j, int selfdestroy);
 job_t *get_at_job(int cron_id, char *nodename, char **perror);
 job_t *get_cron_job(int cron_id, TimestampTz start_at, char *nodename, char **perror);
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,5 @@ void delete_worker_mem_ctx(void)`
`39`	`39`	`{`
`40`	`40`	`MemoryContextSwitchTo(TopMemoryContext);`
`41`	`41`	`MemoryContextDelete(SchedulerWorkerContext);`
	`42`	`+ SchedulerWorkerContext = NULL;`
`42`	`43`	`}`