diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c index 54f6de839..7d684aad1 100644 --- a/src/backend/distributed/commands/utility_hook.c +++ b/src/backend/distributed/commands/utility_hook.c @@ -553,7 +553,6 @@ static void ExecuteDistributedDDLJob(DDLJob *ddlJob) { bool shouldSyncMetadata = ShouldSyncTableMetadata(ddlJob->targetRelationId); - int targetPoolSize = MaxAdaptiveExecutorPoolSize; EnsureCoordinator(); EnsurePartitionTableNotReplicated(ddlJob->targetRelationId); @@ -579,7 +578,7 @@ ExecuteDistributedDDLJob(DDLJob *ddlJob) } /* use adaptive executor when enabled */ - ExecuteUtilityTaskListWithoutResults(ddlJob->taskList, targetPoolSize); + ExecuteUtilityTaskListWithoutResults(ddlJob->taskList); } else { @@ -591,7 +590,7 @@ ExecuteDistributedDDLJob(DDLJob *ddlJob) PG_TRY(); { /* use adaptive executor when enabled */ - ExecuteUtilityTaskListWithoutResults(ddlJob->taskList, targetPoolSize); + ExecuteUtilityTaskListWithoutResults(ddlJob->taskList); if (shouldSyncMetadata) { diff --git a/src/backend/distributed/commands/vacuum.c b/src/backend/distributed/commands/vacuum.c index ee9926cbf..3eb20f58a 100644 --- a/src/backend/distributed/commands/vacuum.c +++ b/src/backend/distributed/commands/vacuum.c @@ -74,7 +74,6 @@ ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand) { List *vacuumColumnList = NIL; List *taskList = NIL; - int targetPoolSize = MaxAdaptiveExecutorPoolSize; /* * VACUUM commands cannot run inside a transaction block, so we use @@ -94,7 +93,7 @@ ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand) taskList = VacuumTaskList(relationId, vacuumStmt->options, vacuumColumnList); /* use adaptive executor when enabled */ - ExecuteUtilityTaskListWithoutResults(taskList, targetPoolSize); + ExecuteUtilityTaskListWithoutResults(taskList); executedVacuumCount++; } relationIndex++; diff --git a/src/backend/distributed/executor/adaptive_executor.c b/src/backend/distributed/executor/adaptive_executor.c index ca42fe0f5..80d574341 100644 --- a/src/backend/distributed/executor/adaptive_executor.c +++ b/src/backend/distributed/executor/adaptive_executor.c @@ -657,11 +657,11 @@ AdaptiveExecutor(CustomScanState *node) * through router executor. */ void -ExecuteUtilityTaskListWithoutResults(List *taskList, int targetPoolSize) +ExecuteUtilityTaskListWithoutResults(List *taskList) { if (TaskExecutorType == MULTI_EXECUTOR_ADAPTIVE) { - ExecuteTaskList(ROW_MODIFY_NONE, taskList, targetPoolSize); + ExecuteTaskList(ROW_MODIFY_NONE, taskList, MaxAdaptiveExecutorPoolSize); } else { diff --git a/src/backend/distributed/master/master_truncate.c b/src/backend/distributed/master/master_truncate.c index ed91ad747..c6ffcf2fb 100644 --- a/src/backend/distributed/master/master_truncate.c +++ b/src/backend/distributed/master/master_truncate.c @@ -77,7 +77,7 @@ citus_truncate_trigger(PG_FUNCTION_ARGS) { List *taskList = TruncateTaskList(relationId); - ExecuteUtilityTaskListWithoutResults(taskList, MaxAdaptiveExecutorPoolSize); + ExecuteUtilityTaskListWithoutResults(taskList); } PG_RETURN_DATUM(PointerGetDatum(NULL)); diff --git a/src/include/distributed/multi_executor.h b/src/include/distributed/multi_executor.h index a1d54e160..e530701ac 100644 --- a/src/include/distributed/multi_executor.h +++ b/src/include/distributed/multi_executor.h @@ -42,7 +42,7 @@ extern uint64 ExecuteTaskListExtended(RowModifyLevel modLevel, List *taskList, TupleDesc tupleDescriptor, Tuplestorestate *tupleStore, bool hasReturning, int targetPoolSize); -extern void ExecuteUtilityTaskListWithoutResults(List *taskList, int targetPoolSize); +extern void ExecuteUtilityTaskListWithoutResults(List *taskList); extern uint64 ExecuteTaskList(RowModifyLevel modLevel, List *taskList, int targetPoolSize); extern TupleTableSlot * CitusExecScan(CustomScanState *node);