From 26ec59d8f0363447f8e46b036d36b8065876df00 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Thu, 12 Jun 2025 14:00:58 +0200 Subject: [PATCH] Remove handling of frontend from pg_tde_guc.{c,h} code Since we do not build the GUC code when building the frontend code the code which handles the frontend define is pointless here. --- contrib/pg_tde/src/catalog/tde_principal_key.c | 2 +- contrib/pg_tde/src/include/pg_tde_guc.h | 3 --- contrib/pg_tde/src/pg_tde_guc.c | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/contrib/pg_tde/src/catalog/tde_principal_key.c b/contrib/pg_tde/src/catalog/tde_principal_key.c index 2ad5b1f4c779f..1d4b03274a692 100644 --- a/contrib/pg_tde/src/catalog/tde_principal_key.c +++ b/contrib/pg_tde/src/catalog/tde_principal_key.c @@ -27,7 +27,6 @@ #include "catalog/tde_principal_key.h" #include "keyring/keyring_api.h" #include "pg_tde.h" -#include "pg_tde_guc.h" #ifndef FRONTEND #include "access/genam.h" @@ -38,6 +37,7 @@ #include "lib/dshash.h" #include "storage/lwlock.h" #include "storage/shmem.h" +#include "pg_tde_guc.h" #else #include "pg_tde_fe.h" #endif diff --git a/contrib/pg_tde/src/include/pg_tde_guc.h b/contrib/pg_tde/src/include/pg_tde_guc.h index a48d0fd6f0294..c4ce064402d6d 100644 --- a/contrib/pg_tde/src/include/pg_tde_guc.h +++ b/contrib/pg_tde/src/include/pg_tde_guc.h @@ -7,13 +7,10 @@ #include "c.h" -#ifndef FRONTEND - extern bool AllowInheritGlobalProviders; extern bool EncryptXLog; extern bool EnforceEncryption; extern void TdeGucInit(void); -#endif #endif /* TDE_GUC_H */ diff --git a/contrib/pg_tde/src/pg_tde_guc.c b/contrib/pg_tde/src/pg_tde_guc.c index fe724d1c91595..912385cc0df75 100644 --- a/contrib/pg_tde/src/pg_tde_guc.c +++ b/contrib/pg_tde/src/pg_tde_guc.c @@ -8,8 +8,6 @@ #include "pg_tde_guc.h" -#ifndef FRONTEND - bool AllowInheritGlobalProviders = true; bool EncryptXLog = false; bool EnforceEncryption = false; @@ -54,5 +52,3 @@ TdeGucInit(void) ); } - -#endif