fix

afiskon · afiskon · commit 7ba1cacbba17 · 2017-02-03T15:40:58.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -260,18 +260,20 @@ static void cfs_rc4_init(void)
     }
 }
 
-void cfs_encrypt(void* block, uint32 offs, uint32 size)
+void cfs_encrypt(const char* fname, void* block, uint32 offs, uint32 size)
 {
 	if (cfs_encryption) 
 	{
+		elog(LOG, "cfs_encrypt, fname = %s, offs = %d, size = %d", fname, offs, size);
 		cfs_rc4_encrypt_block(block, offs, size);
 	}
 }
 
-void cfs_decrypt(void* block, uint32 offs, uint32 size)
+void cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size)
 {
 	if (cfs_encryption) 
 	{
+		elog(LOG, "cfs_decrypt, fname = %s, offs = %d, size = %d", fname, offs, size);
 		cfs_rc4_encrypt_block(block, offs, size);
 	}
 }
@@ -693,7 +695,7 @@ static bool cfs_gc_file(char* map_path)
 					Assert(res == (off_t)CFS_INODE_OFFS(inode));
 					rc = cfs_read_file(fd, block, size);
 					Assert(rc);
-					cfs_decrypt(block, (off_t)i*BLCKSZ, size);
+					cfs_decrypt(file_bck_path, block, (off_t)i*BLCKSZ, size);
 					res = cfs_decompress(decomressedBlock, BLCKSZ, block, size);
 					if (res != BLCKSZ) { 
 						pg_atomic_fetch_sub_u32(&map->lock, CFS_GC_LOCK); /* release lock */
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1742,7 +1742,7 @@ FileRead(File file, char *buffer, int amount)
 				}
 			} while (size != 0);
 
-			cfs_decrypt(compressedBuffer, VfdCache[file].seekPos, amount);
+			cfs_decrypt(VfdCache[file].fileName, compressedBuffer, VfdCache[file].seekPos, amount);
 
 			returnCode = cfs_decompress(buffer, BLCKSZ, compressedBuffer, amount);
 			if (returnCode != BLCKSZ) 
@@ -1769,7 +1769,7 @@ FileRead(File file, char *buffer, int amount)
 	{
 		if (VfdCache[file].fileFlags & PG_COMPRESSION) 
 		{
-			cfs_decrypt(buffer, VfdCache[file].seekPos, amount);
+			cfs_decrypt(VfdCache[file].fileName, buffer, VfdCache[file].seekPos, amount);
 		}
 		VfdCache[file].seekPos += returnCode;
 	}
@@ -1877,12 +1877,12 @@ FileWrite(File file, char *buffer, int amount)
 			inode = CFS_INODE(compressedSize, pos);
 			buffer = compressedBuffer;
 			amount = compressedSize;
-			cfs_encrypt(buffer, VfdCache[file].seekPos, amount);
+			cfs_encrypt(VfdCache[file].fileName, buffer, VfdCache[file].seekPos, amount);
 		} else { 	
 			if (cfs_encryption) { 
 				memcpy(compressedBuffer, buffer, BLCKSZ);
 				buffer = compressedBuffer;
-				cfs_encrypt(buffer, VfdCache[file].seekPos, amount);
+				cfs_encrypt(VfdCache[file].fileName, buffer, VfdCache[file].seekPos, amount);
 			}
 			if (CFS_INODE_SIZE(inode) != BLCKSZ) { 
 				pos = cfs_alloc_page(map, CFS_INODE_SIZE(inode), BLCKSZ);						
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -87,8 +87,8 @@ FileMap* cfs_mmap(int md);
 int      cfs_munmap(FileMap* map);
 void     cfs_initialize(void);
 
-void     cfs_encrypt(void* block, uint32 offs, uint32 size);
-void     cfs_decrypt(void* block, uint32 offs, uint32 size);
+void     cfs_encrypt(const char* fname, void* block, uint32 offs, uint32 size);
+void     cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size);
 
 extern CfsState* cfs_state;
 

Original file line number	Diff line number	Diff line change
`@@ -260,18 +260,20 @@ static void cfs_rc4_init(void)`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`263`		`-void cfs_encrypt(void* block, uint32 offs, uint32 size)`
	`263`	`+void cfs_encrypt(const char* fname, void* block, uint32 offs, uint32 size)`
`264`	`264`	`{`
`265`	`265`	`if (cfs_encryption)`
`266`	`266`	`{`
	`267`	`+ elog(LOG, "cfs_encrypt, fname = %s, offs = %d, size = %d", fname, offs, size);`
`267`	`268`	`cfs_rc4_encrypt_block(block, offs, size);`
`268`	`269`	`}`
`269`	`270`	`}`
`270`	`271`
`271`		`-void cfs_decrypt(void* block, uint32 offs, uint32 size)`
	`272`	`+void cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size)`
`272`	`273`	`{`
`273`	`274`	`if (cfs_encryption)`
`274`	`275`	`{`
	`276`	`+ elog(LOG, "cfs_decrypt, fname = %s, offs = %d, size = %d", fname, offs, size);`
`275`	`277`	`cfs_rc4_encrypt_block(block, offs, size);`
`276`	`278`	`}`
`277`	`279`	`}`
`@@ -693,7 +695,7 @@ static bool cfs_gc_file(char* map_path)`
`693`	`695`	`Assert(res == (off_t)CFS_INODE_OFFS(inode));`
`694`	`696`	`rc = cfs_read_file(fd, block, size);`
`695`	`697`	`Assert(rc);`
`696`		`- cfs_decrypt(block, (off_t)i*BLCKSZ, size);`
	`698`	`+ cfs_decrypt(file_bck_path, block, (off_t)i*BLCKSZ, size);`
`697`	`699`	`res = cfs_decompress(decomressedBlock, BLCKSZ, block, size);`
`698`	`700`	`if (res != BLCKSZ) {`
`699`	`701`	`pg_atomic_fetch_sub_u32(&map->lock, CFS_GC_LOCK); /* release lock */`
Original file line number	Diff line number	Diff line change
`@@ -1742,7 +1742,7 @@ FileRead(File file, char *buffer, int amount)`
`1742`	`1742`	`}`
`1743`	`1743`	`} while (size != 0);`
`1744`	`1744`
`1745`		`- cfs_decrypt(compressedBuffer, VfdCache[file].seekPos, amount);`
	`1745`	`+ cfs_decrypt(VfdCache[file].fileName, compressedBuffer, VfdCache[file].seekPos, amount);`
`1746`	`1746`
`1747`	`1747`	`returnCode = cfs_decompress(buffer, BLCKSZ, compressedBuffer, amount);`
`1748`	`1748`	`if (returnCode != BLCKSZ)`
`@@ -1769,7 +1769,7 @@ FileRead(File file, char *buffer, int amount)`
`1769`	`1769`	`{`
`1770`	`1770`	`if (VfdCache[file].fileFlags & PG_COMPRESSION)`
`1771`	`1771`	`{`
`1772`		`- cfs_decrypt(buffer, VfdCache[file].seekPos, amount);`
	`1772`	`+ cfs_decrypt(VfdCache[file].fileName, buffer, VfdCache[file].seekPos, amount);`
`1773`	`1773`	`}`
`1774`	`1774`	`VfdCache[file].seekPos += returnCode;`
`1775`	`1775`	`}`
`@@ -1877,12 +1877,12 @@ FileWrite(File file, char *buffer, int amount)`
`1877`	`1877`	`inode = CFS_INODE(compressedSize, pos);`
`1878`	`1878`	`buffer = compressedBuffer;`
`1879`	`1879`	`amount = compressedSize;`
`1880`		`- cfs_encrypt(buffer, VfdCache[file].seekPos, amount);`
	`1880`	`+ cfs_encrypt(VfdCache[file].fileName, buffer, VfdCache[file].seekPos, amount);`
`1881`	`1881`	`} else {`
`1882`	`1882`	`if (cfs_encryption) {`
`1883`	`1883`	`memcpy(compressedBuffer, buffer, BLCKSZ);`
`1884`	`1884`	`buffer = compressedBuffer;`
`1885`		`- cfs_encrypt(buffer, VfdCache[file].seekPos, amount);`
	`1885`	`+ cfs_encrypt(VfdCache[file].fileName, buffer, VfdCache[file].seekPos, amount);`
`1886`	`1886`	`}`
`1887`	`1887`	`if (CFS_INODE_SIZE(inode) != BLCKSZ) {`
`1888`	`1888`	`pos = cfs_alloc_page(map, CFS_INODE_SIZE(inode), BLCKSZ);`