hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1750 数据备份时，页面校验增加非压缩页面校验。

Browse Source 
Merge pull request !1750 from 吴岳川/I58B0E
This commit is contained in:
opengauss-bot
2022-05-31 06:47:08 +00:00
committed by Gitee
parent cbe8618e0c df87af4701
commit 0b93d2ea1f
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gausskernel/storage/smgr/page_compression.cpp
View File

@ -376,6 +376,28 @@ uint1 ConvertChunkSize(uint32 compressedChunkSize, bool *success)
constexpr int MAX_RETRY_LIMIT = 60; constexpr int MAX_RETRY_LIMIT = 60;
constexpr long RETRY_SLEEP_TIME = 1000000L; constexpr long RETRY_SLEEP_TIME = 1000000L;
bool CompressedPageChecksum(char *dst)
{
char *data = NULL;
size_t dataLen;
uint32 crc32;
if (PageIs8BXidHeapVersion(dst)) {
HeapPageCompressData *heapPageData = (HeapPageCompressData *)dst;
data = heapPageData->data;
dataLen = heapPageData->size;
crc32 = heapPageData->crc32;
} else {
PageCompressData *heapPageData = (PageCompressData *)dst;
data = heapPageData->data;
dataLen = heapPageData->size;
crc32 = heapPageData->crc32;
}
if (DataBlockChecksum(data, dataLen, true) == crc32) {
return true;
}
return false;
}
size_t ReadAllChunkOfBlock(char *dst, size_t destLen, BlockNumber blockNumber, ReadBlockChunksStruct& rbStruct) size_t ReadAllChunkOfBlock(char *dst, size_t destLen, BlockNumber blockNumber, ReadBlockChunksStruct& rbStruct)
{ {
PageCompressHeader* header = rbStruct.header; PageCompressHeader* header = rbStruct.header;
@ -393,6 +415,7 @@ size_t ReadAllChunkOfBlock(char *dst, size_t destLen, BlockNumber blockNumber, R
/* for empty chunks write */ /* for empty chunks write */
uint8 allocatedChunks; uint8 allocatedChunks;
uint8 nchunks; uint8 nchunks;
int maxChunkNum = BLCKSZ / chunkSize;
do { do {
allocatedChunks = currentAddr->allocated_chunks; allocatedChunks = currentAddr->allocated_chunks;
nchunks = currentAddr->nchunks; nchunks = currentAddr->nchunks;
@ -412,25 +435,20 @@ size_t ReadAllChunkOfBlock(char *dst, size_t destLen, BlockNumber blockNumber, R
ereport(ERROR, (errcode_for_file_access(), errmsg("could not read file \"%s\": %m", fileName))); ereport(ERROR, (errcode_for_file_access(), errmsg("could not read file \"%s\": %m", fileName)));
} }
} }
/* zero page */
if (nchunks == 0) { if (nchunks == 0) {
break; break;
} }
char *data = NULL; /* full uncompressed page */
size_t dataLen; if (maxChunkNum == nchunks) {
uint32 crc32; if (pg_checksum_page((char*)dst, blockNumber) == ((PageHeader)(dst))->pd_checksum) {
if (PageIs8BXidHeapVersion(dst)) { break;
HeapPageCompressData *heapPageData = (HeapPageCompressData *)dst; }
data = heapPageData->data;
dataLen = heapPageData->size;
crc32 = heapPageData->crc32;
} else { } else {
PageCompressData *heapPageData = (PageCompressData *)dst; /* compressed page */
data = heapPageData->data; if (CompressedPageChecksum((char*)dst)) {
dataLen = heapPageData->size; break;
crc32 = heapPageData->crc32; }
}
if (DataBlockChecksum(data, dataLen, true) == crc32) {
break;
} }
if (tryCount < MAX_RETRY_LIMIT) { if (tryCount < MAX_RETRY_LIMIT) {