WIP: Do not log key deletion separately for encrypted tables

Author: jeltz

contrib/pg_tde/src/smgr/pg_tde_smgr.c

@@ -102,23 +102,20 @@ tde_smgr_create_key_redo(const RelFileLocator *rlocator)
 {
 	InternalKey key;
 
-	if (pg_tde_has_smgr_key(*rlocator))
-		return;
+	pg_tde_free_key_map_entry(*rlocator);
 
 	pg_tde_generate_internal_key(&key, TDE_KEY_TYPE_SMGR);
 
 	pg_tde_save_smgr_key(*rlocator, &key);
 }
 
 static void
-tde_smgr_delete_key(const RelFileLocatorBackend *smgr_rlocator)
+tde_smgr_log_delete_key(const RelFileLocatorBackend *smgr_rlocator)
 {
 	XLogRelKey	xlrec = {
 		.rlocator = smgr_rlocator->locator,
 	};
 
-	pg_tde_free_key_map_entry(smgr_rlocator->locator);
-
 	XLogBeginInsert();
 	XLogRegisterData((char *) &xlrec, sizeof(xlrec));
 	XLogInsert(RM_TDERMGR_ID, XLOG_TDE_DELETE_RELATION_KEY);
@@ -380,15 +377,15 @@ tde_mdcreate(RelFileLocator relold, SMgrRelation reln, ForkNumber forknum, bool
 	 * If we have a key for this relation already, we need to remove it. This
 	 * can happen if OID is re-used after a crash left a key for a
 	 * non-existing relation in the key file.
-	 *
-	 * If we're in redo, a separate WAL record will make sure the key is
-	 * removed.
 	 */
 	if (!RelFileLocatorBackendIsTemp(reln->smgr_rlocator))
-		tde_smgr_delete_key(&reln->smgr_rlocator);
+		pg_tde_free_key_map_entry(reln->smgr_rlocator.locator);
 
 	if (!tde_smgr_should_encrypt(&reln->smgr_rlocator, &relold))
 	{
+		if (!RelFileLocatorBackendIsTemp(reln->smgr_rlocator))
+			tde_smgr_log_delete_key(&reln->smgr_rlocator);
+
 		tdereln->encryption_status = RELATION_NOT_ENCRYPTED;
 		return;
 	}