PG-829 Remove noop wrapper function

Now that updating of keys is remove -create_principal_key_info() is
essentially a noop so should be removed to simplify the code.
pull/209/head
Andreas Karlsson 6 months ago committed by Andreas Karlsson
parent 2ca6e7a87d
commit e4856edf5c
  1. 4
      contrib/pg_tde/src/access/pg_tde_tdemap.c
  2. 2
      contrib/pg_tde/src/access/pg_tde_xlog.c
  3. 12
      contrib/pg_tde/src/catalog/tde_principal_key.c
  4. 2
      contrib/pg_tde/src/include/access/pg_tde_tdemap.h
  5. 1
      contrib/pg_tde/src/include/catalog/tde_principal_key.h

@ -317,7 +317,7 @@ pg_tde_delete_tde_files(Oid dbOid)
*
* The caller must have an EXCLUSIVE LOCK on the files before calling this function.
*/
bool
void
pg_tde_save_principal_key(TDEPrincipalKeyInfo *principal_key_info)
{
int map_fd = -1;
@ -341,8 +341,6 @@ pg_tde_save_principal_key(TDEPrincipalKeyInfo *principal_key_info)
/* Closing files. */
close(map_fd);
close(keydata_fd);
return (is_new_map && is_new_key_data);
}
/*

@ -66,7 +66,7 @@ tdeheap_rmgr_redo(XLogReaderState *record)
TDEPrincipalKeyInfo *mkey = (TDEPrincipalKeyInfo *) XLogRecGetData(record);
LWLockAcquire(tde_lwlock_enc_keys(), LW_EXCLUSIVE);
create_principal_key_info(mkey);
pg_tde_save_principal_key(mkey);
LWLockRelease(tde_lwlock_enc_keys());
}
else if (info == XLOG_TDE_EXTENSION_INSTALL_KEY)

@ -252,14 +252,6 @@ shared_memory_shutdown(int code, Datum arg)
principalKeyLocalState.sharedPrincipalKeyState = NULL;
}
bool
create_principal_key_info(TDEPrincipalKeyInfo *principal_key_info)
{
Assert(principal_key_info != NULL);
return pg_tde_save_principal_key(principal_key_info);
}
bool
set_principal_key_with_keyring(const char *key_name, const char *provider_name,
Oid providerOid, Oid dbOid, bool ensure_new_key)
@ -347,7 +339,7 @@ set_principal_key_with_keyring(const char *key_name, const char *provider_name,
if (!already_has_key)
{
/* First key created for the database */
create_principal_key_info(&new_principal_key->keyInfo);
pg_tde_save_principal_key(&new_principal_key->keyInfo);
/* XLog the new key */
XLogBeginInsert();
@ -847,7 +839,7 @@ GetPrincipalKey(Oid dbOid, LWLockMode lockMode)
*newPrincipalKey = *principalKey;
newPrincipalKey->keyInfo.databaseId = dbOid;
create_principal_key_info(&newPrincipalKey->keyInfo);
pg_tde_save_principal_key(&newPrincipalKey->keyInfo);
/* XLog the new use of the default key */
XLogBeginInsert();

@ -100,7 +100,7 @@ extern InternalKey *GetSMGRRelationKey(RelFileLocatorBackend rel);
extern void pg_tde_delete_tde_files(Oid dbOid);
extern TDEPrincipalKeyInfo *pg_tde_get_principal_key_info(Oid dbOid);
extern bool pg_tde_save_principal_key(TDEPrincipalKeyInfo *principal_key_info);
extern void pg_tde_save_principal_key(TDEPrincipalKeyInfo *principal_key_info);
extern bool pg_tde_perform_rotate_key(TDEPrincipalKey *principal_key, TDEPrincipalKey *new_principal_key);
extern bool pg_tde_write_map_keydata_files(off_t map_size, char *m_file_data, off_t keydata_size, char *k_file_data);

@ -56,7 +56,6 @@ extern TDEPrincipalKey *GetPrincipalKey(Oid dbOid, void *lockMode);
extern TDEPrincipalKey *GetPrincipalKeyNoDefault(Oid dbOid, void *lockMode);
#endif
extern bool create_principal_key_info(TDEPrincipalKeyInfo *principalKeyInfo);
extern bool xl_tde_perform_rotate_key(XLogPrincipalKeyRotate *xlrec);
extern TDEPrincipalKey *get_principal_key_from_keyring(Oid dbOid);

Loading…
Cancel
Save