From: Kevin Grittner <kgrittn@postgresql.org>
Date: Sun, 3 Nov 2013 00:18:41 +0000 (-0500)
Subject: Acquire appropriate locks when rewriting during RMV.
X-Git-Tag: REL9_3_2~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b21aed3964794f3ebfbfee9324badf1430b1efbc;p=thirdparty%2Fpostgresql.git

Acquire appropriate locks when rewriting during RMV.

Since the query has not been freshly parsed when executing REFRESH
MATERIALIZED VIEW, locks must be explicitly taken before rewrite.

Backpatch to 9.3.

Andres Freund
---

diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index d3195fc62e5..f7b3244752e 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -242,9 +242,12 @@ refresh_matview_datafill(DestReceiver *dest, Query *query,
 	List	   *rewritten;
 	PlannedStmt *plan;
 	QueryDesc  *queryDesc;
+	Query	   *copied_query;
 
-	/* Rewrite, copying the given Query to make sure it's not changed */
-	rewritten = QueryRewrite((Query *) copyObject(query));
+	/* Lock and rewrite, using a copy to preserve the original query. */
+	copied_query = copyObject(query);
+	AcquireRewriteLocks(copied_query, false);
+	rewritten = QueryRewrite(copied_query);
 
 	/* SELECT should never rewrite to more or less than one SELECT query */
 	if (list_length(rewritten) != 1)