From 71113edfe4e9571e2bf0fe59554913331560754d Mon Sep 17 00:00:00 2001 From: Dmitrii Dolgov <9erthalion6@gmail.com> Date: Sun, 16 Nov 2025 17:30:59 +0100 Subject: [PATCH v4 2/3] Add core versions to pg_system_versions Populate pg_system_versions with a set of core versions: host system architecture, ICU version, glibc version, PostgreSQL itself and compiler which was used to build everything. Register the core versions at the backend startup. select * from pg_system_versions; name | version | type ----------+--------------+-------------- Arch | x86_64-linux | Compile Time ICU | 15.1 | Run Time Core | 18devel | Compile Time Compiler | gcc-14.0.1 | Compile Time Glibc | 2.40 | Run Time --- configure | 12 +++++ configure.ac | 4 ++ meson.build | 4 ++ src/backend/tcop/postgres.c | 12 +++++ src/backend/utils/misc/system_version.c | 59 +++++++++++++++++++++++++ src/include/pg_config.h.in | 4 ++ src/include/utils/system_version.h | 12 +++++ src/test/regress/expected/sysviews.out | 9 ++++ src/test/regress/sql/sysviews.sql | 5 +++ 9 files changed, 121 insertions(+) diff --git a/configure b/configure index 3a0ed11fa8e..f7d5f695679 100755 --- a/configure +++ b/configure @@ -19293,6 +19293,18 @@ else fi +cat >>confdefs.h <<_ACEOF +#define PG_CC_STR "$cc_string" +_ACEOF + + + +cat >>confdefs.h <<_ACEOF +#define PG_ARCH_STR "$host" +_ACEOF + + + cat >>confdefs.h <<_ACEOF #define PG_VERSION_STR "PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit" _ACEOF diff --git a/configure.ac b/configure.ac index c2413720a18..9f7f7f75535 100644 --- a/configure.ac +++ b/configure.ac @@ -2448,6 +2448,10 @@ else cc_string=$CC fi +AC_DEFINE_UNQUOTED(PG_CC_STR, ["$cc_string"], [C compiler version]) + +AC_DEFINE_UNQUOTED(PG_ARCH_STR, ["$host"], [Platform]) + AC_DEFINE_UNQUOTED(PG_VERSION_STR, ["PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"], [A string containing the version number, platform, and C compiler]) diff --git a/meson.build b/meson.build index c1e17aa3040..2265eaafb48 100644 --- a/meson.build +++ b/meson.build @@ -2972,6 +2972,10 @@ cdata.set('USE_@0@_SEMAPHORES'.format(sema_kind.to_upper()), 1) cdata.set('MEMSET_LOOP_LIMIT', memset_loop_limit) cdata.set_quoted('DLSUFFIX', dlsuffix) +cdata.set_quoted('PG_CC_STR', '@0@-@1@'.format(cc.get_id(), cc.version())) + +cdata.set_quoted('PG_ARCH_STR', '@0@-@1@'.format( + host_machine.cpu_family(), host_system)) # built later than the rest of the version metadata, we need SIZEOF_VOID_P cdata.set_quoted('PG_VERSION_STR', diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 7dd75a490aa..3a8ff419425 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -81,6 +81,7 @@ #include "utils/timeout.h" #include "utils/timestamp.h" #include "utils/varlena.h" +#include "utils/system_version.h" /* ---------------- * global variables @@ -186,6 +187,7 @@ static void drop_unnamed_stmt(void); static void log_disconnections(int code, Datum arg); static void enable_statement_timeout(void); static void disable_statement_timeout(void); +static void register_system_versions(void); /* ---------------------------------------------------------------- @@ -4318,6 +4320,9 @@ PostgresMain(const char *dbname, const char *username) */ BeginReportingGUCOptions(); + /* Prepare information for reporting versions and libraries. */ + register_system_versions(); + /* * Also set up handler to log session end; we have to wait till now to be * sure Log_disconnections has its final value. @@ -5237,3 +5242,10 @@ disable_statement_timeout(void) if (get_timeout_active(STATEMENT_TIMEOUT)) disable_timeout(STATEMENT_TIMEOUT, false); } + +static void +register_system_versions() +{ + /* Set up reporting of core versions. */ + register_core_versions(); +} diff --git a/src/backend/utils/misc/system_version.c b/src/backend/utils/misc/system_version.c index 4d15ce58bf9..6d86b90d79c 100644 --- a/src/backend/utils/misc/system_version.c +++ b/src/backend/utils/misc/system_version.c @@ -65,6 +65,65 @@ add_system_version(const char *name, SystemVersionCB cb, VersionType type) hentry->type = type; } +/* + * Register versions that describe core components and do not correspond to any + * individual component. + */ +void +register_core_versions() +{ + add_system_version("Core", core_get_version, CompileTime); + add_system_version("Arch", core_get_arch, CompileTime); + add_system_version("Compiler", core_get_compiler, CompileTime); + add_system_version("ICU", icu_get_version, RunTime); + add_system_version("Glibc", glibc_get_version, RunTime); +} + +const char * +core_get_version(bool *available) +{ + *available = true; + return (const char *) psprintf("%s", PG_VERSION); +} + +const char * +core_get_arch(bool *available) +{ + *available = true; + return (const char *) psprintf("%s", PG_ARCH_STR); +} + +const char * +core_get_compiler(bool *available) +{ + *available = true; + return (const char *) psprintf("%s", PG_CC_STR); +} + +const char * +icu_get_version(bool *available) +{ +#ifdef USE_ICU + UVersionInfo UCDVersion; + char *version = palloc0(U_MAX_VERSION_STRING_LENGTH); + + *available = true; + u_getUnicodeVersion(UCDVersion); + u_versionToString(UCDVersion, version); + return (const char *) version; +#else + *available = false; + return (const char *) ""; +#endif +} + +const char * +glibc_get_version(bool *available) +{ + *available = true; + return (const char *) gnu_get_libc_version(); +} + /* * pg_get_system_versions * diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index b0b0cfdaf79..dacf496ce71 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -621,6 +621,10 @@ /* PostgreSQL version as a number */ #undef PG_VERSION_NUM +#undef PG_CC_STR + +#undef PG_ARCH_STR + /* A string containing the version number, platform, and C compiler */ #undef PG_VERSION_STR diff --git a/src/include/utils/system_version.h b/src/include/utils/system_version.h index 18cb673d4ca..f9680527d55 100644 --- a/src/include/utils/system_version.h +++ b/src/include/utils/system_version.h @@ -11,6 +11,10 @@ #ifndef SYSTEM_VERSION_H #define SYSTEM_VERSION_H +#ifdef __GLIBC__ +#include +#endif + #define MAX_SYSTEM_VERSIONS 100 typedef enum VersionType @@ -34,5 +38,13 @@ typedef struct SystemVersion } SystemVersion; void add_system_version(const char *name, SystemVersionCB cb, VersionType type); +extern void register_core_versions(void); + +const char *core_get_version(bool *available); +const char *core_get_arch(bool *available); +const char *core_get_compiler(bool *available); + +const char *icu_get_version(bool *available); +const char *glibc_get_version(bool *available); #endif /* SYSTEM_VERSION_H */ diff --git a/src/test/regress/expected/sysviews.out b/src/test/regress/expected/sysviews.out index 3b37fafa65b..c813ef10eb5 100644 --- a/src/test/regress/expected/sysviews.out +++ b/src/test/regress/expected/sysviews.out @@ -233,3 +233,12 @@ select * from pg_timezone_abbrevs where abbrev = 'LMT'; LMT | @ 7 hours 52 mins 58 secs ago | f (1 row) +-- 5 core versions should be present: architecture, ICU, core, compiler and +-- glibc. If built with JIT support, one more record will be displayed +-- containing LLVM version. +select count(*) >= 5 as ok FROM pg_system_versions; + ok +---- + t +(1 row) + diff --git a/src/test/regress/sql/sysviews.sql b/src/test/regress/sql/sysviews.sql index 66179f026b3..798a6dddd57 100644 --- a/src/test/regress/sql/sysviews.sql +++ b/src/test/regress/sql/sysviews.sql @@ -101,3 +101,8 @@ select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs; -- One specific case we can check without much fear of breakage -- is the historical local-mean-time value used for America/Los_Angeles. select * from pg_timezone_abbrevs where abbrev = 'LMT'; + +-- 5 core versions should be present: architecture, ICU, core, compiler and +-- glibc. If built with JIT support, one more record will be displayed +-- containing LLVM version. +select count(*) >= 5 as ok FROM pg_system_versions; -- 2.49.0