Skip to content

Commit 2a781d5

Browse files
committed
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
1 parent be420fa commit 2a781d5

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/backend/commands/matview.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ refresh_matview_datafill(DestReceiver *dest, Query *query,
283283
Oid save_userid;
284284
int save_sec_context;
285285
int save_nestlevel;
286+
Query *copied_query;
286287

287288
/*
288289
* Switch to the owner's userid, so that any functions are run as that
@@ -294,8 +295,10 @@ refresh_matview_datafill(DestReceiver *dest, Query *query,
294295
save_sec_context | SECURITY_RESTRICTED_OPERATION);
295296
save_nestlevel = NewGUCNestLevel();
296297

297-
/* Rewrite, copying the given Query to make sure it's not changed */
298-
rewritten = QueryRewrite((Query *) copyObject(query));
298+
/* Lock and rewrite, using a copy to preserve the original query. */
299+
copied_query = copyObject(query);
300+
AcquireRewriteLocks(copied_query, false);
301+
rewritten = QueryRewrite(copied_query);
299302

300303
/* SELECT should never rewrite to more or less than one SELECT query */
301304
if (list_length(rewritten) != 1)

0 commit comments

Comments
 (0)