xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor codes

This commit is contained in:
hjxilinx 2019-12-19 14:46:59 +08:00
parent 4c42be31b6
commit 399fa20915
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/system/detail/src/vnodeQueryImpl.c
View File

@ -340,12 +340,6 @@ static void doInitQueryFileInfoFD(SQueryFilesInfo *pVnodeFilesInfo) {
static int32_t doOpenQueryFileData(SQInfo *pQInfo, SQueryFilesInfo *pVnodeFileInfo, int32_t vnodeId) { static int32_t doOpenQueryFileData(SQInfo *pQInfo, SQueryFilesInfo *pVnodeFileInfo, int32_t vnodeId) {
SHeaderFileInfo *pHeaderFileInfo = &pVnodeFileInfo->pFileInfo[pVnodeFileInfo->current]; SHeaderFileInfo *pHeaderFileInfo = &pVnodeFileInfo->pFileInfo[pVnodeFileInfo->current];
pVnodeFileInfo->headerFd = open(pVnodeFileInfo->headerFilePath, O_RDONLY);
if (!FD_VALID(pVnodeFileInfo->headerFd)) {
dError("QInfo:%p failed open head file:%s reason:%s", pQInfo, pVnodeFileInfo->headerFilePath, strerror(errno));
return -1;
}
/* /*
* current header file is empty or broken, return directly. * current header file is empty or broken, return directly.
* *
@ -360,6 +354,12 @@ static int32_t doOpenQueryFileData(SQInfo *pQInfo, SQueryFilesInfo *pVnodeFileIn
return -1; return -1;
} }
pVnodeFileInfo->headerFd = open(pVnodeFileInfo->headerFilePath, O_RDONLY);
if (!FD_VALID(pVnodeFileInfo->headerFd)) {
dError("QInfo:%p failed open head file:%s reason:%s", pQInfo, pVnodeFileInfo->headerFilePath, strerror(errno));
return -1;
}
pVnodeFileInfo->dataFd = open(pVnodeFileInfo->dataFilePath, O_RDONLY); pVnodeFileInfo->dataFd = open(pVnodeFileInfo->dataFilePath, O_RDONLY);
if (!FD_VALID(pVnodeFileInfo->dataFd)) { if (!FD_VALID(pVnodeFileInfo->dataFd)) {
dError("QInfo:%p failed open data file:%s reason:%s", pQInfo, pVnodeFileInfo->dataFilePath, strerror(errno)); dError("QInfo:%p failed open data file:%s reason:%s", pQInfo, pVnodeFileInfo->dataFilePath, strerror(errno));
@ -548,23 +548,23 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim
pQuery->numOfBlocks = (int32_t)compInfo->numOfBlocks; pQuery->numOfBlocks = (int32_t)compInfo->numOfBlocks;
int32_t compBlockSize = compInfo->numOfBlocks * sizeof(SCompBlock); int32_t compBlockSize = compInfo->numOfBlocks * sizeof(SCompBlock);
size_t bufferSize = compBlockSize + POINTER_BYTES * compInfo->numOfBlocks; size_t bufferSize = compBlockSize + sizeof(TSCKSUM);
// prepare buffer to hold compblock data // prepare buffer to hold compblock data
if (pQuery->blockBufferSize != bufferSize) { if (pQuery->blockBufferSize != bufferSize) {
pQuery->pBlock = realloc(pQuery->pBlock, bufferSize); pQuery->pBlock = realloc(pQuery->pBlock, bufferSize);
pQuery->blockBufferSize = (int32_t)bufferSize; pQuery->blockBufferSize = (int32_t) bufferSize;
} }
memset(pQuery->pBlock, 0, (size_t)pQuery->blockBufferSize); memset(pQuery->pBlock, 0, bufferSize);
#if 0 #if 0
memcpy(pQuery->pBlock, (char *)compInfo + sizeof(SCompInfo), (size_t)compBlockSize); memcpy(pQuery->pBlock, (char *)compInfo + sizeof(SCompInfo), (size_t)compBlockSize);
TSCKSUM checksum = *(TSCKSUM *)((char *)compInfo + sizeof(SCompInfo) + compBlockSize); TSCKSUM checksum = *(TSCKSUM *)((char *)compInfo + sizeof(SCompInfo) + compBlockSize);
#else #else
TSCKSUM checksum; read(pVnodeFileInfo->headerFd, pQuery->pBlock, bufferSize);
read(pVnodeFileInfo->headerFd, pQuery->pBlock, compBlockSize); TSCKSUM checksum = *(TSCKSUM*)((char*)pQuery->pBlock + compBlockSize);
read(pVnodeFileInfo->headerFd, &checksum, sizeof(TSCKSUM)); // read(pVnodeFileInfo->headerFd, &checksum, sizeof(TSCKSUM));
#endif #endif
// check comp block integrity // check comp block integrity