Get rid of an unnecessary parameter

targetPoolSize parameter for ExecuteUtilityTaskListWithoutResults
becomes obsolete, just remove it.
pull/2866/head
Onder Kalaci 2019-08-06 12:23:03 +02:00
parent b2e01d0745
commit 35ee896f3d
5 changed files with 7 additions and 9 deletions

View File

@ -553,7 +553,6 @@ static void
ExecuteDistributedDDLJob(DDLJob *ddlJob) ExecuteDistributedDDLJob(DDLJob *ddlJob)
{ {
bool shouldSyncMetadata = ShouldSyncTableMetadata(ddlJob->targetRelationId); bool shouldSyncMetadata = ShouldSyncTableMetadata(ddlJob->targetRelationId);
int targetPoolSize = MaxAdaptiveExecutorPoolSize;
EnsureCoordinator(); EnsureCoordinator();
EnsurePartitionTableNotReplicated(ddlJob->targetRelationId); EnsurePartitionTableNotReplicated(ddlJob->targetRelationId);
@ -579,7 +578,7 @@ ExecuteDistributedDDLJob(DDLJob *ddlJob)
} }
/* use adaptive executor when enabled */ /* use adaptive executor when enabled */
ExecuteUtilityTaskListWithoutResults(ddlJob->taskList, targetPoolSize); ExecuteUtilityTaskListWithoutResults(ddlJob->taskList);
} }
else else
{ {
@ -591,7 +590,7 @@ ExecuteDistributedDDLJob(DDLJob *ddlJob)
PG_TRY(); PG_TRY();
{ {
/* use adaptive executor when enabled */ /* use adaptive executor when enabled */
ExecuteUtilityTaskListWithoutResults(ddlJob->taskList, targetPoolSize); ExecuteUtilityTaskListWithoutResults(ddlJob->taskList);
if (shouldSyncMetadata) if (shouldSyncMetadata)
{ {

View File

@ -74,7 +74,6 @@ ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand)
{ {
List *vacuumColumnList = NIL; List *vacuumColumnList = NIL;
List *taskList = NIL; List *taskList = NIL;
int targetPoolSize = MaxAdaptiveExecutorPoolSize;
/* /*
* VACUUM commands cannot run inside a transaction block, so we use * 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); taskList = VacuumTaskList(relationId, vacuumStmt->options, vacuumColumnList);
/* use adaptive executor when enabled */ /* use adaptive executor when enabled */
ExecuteUtilityTaskListWithoutResults(taskList, targetPoolSize); ExecuteUtilityTaskListWithoutResults(taskList);
executedVacuumCount++; executedVacuumCount++;
} }
relationIndex++; relationIndex++;

View File

@ -657,11 +657,11 @@ AdaptiveExecutor(CustomScanState *node)
* through router executor. * through router executor.
*/ */
void void
ExecuteUtilityTaskListWithoutResults(List *taskList, int targetPoolSize) ExecuteUtilityTaskListWithoutResults(List *taskList)
{ {
if (TaskExecutorType == MULTI_EXECUTOR_ADAPTIVE) if (TaskExecutorType == MULTI_EXECUTOR_ADAPTIVE)
{ {
ExecuteTaskList(ROW_MODIFY_NONE, taskList, targetPoolSize); ExecuteTaskList(ROW_MODIFY_NONE, taskList, MaxAdaptiveExecutorPoolSize);
} }
else else
{ {

View File

@ -77,7 +77,7 @@ citus_truncate_trigger(PG_FUNCTION_ARGS)
{ {
List *taskList = TruncateTaskList(relationId); List *taskList = TruncateTaskList(relationId);
ExecuteUtilityTaskListWithoutResults(taskList, MaxAdaptiveExecutorPoolSize); ExecuteUtilityTaskListWithoutResults(taskList);
} }
PG_RETURN_DATUM(PointerGetDatum(NULL)); PG_RETURN_DATUM(PointerGetDatum(NULL));

View File

@ -42,7 +42,7 @@ extern uint64 ExecuteTaskListExtended(RowModifyLevel modLevel, List *taskList,
TupleDesc tupleDescriptor, TupleDesc tupleDescriptor,
Tuplestorestate *tupleStore, Tuplestorestate *tupleStore,
bool hasReturning, int targetPoolSize); bool hasReturning, int targetPoolSize);
extern void ExecuteUtilityTaskListWithoutResults(List *taskList, int targetPoolSize); extern void ExecuteUtilityTaskListWithoutResults(List *taskList);
extern uint64 ExecuteTaskList(RowModifyLevel modLevel, List *taskList, int extern uint64 ExecuteTaskList(RowModifyLevel modLevel, List *taskList, int
targetPoolSize); targetPoolSize);
extern TupleTableSlot * CitusExecScan(CustomScanState *node); extern TupleTableSlot * CitusExecScan(CustomScanState *node);