Rename KeyringProviderXLRecord

The new name, KeyringProviderRecordInFile, describes what it is rather
than what it's used for. But the real reason is that I want to use it
for other things than the WAL in future commits.

Author: AndersAstrand

contrib/pg_tde/src/access/pg_tde_xlog.c

@@ -68,7 +68,7 @@ tdeheap_rmgr_redo(XLogReaderState *record)
 	}
 	else if (info == XLOG_TDE_WRITE_KEY_PROVIDER)
 	{
-		KeyringProviderXLRecord *xlrec = (KeyringProviderXLRecord *) XLogRecGetData(record);
+		KeyringProviderRecordInFile *xlrec = (KeyringProviderRecordInFile *) XLogRecGetData(record);
 
 		redo_key_provider_info(xlrec);
 	}
@@ -109,7 +109,7 @@ tdeheap_rmgr_desc(StringInfo buf, XLogReaderState *record)
 	}
 	else if (info == XLOG_TDE_WRITE_KEY_PROVIDER)
 	{
-		KeyringProviderXLRecord *xlrec = (KeyringProviderXLRecord *) XLogRecGetData(record);
+		KeyringProviderRecordInFile *xlrec = (KeyringProviderRecordInFile *) XLogRecGetData(record);
 
 		appendStringInfo(buf, "db: %u, provider id: %d", xlrec->database_id, xlrec->provider.provider_id);
 	}

contrib/pg_tde/src/catalog/tde_keyring.c

@@ -189,7 +189,7 @@ GetAllKeyringProviders(Oid dbOid)
 }
 
 void
-redo_key_provider_info(KeyringProviderXLRecord *xlrec)
+redo_key_provider_info(KeyringProviderRecordInFile *xlrec)
 {
 	write_key_provider_info(&xlrec->provider, xlrec->database_id, xlrec->offset_in_file, false, false);
 }
@@ -503,14 +503,14 @@ write_key_provider_info(KeyringProviderRecord *provider, Oid database_id,
 		if (write_xlog)
 		{
 #ifndef FRONTEND
-			KeyringProviderXLRecord xlrec;
+			KeyringProviderRecordInFile xlrec;
 
 			xlrec.database_id = database_id;
 			xlrec.offset_in_file = curr_pos;
 			xlrec.provider = *provider;
 
 			XLogBeginInsert();
-			XLogRegisterData((char *) &xlrec, sizeof(KeyringProviderXLRecord));
+			XLogRegisterData((char *) &xlrec, sizeof(KeyringProviderRecordInFile));
 			XLogInsert(RM_TDERMGR_ID, XLOG_TDE_WRITE_KEY_PROVIDER);
 #else
 			Assert(0);

contrib/pg_tde/src/include/catalog/tde_keyring.h

@@ -22,12 +22,13 @@ typedef struct KeyringProviderRecord
 	ProviderType provider_type;
 } KeyringProviderRecord;
 
-typedef struct KeyringProviderXLRecord
+/* This struct also keeps some context of where the record belongs */
+typedef struct KeyringProviderRecordInFile
 {
 	Oid			database_id;
 	off_t		offset_in_file;
 	KeyringProviderRecord provider;
-} KeyringProviderXLRecord;
+} KeyringProviderRecordInFile;
 
 extern GenericKeyring *GetKeyProviderByName(const char *provider_name, Oid dbOid);
 extern GenericKeyring *GetKeyProviderByID(int provider_id, Oid dbOid);
@@ -39,7 +40,7 @@ extern void modify_key_provider_info(KeyringProviderRecord *provider,
 									 Oid databaseId, bool write_xlog);
 extern void delete_key_provider_info(int provider_id,
 									 Oid databaseId, bool write_xlog);
-extern void redo_key_provider_info(KeyringProviderXLRecord *xlrec);
+extern void redo_key_provider_info(KeyringProviderRecordInFile *xlrec);
 
 extern bool ParseKeyringJSONOptions(ProviderType provider_type, void *out_opts,
 									char *in_buf, int buf_len);