worker conetxt

Author: Vladimir Ershov

src/scheduler_manager.c

@@ -1364,7 +1364,7 @@ int update_cron_texttime(scheduler_manager_ctx_t *ctx, int cron_id, TimestampTz
 	{
 		nulls[1] = 'n';
 	}
-	r = execute_spi_sql_with_args(CurrentMemoryContext, sql, 2, types, values, nulls);
+	r = execute_spi_sql_with_args(SchedulerWorkerContext, sql, 2, types, values, nulls);
 	ret = r->retval;
 	if(ret < 0)
 	{
@@ -1487,7 +1487,7 @@ int insert_at_record(char *nodename, int cron_id, TimestampTz start_at, Timestam
 		values[1] = 0;
 	}
 
-	r = execute_spi_sql_with_args(CurrentMemoryContext, insert_sql, 4, argtypes, values, nulls);
+	r = execute_spi_sql_with_args(SchedulerWorkerContext, insert_sql, 4, argtypes, values, nulls);
 
 	ret = r->retval;
 	if(r->error) *error = my_copy_string(r->error);

src/scheduler_spi_utils.c

@@ -495,11 +495,13 @@ spi_response_t *execute_spi_sql_with_args(MemoryContext ctx, const char *sql, in
 	char other[100];
 	ResourceOwner oldowner = CurrentResourceOwner;
 	spi_response_t *rv = NULL;
+	MemoryContext old;
+
 	if(!ctx) ctx = SchedulerWorkerContext;
 
 	SetCurrentStatementStartTimestamp();
 	BeginInternalSubTransaction(NULL);
-	MemoryContextSwitchTo(ctx);
+	old = MemoryContextSwitchTo(ctx);
 
 	PG_TRY();
 	{
@@ -572,10 +574,12 @@ spi_response_t *execute_spi_sql_with_args(MemoryContext ctx, const char *sql, in
 		if(!rv)
 		{
 			elog(LOG, "ESSWA: Cannot allocate memory while reporting pg error");
+			MemoryContextSwitchTo(old);
 			return NULL;
 		}
 	}
 
+	MemoryContextSwitchTo(old);
 	return rv;
 }