external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Raise ExecutorLevel only after subplan execution

marcocitus/fix-subplan-local-execution
Marco Slot 2022-08-31 10:47:51 +02:00
parent 98dcbeb304
commit a0eeb55a35
1 changed files with 92 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/backend/distributed/executor/multi_executor.c
View File

@ -152,35 +152,6 @@ void
CitusExecutorRun(QueryDesc *queryDesc,
ScanDirection direction, uint64 count, bool execute_once)
{
DestReceiver *dest = queryDesc->dest;
ParamListInfo savedBoundParams = executorBoundParams;
/*
* Save a pointer to query params so UDFs can access them by calling
* ExecutorBoundParams().
*/
executorBoundParams = queryDesc->params;
/*
* We do some potentially time consuming operations our self now before we hand of
* control to postgres' executor. To make sure that time spent is accurately measured
* we remove the totaltime instrumentation from the queryDesc. Instead we will start
* and stop the instrumentation of the total time and put it back on the queryDesc
* before returning (or rethrowing) from this function.
*/
Instrumentation *volatile totalTime = queryDesc->totaltime;
queryDesc->totaltime = NULL;
PG_TRY();
{
ExecutorLevel++;
if (totalTime)
{
InstrStartNode(totalTime);
}
/*
* Disable execution of ALTER TABLE constraint validation queries. These
* constraints will be validated in worker nodes, so running these queries
@ -202,11 +173,36 @@ CitusExecutorRun(QueryDesc *queryDesc,
estate->es_processed = 0;
/* start and shutdown tuple receiver to simulate empty result */
DestReceiver *dest = queryDesc->dest;
dest->rStartup(queryDesc->dest, CMD_SELECT, queryDesc->tupDesc);
dest->rShutdown(dest);
return;
}
else
/*
* Save a pointer to query params so UDFs can access them by calling
* ExecutorBoundParams().
*/
ParamListInfo savedBoundParams = executorBoundParams;
executorBoundParams = queryDesc->params;
/*
* We do some potentially time consuming operations our self now before we hand of
* control to postgres' executor. To make sure that time spent is accurately measured
* we remove the totaltime instrumentation from the queryDesc. Instead we will start
* and stop the instrumentation of the total time and put it back on the queryDesc
* before returning (or rethrowing) from this function.
*
* We include subplan execution (in PreExecScan) in the total time.
*/
Instrumentation *volatile totalTime = queryDesc->totaltime;
queryDesc->totaltime = NULL;
if (totalTime)
{
InstrStartNode(totalTime);
}
/* switch into per-query memory context before calling PreExecScan */
MemoryContext oldcontext = MemoryContextSwitchTo(
queryDesc->estate->es_query_cxt);
@ -230,9 +226,39 @@ CitusExecutorRun(QueryDesc *queryDesc,
/* postgres will switch here again and will restore back on its own */
MemoryContextSwitchTo(oldcontext);
/*
* ExecutorLevel is used to detect nested execution and to decide
* how to execute certain queries. For instance, if we execute a
* multi-shard query that involves local shards, and it is in a nested
* execution (e.g. a PL/pgsQL function), we choose local execution
* instead of connecting to the local node.
*
* The reason for choosing local execution is that functions can have
* multiple statements, and we could therefore see a mix of statements
* that modify regular tables, Citus tables, and perform joins between
* them. Such queries can only be answered when we use local execution
* throughout the transaction.
*
* We should only raise ExecutorLevel after PreExecScan, which executes
* subplans. Otherwise, top-level subplans will immediately consider
* themselves to be nested and unnecessarily trigger local execution.
*/
ExecutorLevel++;
/*
* We use a PG_TRY to reset our bookkeeping around ExecutorLevel,
* executorBoundParams (used to know parameters in EXPLAIN ANALYZE),
*
* Execution can skip back up several levels and then resume in
* case of savepoints, so we should do the bookkeeping at every
* level instead of e.g. using the abort handler.
*/
PG_TRY();
{
standard_ExecutorRun(queryDesc, direction, count, execute_once);
}
PG_FINALLY();
{
if (totalTime)
{
InstrStopNode(totalTime, queryDesc->estate->es_processed);
@ -250,30 +276,12 @@ CitusExecutorRun(QueryDesc *queryDesc,
* transactions.
*/
CitusTableCacheFlushInvalidatedEntries();
InTopLevelDelegatedFunctionCall = false;
}
/*
* Within a 2PC, when a function is delegated to a remote node, we pin
* the distribution argument as the shard key for all the SQL in the
* function's block. The restriction is imposed to not to access other
* nodes from the current node, and violate the transactional integrity
* of the 2PC. Now that the query is ending, reset the shard key to NULL.
* If we were in a delegated function call, signal that we are now
* done and restrictions that apply outside of such function calls
* once again apply.
*/
CheckAndResetAllowedShardKeyValueIfNeeded();
}
PG_CATCH();
{
if (totalTime)
{
queryDesc->totaltime = totalTime;
}
executorBoundParams = savedBoundParams;
ExecutorLevel--;
if (ExecutorLevel == 0 && PlannerLevel == 0)
{
InTopLevelDelegatedFunctionCall = false;
}
@ -282,8 +290,6 @@ CitusExecutorRun(QueryDesc *queryDesc,
* details see the function header.
*/
CheckAndResetAllowedShardKeyValueIfNeeded();
PG_RE_THROW();
}
PG_END_TRY();
}