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

PG18: fix query results diff in merge regress test. 

The test used SQL functions which can be cached in PG18+ since
commit 0dca5d68d. This means that a Citus distributed plan can
be cached, but the copy function for a distributed plan did not
include the `sourceResultRepartitionColumnIndex` field, which is
critical for MERGE queries. Including it fixes the diff problem.
Also update `OutDistributedPlan()` function so that the field is
picked up by `nodeToString()`.
pull/8323/head
Colm McHugh 2025-11-05 12:51:10 +00:00
parent b10aa02908
commit 43156e0674
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/utils/citus_copyfuncs.c
View File

@ -137,6 +137,8 @@ CopyNodeDistributedPlan(COPYFUNC_ARGS)
COPY_SCALAR_FIELD(fastPathRouterPlan); COPY_SCALAR_FIELD(fastPathRouterPlan);
COPY_SCALAR_FIELD(numberOfTimesExecuted); COPY_SCALAR_FIELD(numberOfTimesExecuted);
COPY_NODE_FIELD(planningError); COPY_NODE_FIELD(planningError);
COPY_SCALAR_FIELD(sourceResultRepartitionColumnIndex);
} }

1
src/backend/distributed/utils/citus_outfuncs.c
View File

@ -203,6 +203,7 @@ OutDistributedPlan(OUTFUNC_ARGS)
WRITE_UINT_FIELD(numberOfTimesExecuted); WRITE_UINT_FIELD(numberOfTimesExecuted);
WRITE_NODE_FIELD(planningError); WRITE_NODE_FIELD(planningError);
WRITE_INT_FIELD(sourceResultRepartitionColumnIndex);
} }