Fix rowmark handling for non-relation RTEs during executor init Commit cbc127917e introduced tracking of unpruned relids to skip processing of pruned partitions. PlannedStmt.unprunableRelids is computed as the difference between PlannerGlobal.allRelids and prunableRelids, but allRelids only contains RTE_RELATION entries. This means non-relation RTEs (VALUES, subqueries, CTEs, etc.) are never included in unprunableRelids, and consequently not in es_unpruned_relids at runtime.
As a result, rowmarks attached to non-relation RTEs were incorrectly skipped during executor initialization. This affects any DML statement that has rowmarks on such RTEs, including MERGE with a VALUES or subquery source, and UPDATE/DELETE with joins against subqueries or CTEs. When a concurrent update triggers an EPQ recheck, the missing rowmark leads to incorrect results. Fix by restricting the es_unpruned_relids membership check to RTE_RELATION entries only, since partition pruning only applies to actual relations. Rowmarks for other RTE kinds are now always processed. Bug: #19355 Reported-by: Bihua Wang <[email protected]> Diagnosed-by: Dean Rasheed <[email protected]> Diagnosed-by: Tender Wang <[email protected]> Author: Dean Rasheed <[email protected]> Discussion: https://postgr.es/m/[email protected] Backpatch-through: 18 Branch ------ REL_18_STABLE Details ------- https://git.postgresql.org/pg/commitdiff/f335457e8adb32ce2e506e0d2b62c7f6f4bb98d1 Modified Files -------------- src/backend/executor/execMain.c | 14 +++++++++----- src/backend/executor/nodeLockRows.c | 10 +++++++--- src/backend/executor/nodeModifyTable.c | 10 +++++++--- src/test/isolation/expected/eval-plan-qual.out | 20 ++++++++++++++++++++ src/test/isolation/specs/eval-plan-qual.spec | 13 +++++++++++++ 5 files changed, 56 insertions(+), 11 deletions(-)
