2 files changed, 24 insertions, 15 deletions

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 1e97ff5643f..9569d2fa423 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -849,8 +849,8 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 			Relation	resultRelation;
 
 			resultRelationOid = getrelid(resultRelationIndex, rangeTable);
-			Assert(rt_fetch(resultRelationIndex, rangeTable)->rellockmode == RowExclusiveLock);
-			resultRelation = heap_open(resultRelationOid, RowExclusiveLock);
+			resultRelation = heap_open(resultRelationOid, NoLock);
+			Assert(CheckRelationLockedByMe(resultRelation, RowExclusiveLock, true));
 
 			InitResultRelInfo(resultRelInfo,
 							  resultRelation,
@@ -890,8 +890,8 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 				Relation	resultRelDesc;
 
 				resultRelOid = getrelid(resultRelIndex, rangeTable);
-				Assert(rt_fetch(resultRelIndex, rangeTable)->rellockmode == RowExclusiveLock);
-				resultRelDesc = heap_open(resultRelOid, RowExclusiveLock);
+				resultRelDesc = heap_open(resultRelOid, NoLock);
+				Assert(CheckRelationLockedByMe(resultRelDesc, RowExclusiveLock, true));
 				InitResultRelInfo(resultRelInfo,
 								  resultRelDesc,
 								  lfirst_int(l),
@@ -903,7 +903,8 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 			estate->es_root_result_relations = resultRelInfos;
 			estate->es_num_root_result_relations = num_roots;
 
-			/* Simply lock the rest of them. */
+			/* Simply check the rest of them are locked. */
+#ifdef USE_ASSERT_CHECKING
 			foreach(l, plannedstmt->nonleafResultRelations)
 			{
 				Index		resultRelIndex = lfirst_int(l);
@@ -912,11 +913,15 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 				if (!list_member_int(plannedstmt->rootResultRelations,
 									 resultRelIndex))
 				{
-					Assert(rt_fetch(resultRelIndex, rangeTable)->rellockmode == RowExclusiveLock);
-					LockRelationOid(getrelid(resultRelIndex, rangeTable),
-									RowExclusiveLock);
+					Relation	resultRelDesc;
+
+					resultRelDesc = heap_open(getrelid(resultRelIndex, rangeTable),
+											  NoLock);
+					Assert(CheckRelationLockedByMe(resultRelDesc, RowExclusiveLock, true));
+					heap_close(resultRelDesc, NoLock);
 				}
 			}
+#endif
 		}
 	}
 	else
@@ -945,7 +950,6 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 	{
 		PlanRowMark *rc = (PlanRowMark *) lfirst(l);
 		Oid			relid;
-		LOCKMODE	rellockmode;
 		Relation	relation;
 		ExecRowMark *erm;
 
@@ -963,8 +967,10 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 			case ROW_MARK_SHARE:
 			case ROW_MARK_KEYSHARE:
 			case ROW_MARK_REFERENCE:
-				rellockmode = rt_fetch(rc->rti, rangeTable)->rellockmode;
-				relation = heap_open(relid, rellockmode);
+				relation = heap_open(relid, NoLock);
+				Assert(CheckRelationLockedByMe(relation,
+											   rt_fetch(rc->rti, rangeTable)->rellockmode,
+											   true));
 				break;
 			case ROW_MARK_COPY:
 				/* no physical table access is required */
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index a4058c0f61d..ba93b401046 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -42,6 +42,7 @@
 
 #include "postgres.h"
 
+#include "access/parallel.h"
 #include "access/relscan.h"
 #include "access/transam.h"
 #include "executor/executor.h"
@@ -648,12 +649,14 @@ ExecOpenScanRelation(EState *estate, Index scanrelid, int eflags)
 {
 	Relation	rel;
 	Oid			reloid;
-	LOCKMODE	lockmode;
 
-	/* Open the relation and acquire lock as needed */
+	/* Open the relation and verify lock was obtained upstream */
 	reloid = getrelid(scanrelid, estate->es_range_table);
-	lockmode = rt_fetch(scanrelid, estate->es_range_table)->rellockmode;
-	rel = heap_open(reloid, lockmode);
+	rel = heap_open(reloid, NoLock);
+	Assert(IsParallelWorker() ||
+		   CheckRelationLockedByMe(rel,
+								   rt_fetch(scanrelid, estate->es_range_table)->rellockmode,
+								   true));
 
 	/*
 	 * Complain if we're attempting a scan of an unscannable relation, except