Do not try to delete keys or log WAL for temporary tables

We forgot to have a check against trying to delete leftover SMGR keys
for temporary tables which is a useless operation sicne they are store
in memory.

Additionally we forgot to prevent WAL from being written when creating
or removing a key in smgrcreate() for temporary tables.

Author: jeltz

contrib/pg_tde/src/access/pg_tde_xlog.c

@@ -62,7 +62,7 @@ tdeheap_rmgr_redo(XLogReaderState *record)
 	{
 		XLogRelKey *xlrec = (XLogRelKey *) XLogRecGetData(record);
 
-		tde_smgr_delete_key_redo(&xlrec->rlocator);
+		tde_smgr_remove_leftover_key_redo(&xlrec->rlocator);
 	}
 	else if (info == XLOG_TDE_ROTATE_PRINCIPAL_KEY)
 	{

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_delete_key_redo(const RelFileLocator *rlocator);
+extern void tde_smgr_remove_leftover_key_redo(const RelFileLocator *rlocator);
 extern bool tde_smgr_rel_is_encrypted(SMgrRelation reln);
 
 #endif							/* PG_TDE_SMGR_H */

contrib/pg_tde/src/smgr/pg_tde_smgr.c

@@ -70,6 +70,26 @@ static bool tde_smgr_has_temp_key(const RelFileLocator *rel);
 static void tde_smgr_remove_temp_key(const RelFileLocator *rel);
 static void CalcBlockIv(ForkNumber forknum, BlockNumber bn, const unsigned char *base_iv, unsigned char *iv);
 
+static void
+tde_smgr_log_create_key(const RelFileLocator *rlocator)
+{
+	XLogRelKey	xlrec = {.rlocator = *rlocator};
+
+	XLogBeginInsert();
+	XLogRegisterData((char *) &xlrec, sizeof(xlrec));
+	XLogInsert(RM_TDERMGR_ID, XLOG_TDE_ADD_RELATION_KEY);
+}
+
+static void
+tde_smgr_log_remove_leftover_key(const RelFileLocator *rlocator)
+{
+	XLogRelKey	xlrec = {.rlocator = *rlocator};
+
+	XLogBeginInsert();
+	XLogRegisterData((char *) &xlrec, sizeof(xlrec));
+	XLogInsert(RM_TDERMGR_ID, XLOG_TDE_DELETE_RELATION_KEY);
+}
+
 static InternalKey *
 tde_smgr_create_key(const RelFileLocatorBackend *smgr_rlocator)
 {
@@ -80,23 +100,14 @@ tde_smgr_create_key(const RelFileLocatorBackend *smgr_rlocator)
 	if (RelFileLocatorBackendIsTemp(*smgr_rlocator))
 		tde_smgr_save_temp_key(&smgr_rlocator->locator, key);
 	else
+	{
 		pg_tde_save_smgr_key(smgr_rlocator->locator, key);
+		tde_smgr_log_create_key(&smgr_rlocator->locator);
+	}
 
 	return key;
 }
 
-static void
-tde_smgr_log_create_key(const RelFileLocatorBackend *smgr_rlocator)
-{
-	XLogRelKey	xlrec = {
-		.rlocator = smgr_rlocator->locator,
-	};
-
-	XLogBeginInsert();
-	XLogRegisterData((char *) &xlrec, sizeof(xlrec));
-	XLogInsert(RM_TDERMGR_ID, XLOG_TDE_ADD_RELATION_KEY);
-}
-
 void
 tde_smgr_create_key_redo(const RelFileLocator *rlocator)
 {
@@ -111,21 +122,25 @@ tde_smgr_create_key_redo(const RelFileLocator *rlocator)
 }
 
 static void
-tde_smgr_delete_key(const RelFileLocatorBackend *smgr_rlocator)
+tde_smgr_remove_key(const RelFileLocatorBackend *smgr_rlocator)
 {
-	XLogRelKey	xlrec = {
-		.rlocator = smgr_rlocator->locator,
-	};
-
-	pg_tde_free_key_map_entry(smgr_rlocator->locator);
+	if (RelFileLocatorBackendIsTemp(*smgr_rlocator))
+		tde_smgr_remove_temp_key(&smgr_rlocator->locator);
+	else
+		pg_tde_free_key_map_entry(smgr_rlocator->locator);
+}
 
-	XLogBeginInsert();
-	XLogRegisterData((char *) &xlrec, sizeof(xlrec));
-	XLogInsert(RM_TDERMGR_ID, XLOG_TDE_DELETE_RELATION_KEY);
+static void
+tde_smgr_remove_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);
+	}
 }
 
 void
-tde_smgr_delete_key_redo(const RelFileLocator *rlocator)
+tde_smgr_remove_leftover_key_redo(const RelFileLocator *rlocator)
 {
 	pg_tde_free_key_map_entry(*rlocator);
 }
@@ -148,15 +163,6 @@ tde_smgr_get_key(const RelFileLocatorBackend *smgr_rlocator)
 		return pg_tde_get_smgr_key(smgr_rlocator->locator);
 }
 
-static void
-tde_smgr_remove_key(const RelFileLocatorBackend *smgr_rlocator)
-{
-	if (RelFileLocatorBackendIsTemp(*smgr_rlocator))
-		tde_smgr_remove_temp_key(&smgr_rlocator->locator);
-	else
-		pg_tde_free_key_map_entry(smgr_rlocator->locator);
-}
-
 static bool
 tde_smgr_should_encrypt(const RelFileLocatorBackend *smgr_rlocator, RelFileLocator *old_locator)
 {
@@ -384,7 +390,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_delete_key(&reln->smgr_rlocator);
+	tde_smgr_remove_leftover_key(&reln->smgr_rlocator);
 
 	if (!tde_smgr_should_encrypt(&reln->smgr_rlocator, &relold))
 	{
@@ -393,7 +399,6 @@ tde_mdcreate(RelFileLocator relold, SMgrRelation reln, ForkNumber forknum, bool
 	}
 
 	key = tde_smgr_create_key(&reln->smgr_rlocator);
-	tde_smgr_log_create_key(&reln->smgr_rlocator);
 
 	tdereln->encryption_status = RELATION_KEY_AVAILABLE;
 	tdereln->relKey = *key;