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

ExecInitResult on scanState->customScanState.ss.ps as pg's nodeCustom initializes with TTSOpsVirtual which is incompatible with tuplestore

read_write_etc
Philip Dubé 2019-07-17 19:39:59 +00:00
parent ae773c8442
commit b26422e301
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,11 @@ CitusBeginScan(CustomScanState *node, EState *estate, int eflags)
MarkCitusInitiatedCoordinatorBackend(); MarkCitusInitiatedCoordinatorBackend();
scanState = (CitusScanState *) node; scanState = (CitusScanState *) node;
#if PG_VERSION_NUM >= 120000
ExecInitResultSlot(&scanState->customScanState.ss.ps, &TTSOpsMinimalTuple);
#endif
distributedPlan = scanState->distributedPlan; distributedPlan = scanState->distributedPlan;
if (distributedPlan->modLevel == ROW_MODIFY_READONLY || if (distributedPlan->modLevel == ROW_MODIFY_READONLY ||
distributedPlan->insertSelectSubquery != NULL) distributedPlan->insertSelectSubquery != NULL)

6
src/include/distributed/version_compat.h
View File

@ -264,9 +264,9 @@ RangeVarGetRelidInternal(const RangeVar *relation, LOCKMODE lockmode, uint32 fla
#define FileWriteCompat FileWrite #define FileWriteCompat FileWrite
#define fcSetArg(fc, n, argval) \ #define fcSetArg(fc, n, argval) \
((fc)->args[n].isnull = false, (fc)->args[n].value = (argval)) (((fc)->args[n].isnull = false), ((fc)->args[n].value = (argval)))
#define fcSetArgNull(fc, n) \ #define fcSetArgNull(fc, n) \
((fc)->args[n].isnull = true, (fc)->args[n].value = (Datum) 0) (((fc)->args[n].isnull = true), ((fc)->args[n].value = (Datum) 0))
#else /* pre PG12 */ #else /* pre PG12 */
#define QTW_EXAMINE_RTES_BEFORE QTW_EXAMINE_RTES #define QTW_EXAMINE_RTES_BEFORE QTW_EXAMINE_RTES