database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-01-26 09:41:40 +03:00
Code Activity

Fix rowmark handling for non-relation RTEs during executor init

Browse Source 
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 <wangbihua.cn@gmail.com>
Diagnosed-by: Dean Rasheed <dean.a.rasheed@gmail.com>
Diagnosed-by: Tender Wang <tndrwang@gmail.com>
Author: Dean Rasheed <dean.a.rasheed@gmail.com>
Discussion: https://postgr.es/m/19355-57d7d52ea4980dc6@postgresql.org
Backpatch-through: 18
This commit is contained in:
Amit Langote
2026-01-16 14:53:50 +09:00
parent 9cbb1d21d6
commit 889676a0d5
5 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/executor/execMain.c
View File

@@ -880,21 +880,25 @@ InitPlan(QueryDesc *queryDesc, int eflags)
foreach(l, plannedstmt->rowMarks)
{
PlanRowMark *rc = (PlanRowMark *) lfirst(l);
RangeTblEntry *rte = exec_rt_fetch(rc->rti, estate);
Oid relid;
Relation relation;
ExecRowMark *erm;
/* ignore "parent" rowmarks; they are irrelevant at runtime */
if (rc->isParent)
continue;
/*
* Ignore "parent" rowmarks, because they are irrelevant at
* runtime. Also ignore the rowmarks belonging to child tables
* that have been pruned in ExecDoInitialPruning().
* Also ignore rowmarks belonging to child tables that have been
* pruned in ExecDoInitialPruning().
*/
if (rc->isParent ||
if (rte->rtekind == RTE_RELATION &&
!bms_is_member(rc->rti, estate->es_unpruned_relids))
continue;
/* get relation's OID (will produce InvalidOid if subquery) */
relid = exec_rt_fetch(rc->rti, estate)->relid;
relid = rte->relid;
/* open relation, if we need to access it for this mark type */
switch (rc->markType)

10
src/backend/executor/nodeLockRows.c
View File

@@ -344,15 +344,19 @@ ExecInitLockRows(LockRows *node, EState *estate, int eflags)
foreach(lc, node->rowMarks)
{
PlanRowMark *rc = lfirst_node(PlanRowMark, lc);
RangeTblEntry *rte = exec_rt_fetch(rc->rti, estate);
ExecRowMark *erm;
ExecAuxRowMark *aerm;
/* ignore "parent" rowmarks; they are irrelevant at runtime */
if (rc->isParent)
continue;
/*
* Ignore "parent" rowmarks, because they are irrelevant at runtime.
* Also ignore the rowmarks belonging to child tables that have been
* Also ignore rowmarks belonging to child tables that have been
* pruned in ExecDoInitialPruning().
*/
if (rc->isParent ||
if (rte->rtekind == RTE_RELATION &&
!bms_is_member(rc->rti, estate->es_unpruned_relids))
continue;

10
src/backend/executor/nodeModifyTable.c
View File

@@ -5092,15 +5092,19 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
foreach(l, node->rowMarks)
{
PlanRowMark *rc = lfirst_node(PlanRowMark, l);
RangeTblEntry *rte = exec_rt_fetch(rc->rti, estate);
ExecRowMark *erm;
ExecAuxRowMark *aerm;
/* ignore "parent" rowmarks; they are irrelevant at runtime */
if (rc->isParent)
continue;
/*
* Ignore "parent" rowmarks, because they are irrelevant at runtime.
* Also ignore the rowmarks belonging to child tables that have been
* Also ignore rowmarks belonging to child tables that have been
* pruned in ExecDoInitialPruning().
*/
if (rc->isParent ||
if (rte->rtekind == RTE_RELATION &&
!bms_is_member(rc->rti, estate->es_unpruned_relids))
continue;

20
src/test/isolation/expected/eval-plan-qual.out
View File

@@ -1473,3 +1473,23 @@ step s2pp4: DELETE FROM another_parttbl WHERE a = (SELECT 1); <waiting ...>
step c1: COMMIT;
step s2pp4: <... completed>
step c2: COMMIT;
starting permutation: updateformergevalues mergevalues c1 c2 read
step updateformergevalues: UPDATE accounts SET balance = balance + 100;
step mergevalues:
MERGE INTO accounts
USING (VALUES ('checking', 610), ('savings', 620)) v(accountid, balance)
ON v.accountid = accounts.accountid
WHEN MATCHED THEN UPDATE SET balance = v.balance
WHEN NOT MATCHED THEN INSERT VALUES ('unmatched', -1);
<waiting ...>
step c1: COMMIT;
step mergevalues: <... completed>
step c2: COMMIT;
step read: SELECT * FROM accounts ORDER BY accountid;
accountid|balance|balance2
---------+-------+--------
checking | 610| 1220
savings | 620| 1240
(2 rows)

13
src/test/isolation/specs/eval-plan-qual.spec
View File

@@ -206,6 +206,8 @@ step sys1 {
step s1pp1 { UPDATE another_parttbl SET b = b + 1 WHERE a = 1; }
step updateformergevalues { UPDATE accounts SET balance = balance + 100; }
session s2
setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
step wx2 { UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; }
@@ -318,6 +320,14 @@ step s2pp2 { PREPARE epd AS DELETE FROM another_parttbl WHERE a = $1; }
step s2pp3 { EXECUTE epd(1); }
step s2pp4 { DELETE FROM another_parttbl WHERE a = (SELECT 1); }
step mergevalues {
MERGE INTO accounts
USING (VALUES ('checking', 610), ('savings', 620)) v(accountid, balance)
ON v.accountid = accounts.accountid
WHEN MATCHED THEN UPDATE SET balance = v.balance
WHEN NOT MATCHED THEN INSERT VALUES ('unmatched', -1);
}
session s3
setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
step read { SELECT * FROM accounts ORDER BY accountid; }
@@ -425,3 +435,6 @@ permutation sys1 sysmerge2 c1 c2
# Exercise run-time partition pruning code in an EPQ recheck
permutation s1pp1 s2pp1 s2pp2 s2pp3 c1 c2
permutation s1pp1 s2pp4 c1 c2
# test EPQ recheck in MERGE from VALUES_RTE, cf bug #19355
permutation updateformergevalues mergevalues c1 c2 read