Renamed master key to principal key #228
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dutow
force-pushed
the
masterrename
branch
2 times, most recently
from
dd15e3b
to
6ee4ea4
Compare
This commit contains lots of changes, but it's just a repeated execution of find <...> -exec sed <...>, so everything should work as before.
dAdAbird
requested changes
Jun 26, 2024
There was a problem hiding this comment.
I made a couple of comments marking not renamed entities. But there are quite a bit of them.
I think patterns MasterKey and masterKey were omitted.
Plus there is a variable mastere_key_info (a misspelling and a snake case) in load_latest_versioned_key_name() (src/catalog/tde_principal_key.c)
src/access/pg_tde_tdemap.c
Outdated
| @@ -63,7 +63,7 @@ | |||
| typedef struct TDEFileHeader | |||
| { | |||
| int32 file_version; | |||
| TDEMasterKeyInfo master_key_info; | |||
| TDEMasterKeyInfo principal_key_info; | |||
There was a problem hiding this comment.
It makes sense to rename the type as well
src/access/pg_tde_tdemap.c
Outdated
| XLogRelKey xlrec; | ||
|
|
||
| master_key = GetMasterKey(newrlocator->dbOid, newrlocator->spcOid, NULL); | ||
| if (master_key == NULL) | ||
| principal_key = GetMasterKey(newrlocator->dbOid, newrlocator->spcOid, NULL); |
src/access/pg_tde_tdemap.c
Outdated
| @@ -260,12 +260,12 @@ tde_encrypt_rel_key(TDEMasterKey *master_key, RelKeyData *rel_key_data, const Re | |||
| * Decrypts a given key and returns the decrypted one. | |||
| */ | |||
| RelKeyData * | |||
| tde_decrypt_rel_key(TDEMasterKey *master_key, RelKeyData *enc_rel_key_data, const RelFileLocator *rlocator) | |||
| tde_decrypt_rel_key(TDEMasterKey *principal_key, RelKeyData *enc_rel_key_data, const RelFileLocator *rlocator) | |||
src/catalog/tde_global_catalog.c
Outdated
| @@ -215,7 +215,7 @@ init_gl_catalog_keys(void) | |||
| } | |||
|
|
|||
| static TDEMasterKey * | |||
| create_master_key(const char *key_name, GenericKeyring * keyring, | |||
| create_principal_key(const char *key_name, GenericKeyring * keyring, | |||
| Oid dbOid, Oid spcOid, bool ensure_new_key) | |||
| { | |||
| TDEMasterKey *masterKey; | |||
There was a problem hiding this comment.
The variable name (along with the type)
src/catalog/tde_principal_key.c
Outdated
| /* parameter for the master key info shared hash */ | ||
| static dshash_parameters master_key_dsh_params = { | ||
| /* parameter for the principal key info shared hash */ | ||
| static dshash_parameters principal_key_dsh_params = { | ||
| sizeof(Oid), | ||
| sizeof(TDEMasterKey), | ||
| dshash_memcmp, /* TODO use int compare instead */ | ||
| dshash_memhash}; | ||
|
|
||
| TdeMasterKeylocalState masterKeyLocalState; |
|
@dAdAbird yes, I only searched for master.key, not [mM]aster[k]Key. Fixed now. |
dAdAbird
requested changes
Jun 26, 2024
src/access/pg_tde_tdemap.c
Outdated
| @@ -1021,12 +1021,12 @@ pg_tde_get_key_from_file(const RelFileLocator *rlocator, GenericKeyring *keyring | |||
| LWLockAcquire(lock_files, LW_SHARED); | |||
|
|
|||
| /* Get/generate a master, create the key for relation and get the encrypted key with bytes to write */ | |||
There was a problem hiding this comment.
Suggested change
| /* Get/generate a master, create the key for relation and get the encrypted key with bytes to write */ | |
| /* Get/generate a principal key, create the key for relation and get the encrypted key with bytes to write */ |
src/catalog/tde_principal_key.c
Outdated
| * If ensure_new_key is true, then we will keep on incrementing the version number | ||
| * till we get a key name that is not present in the keyring | ||
| */ | ||
| keyInfo * | ||
| load_latest_versioned_key_name(TDEMasterKeyInfo *mastere_key_info, GenericKeyring *keyring, bool ensure_new_key) | ||
| load_latest_versioned_key_name(TDEPrincipalKeyInfo *mastere_key_info, GenericKeyring *keyring, bool ensure_new_key) |
There was a problem hiding this comment.
mastere_key_info here and all over the func body + in the function prototype, in src/include/catalog/tde_principal_key.h
dAdAbird
approved these changes
Jun 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit contains lots of changes, but it's just a repeated
execution of find <...> -exec sed <...>, so everything should
work as before.
Note: PR also contains changes from the SMGR branch merge, as it is based on that, please only check the latest commit: 9c08d95