Add missing CommandCounterIncrement() in stats import functions.

jeff-davis · jeff-davis · commit f22e436bff77 · 2024-10-29T10:14:23.000-07:00
Reported-by: Alexander Lakhin Discussion: https://postgr.es/m/98b2fcf0-f701-369e-d63d-6be9739ce17c@gmail.com
diff --git a/src/backend/statistics/attribute_stats.c b/src/backend/statistics/attribute_stats.c
@@ -752,6 +752,8 @@ upsert_pg_statistic(Relation starel, HeapTuple oldtup,
 	}
 
 	heap_freetuple(newtup);
+
+	CommandCounterIncrement();
 }
 
 /*
@@ -762,6 +764,7 @@ delete_pg_statistic(Oid reloid, AttrNumber attnum, bool stainherit)
 {
 	Relation	sd = table_open(StatisticRelationId, RowExclusiveLock);
 	HeapTuple	oldtup;
+	bool		result = false;
 
 	/* Is there already a pg_statistic tuple for this attribute? */
 	oldtup = SearchSysCache3(STATRELATTINH,
@@ -773,12 +776,14 @@ delete_pg_statistic(Oid reloid, AttrNumber attnum, bool stainherit)
 	{
 		CatalogTupleDelete(sd, &oldtup->t_self);
 		ReleaseSysCache(oldtup);
-		table_close(sd, RowExclusiveLock);
-		return true;
+		result = true;
 	}
 
 	table_close(sd, RowExclusiveLock);
-	return false;
+
+	CommandCounterIncrement();
+
+	return result;
 }
 
 /*
diff --git a/src/backend/statistics/relation_stats.c b/src/backend/statistics/relation_stats.c
@@ -171,6 +171,8 @@ relation_statistics_update(FunctionCallInfo fcinfo, int elevel)
 	/* release the lock, consistent with vac_update_relstats() */
 	table_close(crel, RowExclusiveLock);
 
+	CommandCounterIncrement();
+
 	return result;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -752,6 +752,8 @@ upsert_pg_statistic(Relation starel, HeapTuple oldtup,`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`heap_freetuple(newtup);`
	`755`	`+`
	`756`	`+ CommandCounterIncrement();`
`755`	`757`	`}`
`756`	`758`
`757`	`759`	`/*`
`@@ -762,6 +764,7 @@ delete_pg_statistic(Oid reloid, AttrNumber attnum, bool stainherit)`
`762`	`764`	`{`
`763`	`765`	`Relation sd = table_open(StatisticRelationId, RowExclusiveLock);`
`764`	`766`	`HeapTuple oldtup;`
	`767`	`+ bool result = false;`
`765`	`768`
`766`	`769`	`/* Is there already a pg_statistic tuple for this attribute? */`
`767`	`770`	`oldtup = SearchSysCache3(STATRELATTINH,`
`@@ -773,12 +776,14 @@ delete_pg_statistic(Oid reloid, AttrNumber attnum, bool stainherit)`
`773`	`776`	`{`
`774`	`777`	`CatalogTupleDelete(sd, &oldtup->t_self);`
`775`	`778`	`ReleaseSysCache(oldtup);`
`776`		`- table_close(sd, RowExclusiveLock);`
`777`		`- return true;`
	`779`	`+ result = true;`
`778`	`780`	`}`
`779`	`781`
`780`	`782`	`table_close(sd, RowExclusiveLock);`
`781`		`- return false;`
	`783`	`+`
	`784`	`+ CommandCounterIncrement();`
	`785`	`+`
	`786`	`+ return result;`
`782`	`787`	`}`
`783`	`788`
`784`	`789`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,8 @@ relation_statistics_update(FunctionCallInfo fcinfo, int elevel)`
`171`	`171`	`/* release the lock, consistent with vac_update_relstats() */`
`172`	`172`	`table_close(crel, RowExclusiveLock);`
`173`	`173`
	`174`	`+ CommandCounterIncrement();`
	`175`	`+`
`174`	`176`	`return result;`
`175`	`177`	`}`
`176`	`178`