Re-introduce pgstat_drop_entry(), keeping ABI compatibility

This routine acts as a wrapper of a new pgstat_drop_entry_ext(), used in
the core code with a missing_ok argument.

This includes an update of .abi-compliance-history, removing the latest
entry that has documented the change of pgstat_drop_entry().  This
change is applied across v15~v18.  HEAD keeps pgstat_drop_entry() as
single entry point, with the new missing_ok.

Per discussion with Álvaro Herrera and Lukas Fittl.  This is a follow-up
of 850b9218c8e4.

Discussion: https://postgr.es/m/ajZz_sVJVX7pmPHo@alvherre.pgsql
Backpatch-through: 15-18

diff --git a/.abi-compliance-history b/.abi-compliance-history
index 9a24d1601ab11d04b677702e9ea068fdeb100df4..590b989094f6107a0b47ffde05929e5872e07dd0 100644 (file)
--- a/.abi-compliance-history
+++ b/.abi-compliance-history
@@ -18,15 +18,6 @@
 # Be sure to replace "<ADD JUSTIFICATION HERE>" with details of your change and
 # why it is deemed acceptable.
 
-2e0c61aed6241bb66547bfab7467d43f889f78ba
-#
-# Fix PANIC with track_functions due to concurrent drop of pgstats entries
-# 2026-06-18 11:49:36 +0900
-#
-# This commit has added a "missing_ok" argument to pgstat_drop_entry().  All
-# the callers of this routine are in core for v15-v17.  One custom stats kinds
-# available in the public since v18 is impacted (maintainer informed).
-
 586f4266fb4945f6ea3564b9c1bab093eb74bee4
 #
 # Fix ABI break by moving PROCSIG_SLOTSYNC_MESSAGE in ProcSignalReason

diff --git a/src/backend/utils/activity/pgstat_function.c b/src/backend/utils/activity/pgstat_function.c
index 675ff13dc5cef1c69ed0a7ca30c9955d5372a337..7ab19766cddb3bff20c035c36195f6ec850bd3a5 100644 (file)
--- a/src/backend/utils/activity/pgstat_function.c
+++ b/src/backend/utils/activity/pgstat_function.c
@@ -112,8 +112,8 @@ pgstat_init_function_usage(FunctionCallInfo fcinfo,
                AcceptInvalidationMessages();
                if (!SearchSysCacheExists1(PROCOID, ObjectIdGetDatum(fcinfo->flinfo->fn_oid)))
                {
-                       pgstat_drop_entry(PGSTAT_KIND_FUNCTION, MyDatabaseId,
-                                                         fcinfo->flinfo->fn_oid, true);
+                       pgstat_drop_entry_ext(PGSTAT_KIND_FUNCTION, MyDatabaseId,
+                                                                 fcinfo->flinfo->fn_oid, true);
                        ereport(ERROR, errcode(ERRCODE_UNDEFINED_FUNCTION),
                                        errmsg("function call to dropped function"));
                }

diff --git a/src/backend/utils/activity/pgstat_replslot.c b/src/backend/utils/activity/pgstat_replslot.c
index 8d5433db362e82aa3efd8fb5738a297e909cc591..8582dd28f605f9a2eb58b5da82571a111fcfd7db 100644 (file)
--- a/src/backend/utils/activity/pgstat_replslot.c
+++ b/src/backend/utils/activity/pgstat_replslot.c
@@ -157,8 +157,8 @@ pgstat_drop_replslot(ReplicationSlot *slot)
 {
        Assert(LWLockHeldByMeInMode(ReplicationSlotAllocationLock, LW_EXCLUSIVE));
 
-       if (!pgstat_drop_entry(PGSTAT_KIND_REPLSLOT, InvalidOid,
-                                                  ReplicationSlotIndex(slot), false))
+       if (!pgstat_drop_entry_ext(PGSTAT_KIND_REPLSLOT, InvalidOid,
+                                                          ReplicationSlotIndex(slot), false))
                pgstat_request_entry_refs_gc();
 }
 

diff --git a/src/backend/utils/activity/pgstat_shmem.c b/src/backend/utils/activity/pgstat_shmem.c
index 7e03e9f8484c07a0f914cc3b8959d00fe4a2eca2..e38b5dfb6994fd3e2ba85ffcbbab7b02b2510dca 100644 (file)
--- a/src/backend/utils/activity/pgstat_shmem.c
+++ b/src/backend/utils/activity/pgstat_shmem.c
@@ -844,7 +844,7 @@ pgstat_free_entry(PgStatShared_HashEntry *shent, dshash_seq_status *hstat)
 
 /*
  * Helper for both pgstat_drop_database_and_contents() and
- * pgstat_drop_entry(). If hstat is non-null delete the shared entry using
+ * pgstat_drop_entry_ext(). If hstat is non-null delete the shared entry using
  * dshash_delete_current(), otherwise use dshash_delete_entry(). In either
  * case the entry needs to be already locked.
  */
@@ -932,6 +932,17 @@ pgstat_drop_database_and_contents(Oid dboid)
                pgstat_request_entry_refs_gc();
 }
 
+/*
+ * ABI-preserving wrapper around pgstat_drop_entry_ext().
+ *
+ * The original routine introduced in v15 did not include "missing_ok".
+ */
+bool
+pgstat_drop_entry(PgStat_Kind kind, Oid dboid, Oid objoid)
+{
+       return pgstat_drop_entry_ext(kind, dboid, objoid, false);
+}
+
 /*
  * Drop a single stats entry.
  *
@@ -946,8 +957,8 @@ pgstat_drop_database_and_contents(Oid dboid)
  * pgstat_gc_entry_refs().
  */
 bool
-pgstat_drop_entry(PgStat_Kind kind, Oid dboid, Oid objoid,
-                                 bool missing_ok)
+pgstat_drop_entry_ext(PgStat_Kind kind, Oid dboid, Oid objoid,
+                                         bool missing_ok)
 {
        PgStat_HashKey key;
        PgStatShared_HashEntry *shent;

diff --git a/src/backend/utils/activity/pgstat_xact.c b/src/backend/utils/activity/pgstat_xact.c
index 65108ffaefe47610ba5352ecf02f10f20da4c9dd..b18dacd33f69869b68628382eb1716667a4d2826 100644 (file)
--- a/src/backend/utils/activity/pgstat_xact.c
+++ b/src/backend/utils/activity/pgstat_xact.c
@@ -84,7 +84,7 @@ AtEOXact_PgStat_DroppedStats(PgStat_SubXactStatus *xact_state, bool isCommit)
                         * Transaction that dropped an object committed. Drop the stats
                         * too.
                         */
-                       if (!pgstat_drop_entry(it->kind, it->dboid, it->objoid, true))
+                       if (!pgstat_drop_entry_ext(it->kind, it->dboid, it->objoid, true))
                                not_freed_count++;
                }
                else if (!isCommit && pending->is_create)
@@ -93,7 +93,7 @@ AtEOXact_PgStat_DroppedStats(PgStat_SubXactStatus *xact_state, bool isCommit)
                         * Transaction that created an object aborted. Drop the stats
                         * associated with the object.
                         */
-                       if (!pgstat_drop_entry(it->kind, it->dboid, it->objoid, true))
+                       if (!pgstat_drop_entry_ext(it->kind, it->dboid, it->objoid, true))
                                not_freed_count++;
                }
 
@@ -158,7 +158,7 @@ AtEOSubXact_PgStat_DroppedStats(PgStat_SubXactStatus *xact_state,
                         * Subtransaction creating a new stats object aborted. Drop the
                         * stats object.
                         */
-                       if (!pgstat_drop_entry(it->kind, it->dboid, it->objoid, true))
+                       if (!pgstat_drop_entry_ext(it->kind, it->dboid, it->objoid, true))
                                not_freed_count++;
                        pfree(pending);
                }
@@ -320,7 +320,7 @@ pgstat_execute_transactional_drops(int ndrops, struct xl_xact_stats_item *items,
        {
                xl_xact_stats_item *it = &items[i];
 
-               if (!pgstat_drop_entry(it->kind, it->dboid, it->objoid, true))
+               if (!pgstat_drop_entry_ext(it->kind, it->dboid, it->objoid, true))
                        not_freed_count++;
        }
 

diff --git a/src/include/utils/pgstat_internal.h b/src/include/utils/pgstat_internal.h
index c9b0552ed36a656bb9ff672f033171f9e5f902a9..84b52305d1ec07410fb10999cb78b866c4610487 100644 (file)
--- a/src/include/utils/pgstat_internal.h
+++ b/src/include/utils/pgstat_internal.h
@@ -625,8 +625,9 @@ extern PgStat_EntryRef *pgstat_get_entry_ref(PgStat_Kind kind, Oid dboid, Oid ob
 extern bool pgstat_lock_entry(PgStat_EntryRef *entry_ref, bool nowait);
 extern bool pgstat_lock_entry_shared(PgStat_EntryRef *entry_ref, bool nowait);
 extern void pgstat_unlock_entry(PgStat_EntryRef *entry_ref);
-extern bool pgstat_drop_entry(PgStat_Kind kind, Oid dboid, Oid objoid,
-                                                         bool missing_ok);
+extern bool pgstat_drop_entry(PgStat_Kind kind, Oid dboid, Oid objoid);
+extern bool pgstat_drop_entry_ext(PgStat_Kind kind, Oid dboid, Oid objoid,
+                                                                 bool missing_ok);
 extern void pgstat_drop_all_entries(void);
 extern PgStat_EntryRef *pgstat_get_entry_ref_locked(PgStat_Kind kind, Oid dboid, Oid objoid,
                                                                                                        bool nowait);