Fix conflicts and tests

percona · Sep 16, 2024 · 5fed59c · 5fed59c
1 parent 5dfade8
commit 5fed59c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/access/pg_tde_tdemap.c b/src/access/pg_tde_tdemap.c
@@ -121,6 +121,7 @@ static int pg_tde_file_header_read(char *tde_filename, int fd, TDEFileHeader *fh
 static bool pg_tde_read_one_map_entry(int fd, const RelFileLocator *rlocator, int flags, TDEMapEntry *map_entry, off_t *offset);
 static RelKeyData* pg_tde_read_one_keydata(int keydata_fd, int32 key_index, TDEPrincipalKey *principal_key);
 static int pg_tde_open_file(char *tde_filename, TDEPrincipalKeyInfo *principal_key_info, bool should_fill_info, int fileFlags, bool *is_new_file, off_t *offset);
+static RelKeyData *pg_tde_get_key_from_cache(Oid rel_id);
 
 #ifndef FRONTEND
 
@@ -132,8 +133,6 @@ static void pg_tde_write_one_keydata(int keydata_fd, int32 key_index, RelKeyData
 static int keyrotation_init_file(TDEPrincipalKeyInfo *new_principal_key_info, char *rotated_filename, char *filename, bool *is_new_file, off_t *curr_pos);
 static void finalize_key_rotation(char *m_path_old, char *k_path_old, char *m_path_new, char *k_path_new);
 
-static RelKeyData *pg_tde_get_key_from_cache(Oid rel_id);
-
 /*
  * Generate an encrypted key for the relation and store it in the keymap file.
  */
@@ -1357,12 +1356,13 @@ pg_tde_put_key_into_cache(Oid rel_id, RelKeyData *key)
 	{
 #ifndef FRONTEND
 		oldCtx = MemoryContextSwitchTo(TopMemoryContext);
-#endif
 		tde_rel_key_cache = palloc(sizeof(RelKeyCache));
-
 		tde_rel_key_cache->data = palloc_aligned(pageSize, pageSize, MCXT_ALLOC_ZERO);
-#ifndef FRONTEND
 		MemoryContextSwitchTo(oldCtx);
+#else
+		tde_rel_key_cache = palloc(sizeof(RelKeyCache));
+		tde_rel_key_cache->data = aligned_alloc(pageSize, pageSize);
+		memset(tde_rel_key_cache->data, 0, pageSize);
 #endif
 
 		if (mlock(tde_rel_key_cache->data, pageSize) == -1)
@@ -1387,10 +1387,11 @@ pg_tde_put_key_into_cache(Oid rel_id, RelKeyData *key)
 
 #ifndef FRONTEND
 		oldCtx = MemoryContextSwitchTo(TopMemoryContext);
-#endif
 		chachePage = palloc_aligned(pageSize, size, MCXT_ALLOC_ZERO);
-#ifndef FRONTEND
 		MemoryContextSwitchTo(oldCtx);
+#else
+		chachePage = aligned_alloc(pageSize, size);
+		memset(chachePage, 0, size);
 #endif
 
 		memcpy(chachePage, tde_rel_key_cache->data, old_size);

diff --git a/src/catalog/tde_global_space.c b/src/catalog/tde_global_space.c
@@ -78,7 +78,7 @@ TDEInitGlobalKeys(const char *dir)
 		 * backend. (see
 		 * https://github.com/Percona-Lab/pg_tde/pull/214#discussion_r1648998317)
 		 */
-		pg_tde_put_key_into_map(XLOG_TDE_OID, ikey);
+		pg_tde_put_key_into_cache(XLOG_TDE_OID, ikey);
 	}
 }
 

diff --git a/src/smgr/pg_tde_smgr.c b/src/smgr/pg_tde_smgr.c
@@ -96,7 +96,7 @@ tde_mdwritev(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 			local_buffers[i] = &local_blocks_aligned[i * BLCKSZ];
 
 			BlockNumber bn = blocknum + i;
-			unsigned char iv[16] = {0,}
+			unsigned char iv[16] = {0,};
 			memcpy(iv+4, &bn, sizeof(BlockNumber));
 
 			AesEncrypt(rkd->internal_key.key, iv, ((char**)buffers)[i], BLCKSZ, local_buffers[i], &out_len);
@@ -133,7 +133,7 @@ tde_mdextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 		char *local_blocks_aligned = (char *)TYPEALIGN(PG_IO_ALIGN_SIZE, local_blocks);
 		int out_len = BLCKSZ;
 
-		unsigned char iv[16] = {0,}
+		unsigned char iv[16] = {0,};
 		memcpy(iv+4, &blocknum, sizeof(BlockNumber));
 
 		AesEncrypt(rkd->internal_key.key, iv, ((char*)buffer), BLCKSZ, local_blocks_aligned, &out_len);
@@ -180,7 +180,7 @@ tde_mdreadv(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 			continue;
 
 		BlockNumber bn = blocknum + i;
-		unsigned char iv[16] = {0,}
+		unsigned char iv[16] = {0,};
 		memcpy(iv+4, &bn, sizeof(BlockNumber));
 
 		AesDecrypt(rkd->internal_key.key, iv, ((char **)buffers)[i], BLCKSZ, ((char **)buffers)[i], &out_len);