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

Refactor ScanStateGetExecutorState into its own function.

pull/2748/head
Hadi Moshayedi 2019-06-04 15:32:50 -07:00 committed by Hadi Moshayedi
parent 0b01c59fa6
commit 85325e0098
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/distributed/executor/citus_custom_scan.c
View File

@ -308,7 +308,7 @@ static void
CitusReScan(CustomScanState *node) CitusReScan(CustomScanState *node)
{ {
CitusScanState *scanState = (CitusScanState *) node; CitusScanState *scanState = (CitusScanState *) node;
EState *executorState = scanState->customScanState.ss.ps.state; EState *executorState = ScanStateGetExecutorState(scanState);
ParamListInfo paramListInfo = executorState->es_param_list_info; ParamListInfo paramListInfo = executorState->es_param_list_info;
if (paramListInfo != NULL) if (paramListInfo != NULL)
@ -324,8 +324,19 @@ CitusReScan(CustomScanState *node)
* ScanStateGetTupleDescriptor returns the tuple descriptor for the given * ScanStateGetTupleDescriptor returns the tuple descriptor for the given
* scan state. * scan state.
*/ */
extern TupleDesc TupleDesc
ScanStateGetTupleDescriptor(CitusScanState *scanState) ScanStateGetTupleDescriptor(CitusScanState *scanState)
{ {
return scanState->customScanState.ss.ps.ps_ResultTupleSlot->tts_tupleDescriptor; return scanState->customScanState.ss.ps.ps_ResultTupleSlot->tts_tupleDescriptor;
} }
/*
* ScanStateGetExecutorState returns the executor state for the given scan
* state.
*/
EState *
ScanStateGetExecutorState(CitusScanState *scanState)
{
return scanState->customScanState.ss.ps.state;
}

2
src/backend/distributed/executor/insert_select_executor.c
View File

@ -63,7 +63,7 @@ CoordinatorInsertSelectExecScan(CustomScanState *node)
if (!scanState->finishedRemoteScan) if (!scanState->finishedRemoteScan)
{ {
EState *executorState = scanState->customScanState.ss.ps.state; EState *executorState = ScanStateGetExecutorState(scanState);
DistributedPlan *distributedPlan = scanState->distributedPlan; DistributedPlan *distributedPlan = scanState->distributedPlan;
Query *selectQuery = distributedPlan->insertSelectSubquery; Query *selectQuery = distributedPlan->insertSelectSubquery;
List *insertTargetList = distributedPlan->insertTargetList; List *insertTargetList = distributedPlan->insertTargetList;

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

@ -237,6 +237,7 @@ ReturnTupleFromTuplestore(CitusScanState *scanState)
{ {
Tuplestorestate *tupleStore = scanState->tuplestorestate; Tuplestorestate *tupleStore = scanState->tuplestorestate;
TupleTableSlot *resultSlot = NULL; TupleTableSlot *resultSlot = NULL;
EState *executorState = NULL;
ScanDirection scanDirection = NoMovementScanDirection; ScanDirection scanDirection = NoMovementScanDirection;
bool forwardScanDirection = true; bool forwardScanDirection = true;
@ -245,7 +246,8 @@ ReturnTupleFromTuplestore(CitusScanState *scanState)
return NULL; return NULL;
} }
scanDirection = scanState->customScanState.ss.ps.state->es_direction; executorState = ScanStateGetExecutorState(scanState);
scanDirection = executorState->es_direction;
Assert(ScanDirectionIsValid(scanDirection)); Assert(ScanDirectionIsValid(scanDirection));
if (ScanDirectionIsBackward(scanDirection)) if (ScanDirectionIsBackward(scanDirection))

10
src/backend/distributed/executor/multi_router_executor.c
View File

@ -734,7 +734,7 @@ RouterSequentialModifyExecScan(CustomScanState *node)
List *taskList = workerJob->taskList; List *taskList = workerJob->taskList;
ListCell *taskCell = NULL; ListCell *taskCell = NULL;
bool multipleTasks = list_length(taskList) > 1; bool multipleTasks = list_length(taskList) > 1;
EState *executorState = scanState->customScanState.ss.ps.state; EState *executorState = ScanStateGetExecutorState(scanState);
bool taskListRequires2PC = TaskListRequires2PC(taskList); bool taskListRequires2PC = TaskListRequires2PC(taskList);
bool alwaysThrowErrorOnFailure = false; bool alwaysThrowErrorOnFailure = false;
CmdType operation = scanState->distributedPlan->operation; CmdType operation = scanState->distributedPlan->operation;
@ -905,8 +905,8 @@ RouterSelectExecScan(CustomScanState *node)
static void static void
ExecuteSingleSelectTask(CitusScanState *scanState, Task *task) ExecuteSingleSelectTask(CitusScanState *scanState, Task *task)
{ {
ParamListInfo paramListInfo = EState *executorState = ScanStateGetExecutorState(scanState);
scanState->customScanState.ss.ps.state->es_param_list_info; ParamListInfo paramListInfo = executorState->es_param_list_info;
List *taskPlacementList = task->taskPlacementList; List *taskPlacementList = task->taskPlacementList;
ListCell *taskPlacementCell = NULL; ListCell *taskPlacementCell = NULL;
char *queryString = task->queryString; char *queryString = task->queryString;
@ -1104,7 +1104,7 @@ ExecuteSingleModifyTask(CitusScanState *scanState, Task *task, CmdType operation
if (scanState) if (scanState)
{ {
executorState = scanState->customScanState.ss.ps.state; executorState = ScanStateGetExecutorState(scanState);
paramListInfo = executorState->es_param_list_info; paramListInfo = executorState->es_param_list_info;
} }
@ -1350,7 +1350,7 @@ void
ExecuteMultipleTasks(CitusScanState *scanState, List *taskList, ExecuteMultipleTasks(CitusScanState *scanState, List *taskList,
bool isModificationQuery, bool expectResults) bool isModificationQuery, bool expectResults)
{ {
EState *executorState = scanState->customScanState.ss.ps.state; EState *executorState = ScanStateGetExecutorState(scanState);
ParamListInfo paramListInfo = executorState->es_param_list_info; ParamListInfo paramListInfo = executorState->es_param_list_info;
int64 affectedTupleCount = -1; int64 affectedTupleCount = -1;

1
src/include/distributed/citus_custom_scan.h
View File

@ -38,5 +38,6 @@ extern void RegisterCitusCustomScanMethods(void);
extern void CitusExplainScan(CustomScanState *node, List *ancestors, struct extern void CitusExplainScan(CustomScanState *node, List *ancestors, struct
ExplainState *es); ExplainState *es);
extern TupleDesc ScanStateGetTupleDescriptor(CitusScanState *scanState); extern TupleDesc ScanStateGetTupleDescriptor(CitusScanState *scanState);
extern EState * ScanStateGetExecutorState(CitusScanState *scanState);
#endif /* CITUS_CUSTOM_SCAN_H */ #endif /* CITUS_CUSTOM_SCAN_H */