Consistently use create/delete for keys

jeltz · jeltz · commit 13b191a6367d · 2025-08-11T16:27:05.000+02:00
We used a mix of create, add, delete and remove. We still use free and
save in pg_tde_tdemap.c but that is soemthing we can fix later.
diff --git a/contrib/pg_tde/src/access/pg_tde_tdemap.c b/contrib/pg_tde/src/access/pg_tde_tdemap.c
@@ -195,7 +195,7 @@ pg_tde_save_principal_key(const TDEPrincipalKey *principal_key, bool write_xlog)
 	{
 		XLogBeginInsert();
 		XLogRegisterData((char *) &signed_key_Info, sizeof(TDESignedPrincipalKeyInfo));
-		XLogInsert(RM_TDERMGR_ID, XLOG_TDE_ADD_PRINCIPAL_KEY);
+		XLogInsert(RM_TDERMGR_ID, XLOG_TDE_CREATE_PRINCIPAL_KEY);
 	}
 
 	map_fd = pg_tde_open_file_write(db_map_path, &signed_key_Info, true, &curr_pos);
diff --git a/contrib/pg_tde/src/access/pg_tde_xlog.c b/contrib/pg_tde/src/access/pg_tde_xlog.c
@@ -43,13 +43,13 @@ tdeheap_rmgr_redo(XLogReaderState *record)
 {
 	uint8		info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
 
-	if (info == XLOG_TDE_ADD_RELATION_KEY)
+	if (info == XLOG_TDE_CREATE_RELATION_KEY)
 	{
 		XLogRelKey *xlrec = (XLogRelKey *) XLogRecGetData(record);
 
 		tde_smgr_create_key_redo(&xlrec->rlocator);
 	}
-	else if (info == XLOG_TDE_ADD_PRINCIPAL_KEY)
+	else if (info == XLOG_TDE_CREATE_PRINCIPAL_KEY)
 	{
 		TDESignedPrincipalKeyInfo *mkey = (TDESignedPrincipalKeyInfo *) XLogRecGetData(record);
 
@@ -62,7 +62,7 @@ tdeheap_rmgr_redo(XLogReaderState *record)
 	{
 		XLogRelKey *xlrec = (XLogRelKey *) XLogRecGetData(record);
 
-		tde_smgr_remove_leftover_key_redo(&xlrec->rlocator);
+		tde_smgr_delete_leftover_key_redo(&xlrec->rlocator);
 	}
 	else if (info == XLOG_TDE_ROTATE_PRINCIPAL_KEY)
 	{
@@ -99,13 +99,13 @@ tdeheap_rmgr_desc(StringInfo buf, XLogReaderState *record)
 {
 	uint8		info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
 
-	if (info == XLOG_TDE_ADD_RELATION_KEY)
+	if (info == XLOG_TDE_CREATE_RELATION_KEY)
 	{
 		XLogRelKey *xlrec = (XLogRelKey *) XLogRecGetData(record);
 
 		appendStringInfo(buf, "rel: %u/%u/%u", xlrec->rlocator.spcOid, xlrec->rlocator.dbOid, xlrec->rlocator.relNumber);
 	}
-	else if (info == XLOG_TDE_ADD_PRINCIPAL_KEY)
+	else if (info == XLOG_TDE_CREATE_PRINCIPAL_KEY)
 	{
 		TDEPrincipalKeyInfo *xlrec = (TDEPrincipalKeyInfo *) XLogRecGetData(record);
 
@@ -148,10 +148,10 @@ tdeheap_rmgr_identify(uint8 info)
 {
 	switch (info & ~XLR_INFO_MASK)
 	{
-		case XLOG_TDE_ADD_RELATION_KEY:
-			return "ADD_RELATION_KEY";
-		case XLOG_TDE_ADD_PRINCIPAL_KEY:
-			return "ADD_PRINCIPAL_KEY";
+		case XLOG_TDE_CREATE_RELATION_KEY:
+			return "CREATE_RELATION_KEY";
+		case XLOG_TDE_CREATE_PRINCIPAL_KEY:
+			return "CREATE_PRINCIPAL_KEY";
 		case XLOG_TDE_ROTATE_PRINCIPAL_KEY:
 			return "ROTATE_PRINCIPAL_KEY";
 		case XLOG_TDE_DELETE_RELATION_KEY:
diff --git a/contrib/pg_tde/src/access/pg_tde_xlog_keys.c b/contrib/pg_tde/src/access/pg_tde_xlog_keys.c
@@ -743,7 +743,7 @@ pg_tde_save_server_key(const TDEPrincipalKey *principal_key, bool write_xlog)
 	{
 		XLogBeginInsert();
 		XLogRegisterData((char *) &signed_key_Info, sizeof(TDESignedPrincipalKeyInfo));
-		XLogInsert(RM_TDERMGR_ID, XLOG_TDE_ADD_PRINCIPAL_KEY);
+		XLogInsert(RM_TDERMGR_ID, XLOG_TDE_CREATE_PRINCIPAL_KEY);
 	}
 
 	fd = pg_tde_open_wal_key_file_write(get_wal_key_file_path(), &signed_key_Info, true, &curr_pos);
diff --git a/contrib/pg_tde/src/include/access/pg_tde_xlog.h b/contrib/pg_tde/src/include/access/pg_tde_xlog.h
@@ -8,8 +8,8 @@
 #ifndef FRONTEND
 
 /* TDE XLOG record types */
-#define XLOG_TDE_ADD_RELATION_KEY		0x00
-#define XLOG_TDE_ADD_PRINCIPAL_KEY		0x10
+#define XLOG_TDE_CREATE_RELATION_KEY	0x00
+#define XLOG_TDE_CREATE_PRINCIPAL_KEY	0x10
 #define XLOG_TDE_ROTATE_PRINCIPAL_KEY	0x20
 #define XLOG_TDE_WRITE_KEY_PROVIDER 	0x30
 #define XLOG_TDE_INSTALL_EXTENSION		0x40
diff --git a/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h b/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h
@@ -6,7 +6,7 @@
 
 extern void RegisterStorageMgr(void);
 extern void tde_smgr_create_key_redo(const RelFileLocator *rlocator);
-extern void tde_smgr_remove_leftover_key_redo(const RelFileLocator *rlocator);
+extern void tde_smgr_delete_leftover_key_redo(const RelFileLocator *rlocator);
 extern bool tde_smgr_rel_is_encrypted(SMgrRelation reln);
 
 #endif							/* PG_TDE_SMGR_H */
diff --git a/contrib/pg_tde/src/smgr/pg_tde_smgr.c b/contrib/pg_tde/src/smgr/pg_tde_smgr.c
@@ -67,7 +67,7 @@ static SMgrId OurSMgrId = MaxSMgrId;
 static void tde_smgr_save_temp_key(const RelFileLocator *newrlocator, const InternalKey *key);
 static InternalKey *tde_smgr_get_temp_key(const RelFileLocator *rel);
 static bool tde_smgr_has_temp_key(const RelFileLocator *rel);
-static void tde_smgr_remove_temp_key(const RelFileLocator *rel);
+static void tde_smgr_delete_temp_key(const RelFileLocator *rel);
 static void CalcBlockIv(ForkNumber forknum, BlockNumber bn, const unsigned char *base_iv, unsigned char *iv);
 
 static void
@@ -77,11 +77,11 @@ tde_smgr_log_create_key(const RelFileLocator *rlocator)
 
 	XLogBeginInsert();
 	XLogRegisterData((char *) &xlrec, sizeof(xlrec));
-	XLogInsert(RM_TDERMGR_ID, XLOG_TDE_ADD_RELATION_KEY);
+	XLogInsert(RM_TDERMGR_ID, XLOG_TDE_CREATE_RELATION_KEY);
 }
 
 static void
-tde_smgr_log_remove_leftover_key(const RelFileLocator *rlocator)
+tde_smgr_log_delete_leftover_key(const RelFileLocator *rlocator)
 {
 	XLogRelKey	xlrec = {.rlocator = *rlocator};
 
@@ -122,26 +122,26 @@ tde_smgr_create_key_redo(const RelFileLocator *rlocator)
 }
 
 static void
-tde_smgr_remove_key(const RelFileLocatorBackend *smgr_rlocator)
+tde_smgr_delete_key(const RelFileLocatorBackend *smgr_rlocator)
 {
 	if (RelFileLocatorBackendIsTemp(*smgr_rlocator))
-		tde_smgr_remove_temp_key(&smgr_rlocator->locator);
+		tde_smgr_delete_temp_key(&smgr_rlocator->locator);
 	else
 		pg_tde_free_key_map_entry(smgr_rlocator->locator);
 }
 
 static void
-tde_smgr_remove_leftover_key(const RelFileLocatorBackend *smgr_rlocator)
+tde_smgr_delete_leftover_key(const RelFileLocatorBackend *smgr_rlocator)
 {
 	if (!RelFileLocatorBackendIsTemp(*smgr_rlocator))
 	{
 		pg_tde_free_key_map_entry(smgr_rlocator->locator);
-		tde_smgr_log_remove_leftover_key(&smgr_rlocator->locator);
+		tde_smgr_log_delete_leftover_key(&smgr_rlocator->locator);
 	}
 }
 
 void
-tde_smgr_remove_leftover_key_redo(const RelFileLocator *rlocator)
+tde_smgr_delete_leftover_key_redo(const RelFileLocator *rlocator)
 {
 	pg_tde_free_key_map_entry(*rlocator);
 }
@@ -271,7 +271,7 @@ tde_mdunlink(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo)
 	if (forknum == MAIN_FORKNUM || forknum == InvalidForkNumber)
 	{
 		if (tde_smgr_is_encrypted(&rlocator))
-			tde_smgr_remove_key(&rlocator);
+			tde_smgr_delete_key(&rlocator);
 	}
 }
 
@@ -391,7 +391,7 @@ tde_mdcreate(RelFileLocator relold, SMgrRelation reln, ForkNumber forknum, bool
 	 * If we're in redo, a separate WAL record will make sure the key is
 	 * removed.
 	 */
-	tde_smgr_remove_leftover_key(&reln->smgr_rlocator);
+	tde_smgr_delete_leftover_key(&reln->smgr_rlocator);
 
 	if (!tde_smgr_should_encrypt(&reln->smgr_rlocator, &relold))
 	{
@@ -514,7 +514,7 @@ tde_smgr_has_temp_key(const RelFileLocator *rel)
 }
 
 static void
-tde_smgr_remove_temp_key(const RelFileLocator *rel)
+tde_smgr_delete_temp_key(const RelFileLocator *rel)
 {
 	Assert(TempRelKeys);
 	hash_search(TempRelKeys, rel, HASH_REMOVE, NULL);

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ pg_tde_save_principal_key(const TDEPrincipalKey *principal_key, bool write_xlog)`
`195`	`195`	`{`
`196`	`196`	`XLogBeginInsert();`
`197`	`197`	`XLogRegisterData((char *) &signed_key_Info, sizeof(TDESignedPrincipalKeyInfo));`
`198`		`- XLogInsert(RM_TDERMGR_ID, XLOG_TDE_ADD_PRINCIPAL_KEY);`
	`198`	`+ XLogInsert(RM_TDERMGR_ID, XLOG_TDE_CREATE_PRINCIPAL_KEY);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`map_fd = pg_tde_open_file_write(db_map_path, &signed_key_Info, true, &curr_pos);`
Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,13 @@ tdeheap_rmgr_redo(XLogReaderState *record)`
`43`	`43`	`{`
`44`	`44`	`uint8 info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;`
`45`	`45`
`46`		`- if (info == XLOG_TDE_ADD_RELATION_KEY)`
	`46`	`+ if (info == XLOG_TDE_CREATE_RELATION_KEY)`
`47`	`47`	`{`
`48`	`48`	`XLogRelKey xlrec = (XLogRelKey ) XLogRecGetData(record);`
`49`	`49`
`50`	`50`	`tde_smgr_create_key_redo(&xlrec->rlocator);`
`51`	`51`	`}`
`52`		`- else if (info == XLOG_TDE_ADD_PRINCIPAL_KEY)`
	`52`	`+ else if (info == XLOG_TDE_CREATE_PRINCIPAL_KEY)`
`53`	`53`	`{`
`54`	`54`	`TDESignedPrincipalKeyInfo mkey = (TDESignedPrincipalKeyInfo ) XLogRecGetData(record);`
`55`	`55`
`@@ -62,7 +62,7 @@ tdeheap_rmgr_redo(XLogReaderState *record)`
`62`	`62`	`{`
`63`	`63`	`XLogRelKey xlrec = (XLogRelKey ) XLogRecGetData(record);`
`64`	`64`
`65`		`- tde_smgr_remove_leftover_key_redo(&xlrec->rlocator);`
	`65`	`+ tde_smgr_delete_leftover_key_redo(&xlrec->rlocator);`
`66`	`66`	`}`
`67`	`67`	`else if (info == XLOG_TDE_ROTATE_PRINCIPAL_KEY)`
`68`	`68`	`{`
`@@ -99,13 +99,13 @@ tdeheap_rmgr_desc(StringInfo buf, XLogReaderState *record)`
`99`	`99`	`{`
`100`	`100`	`uint8 info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;`
`101`	`101`
`102`		`- if (info == XLOG_TDE_ADD_RELATION_KEY)`
	`102`	`+ if (info == XLOG_TDE_CREATE_RELATION_KEY)`
`103`	`103`	`{`
`104`	`104`	`XLogRelKey xlrec = (XLogRelKey ) XLogRecGetData(record);`
`105`	`105`
`106`	`106`	`appendStringInfo(buf, "rel: %u/%u/%u", xlrec->rlocator.spcOid, xlrec->rlocator.dbOid, xlrec->rlocator.relNumber);`
`107`	`107`	`}`
`108`		`- else if (info == XLOG_TDE_ADD_PRINCIPAL_KEY)`
	`108`	`+ else if (info == XLOG_TDE_CREATE_PRINCIPAL_KEY)`
`109`	`109`	`{`
`110`	`110`	`TDEPrincipalKeyInfo xlrec = (TDEPrincipalKeyInfo ) XLogRecGetData(record);`
`111`	`111`
`@@ -148,10 +148,10 @@ tdeheap_rmgr_identify(uint8 info)`
`148`	`148`	`{`
`149`	`149`	`switch (info & ~XLR_INFO_MASK)`
`150`	`150`	`{`
`151`		`- case XLOG_TDE_ADD_RELATION_KEY:`
`152`		`- return "ADD_RELATION_KEY";`
`153`		`- case XLOG_TDE_ADD_PRINCIPAL_KEY:`
`154`		`- return "ADD_PRINCIPAL_KEY";`
	`151`	`+ case XLOG_TDE_CREATE_RELATION_KEY:`
	`152`	`+ return "CREATE_RELATION_KEY";`
	`153`	`+ case XLOG_TDE_CREATE_PRINCIPAL_KEY:`
	`154`	`+ return "CREATE_PRINCIPAL_KEY";`
`155`	`155`	`case XLOG_TDE_ROTATE_PRINCIPAL_KEY:`
`156`	`156`	`return "ROTATE_PRINCIPAL_KEY";`
`157`	`157`	`case XLOG_TDE_DELETE_RELATION_KEY:`
Original file line number	Diff line number	Diff line change
`@@ -743,7 +743,7 @@ pg_tde_save_server_key(const TDEPrincipalKey *principal_key, bool write_xlog)`
`743`	`743`	`{`
`744`	`744`	`XLogBeginInsert();`
`745`	`745`	`XLogRegisterData((char *) &signed_key_Info, sizeof(TDESignedPrincipalKeyInfo));`
`746`		`- XLogInsert(RM_TDERMGR_ID, XLOG_TDE_ADD_PRINCIPAL_KEY);`
	`746`	`+ XLogInsert(RM_TDERMGR_ID, XLOG_TDE_CREATE_PRINCIPAL_KEY);`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`fd = pg_tde_open_wal_key_file_write(get_wal_key_file_path(), &signed_key_Info, true, &curr_pos);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ static SMgrId OurSMgrId = MaxSMgrId;`
`67`	`67`	`static void tde_smgr_save_temp_key(const RelFileLocator newrlocator, const InternalKey key);`
`68`	`68`	`static InternalKey tde_smgr_get_temp_key(const RelFileLocator rel);`
`69`	`69`	`static bool tde_smgr_has_temp_key(const RelFileLocator *rel);`
`70`		`-static void tde_smgr_remove_temp_key(const RelFileLocator *rel);`
	`70`	`+static void tde_smgr_delete_temp_key(const RelFileLocator *rel);`
`71`	`71`	`static void CalcBlockIv(ForkNumber forknum, BlockNumber bn, const unsigned char base_iv, unsigned char iv);`
`72`	`72`
`73`	`73`	`static void`
`@@ -77,11 +77,11 @@ tde_smgr_log_create_key(const RelFileLocator *rlocator)`
`77`	`77`
`78`	`78`	`XLogBeginInsert();`
`79`	`79`	`XLogRegisterData((char *) &xlrec, sizeof(xlrec));`
`80`		`- XLogInsert(RM_TDERMGR_ID, XLOG_TDE_ADD_RELATION_KEY);`
	`80`	`+ XLogInsert(RM_TDERMGR_ID, XLOG_TDE_CREATE_RELATION_KEY);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`static void`
`84`		`-tde_smgr_log_remove_leftover_key(const RelFileLocator *rlocator)`
	`84`	`+tde_smgr_log_delete_leftover_key(const RelFileLocator *rlocator)`
`85`	`85`	`{`
`86`	`86`	`XLogRelKey xlrec = {.rlocator = *rlocator};`
`87`	`87`
`@@ -122,26 +122,26 @@ tde_smgr_create_key_redo(const RelFileLocator *rlocator)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`static void`
`125`		`-tde_smgr_remove_key(const RelFileLocatorBackend *smgr_rlocator)`
	`125`	`+tde_smgr_delete_key(const RelFileLocatorBackend *smgr_rlocator)`
`126`	`126`	`{`
`127`	`127`	`if (RelFileLocatorBackendIsTemp(*smgr_rlocator))`
`128`		`- tde_smgr_remove_temp_key(&smgr_rlocator->locator);`
	`128`	`+ tde_smgr_delete_temp_key(&smgr_rlocator->locator);`
`129`	`129`	`else`
`130`	`130`	`pg_tde_free_key_map_entry(smgr_rlocator->locator);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`static void`
`134`		`-tde_smgr_remove_leftover_key(const RelFileLocatorBackend *smgr_rlocator)`
	`134`	`+tde_smgr_delete_leftover_key(const RelFileLocatorBackend *smgr_rlocator)`
`135`	`135`	`{`
`136`	`136`	`if (!RelFileLocatorBackendIsTemp(*smgr_rlocator))`
`137`	`137`	`{`
`138`	`138`	`pg_tde_free_key_map_entry(smgr_rlocator->locator);`
`139`		`- tde_smgr_log_remove_leftover_key(&smgr_rlocator->locator);`
	`139`	`+ tde_smgr_log_delete_leftover_key(&smgr_rlocator->locator);`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`void`
`144`		`-tde_smgr_remove_leftover_key_redo(const RelFileLocator *rlocator)`
	`144`	`+tde_smgr_delete_leftover_key_redo(const RelFileLocator *rlocator)`
`145`	`145`	`{`
`146`	`146`	`pg_tde_free_key_map_entry(*rlocator);`
`147`	`147`	`}`
`@@ -271,7 +271,7 @@ tde_mdunlink(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo)`
`271`	`271`	`if (forknum == MAIN_FORKNUM \|\| forknum == InvalidForkNumber)`
`272`	`272`	`{`
`273`	`273`	`if (tde_smgr_is_encrypted(&rlocator))`
`274`		`- tde_smgr_remove_key(&rlocator);`
	`274`	`+ tde_smgr_delete_key(&rlocator);`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`
`@@ -391,7 +391,7 @@ tde_mdcreate(RelFileLocator relold, SMgrRelation reln, ForkNumber forknum, bool`
`391`	`391`	`* If we're in redo, a separate WAL record will make sure the key is`
`392`	`392`	`* removed.`
`393`	`393`	`*/`
`394`		`- tde_smgr_remove_leftover_key(&reln->smgr_rlocator);`
	`394`	`+ tde_smgr_delete_leftover_key(&reln->smgr_rlocator);`
`395`	`395`
`396`	`396`	`if (!tde_smgr_should_encrypt(&reln->smgr_rlocator, &relold))`
`397`	`397`	`{`
`@@ -514,7 +514,7 @@ tde_smgr_has_temp_key(const RelFileLocator *rel)`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`static void`
`517`		`-tde_smgr_remove_temp_key(const RelFileLocator *rel)`
	`517`	`+tde_smgr_delete_temp_key(const RelFileLocator *rel)`
`518`	`518`	`{`
`519`	`519`	`Assert(TempRelKeys);`
`520`	`520`	`hash_search(TempRelKeys, rel, HASH_REMOVE, NULL);`