Avoid use of already-closed relcache entry.

tglsfdc · tglsfdc · commit e3044f6184be · 2017-03-18T18:43:06.000-04:00
Oversight in commit 17f8ffa. Per buildfarm member prion.
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
@@ -326,8 +326,6 @@ ExecRefreshMatView(RefreshMatViewStmt *stmt, const char *queryString,
 	if (!stmt->skipData)
 		processed = refresh_matview_datafill(dest, dataQuery, queryString);
 
-	heap_close(matviewRel, NoLock);
-
 	/* Make the matview match the newly generated data. */
 	if (concurrent)
 	{
@@ -361,6 +359,8 @@ ExecRefreshMatView(RefreshMatViewStmt *stmt, const char *queryString,
 			pgstat_count_heap_insert(matviewRel, processed);
 	}
 
+	heap_close(matviewRel, NoLock);
+
 	/* Roll back any GUC changes */
 	AtEOXact_GUC(false, save_nestlevel);
 

Original file line number	Diff line number	Diff line change
`@@ -326,8 +326,6 @@ ExecRefreshMatView(RefreshMatViewStmt stmt, const char queryString,`
`326`	`326`	`if (!stmt->skipData)`
`327`	`327`	`processed = refresh_matview_datafill(dest, dataQuery, queryString);`
`328`	`328`
`329`		`- heap_close(matviewRel, NoLock);`
`330`		`-`
`331`	`329`	`/* Make the matview match the newly generated data. */`
`332`	`330`	`if (concurrent)`
`333`	`331`	`{`
`@@ -361,6 +359,8 @@ ExecRefreshMatView(RefreshMatViewStmt stmt, const char queryString,`
`361`	`359`	`pgstat_count_heap_insert(matviewRel, processed);`
`362`	`360`	`}`
`363`	`361`
	`362`	`+ heap_close(matviewRel, NoLock);`
	`363`	`+`
`364`	`364`	`/* Roll back any GUC changes */`
`365`	`365`	`AtEOXact_GUC(false, save_nestlevel);`
`366`	`366`