Marginal cleanup in arrangements for ensuring StrategyHintVacuum is cleared

tglsfdc · tglsfdc · commit 2e5e856f6b4f · 2006-09-17T22:16:22.000Z
after an error during VACUUM.  We have a PG_TRY block anyway around the only
call sites, so just reset it in the CATCH clause instead of having
AtEOXact_Buffers blindly do it during xact end.  I think the old code was
actively wrong for the case of a failure during ANALYZE inside a
subtransaction --- the flag wouldn't get cleared until main transaction end.
Probably not worth back-patching though.
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.338 2006/08/18 16:09:08 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.339 2006/09/17 22:16:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -460,6 +460,8 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 	{
 		/* Make sure cost accounting is turned off after error */
 		VacuumCostActive = false;
+		/* And reset buffer replacement strategy, too */
+		StrategyHintVacuum(false);
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
@@ -1173,8 +1175,6 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt, char expected_relkind)
 	 * Now release the session-level lock on the master table.
 	 */
 	UnlockRelationIdForSession(&onerelid, lmode);
-
-	return;
 }
 
 
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.209 2006/07/23 03:07:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.210 2006/09/17 22:16:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1171,9 +1171,6 @@ AtEOXact_Buffers(bool isCommit)
 #endif
 
 	AtEOXact_LocalBuffers(isCommit);
-
-	/* Make sure we reset the strategy hint in case VACUUM errored out */
-	StrategyHintVacuum(false);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.338 2006/08/18 16:09:08 tgl Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.339 2006/09/17 22:16:22 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -460,6 +460,8 @@ vacuum(VacuumStmt vacstmt, List relids)`
`460`	`460`	`{`
`461`	`461`	`/* Make sure cost accounting is turned off after error */`
`462`	`462`	`VacuumCostActive = false;`
	`463`	`+ /* And reset buffer replacement strategy, too */`
	`464`	`+ StrategyHintVacuum(false);`
`463`	`465`	`PG_RE_THROW();`
`464`	`466`	`}`
`465`	`467`	`PG_END_TRY();`
`@@ -1173,8 +1175,6 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt, char expected_relkind)`
`1173`	`1175`	`* Now release the session-level lock on the master table.`
`1174`	`1176`	`*/`
`1175`	`1177`	`UnlockRelationIdForSession(&onerelid, lmode);`
`1176`		`-`
`1177`		`- return;`
`1178`	`1178`	`}`
`1179`	`1179`
`1180`	`1180`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.209 2006/07/23 03:07:58 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.210 2006/09/17 22:16:22 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1171,9 +1171,6 @@ AtEOXact_Buffers(bool isCommit)`
`1171`	`1171`	`#endif`
`1172`	`1172`
`1173`	`1173`	`AtEOXact_LocalBuffers(isCommit);`
`1174`		`-`
`1175`		`- /* Make sure we reset the strategy hint in case VACUUM errored out */`
`1176`		`- StrategyHintVacuum(false);`
`1177`	`1174`	`}`
`1178`	`1175`
`1179`	`1176`	`/*`