pgsql: Fix EvalPlanQual rechecking during MERGE.

From: Dean Rasheed <dean(dot)a(dot)rasheed(at)gmail(dot)com>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Fix EvalPlanQual rechecking during MERGE.
Date: 2023-09-30 09:57:19
Message-ID: E1qmWit-006mfU-Kd@gemulon.postgresql.org
Views: Whole Thread | Raw Message | Download mbox | Resend email
Thread:
Lists: pgsql-committers

Fix EvalPlanQual rechecking during MERGE.

Under some circumstances, concurrent MERGE operations could lead to
inconsistent results, that varied according the plan chosen. This was
caused by a lack of rowmarks on the source relation, which meant that
EvalPlanQual rechecking was not guaranteed to return the same source
tuples when re-running the join query.

Fix by ensuring that preprocess_rowmarks() sets up PlanRowMarks for
all non-target relations used in MERGE, in the same way that it does
for UPDATE and DELETE.

Per bug #18103. Back-patch to v15, where MERGE was introduced.

Dean Rasheed, reviewed by Richard Guo.

Discussion: https://postgr.es/m/18103-c4386baab8e355e3%40postgresql.org

Branch
------
REL_15_STABLE

Details
-------
https://git.postgresql.org/pg/commitdiff/3c1a1af91d9504e4ce0319f48e83f7c2d5765969

Modified Files
--------------
src/backend/executor/README | 12 +--
src/backend/executor/nodeModifyTable.c | 6 +-
src/backend/optimizer/plan/planner.c | 5 +-
src/include/nodes/execnodes.h | 4 +-
src/include/nodes/plannodes.h | 4 +-
src/test/isolation/expected/merge-join.out | 148 +++++++++++++++++++++++++++++
src/test/isolation/isolation_schedule | 1 +
src/test/isolation/specs/merge-join.spec | 45 +++++++++
src/test/regress/expected/merge.out | 8 +-
src/test/regress/expected/with.out | 42 ++++----
10 files changed, 237 insertions(+), 38 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Heikki Linnakangas 2023-09-30 14:17:31 pgsql: Fix briefly showing old progress stats for ANALYZE on inherited
Previous Message Tom Lane 2023-09-30 00:21:19 pgsql: Remove environment sensitivity in pl/tcl regression test.