mirror of https://github.com/citusdata/citus.git
Apply feedback 1
parent
fd17e4578e
commit
2f0ef8bc36
|
@ -143,7 +143,6 @@ ExecuteLocalTaskList(CitusScanState *scanState, List *taskList)
|
||||||
foreach(taskCell, taskList)
|
foreach(taskCell, taskList)
|
||||||
{
|
{
|
||||||
Task *task = (Task *) lfirst(taskCell);
|
Task *task = (Task *) lfirst(taskCell);
|
||||||
char *shardQueryString = NULL;
|
|
||||||
|
|
||||||
PlannedStmt *localPlan = GetCachedLocalPlan(task, distributedPlan);
|
PlannedStmt *localPlan = GetCachedLocalPlan(task, distributedPlan);
|
||||||
|
|
||||||
|
@ -153,10 +152,6 @@ ExecuteLocalTaskList(CitusScanState *scanState, List *taskList)
|
||||||
*/
|
*/
|
||||||
if (localPlan != NULL)
|
if (localPlan != NULL)
|
||||||
{
|
{
|
||||||
shardQueryString = task->queryStringLazy
|
|
||||||
? task->queryStringLazy
|
|
||||||
: "<optimized out by local execution>";
|
|
||||||
|
|
||||||
Query *jobQuery = distributedPlan->workerJob->jobQuery;
|
Query *jobQuery = distributedPlan->workerJob->jobQuery;
|
||||||
LOCKMODE lockMode =
|
LOCKMODE lockMode =
|
||||||
IsModifyCommand(jobQuery) ? RowExclusiveLock : (jobQuery->hasForUpdate ?
|
IsModifyCommand(jobQuery) ? RowExclusiveLock : (jobQuery->hasForUpdate ?
|
||||||
|
@ -171,9 +166,7 @@ ExecuteLocalTaskList(CitusScanState *scanState, List *taskList)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
shardQueryString = TaskQueryString(task);
|
Query *shardQuery = ParseQueryString(TaskQueryString(task), parameterTypes,
|
||||||
|
|
||||||
Query *shardQuery = ParseQueryString(shardQueryString, parameterTypes,
|
|
||||||
numParams);
|
numParams);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -197,6 +190,10 @@ ExecuteLocalTaskList(CitusScanState *scanState, List *taskList)
|
||||||
|
|
||||||
LogLocalCommand(task);
|
LogLocalCommand(task);
|
||||||
|
|
||||||
|
char *shardQueryString = task->queryStringLazy
|
||||||
|
? task->queryStringLazy
|
||||||
|
: "<optimized out by local execution>";
|
||||||
|
|
||||||
totalRowsProcessed +=
|
totalRowsProcessed +=
|
||||||
ExecuteLocalTaskPlan(scanState, localPlan, shardQueryString);
|
ExecuteLocalTaskPlan(scanState, localPlan, shardQueryString);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue