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

pass CitusCustomState directly to adaptive executor (#3151)

pull/3127/head
SaitTalhaNisanci 2019-11-01 19:57:32 +03:00 committed by GitHub
parent ffd89e4e01
commit 7c410e3cd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/distributed/executor/adaptive_executor.c
View File

@ -600,9 +600,8 @@ static TaskExecutionState TaskExecutionStateMachine(ShardCommandExecution *
* of the input scanScate. * of the input scanScate.
*/ */
TupleTableSlot * TupleTableSlot *
AdaptiveExecutor(CustomScanState *node) AdaptiveExecutor(CitusScanState *scanState)
{ {
CitusScanState *scanState = (CitusScanState *) node;
TupleTableSlot *resultSlot = NULL; TupleTableSlot *resultSlot = NULL;
DistributedPlan *distributedPlan = scanState->distributedPlan; DistributedPlan *distributedPlan = scanState->distributedPlan;

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

@ -193,7 +193,7 @@ CitusExecScan(CustomScanState *node)
if (!scanState->finishedRemoteScan) if (!scanState->finishedRemoteScan)
{ {
AdaptiveExecutor(node); AdaptiveExecutor(scanState);
scanState->finishedRemoteScan = true; scanState->finishedRemoteScan = true;
} }

2
src/include/distributed/multi_executor.h
View File

@ -37,7 +37,7 @@ extern int ExecutorSlowStartInterval;
extern void CitusExecutorStart(QueryDesc *queryDesc, int eflags); extern void CitusExecutorStart(QueryDesc *queryDesc, int eflags);
extern void CitusExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count, extern void CitusExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count,
bool execute_once); bool execute_once);
extern TupleTableSlot * AdaptiveExecutor(CustomScanState *node); extern TupleTableSlot * AdaptiveExecutor(CitusScanState *scanState);
extern uint64 ExecuteTaskListExtended(RowModifyLevel modLevel, List *taskList, extern uint64 ExecuteTaskListExtended(RowModifyLevel modLevel, List *taskList,
TupleDesc tupleDescriptor, TupleDesc tupleDescriptor,
Tuplestorestate *tupleStore, Tuplestorestate *tupleStore,