Rename rel_type field for internal keys to type

This type has nothing to do with relations so the rel_ prefix only
served to add confusion.

Author: AndersAstrand

contrib/pg_tde/src/access/pg_tde_tdemap.c

@@ -218,7 +218,7 @@ pg_tde_create_smgr_key_perm_redo(const RelFileLocator *newrlocator)
 static void
 pg_tde_generate_internal_key(InternalKey *int_key, uint32 entry_type)
 {
-	int_key->rel_type = entry_type;
+	int_key->type = entry_type;
 	int_key->start_lsn = InvalidXLogRecPtr;
 
 	if (!RAND_bytes(int_key->key, INTERNAL_KEY_LEN))
@@ -399,7 +399,7 @@ pg_tde_initialize_map_entry(TDEMapEntry *map_entry, const TDEPrincipalKey *princ
 {
 	map_entry->spcOid = rlocator->spcOid;
 	map_entry->relNumber = rlocator->relNumber;
-	map_entry->flags = rel_key_data->rel_type;
+	map_entry->flags = rel_key_data->type;
 	map_entry->enc_key = *rel_key_data;
 
 	if (!RAND_bytes(map_entry->entry_iv, MAP_ENTRY_EMPTY_IV_SIZE))
@@ -534,7 +534,7 @@ pg_tde_free_key_map_entry(const RelFileLocator *rlocator)
 			TDEMapEntry empty_map_entry = {
 				.flags = MAP_ENTRY_EMPTY,
 				.enc_key = {
-					.rel_type = MAP_ENTRY_EMPTY,
+					.type = MAP_ENTRY_EMPTY,
 				},
 			};
 
@@ -1146,7 +1146,7 @@ pg_tde_get_key_from_cache(const RelFileLocator *rlocator, uint32 key_type)
 	{
 		RelKeyCacheRec *rec = tde_rel_key_cache.data + i;
 
-		if (RelFileLocatorEquals(rec->locator, *rlocator) && rec->key.rel_type & key_type)
+		if (RelFileLocatorEquals(rec->locator, *rlocator) && rec->key.type & key_type)
 		{
 			return &rec->key;
 		}

contrib/pg_tde/src/access/pg_tde_xlog_smgr.c

@@ -73,7 +73,7 @@ static EncryptionStateData *EncryptionState = NULL;
 /* TODO: can be swapped out to the disk */
 static InternalKey EncryptionKey =
 {
-	.rel_type = MAP_ENTRY_EMPTY,
+	.type = MAP_ENTRY_EMPTY,
 	.start_lsn = InvalidXLogRecPtr,
 };
 static void *EncryptionCryptCtx = NULL;
@@ -202,7 +202,7 @@ TDEXLogSmgrInit(void)
 		pg_tde_create_wal_key(&EncryptionKey, &GLOBAL_SPACE_RLOCATOR(XLOG_TDE_OID),
 							  TDE_KEY_TYPE_WAL_ENCRYPTED);
 	}
-	else if (key && key->rel_type & TDE_KEY_TYPE_WAL_ENCRYPTED)
+	else if (key && key->type & TDE_KEY_TYPE_WAL_ENCRYPTED)
 	{
 		pg_tde_create_wal_key(&EncryptionKey, &GLOBAL_SPACE_RLOCATOR(XLOG_TDE_OID),
 							  TDE_KEY_TYPE_WAL_UNENCRYPTED);
@@ -233,7 +233,7 @@ tdeheap_xlog_seg_write(int fd, const void *buf, size_t count, off_t offset,
 	 *
 	 * This func called with WALWriteLock held, so no need in any extra sync.
 	 */
-	if (EncryptionKey.rel_type & TDE_KEY_TYPE_GLOBAL &&
+	if (EncryptionKey.type & TDE_KEY_TYPE_GLOBAL &&
 		pg_atomic_read_u64(&EncryptionState->enc_key_lsn) == 0)
 	{
 		XLogRecPtr	lsn;
@@ -314,11 +314,11 @@ tdeheap_xlog_seg_read(int fd, void *buf, size_t count, off_t offset,
 		elog(DEBUG1, "WAL key %X/%X-%X/%X, encrypted: %s",
 			 LSN_FORMAT_ARGS(curr_key->start_lsn),
 			 LSN_FORMAT_ARGS(curr_key->end_lsn),
-			 curr_key->key->rel_type & TDE_KEY_TYPE_WAL_ENCRYPTED ? "yes" : "no");
+			 curr_key->key->type & TDE_KEY_TYPE_WAL_ENCRYPTED ? "yes" : "no");
 #endif
 
 		if (curr_key->key->start_lsn != InvalidXLogRecPtr &&
-			(curr_key->key->rel_type & TDE_KEY_TYPE_WAL_ENCRYPTED))
+			(curr_key->key->type & TDE_KEY_TYPE_WAL_ENCRYPTED))
 		{
 			/*
 			 * Check if the key's range overlaps with the buffer's and decypt

contrib/pg_tde/src/include/access/pg_tde_tdemap.h

@@ -27,16 +27,16 @@ typedef struct InternalKey
 {
 	uint8		key[INTERNAL_KEY_LEN];
 	uint8		base_iv[INTERNAL_KEY_IV_LEN];
-	uint32		rel_type;
+	uint32		type;
 
 	XLogRecPtr	start_lsn;
 } InternalKey;
 
 #define WALKeySetInvalid(key) \
-	((key)->rel_type &= ~(TDE_KEY_TYPE_WAL_ENCRYPTED | TDE_KEY_TYPE_WAL_UNENCRYPTED))
+	((key)->type &= ~(TDE_KEY_TYPE_WAL_ENCRYPTED | TDE_KEY_TYPE_WAL_UNENCRYPTED))
 #define WALKeyIsValid(key) \
-	(((key)->rel_type & TDE_KEY_TYPE_WAL_UNENCRYPTED) != 0 || \
-	((key)->rel_type & TDE_KEY_TYPE_WAL_ENCRYPTED) != 0)
+	(((key)->type & TDE_KEY_TYPE_WAL_UNENCRYPTED) != 0 || \
+	((key)->type & TDE_KEY_TYPE_WAL_ENCRYPTED) != 0)
 
 #define MAP_ENTRY_EMPTY_IV_SIZE 16
 #define MAP_ENTRY_EMPTY_AEAD_TAG_SIZE 16