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 6bc719dcc1637747ba5281b45dcdbdcb99818387..e4a7770611a6ec1afda9792f247092df11d38c40 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.
 
-1e9e62193c3fa66e39b50163f225388fcf6eb7d5
-#
-# Fix PANIC with track_functions due to concurrent drop of pgstats entries
-# 2026-06-18 11:49:41 +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).
-
 c5824536e7ca3c5ef5a9db59bd36c4e6beb23f51
 #
 # Fix trigger transition table capture for MERGE in CTE queries.

diff --git a/src/backend/utils/activity/pgstat_function.c b/src/backend/utils/activity/pgstat_function.c
index d1853f33753d2fabd0c019058140a49f31a83c48..0a975c04f910328bd9189184c4115ed58317e41f 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 440477470567597c4f18d2c03d206e3df3afdcb9..cb61e3e5594d195de9caef48e9f48b1cf2292a39 100644 (file)
--- a/src/backend/utils/activity/pgstat_replslot.c
+++ b/src/backend/utils/activity/pgstat_replslot.c
@@ -153,8 +153,8 @@ pgstat_acquire_replslot(ReplicationSlot *slot)
 void
 pgstat_drop_replslot(ReplicationSlot *slot)
 {
-       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 5a4657ed42bbfed155135cb07f23aabefd8c4567..332c88eed62c607ad5a0fc1aae7dba04bcbfab24 100644 (file)
--- a/src/backend/utils/activity/pgstat_shmem.c
+++ b/src/backend/utils/activity/pgstat_shmem.c
@@ -839,7 +839,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.
  */
@@ -927,6 +927,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.
  *
@@ -941,8 +952,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 31a73d83865bad96d0f64313ca16a156d0d65356..afa686d28e5bca24fd39994662e6d5fef70c7ade 100644 (file)
--- a/src/backend/utils/activity/pgstat_xact.c
+++ b/src/backend/utils/activity/pgstat_xact.c
@@ -88,7 +88,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)
@@ -97,7 +97,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++;
                }
 
@@ -164,7 +164,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);
                }
@@ -328,7 +328,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 ec9fa891670cc20b75004eccda8321156015b73d..28bb1aff2dfe19f8f799d2c1a5e735631c078e76 100644 (file)
--- a/src/include/utils/pgstat_internal.h
+++ b/src/include/utils/pgstat_internal.h
@@ -603,8 +603,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);