From 7f97b4734f937db6f8dab1bbf8bbaab349e6c9b1 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 23 Dec 2024 14:46:49 +0900 Subject: [PATCH] Fix some comments related to library unloading Library unloading has never been supported with its code removed in ab02d702ef08, and there were some comments still mentioning that it was a possible operation. ChangAo has noticed the incorrect references in dfmgr.c, while I have noticed the other ones while scanning the rest of the tree for similar mistakes. Author: ChangAo Chen, Michael Paquier Reviewed-by: Tom Lane Discussion: https://postgr.es/m/tencent_1D09840A1632D406A610C8C4E2491D74DB0A@qq.com --- contrib/auto_explain/auto_explain.c | 2 +- contrib/passwordcheck/passwordcheck.c | 2 +- contrib/pg_stat_statements/pg_stat_statements.c | 2 +- contrib/sepgsql/hooks.c | 2 +- src/backend/utils/fmgr/dfmgr.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/auto_explain/auto_explain.c b/contrib/auto_explain/auto_explain.c index f2eaa8e494..4d87ea808e 100644 --- a/contrib/auto_explain/auto_explain.c +++ b/contrib/auto_explain/auto_explain.c @@ -70,7 +70,7 @@ static bool current_query_sampled = false; (nesting_level == 0 || auto_explain_log_nested_statements) && \ current_query_sampled) -/* Saved hook values in case of unload */ +/* Saved hook values */ static ExecutorStart_hook_type prev_ExecutorStart = NULL; static ExecutorRun_hook_type prev_ExecutorRun = NULL; static ExecutorFinish_hook_type prev_ExecutorFinish = NULL; diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c index 0785618f2a..b5d95b558e 100644 --- a/contrib/passwordcheck/passwordcheck.c +++ b/contrib/passwordcheck/passwordcheck.c @@ -26,7 +26,7 @@ PG_MODULE_MAGIC; -/* Saved hook value in case of unload */ +/* Saved hook value */ static check_password_hook_type prev_check_password_hook = NULL; /* passwords shorter than this will be rejected */ diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 602cae54ff..7b3dd137b8 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -256,7 +256,7 @@ typedef struct pgssSharedState /* Current nesting depth of planner/ExecutorRun/ProcessUtility calls */ static int nesting_level = 0; -/* Saved hook values in case of unload */ +/* Saved hook values */ static shmem_request_hook_type prev_shmem_request_hook = NULL; static shmem_startup_hook_type prev_shmem_startup_hook = NULL; static post_parse_analyze_hook_type prev_post_parse_analyze_hook = NULL; diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c index 0f206b1093..edf5206aa8 100644 --- a/contrib/sepgsql/hooks.c +++ b/contrib/sepgsql/hooks.c @@ -394,7 +394,7 @@ sepgsql_utility_command(PlannedStmt *pstmt, } /* - * Module load/unload callback + * Module load callback */ void _PG_init(void) diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 8e81ecc749..8b7807472f 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -125,7 +125,7 @@ load_external_function(const char *filename, const char *funcname, /* * This function loads a shlib file without looking up any particular * function in it. If the same shlib has previously been loaded, - * unload and reload it. + * we do not load it again. * * When 'restricted' is true, only libraries in the presumed-secure * directory $libdir/plugins may be referenced. @@ -142,7 +142,7 @@ load_file(const char *filename, bool restricted) /* Expand the possibly-abbreviated filename to an exact path name */ fullname = expand_dynamic_library_name(filename); - /* Load the shared library */ + /* Load the shared library, unless we already did */ (void) internal_load_library(fullname); pfree(fullname); -- 2.30.2