worker conetxt

Vladimir Ershov · Vladimir Ershov · commit ba22bba35604 · 2017-04-24T12:15:24.000+03:00
diff --git a/src/scheduler_manager.c b/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);
diff --git a/src/scheduler_spi_utils.c b/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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1364,7 +1364,7 @@ int update_cron_texttime(scheduler_manager_ctx_t *ctx, int cron_id, TimestampTz`
`1364`	`1364`	`{`
`1365`	`1365`	`nulls[1] = 'n';`
`1366`	`1366`	`}`
`1367`		`- r = execute_spi_sql_with_args(CurrentMemoryContext, sql, 2, types, values, nulls);`
	`1367`	`+ r = execute_spi_sql_with_args(SchedulerWorkerContext, sql, 2, types, values, nulls);`
`1368`	`1368`	`ret = r->retval;`
`1369`	`1369`	`if(ret < 0)`
`1370`	`1370`	`{`
`@@ -1487,7 +1487,7 @@ int insert_at_record(char *nodename, int cron_id, TimestampTz start_at, Timestam`
`1487`	`1487`	`values[1] = 0;`
`1488`	`1488`	`}`
`1489`	`1489`
`1490`		`- r = execute_spi_sql_with_args(CurrentMemoryContext, insert_sql, 4, argtypes, values, nulls);`
	`1490`	`+ r = execute_spi_sql_with_args(SchedulerWorkerContext, insert_sql, 4, argtypes, values, nulls);`
`1491`	`1491`
`1492`	`1492`	`ret = r->retval;`
`1493`	`1493`	`if(r->error) *error = my_copy_string(r->error);`
Original file line number	Diff line number	Diff line change
`@@ -495,11 +495,13 @@ spi_response_t execute_spi_sql_with_args(MemoryContext ctx, const char sql, in`
`495`	`495`	`char other[100];`
`496`	`496`	`ResourceOwner oldowner = CurrentResourceOwner;`
`497`	`497`	`spi_response_t *rv = NULL;`
	`498`	`+ MemoryContext old;`
	`499`	`+`
`498`	`500`	`if(!ctx) ctx = SchedulerWorkerContext;`
`499`	`501`
`500`	`502`	`SetCurrentStatementStartTimestamp();`
`501`	`503`	`BeginInternalSubTransaction(NULL);`
`502`		`- MemoryContextSwitchTo(ctx);`
	`504`	`+ old = MemoryContextSwitchTo(ctx);`
`503`	`505`
`504`	`506`	`PG_TRY();`
`505`	`507`	`{`
`@@ -572,10 +574,12 @@ spi_response_t execute_spi_sql_with_args(MemoryContext ctx, const char sql, in`
`572`	`574`	`if(!rv)`
`573`	`575`	`{`
`574`	`576`	`elog(LOG, "ESSWA: Cannot allocate memory while reporting pg error");`
	`577`	`+ MemoryContextSwitchTo(old);`
`575`	`578`	`return NULL;`
`576`	`579`	`}`
`577`	`580`	`}`
`578`	`581`
	`582`	`+ MemoryContextSwitchTo(old);`
`579`	`583`	`return rv;`
`580`	`584`	`}`
`581`	`585`