Merge pull request #797 from taosdata/feature/liaohj
[jira none]only open and memory map one group of files
This commit is contained in:
slguan
GitHub
commit
dd4f909f42
|
|
@ -111,7 +111,7 @@ typedef enum {
|
|||
#define SET_MASTER_SCAN_FLAG(runtime) ((runtime)->scanFlag = MASTER_SCAN)
|
||||
|
||||
typedef int (*__block_search_fn_t)(char* data, int num, int64_t key, int order);
|
||||
typedef int32_t (*__read_data_fn_t)(int fd, SQInfo* pQInfo, SQueryFileInfo* pQueryFile, char* buf, uint64_t offset,
|
||||
typedef int32_t (*__read_data_fn_t)(int fd, SQInfo* pQInfo, SQueryFilesInfo* pQueryFile, char* buf, uint64_t offset,
|
||||
int32_t size);
|
||||
|
||||
static FORCE_INLINE SMeterObj* getMeterObj(void* hashHandle, int32_t sid) {
|
||||
|
|
@ -191,7 +191,7 @@ int64_t getQueryStartPositionInCache(SQueryRuntimeEnv* pRuntimeEnv, int32_t* slo
|
|||
int64_t getNextAccessedKeyInData(SQuery* pQuery, int64_t* pPrimaryCol, SBlockInfo* pBlockInfo, int32_t blockStatus);
|
||||
|
||||
uint32_t getDataBlocksForMeters(SMeterQuerySupportObj* pSupporter, SQuery* pQuery, char* pHeaderData,
|
||||
int32_t numOfMeters, SQueryFileInfo* pQueryFileInfo, SMeterDataInfo** pMeterDataInfo);
|
||||
int32_t numOfMeters, const char* filePath, SMeterDataInfo** pMeterDataInfo);
|
||||
int32_t LoadDatablockOnDemand(SCompBlock* pBlock, SField** pFields, uint8_t* blkStatus, SQueryRuntimeEnv* pRuntimeEnv,
|
||||
int32_t fileIdx, int32_t slotIdx, __block_search_fn_t searchFn, bool onDemand);
|
||||
char *vnodeGetHeaderFileData(SQueryRuntimeEnv *pRuntimeEnv, int32_t vnodeId, int32_t fileIndex);
|
||||
|
|
|
|||
|
|
@ -47,29 +47,14 @@ typedef struct SQueryLoadCompBlockInfo {
|
|||
int32_t fileId;
|
||||
int32_t fileListIndex;
|
||||
} SQueryLoadCompBlockInfo;
|
||||
|
||||
/*
|
||||
* the header file info for one vnode
|
||||
*/
|
||||
typedef struct SQueryFileInfo {
|
||||
int32_t fileID; /* file id */
|
||||
char headerFilePath[PATH_MAX]; /* full file name */
|
||||
char dataFilePath[PATH_MAX];
|
||||
char lastFilePath[PATH_MAX];
|
||||
int32_t defaultMappingSize; /* default mapping size */
|
||||
|
||||
int32_t headerFd; /* file handler */
|
||||
char* pHeaderFileData; /* mmap header files */
|
||||
size_t headFileSize;
|
||||
int32_t dataFd;
|
||||
char* pDataFileData;
|
||||
size_t dataFileSize;
|
||||
uint64_t dtFileMappingOffset;
|
||||
|
||||
int32_t lastFd;
|
||||
size_t lastFileSize;
|
||||
uint64_t lastFileMappingOffset;
|
||||
|
||||
} SQueryFileInfo;
|
||||
typedef struct SHeaderFileInfo {
|
||||
int32_t fileID; // file id
|
||||
size_t headFileSize; // header file size
|
||||
} SHeaderFileInfo;
|
||||
|
||||
typedef struct SQueryCostSummary {
|
||||
double cacheTimeUs;
|
||||
|
|
@ -106,6 +91,27 @@ typedef struct SOutputRes {
|
|||
SResultInfo* resultInfo;
|
||||
} SOutputRes;
|
||||
|
||||
/*
|
||||
* header files info, avoid to iterate the directory, the data is acquired
|
||||
* during in query preparation function
|
||||
*/
|
||||
typedef struct SQueryFilesInfo {
|
||||
SHeaderFileInfo* pFileInfo;
|
||||
uint32_t numOfFiles; // the total available number of files for this virtual node during query execution
|
||||
int32_t current; // the memory mapped header file, NOTE: only one header file can be mmap.
|
||||
int32_t vnodeId;
|
||||
|
||||
int32_t headerFd; // header file fd
|
||||
char* pHeaderFileData; // mmap header files
|
||||
|
||||
int32_t dataFd;
|
||||
int32_t lastFd;
|
||||
char headerFilePath[PATH_MAX]; // current opened header file name
|
||||
char dataFilePath[PATH_MAX]; // current opened data file name
|
||||
char lastFilePath[PATH_MAX]; // current opened last file path
|
||||
char dbFilePathPrefix[PATH_MAX];
|
||||
} SQueryFilesInfo;
|
||||
|
||||
typedef struct RuntimeEnvironment {
|
||||
SPositionInfo startPos; /* the start position, used for secondary/third iteration */
|
||||
SPositionInfo endPos; /* the last access position in query, served as the start pos of reversed order query */
|
||||
|
|
@ -122,17 +128,10 @@ typedef struct RuntimeEnvironment {
|
|||
SQLFunctionCtx* pCtx;
|
||||
SQueryLoadBlockInfo loadBlockInfo; /* record current block load information */
|
||||
SQueryLoadCompBlockInfo loadCompBlockInfo; /* record current compblock information in SQuery */
|
||||
|
||||
/*
|
||||
* header files info, avoid to iterate the directory, the data is acquired
|
||||
* during in query preparation function
|
||||
*/
|
||||
SQueryFileInfo* pVnodeFiles;
|
||||
uint32_t numOfFiles; // the total available number of files for this virtual node during query execution
|
||||
int32_t mmapedHFileIndex; // the mmaped header file, NOTE: only one header file can be mmap.
|
||||
SQueryFilesInfo vnodeFileInfo;
|
||||
int16_t numOfRowsPerPage;
|
||||
int16_t offset[TSDB_MAX_COLUMNS];
|
||||
int16_t scanFlag; // denotes reversed scan of data or not
|
||||
int16_t scanFlag; // denotes reversed scan of data or not
|
||||
SInterpolationInfo interpoInfo;
|
||||
SData** pInterpoBuf;
|
||||
SOutputRes* pResult; // reference to SQuerySupporter->pResult
|
||||
|
|
|
|||
|
|
@ -40,12 +40,12 @@ enum {
|
|||
|
||||
#define IS_DISK_DATA_BLOCK(q) ((q)->fileId >= 0)
|
||||
|
||||
static int32_t copyDataFromMMapBuffer(int fd, SQInfo *pQInfo, SQueryFileInfo *pQueryFile, char *buf, uint64_t offset,
|
||||
int32_t size);
|
||||
static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFileInfo *pQueryFile, char *buf, uint64_t offset,
|
||||
//static int32_t copyDataFromMMapBuffer(int fd, SQInfo *pQInfo, SQueryFilesInfo *pQueryFile, char *buf, uint64_t offset,
|
||||
// int32_t size);
|
||||
static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFilesInfo *pQueryFile, char *buf, uint64_t offset,
|
||||
int32_t size);
|
||||
|
||||
__read_data_fn_t readDataFunctor[2] = {copyDataFromMMapBuffer, readDataFromDiskFile};
|
||||
//__read_data_fn_t readDataFunctor[2] = {copyDataFromMMapBuffer, readDataFromDiskFile};
|
||||
|
||||
static void vnodeInitLoadCompBlockInfo(SQueryLoadCompBlockInfo *pCompBlockLoadInfo);
|
||||
static int32_t moveToNextBlock(SQueryRuntimeEnv *pRuntimeEnv, int32_t step, __block_search_fn_t searchFn,
|
||||
|
|
@ -99,7 +99,7 @@ static FORCE_INLINE int32_t getCompHeaderStartPosition(SVnodeCfg *pCfg) {
|
|||
}
|
||||
|
||||
static FORCE_INLINE int32_t validateCompBlockOffset(SQInfo *pQInfo, SMeterObj *pMeterObj, SCompHeader *pCompHeader,
|
||||
SQueryFileInfo *pQueryFileInfo, int32_t headerSize) {
|
||||
SHeaderFileInfo *pQueryFileInfo, int32_t headerSize) {
|
||||
if (pCompHeader->compInfoOffset < headerSize || pCompHeader->compInfoOffset > pQueryFileInfo->headFileSize) {
|
||||
dError("QInfo:%p vid:%d sid:%d id:%s, compInfoOffset:%d is not valid, size:%ld", pQInfo, pMeterObj->vnode,
|
||||
pMeterObj->sid, pMeterObj->meterId, pCompHeader->compInfoOffset, pQueryFileInfo->headFileSize);
|
||||
|
|
@ -195,7 +195,7 @@ static bool vnodeIsCompBlockInfoLoaded(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj
|
|||
// if vnodeFreeFields is called, the pQuery->pFields is NULL
|
||||
if (pLoadCompBlockInfo->fileListIndex == fileIndex && pLoadCompBlockInfo->sid == pMeterObj->sid &&
|
||||
pQuery->pFields != NULL && pQuery->fileId > 0) {
|
||||
assert(pRuntimeEnv->pVnodeFiles[fileIndex].fileID == pLoadCompBlockInfo->fileId && pQuery->numOfBlocks > 0);
|
||||
assert(pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex].fileID == pLoadCompBlockInfo->fileId && pQuery->numOfBlocks > 0);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -207,7 +207,7 @@ static void vnodeSetCompBlockInfoLoaded(SQueryRuntimeEnv *pRuntimeEnv, int32_t f
|
|||
|
||||
pLoadCompBlockInfo->sid = sid;
|
||||
pLoadCompBlockInfo->fileListIndex = fileIndex;
|
||||
pLoadCompBlockInfo->fileId = pRuntimeEnv->pVnodeFiles[fileIndex].fileID;
|
||||
pLoadCompBlockInfo->fileId = pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex].fileID;
|
||||
}
|
||||
|
||||
static void vnodeInitLoadCompBlockInfo(SQueryLoadCompBlockInfo *pCompBlockLoadInfo) {
|
||||
|
|
@ -259,49 +259,90 @@ static bool isHeaderFileEmpty(int32_t vnodeId, size_t headerFileSize) {
|
|||
return headerFileSize <= getCompHeaderStartPosition(pVnodeCfg);
|
||||
}
|
||||
|
||||
static void doCloseQueryFileInfoFD(SQueryFileInfo* pVnodeFiles) {
|
||||
tclose(pVnodeFiles->headerFd);
|
||||
tclose(pVnodeFiles->dataFd);
|
||||
tclose(pVnodeFiles->lastFd);
|
||||
static void doCloseQueryFileInfoFD(SQueryFilesInfo* pVnodeFilesInfo) {
|
||||
tclose(pVnodeFilesInfo->headerFd);
|
||||
tclose(pVnodeFilesInfo->dataFd);
|
||||
tclose(pVnodeFilesInfo->lastFd);
|
||||
}
|
||||
|
||||
static int32_t doOpenQueryFileInfoDF(SQInfo* pQInfo, SQueryFileInfo* pVnodeFiles) {
|
||||
static void doInitQueryFileInfoFD(SQueryFilesInfo* pVnodeFilesInfo) {
|
||||
pVnodeFilesInfo->current = -1;
|
||||
|
||||
pVnodeFilesInfo->headerFd = FD_INITIALIZER; // set the initial value
|
||||
pVnodeFilesInfo->dataFd = FD_INITIALIZER;
|
||||
pVnodeFilesInfo->lastFd = FD_INITIALIZER;
|
||||
}
|
||||
|
||||
static int32_t doOpenQueryFileData(SQInfo* pQInfo, SQueryFilesInfo* pVnodeFiles) {
|
||||
// if the header is smaller than a threshold value, this file is empty, no need to
|
||||
SHeaderFileInfo* pCurrentFileInfo = &pVnodeFiles->pFileInfo[pVnodeFiles->current];
|
||||
|
||||
// set the full file path for current opened files
|
||||
snprintf(pVnodeFiles->headerFilePath, PATH_MAX, "%sv%df%d.head", pVnodeFiles->dbFilePathPrefix,
|
||||
pVnodeFiles->vnodeId, pCurrentFileInfo->fileID);
|
||||
|
||||
pVnodeFiles->headerFd = open(pVnodeFiles->headerFilePath, O_RDONLY);
|
||||
if (!FD_VALID(pVnodeFiles->headerFd)) {
|
||||
dError("QInfo:%p failed open header file:%s reason:%s", pQInfo, pVnodeFiles->headerFilePath, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
snprintf(pVnodeFiles->dataFilePath, PATH_MAX, "%sv%df%d.data", pVnodeFiles->dbFilePathPrefix,
|
||||
pVnodeFiles->vnodeId, pCurrentFileInfo->fileID);
|
||||
|
||||
pVnodeFiles->dataFd = open(pVnodeFiles->dataFilePath, O_RDONLY);
|
||||
if (!FD_VALID(pVnodeFiles->headerFd)) {
|
||||
if (!FD_VALID(pVnodeFiles->dataFd)) {
|
||||
dError("QInfo:%p failed open data file:%s reason:%s", pQInfo, pVnodeFiles->dataFilePath, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
snprintf(pVnodeFiles->lastFilePath, PATH_MAX, "%sv%df%d.last", pVnodeFiles->dbFilePathPrefix,
|
||||
pVnodeFiles->vnodeId, pCurrentFileInfo->fileID);
|
||||
|
||||
pVnodeFiles->lastFd = open(pVnodeFiles->lastFilePath, O_RDONLY);
|
||||
if (!FD_VALID(pVnodeFiles->headerFd)) {
|
||||
if (!FD_VALID(pVnodeFiles->lastFd)) {
|
||||
dError("QInfo:%p failed open last file:%s reason:%s", pQInfo, pVnodeFiles->lastFilePath, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
pVnodeFiles->pHeaderFileData = mmap(NULL, pCurrentFileInfo->headFileSize, PROT_READ, MAP_SHARED,
|
||||
pVnodeFiles->headerFd, 0);
|
||||
|
||||
if (pVnodeFiles->pHeaderFileData == MAP_FAILED) {
|
||||
pVnodeFiles->pHeaderFileData = NULL;
|
||||
|
||||
doCloseQueryFileInfoFD(pVnodeFiles);
|
||||
doInitQueryFileInfoFD(pVnodeFiles);
|
||||
|
||||
dError("QInfo:%p failed to mmap header file:%s, size:%lld, %s", pQInfo, pVnodeFiles->headerFilePath,
|
||||
pCurrentFileInfo->headFileSize, strerror(errno));
|
||||
|
||||
return -1;
|
||||
} else {
|
||||
if (madvise(pVnodeFiles->pHeaderFileData, pCurrentFileInfo->headFileSize, MADV_SEQUENTIAL) == -1) {
|
||||
dError("QInfo:%p failed to advise kernel the usage of header file, reason:%s", pQInfo, strerror(errno));
|
||||
}
|
||||
}
|
||||
|
||||
return TSDB_CODE_SUCCESS;
|
||||
}
|
||||
|
||||
static void doUnmapHeaderFileData(SQueryRuntimeEnv* pRuntimeEnv) {
|
||||
if (pRuntimeEnv->mmapedHFileIndex >= 0) {
|
||||
assert(pRuntimeEnv->mmapedHFileIndex < pRuntimeEnv->numOfFiles && pRuntimeEnv->mmapedHFileIndex >= 0);
|
||||
static void doCloseOpenedFileData(SQueryFilesInfo* pVnodeFileInfo) {
|
||||
if (pVnodeFileInfo->current >= 0) {
|
||||
|
||||
SQueryFileInfo *otherVnodeFiles = &pRuntimeEnv->pVnodeFiles[pRuntimeEnv->mmapedHFileIndex];
|
||||
munmap(otherVnodeFiles->pHeaderFileData, otherVnodeFiles->headFileSize);
|
||||
assert(pVnodeFileInfo->current < pVnodeFileInfo->numOfFiles && pVnodeFileInfo->current >= 0 &&
|
||||
pVnodeFileInfo->pHeaderFileData != NULL);
|
||||
|
||||
otherVnodeFiles->pHeaderFileData = NULL;
|
||||
doCloseQueryFileInfoFD(otherVnodeFiles);
|
||||
SHeaderFileInfo *pCurrentFile = &pVnodeFileInfo->pFileInfo[pVnodeFileInfo->current];
|
||||
|
||||
pRuntimeEnv->mmapedHFileIndex = -1;
|
||||
munmap(pVnodeFileInfo->pHeaderFileData, pCurrentFile->headFileSize);
|
||||
pVnodeFileInfo->pHeaderFileData = NULL;
|
||||
|
||||
doCloseQueryFileInfoFD(pVnodeFileInfo);
|
||||
doInitQueryFileInfoFD(pVnodeFileInfo);
|
||||
}
|
||||
|
||||
assert(pRuntimeEnv->mmapedHFileIndex == -1);
|
||||
assert(pVnodeFileInfo->current == -1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -314,46 +355,40 @@ static void doUnmapHeaderFileData(SQueryRuntimeEnv* pRuntimeEnv) {
|
|||
* @return the return value may be null, so any invoker needs to check the returned value
|
||||
*/
|
||||
char *vnodeGetHeaderFileData(SQueryRuntimeEnv *pRuntimeEnv, int32_t vnodeId, int32_t fileIndex) {
|
||||
assert(fileIndex >= 0 && fileIndex < pRuntimeEnv->numOfFiles);
|
||||
assert(fileIndex >= 0 && fileIndex < pRuntimeEnv->vnodeFileInfo.numOfFiles);
|
||||
|
||||
SQuery *pQuery = pRuntimeEnv->pQuery;
|
||||
SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery); // only for log output
|
||||
|
||||
SQueryFileInfo *pVnodeFiles = &pRuntimeEnv->pVnodeFiles[fileIndex];
|
||||
SQueryFilesInfo *pVnodeFileInfo = &pRuntimeEnv->vnodeFileInfo;
|
||||
SHeaderFileInfo *pHeaderFileInfo = &pVnodeFileInfo->pFileInfo[fileIndex];
|
||||
|
||||
if (pVnodeFiles->pHeaderFileData == NULL) {
|
||||
assert(pRuntimeEnv->mmapedHFileIndex != fileIndex);
|
||||
doUnmapHeaderFileData(pRuntimeEnv); // do close the other memory mapped header file
|
||||
|
||||
assert(pVnodeFiles->pHeaderFileData == NULL);
|
||||
if (pVnodeFileInfo->current != fileIndex || pVnodeFileInfo->pHeaderFileData == NULL) {
|
||||
if (pVnodeFileInfo->current >= 0) {
|
||||
assert(pVnodeFileInfo->pHeaderFileData != NULL);
|
||||
}
|
||||
|
||||
doCloseOpenedFileData(pVnodeFileInfo); // do close the other memory mapped header file
|
||||
assert(pVnodeFileInfo->pHeaderFileData == NULL);
|
||||
|
||||
// current header file is empty or broken, return directly
|
||||
if (isHeaderFileEmpty(vnodeId, pVnodeFiles->headFileSize)) {
|
||||
return pVnodeFiles->pHeaderFileData;
|
||||
}
|
||||
|
||||
if (doOpenQueryFileInfoDF(pQInfo, pVnodeFiles) != TSDB_CODE_SUCCESS) {
|
||||
return pVnodeFiles->pHeaderFileData;
|
||||
}
|
||||
|
||||
pVnodeFiles->pHeaderFileData = mmap(NULL, pVnodeFiles->headFileSize, PROT_READ, MAP_SHARED, pVnodeFiles->headerFd, 0);
|
||||
if (pVnodeFiles->pHeaderFileData == MAP_FAILED) {
|
||||
pVnodeFiles->pHeaderFileData = NULL;
|
||||
doCloseQueryFileInfoFD(pVnodeFiles);
|
||||
if (isHeaderFileEmpty(vnodeId, pHeaderFileInfo->headFileSize)) {
|
||||
qTrace("QInfo:%p vid:%d, fileId:%d, index:%d, size:%d, ignore file, empty or broken", pQInfo,
|
||||
pVnodeFileInfo->vnodeId, pHeaderFileInfo->fileID, fileIndex, pHeaderFileInfo->headFileSize);
|
||||
|
||||
dError("QInfo:%p failed to mmap header file:%s, size:%lld, %s", pQInfo, pVnodeFiles->headerFilePath,
|
||||
pVnodeFiles->headFileSize, strerror(errno));
|
||||
} else {
|
||||
pRuntimeEnv->mmapedHFileIndex = fileIndex; // set the value in case of success mmap file
|
||||
if (madvise(pVnodeFiles->pHeaderFileData, pVnodeFiles->headFileSize, MADV_SEQUENTIAL) == -1) {
|
||||
dError("QInfo:%p failed to advise kernel the usage of header file, reason:%s", pQInfo, strerror(errno));
|
||||
}
|
||||
return pVnodeFileInfo->pHeaderFileData;
|
||||
}
|
||||
|
||||
// set current opened file Index
|
||||
pVnodeFileInfo->current = fileIndex;
|
||||
|
||||
if (doOpenQueryFileData(pQInfo, pVnodeFileInfo) != TSDB_CODE_SUCCESS) {
|
||||
doCloseOpenedFileData(pVnodeFileInfo); // there may be partially open fd, close it anyway.
|
||||
return pVnodeFileInfo->pHeaderFileData;
|
||||
}
|
||||
} else {
|
||||
assert(pRuntimeEnv->mmapedHFileIndex == fileIndex);
|
||||
}
|
||||
|
||||
return pVnodeFiles->pHeaderFileData;
|
||||
return pVnodeFileInfo->pHeaderFileData;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -365,7 +400,7 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim
|
|||
SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
|
||||
|
||||
SVnodeCfg * pCfg = &vnodeList[pMeterObj->vnode].cfg;
|
||||
SQueryFileInfo *pQueryFileInfo = &pRuntimeEnv->pVnodeFiles[fileIndex];
|
||||
SHeaderFileInfo *pQueryFileInfo = &pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex];
|
||||
|
||||
int64_t st = taosGetTimestampUs();
|
||||
|
||||
|
|
@ -392,7 +427,7 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim
|
|||
#endif
|
||||
|
||||
// check the offset value integrity
|
||||
if (validateHeaderOffsetSegment(pQInfo, pQueryFileInfo->headerFilePath, pMeterObj->vnode, data,
|
||||
if (validateHeaderOffsetSegment(pQInfo, pRuntimeEnv->vnodeFileInfo.headerFilePath, pMeterObj->vnode, data,
|
||||
getCompHeaderSegSize(pCfg)) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -420,7 +455,7 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim
|
|||
#endif
|
||||
|
||||
// check compblock info integrity
|
||||
if (validateCompBlockInfoSegment(pQInfo, pQueryFileInfo->headerFilePath, pMeterObj->vnode, compInfo,
|
||||
if (validateCompBlockInfoSegment(pQInfo, pRuntimeEnv->vnodeFileInfo.headerFilePath, pMeterObj->vnode, compInfo,
|
||||
compHeader->compInfoOffset) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -454,7 +489,7 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim
|
|||
#endif
|
||||
|
||||
// check comp block integrity
|
||||
if (validateCompBlockSegment(pQInfo, pQueryFileInfo->headerFilePath, compInfo, (char *)pQuery->pBlock,
|
||||
if (validateCompBlockSegment(pQInfo, pRuntimeEnv->vnodeFileInfo.headerFilePath, compInfo, (char *)pQuery->pBlock,
|
||||
pMeterObj->vnode, checksum) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -464,7 +499,7 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim
|
|||
|
||||
int64_t et = taosGetTimestampUs();
|
||||
qTrace("QInfo:%p vid:%d sid:%d id:%s, fileId:%d, load compblock info, size:%d, elapsed:%f ms", pQInfo,
|
||||
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pRuntimeEnv->pVnodeFiles[fileIndex].fileID,
|
||||
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex].fileID,
|
||||
compBlockSize, (et - st) / 1000.0);
|
||||
|
||||
pSummary->totalCompInfoSize += compBlockSize;
|
||||
|
|
@ -524,8 +559,9 @@ static int32_t binarySearchForBlock(SQuery *pQuery, int64_t key) {
|
|||
return binarySearchForBlockImpl(pQuery->pBlock, pQuery->numOfBlocks, key, pQuery->order.order);
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* unmap previous buffer */
|
||||
static UNUSED_FUNC int32_t resetMMapWindow(SQueryFileInfo *pQueryFileInfo) {
|
||||
static UNUSED_FUNC int32_t resetMMapWindow(SHeaderFileInfo *pQueryFileInfo) {
|
||||
munmap(pQueryFileInfo->pDataFileData, pQueryFileInfo->defaultMappingSize);
|
||||
|
||||
pQueryFileInfo->dtFileMappingOffset = 0;
|
||||
|
|
@ -539,7 +575,7 @@ static UNUSED_FUNC int32_t resetMMapWindow(SQueryFileInfo *pQueryFileInfo) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int32_t moveMMapWindow(SQueryFileInfo *pQueryFileInfo, uint64_t offset) {
|
||||
static int32_t moveMMapWindow(SHeaderFileInfo *pQueryFileInfo, uint64_t offset) {
|
||||
uint64_t upperBnd = (pQueryFileInfo->dtFileMappingOffset + pQueryFileInfo->defaultMappingSize - 1);
|
||||
|
||||
/* data that are located in current mmapping window */
|
||||
|
|
@ -586,7 +622,7 @@ static int32_t moveMMapWindow(SQueryFileInfo *pQueryFileInfo, uint64_t offset) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int32_t copyDataFromMMapBuffer(int fd, SQInfo *pQInfo, SQueryFileInfo *pQueryFile, char *buf, uint64_t offset,
|
||||
static int32_t copyDataFromMMapBuffer(int fd, SQInfo *pQInfo, SHeaderFileInfo *pQueryFile, char *buf, uint64_t offset,
|
||||
int32_t size) {
|
||||
assert(size >= 0);
|
||||
|
||||
|
|
@ -637,7 +673,9 @@ static int32_t copyDataFromMMapBuffer(int fd, SQInfo *pQInfo, SQueryFileInfo *pQ
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFileInfo *pQueryFile, char *buf, uint64_t offset,
|
||||
#endif
|
||||
|
||||
static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFilesInfo *pQueryFile, char *buf, uint64_t offset,
|
||||
int32_t size) {
|
||||
assert(size >= 0);
|
||||
|
||||
|
|
@ -652,7 +690,7 @@ static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFileInfo *pQue
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int32_t loadColumnIntoMem(SQuery *pQuery, SQueryFileInfo *pQueryFileInfo, SCompBlock *pBlock, SField *pFields,
|
||||
static int32_t loadColumnIntoMem(SQuery *pQuery, SQueryFilesInfo *pQueryFileInfo, SCompBlock *pBlock, SField *pFields,
|
||||
int32_t col, SData *sdata, void *tmpBuf, char *buffer, int32_t buffersize) {
|
||||
char *dst = (pBlock->algorithm) ? tmpBuf : sdata->data;
|
||||
|
||||
|
|
@ -660,14 +698,14 @@ static int32_t loadColumnIntoMem(SQuery *pQuery, SQueryFileInfo *pQueryFileInfo,
|
|||
SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
|
||||
|
||||
int fd = pBlock->last ? pQueryFileInfo->lastFd : pQueryFileInfo->dataFd;
|
||||
int32_t ret = (*readDataFunctor[DEFAULT_IO_ENGINE])(fd, pQInfo, pQueryFileInfo, dst, offset, pFields[col].len);
|
||||
int32_t ret = readDataFromDiskFile(fd, pQInfo, pQueryFileInfo, dst, offset, pFields[col].len);
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
// load checksum
|
||||
TSCKSUM checksum = 0;
|
||||
ret = (*readDataFunctor[DEFAULT_IO_ENGINE])(fd, pQInfo, pQueryFileInfo, (char *)&checksum, offset + pFields[col].len,
|
||||
ret = readDataFromDiskFile(fd, pQInfo, pQueryFileInfo, (char *)&checksum, offset + pFields[col].len,
|
||||
sizeof(TSCKSUM));
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
|
|
@ -689,12 +727,12 @@ static int32_t loadColumnIntoMem(SQuery *pQuery, SQueryFileInfo *pQueryFileInfo,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int32_t loadDataBlockFieldsInfo(SQueryRuntimeEnv *pRuntimeEnv, SQueryFileInfo *pQueryFileInfo,
|
||||
SCompBlock *pBlock, SField **pField) {
|
||||
static int32_t loadDataBlockFieldsInfo(SQueryRuntimeEnv *pRuntimeEnv, SCompBlock *pBlock, SField **pField) {
|
||||
SQuery * pQuery = pRuntimeEnv->pQuery;
|
||||
SQInfo * pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
|
||||
SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
|
||||
|
||||
SQueryFilesInfo *pVnodeFilesInfo = &pRuntimeEnv->vnodeFileInfo;
|
||||
|
||||
size_t size = sizeof(SField) * (pBlock->numOfCols) + sizeof(TSCKSUM);
|
||||
|
||||
// if *pField != NULL, this block is loaded once, in current query do nothing
|
||||
|
|
@ -709,9 +747,8 @@ static int32_t loadDataBlockFieldsInfo(SQueryRuntimeEnv *pRuntimeEnv, SQueryFile
|
|||
|
||||
int64_t st = taosGetTimestampUs();
|
||||
|
||||
int fd = pBlock->last ? pQueryFileInfo->lastFd : pQueryFileInfo->dataFd;
|
||||
int32_t ret =
|
||||
(*readDataFunctor[DEFAULT_IO_ENGINE])(fd, pQInfo, pQueryFileInfo, (char *)(*pField), pBlock->offset, size);
|
||||
int fd = pBlock->last ? pVnodeFilesInfo->lastFd : pVnodeFilesInfo->dataFd;
|
||||
int32_t ret = readDataFromDiskFile(fd, pQInfo, pVnodeFilesInfo, (char *)(*pField), pBlock->offset, size);
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -719,7 +756,7 @@ static int32_t loadDataBlockFieldsInfo(SQueryRuntimeEnv *pRuntimeEnv, SQueryFile
|
|||
// check fields integrity
|
||||
if (!taosCheckChecksumWhole((uint8_t *)(*pField), size)) {
|
||||
dLError("QInfo:%p vid:%d sid:%d id:%s, slot:%d, failed to read sfields, file:%s, sfields area broken:%lld", pQInfo,
|
||||
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, pQueryFileInfo->dataFilePath,
|
||||
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, pVnodeFilesInfo->dataFilePath,
|
||||
pBlock->offset);
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -747,7 +784,8 @@ static int32_t loadDataBlockIntoMem(SCompBlock *pBlock, SField **pField, SQueryR
|
|||
SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
|
||||
SData ** sdata = pRuntimeEnv->colDataBuffer;
|
||||
|
||||
SQueryFileInfo *pQueryFileInfo = &pRuntimeEnv->pVnodeFiles[fileIdx];
|
||||
assert(fileIdx == pRuntimeEnv->vnodeFileInfo.current);
|
||||
|
||||
SData ** primaryTSBuf = &pRuntimeEnv->primaryColBuffer;
|
||||
void * tmpBuf = pRuntimeEnv->unzipBuffer;
|
||||
|
||||
|
|
@ -760,7 +798,7 @@ static int32_t loadDataBlockIntoMem(SCompBlock *pBlock, SField **pField, SQueryR
|
|||
}
|
||||
|
||||
/* failed to load fields info, return with error info */
|
||||
if (loadSField && (loadDataBlockFieldsInfo(pRuntimeEnv, pQueryFileInfo, pBlock, pField) != 0)) {
|
||||
if (loadSField && (loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, pField) != 0)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -775,7 +813,7 @@ static int32_t loadDataBlockIntoMem(SCompBlock *pBlock, SField **pField, SQueryR
|
|||
} else {
|
||||
columnBytes += (*pField)[PRIMARYKEY_TIMESTAMP_COL_INDEX].len + sizeof(TSCKSUM);
|
||||
int32_t ret =
|
||||
loadColumnIntoMem(pQuery, pQueryFileInfo, pBlock, *pField, PRIMARYKEY_TIMESTAMP_COL_INDEX, *primaryTSBuf,
|
||||
loadColumnIntoMem(pQuery, &pRuntimeEnv->vnodeFileInfo, pBlock, *pField, PRIMARYKEY_TIMESTAMP_COL_INDEX, *primaryTSBuf,
|
||||
tmpBuf, pRuntimeEnv->secondaryUnzipBuffer, pRuntimeEnv->unzipBufSize);
|
||||
if (ret != 0) {
|
||||
return -1;
|
||||
|
|
@ -813,7 +851,7 @@ static int32_t loadDataBlockIntoMem(SCompBlock *pBlock, SField **pField, SQueryR
|
|||
fillWithNull(pQuery, sdata[i]->data, i, pBlock->numOfPoints);
|
||||
} else {
|
||||
columnBytes += (*pField)[j].len + sizeof(TSCKSUM);
|
||||
ret = loadColumnIntoMem(pQuery, pQueryFileInfo, pBlock, *pField, j, sdata[i], tmpBuf,
|
||||
ret = loadColumnIntoMem(pQuery, &pRuntimeEnv->vnodeFileInfo, pBlock, *pField, j, sdata[i], tmpBuf,
|
||||
pRuntimeEnv->secondaryUnzipBuffer, pRuntimeEnv->unzipBufSize);
|
||||
|
||||
pSummary->numOfSeek++;
|
||||
|
|
@ -1763,23 +1801,25 @@ static int32_t applyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, SBlockInfo *
|
|||
}
|
||||
|
||||
int32_t vnodeGetVnodeHeaderFileIdx(int32_t *fid, SQueryRuntimeEnv *pRuntimeEnv, int32_t order) {
|
||||
if (pRuntimeEnv->numOfFiles == 0) {
|
||||
if (pRuntimeEnv->vnodeFileInfo.numOfFiles == 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
SQueryFilesInfo* pVnodeFiles = &pRuntimeEnv->vnodeFileInfo;
|
||||
|
||||
/* set the initial file for current query */
|
||||
if (order == TSQL_SO_ASC && *fid < pRuntimeEnv->pVnodeFiles[0].fileID) {
|
||||
*fid = pRuntimeEnv->pVnodeFiles[0].fileID;
|
||||
if (order == TSQL_SO_ASC && *fid < pVnodeFiles->pFileInfo[0].fileID) {
|
||||
*fid = pVnodeFiles->pFileInfo[0].fileID;
|
||||
return 0;
|
||||
} else if (order == TSQL_SO_DESC && *fid > pRuntimeEnv->pVnodeFiles[pRuntimeEnv->numOfFiles - 1].fileID) {
|
||||
*fid = pRuntimeEnv->pVnodeFiles[pRuntimeEnv->numOfFiles - 1].fileID;
|
||||
return pRuntimeEnv->numOfFiles - 1;
|
||||
} else if (order == TSQL_SO_DESC && *fid > pVnodeFiles->pFileInfo[pVnodeFiles->numOfFiles - 1].fileID) {
|
||||
*fid = pVnodeFiles->pFileInfo[pVnodeFiles->numOfFiles - 1].fileID;
|
||||
return pVnodeFiles->numOfFiles - 1;
|
||||
}
|
||||
|
||||
int32_t numOfFiles = pRuntimeEnv->numOfFiles;
|
||||
int32_t numOfFiles = pVnodeFiles->numOfFiles;
|
||||
|
||||
if (order == TSQL_SO_DESC && *fid > pRuntimeEnv->pVnodeFiles[numOfFiles - 1].fileID) {
|
||||
*fid = pRuntimeEnv->pVnodeFiles[numOfFiles - 1].fileID;
|
||||
if (order == TSQL_SO_DESC && *fid > pVnodeFiles->pFileInfo[numOfFiles - 1].fileID) {
|
||||
*fid = pVnodeFiles->pFileInfo[numOfFiles - 1].fileID;
|
||||
return numOfFiles - 1;
|
||||
}
|
||||
|
||||
|
|
@ -1787,12 +1827,12 @@ int32_t vnodeGetVnodeHeaderFileIdx(int32_t *fid, SQueryRuntimeEnv *pRuntimeEnv,
|
|||
int32_t i = 0;
|
||||
int32_t step = 1;
|
||||
|
||||
while (i<numOfFiles && * fid> pRuntimeEnv->pVnodeFiles[i].fileID) {
|
||||
while (i<numOfFiles && * fid> pVnodeFiles->pFileInfo[i].fileID) {
|
||||
i += step;
|
||||
}
|
||||
|
||||
if (i < numOfFiles && *fid <= pRuntimeEnv->pVnodeFiles[i].fileID) {
|
||||
*fid = pRuntimeEnv->pVnodeFiles[i].fileID;
|
||||
if (i < numOfFiles && *fid <= pVnodeFiles->pFileInfo[i].fileID) {
|
||||
*fid = pVnodeFiles->pFileInfo[i].fileID;
|
||||
return i;
|
||||
} else {
|
||||
return -1;
|
||||
|
|
@ -1801,12 +1841,12 @@ int32_t vnodeGetVnodeHeaderFileIdx(int32_t *fid, SQueryRuntimeEnv *pRuntimeEnv,
|
|||
int32_t i = numOfFiles - 1;
|
||||
int32_t step = -1;
|
||||
|
||||
while (i >= 0 && *fid < pRuntimeEnv->pVnodeFiles[i].fileID) {
|
||||
while (i >= 0 && *fid < pVnodeFiles->pFileInfo[i].fileID) {
|
||||
i += step;
|
||||
}
|
||||
|
||||
if (i >= 0 && *fid >= pRuntimeEnv->pVnodeFiles[i].fileID) {
|
||||
*fid = pRuntimeEnv->pVnodeFiles[i].fileID;
|
||||
if (i >= 0 && *fid >= pVnodeFiles->pFileInfo[i].fileID) {
|
||||
*fid = pVnodeFiles->pFileInfo[i].fileID;
|
||||
return i;
|
||||
} else {
|
||||
return -1;
|
||||
|
|
@ -2137,24 +2177,11 @@ static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
|
|||
tfree(pRuntimeEnv->primaryColBuffer);
|
||||
}
|
||||
|
||||
for (int32_t i = 0; i < pRuntimeEnv->numOfFiles; ++i) {
|
||||
SQueryFileInfo *pQFileInfo = &(pRuntimeEnv->pVnodeFiles[i]);
|
||||
if (pQFileInfo->pHeaderFileData != NULL && pQFileInfo->pHeaderFileData != MAP_FAILED) {
|
||||
munmap(pQFileInfo->pHeaderFileData, pQFileInfo->headFileSize);
|
||||
}
|
||||
tclose(pQFileInfo->headerFd);
|
||||
doCloseOpenedFileData(&pRuntimeEnv->vnodeFileInfo);
|
||||
|
||||
if (pQFileInfo->pDataFileData != NULL && pQFileInfo->pDataFileData != MAP_FAILED) {
|
||||
munmap(pQFileInfo->pDataFileData, pQFileInfo->defaultMappingSize);
|
||||
}
|
||||
|
||||
tclose(pQFileInfo->dataFd);
|
||||
tclose(pQFileInfo->lastFd);
|
||||
}
|
||||
|
||||
if (pRuntimeEnv->pVnodeFiles != NULL) {
|
||||
pRuntimeEnv->numOfFiles = 0;
|
||||
free(pRuntimeEnv->pVnodeFiles);
|
||||
if (pRuntimeEnv->vnodeFileInfo.pFileInfo != NULL) {
|
||||
pRuntimeEnv->vnodeFileInfo.numOfFiles = 0;
|
||||
free(pRuntimeEnv->vnodeFileInfo.pFileInfo);
|
||||
}
|
||||
|
||||
if (pRuntimeEnv->pInterpoBuf != NULL) {
|
||||
|
|
@ -2962,8 +2989,8 @@ bool vnodeParametersSafetyCheck(SQuery *pQuery) {
|
|||
}
|
||||
|
||||
static int file_order_comparator(const void *p1, const void *p2) {
|
||||
SQueryFileInfo *pInfo1 = (SQueryFileInfo *)p1;
|
||||
SQueryFileInfo *pInfo2 = (SQueryFileInfo *)p2;
|
||||
SHeaderFileInfo *pInfo1 = (SHeaderFileInfo *)p1;
|
||||
SHeaderFileInfo *pInfo2 = (SHeaderFileInfo *)p2;
|
||||
|
||||
if (pInfo1->fileID == pInfo2->fileID) {
|
||||
return 0;
|
||||
|
|
@ -2983,24 +3010,17 @@ static int file_order_comparator(const void *p1, const void *p2) {
|
|||
* @param prefix
|
||||
* @return
|
||||
*/
|
||||
static int32_t vnodeOpenVnodeDBFiles(SQueryFileInfo *pVnodeFiles, int32_t fid, int32_t vnodeId, char *fileName,
|
||||
char *prefix) {
|
||||
static int32_t vnodeOpenVnodeDBFiles(SQueryFilesInfo *pVnodeFiles, int32_t fid, int32_t index, char *fileName) {
|
||||
SHeaderFileInfo *pFileInfo = &pVnodeFiles->pFileInfo[index];
|
||||
|
||||
pVnodeFiles->fileID = fid;
|
||||
pVnodeFiles->defaultMappingSize = DEFAULT_DATA_FILE_MMAP_WINDOW_SIZE;
|
||||
pFileInfo->fileID = fid;
|
||||
|
||||
snprintf(pVnodeFiles->headerFilePath, PATH_MAX, "%s%s", prefix, fileName);
|
||||
char buf[PATH_MAX] = {0};
|
||||
snprintf(buf, PATH_MAX, "%s%s", pVnodeFiles->dbFilePathPrefix, fileName);
|
||||
|
||||
struct stat fstat = {0};
|
||||
if (stat(pVnodeFiles->headerFilePath, &fstat) < 0) return -1;
|
||||
pVnodeFiles->headFileSize = fstat.st_size;
|
||||
|
||||
snprintf(pVnodeFiles->dataFilePath, PATH_MAX, "%sv%df%d.data", prefix, vnodeId, fid);
|
||||
snprintf(pVnodeFiles->lastFilePath, PATH_MAX, "%sv%df%d.last", prefix, vnodeId, fid);
|
||||
|
||||
pVnodeFiles->headerFd = FD_INITIALIZER;
|
||||
pVnodeFiles->dataFd = FD_INITIALIZER;
|
||||
pVnodeFiles->lastFd = FD_INITIALIZER;
|
||||
if (stat(buf, &fstat) < 0) return -1;
|
||||
pFileInfo->headFileSize = fstat.st_size;
|
||||
|
||||
#if DEFAULT_IO_ENGINE == IO_ENGINE_MMAP
|
||||
/* enforce kernel to preload data when the file is mapping */
|
||||
|
|
@ -3035,23 +3055,23 @@ _clean:
|
|||
#endif
|
||||
}
|
||||
|
||||
static void vnodeOpenAllFiles(SQInfo *pQInfo, int32_t vnodeId) {
|
||||
char dbFilePathPrefix[TSDB_FILENAME_LEN] = {0};
|
||||
|
||||
sprintf(dbFilePathPrefix, "%s/vnode%d/db/", tsDirectory, vnodeId);
|
||||
DIR *pDir = opendir(dbFilePathPrefix);
|
||||
if (pDir == NULL) {
|
||||
dError("QInfo:%p failed to open directory:%s", pQInfo, dbFilePathPrefix);
|
||||
return;
|
||||
}
|
||||
|
||||
static void vnodeRecordAllFiles(SQInfo *pQInfo, int32_t vnodeId) {
|
||||
char suffix[] = ".head";
|
||||
|
||||
struct dirent *pEntry = NULL;
|
||||
size_t alloc = 4; // default allocated size
|
||||
|
||||
SQueryRuntimeEnv *pRuntimeEnv = &(pQInfo->pMeterQuerySupporter->runtimeEnv);
|
||||
pRuntimeEnv->pVnodeFiles = calloc(1, sizeof(SQueryFileInfo) * alloc);
|
||||
SQueryFilesInfo *pVnodeFilesInfo = &(pQInfo->pMeterQuerySupporter->runtimeEnv.vnodeFileInfo);
|
||||
pVnodeFilesInfo->vnodeId = vnodeId;
|
||||
|
||||
sprintf(pVnodeFilesInfo->dbFilePathPrefix, "%s/vnode%d/db/", tsDirectory, vnodeId);
|
||||
DIR *pDir = opendir(pVnodeFilesInfo->dbFilePathPrefix);
|
||||
if (pDir == NULL) {
|
||||
dError("QInfo:%p failed to open directory:%s", pQInfo, pVnodeFilesInfo->dbFilePathPrefix);
|
||||
return;
|
||||
}
|
||||
|
||||
pVnodeFilesInfo->pFileInfo = calloc(1, sizeof(SHeaderFileInfo) * alloc);
|
||||
SVnodeObj *pVnode = &vnodeList[vnodeId];
|
||||
|
||||
while ((pEntry = readdir(pDir)) != NULL) {
|
||||
|
|
@ -3085,26 +3105,28 @@ static void vnodeOpenAllFiles(SQInfo *pQInfo, int32_t vnodeId) {
|
|||
|
||||
assert(fid >= 0 && vid >= 0);
|
||||
|
||||
if (++pRuntimeEnv->numOfFiles > alloc) {
|
||||
alloc = alloc << 1;
|
||||
pRuntimeEnv->pVnodeFiles = realloc(pRuntimeEnv->pVnodeFiles, alloc * sizeof(SQueryFileInfo));
|
||||
memset(&pRuntimeEnv->pVnodeFiles[alloc >> 1], 0, (alloc >> 1) * sizeof(SQueryFileInfo));
|
||||
if (++pVnodeFilesInfo->numOfFiles > alloc) {
|
||||
alloc = alloc << 1U;
|
||||
pVnodeFilesInfo->pFileInfo = realloc(pVnodeFilesInfo->pFileInfo, alloc * sizeof(SHeaderFileInfo));
|
||||
memset(&pVnodeFilesInfo->pFileInfo[alloc >> 1U], 0, (alloc >> 1U) * sizeof(SHeaderFileInfo));
|
||||
}
|
||||
|
||||
SQueryFileInfo *pVnodeFiles = &pRuntimeEnv->pVnodeFiles[pRuntimeEnv->numOfFiles - 1];
|
||||
int32_t ret = vnodeOpenVnodeDBFiles(pVnodeFiles, fid, vnodeId, pEntry->d_name, dbFilePathPrefix);
|
||||
SHeaderFileInfo *pVnodeFiles = &pVnodeFilesInfo->pFileInfo[pVnodeFilesInfo->numOfFiles - 1];
|
||||
|
||||
int32_t ret = vnodeOpenVnodeDBFiles(pVnodeFilesInfo, fid, pVnodeFilesInfo->numOfFiles - 1, pEntry->d_name);
|
||||
if (ret < 0) {
|
||||
memset(pVnodeFiles, 0, sizeof(SQueryFileInfo)); // reset information
|
||||
pRuntimeEnv->numOfFiles -= 1;
|
||||
memset(pVnodeFiles, 0, sizeof(SHeaderFileInfo)); // reset information
|
||||
pVnodeFilesInfo->numOfFiles -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
closedir(pDir);
|
||||
|
||||
dTrace("QInfo:%p find %d data files in %s to be checked", pQInfo, pRuntimeEnv->numOfFiles, dbFilePathPrefix);
|
||||
dTrace("QInfo:%p find %d data files in %s to be checked", pQInfo, pVnodeFilesInfo->numOfFiles,
|
||||
pVnodeFilesInfo->dbFilePathPrefix);
|
||||
|
||||
/* order the files information according their names */
|
||||
qsort(pRuntimeEnv->pVnodeFiles, (size_t)pRuntimeEnv->numOfFiles, sizeof(SQueryFileInfo), file_order_comparator);
|
||||
qsort(pVnodeFilesInfo->pFileInfo, (size_t)pVnodeFilesInfo->numOfFiles, sizeof(SHeaderFileInfo), file_order_comparator);
|
||||
}
|
||||
|
||||
static void updateOffsetVal(SQueryRuntimeEnv *pRuntimeEnv, SBlockInfo *pBlockInfo, void *pBlock) {
|
||||
|
|
@ -3686,7 +3708,8 @@ int32_t vnodeQuerySingleMeterPrepare(SQInfo *pQInfo, SMeterObj *pMeterObj, SMete
|
|||
// dataInCache requires lastKey value
|
||||
pQuery->lastKey = pQuery->skey;
|
||||
|
||||
pSupporter->runtimeEnv.mmapedHFileIndex = -1; // set the initial value
|
||||
doInitQueryFileInfoFD(&pSupporter->runtimeEnv.vnodeFileInfo);
|
||||
|
||||
vnodeInitDataBlockInfo(&pSupporter->runtimeEnv.loadBlockInfo);
|
||||
vnodeInitLoadCompBlockInfo(&pSupporter->runtimeEnv.loadCompBlockInfo);
|
||||
|
||||
|
|
@ -3719,7 +3742,7 @@ int32_t vnodeQuerySingleMeterPrepare(SQInfo *pQInfo, SMeterObj *pMeterObj, SMete
|
|||
return ret;
|
||||
}
|
||||
|
||||
vnodeOpenAllFiles(pQInfo, pMeterObj->vnode);
|
||||
vnodeRecordAllFiles(pQInfo, pMeterObj->vnode);
|
||||
|
||||
if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
|
||||
if ((ret = allocateOutputBufForGroup(pSupporter, pQuery, false)) != TSDB_CODE_SUCCESS) {
|
||||
|
|
@ -3855,8 +3878,8 @@ int32_t vnodeMultiMeterQueryPrepare(SQInfo *pQInfo, SQuery *pQuery, void *param)
|
|||
pQuery->pointsRead = 0;
|
||||
|
||||
changeExecuteScanOrder(pQuery, true);
|
||||
|
||||
pSupporter->runtimeEnv.mmapedHFileIndex = -1; // set the initial value
|
||||
|
||||
doInitQueryFileInfoFD(&pSupporter->runtimeEnv.vnodeFileInfo);
|
||||
vnodeInitDataBlockInfo(&pSupporter->runtimeEnv.loadBlockInfo);
|
||||
vnodeInitLoadCompBlockInfo(&pSupporter->runtimeEnv.loadCompBlockInfo);
|
||||
|
||||
|
|
@ -3897,7 +3920,7 @@ int32_t vnodeMultiMeterQueryPrepare(SQInfo *pQInfo, SQuery *pQuery, void *param)
|
|||
}
|
||||
|
||||
tSidSetSort(pSupporter->pSidSet);
|
||||
vnodeOpenAllFiles(pQInfo, pMeter->vnode);
|
||||
vnodeRecordAllFiles(pQInfo, pMeter->vnode);
|
||||
|
||||
if ((ret = allocateOutputBufForGroup(pSupporter, pQuery, true)) != TSDB_CODE_SUCCESS) {
|
||||
return ret;
|
||||
|
|
@ -4038,7 +4061,7 @@ TSKEY getTimestampInDiskBlock(SQueryRuntimeEnv *pRuntimeEnv, int32_t index) {
|
|||
|
||||
// the fields info is not loaded, load it into memory
|
||||
if (pQuery->pFields == NULL || pQuery->pFields[pQuery->slot] == NULL) {
|
||||
loadDataBlockFieldsInfo(pRuntimeEnv, &pRuntimeEnv->pVnodeFiles[fileIndex], pBlock, &pQuery->pFields[pQuery->slot]);
|
||||
loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, &pQuery->pFields[pQuery->slot]);
|
||||
}
|
||||
|
||||
SET_DATA_BLOCK_LOADED(pRuntimeEnv->blockStatus);
|
||||
|
|
@ -5533,7 +5556,8 @@ SMeterDataInfo **vnodeFilterQualifiedMeters(SQInfo *pQInfo, int32_t vid, int32_t
|
|||
SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
|
||||
SMeterSidExtInfo ** pMeterSidExtInfo = pSupporter->pMeterSidExtInfo;
|
||||
SQueryRuntimeEnv * pRuntimeEnv = &pSupporter->runtimeEnv;
|
||||
SQueryFileInfo * pQueryFileInfo = &pRuntimeEnv->pVnodeFiles[fileIndex];
|
||||
|
||||
SHeaderFileInfo * pQueryFileInfo = &pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex];
|
||||
|
||||
SVnodeObj *pVnode = &vnodeList[vid];
|
||||
|
||||
|
|
@ -5545,7 +5569,7 @@ SMeterDataInfo **vnodeFilterQualifiedMeters(SQInfo *pQInfo, int32_t vid, int32_t
|
|||
int32_t tmsize = sizeof(SCompHeader) * (pVnode->cfg.maxSessions) + sizeof(TSCKSUM);
|
||||
|
||||
// file is corrupted, abort query in current file
|
||||
if (validateHeaderOffsetSegment(pQInfo, pQueryFileInfo->headerFilePath, vid, pHeaderFileData, tmsize) < 0) {
|
||||
if (validateHeaderOffsetSegment(pQInfo, pRuntimeEnv->vnodeFileInfo.headerFilePath, vid, pHeaderFileData, tmsize) < 0) {
|
||||
*numOfMeters = 0;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -5835,7 +5859,7 @@ static bool setCurrentQueryRange(SMeterDataInfo *pMeterDataInfo, SQuery *pQuery,
|
|||
* @return
|
||||
*/
|
||||
uint32_t getDataBlocksForMeters(SMeterQuerySupportObj *pSupporter, SQuery *pQuery, char *pHeaderData,
|
||||
int32_t numOfMeters, SQueryFileInfo *pQueryFileInfo, SMeterDataInfo **pMeterDataInfo) {
|
||||
int32_t numOfMeters, const char* filePath, SMeterDataInfo **pMeterDataInfo) {
|
||||
uint32_t numOfBlocks = 0;
|
||||
SQInfo * pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
|
||||
SQueryCostSummary *pSummary = &pSupporter->runtimeEnv.summary;
|
||||
|
|
@ -5847,7 +5871,7 @@ uint32_t getDataBlocksForMeters(SMeterQuerySupportObj *pSupporter, SQuery *pQuer
|
|||
SMeterObj *pMeterObj = pMeterDataInfo[j]->pMeterObj;
|
||||
|
||||
SCompInfo *compInfo = (SCompInfo *)(pHeaderData + pMeterDataInfo[j]->offsetInHeaderFile);
|
||||
int32_t ret = validateCompBlockInfoSegment(pQInfo, pQueryFileInfo->headerFilePath, pMeterObj->vnode, compInfo,
|
||||
int32_t ret = validateCompBlockInfoSegment(pQInfo, filePath, pMeterObj->vnode, compInfo,
|
||||
pMeterDataInfo[j]->offsetInHeaderFile);
|
||||
if (ret != 0) {
|
||||
clearMeterDataBlockInfo(pMeterDataInfo[j]);
|
||||
|
|
@ -5866,8 +5890,7 @@ uint32_t getDataBlocksForMeters(SMeterQuerySupportObj *pSupporter, SQuery *pQuer
|
|||
|
||||
// check compblock integrity
|
||||
TSCKSUM checksum = *(TSCKSUM *)((char *)compInfo + sizeof(SCompInfo) + size);
|
||||
ret = validateCompBlockSegment(pQInfo, pQueryFileInfo->headerFilePath, compInfo, (char *)pCompBlock,
|
||||
pMeterObj->vnode, checksum);
|
||||
ret = validateCompBlockSegment(pQInfo, filePath, compInfo, (char *)pCompBlock, pMeterObj->vnode, checksum);
|
||||
if (ret < 0) {
|
||||
clearMeterDataBlockInfo(pMeterDataInfo[j]);
|
||||
continue;
|
||||
|
|
@ -6540,7 +6563,7 @@ int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blk
|
|||
int32_t fileIdx, int32_t slotIdx, __block_search_fn_t searchFn, bool onDemand) {
|
||||
SQuery * pQuery = pRuntimeEnv->pQuery;
|
||||
SMeterObj * pMeterObj = pRuntimeEnv->pMeterObj;
|
||||
SQueryFileInfo *pQueryFileInfo = &pRuntimeEnv->pVnodeFiles[fileIdx];
|
||||
SHeaderFileInfo *pQueryFileInfo = &pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIdx];
|
||||
|
||||
TSKEY *primaryKeys = (TSKEY *)pRuntimeEnv->primaryColBuffer->data;
|
||||
|
||||
|
|
@ -6575,7 +6598,7 @@ int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blk
|
|||
|
||||
setTimestampRange(pRuntimeEnv, pBlock->keyFirst, pBlock->keyLast);
|
||||
} else if (req == BLK_DATA_FILEDS_NEEDED) {
|
||||
if (loadDataBlockFieldsInfo(pRuntimeEnv, pQueryFileInfo, pBlock, pFields) < 0) {
|
||||
if (loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, pFields) < 0) {
|
||||
return DISK_DATA_LOAD_FAILED;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -6584,7 +6607,7 @@ int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blk
|
|||
}
|
||||
} else {
|
||||
_load_all:
|
||||
if (loadDataBlockFieldsInfo(pRuntimeEnv, pQueryFileInfo, pBlock, pFields) < 0) {
|
||||
if (loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, pFields) < 0) {
|
||||
return DISK_DATA_LOAD_FAILED;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -266,7 +266,9 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe
|
|||
__block_search_fn_t searchFn = vnodeSearchKeyFunc[pTempMeter->searchAlgorithm];
|
||||
|
||||
int32_t vnodeId = pTempMeter->vnode;
|
||||
dTrace("QInfo:%p start to check data blocks in %d files", pQInfo, pRuntimeEnv->numOfFiles);
|
||||
SQueryFilesInfo* pVnodeFileInfo = &pRuntimeEnv->vnodeFileInfo;
|
||||
|
||||
dTrace("QInfo:%p start to check data blocks in %d files", pQInfo, pVnodeFileInfo->numOfFiles);
|
||||
|
||||
int32_t fid = QUERY_IS_ASC_QUERY(pQuery) ? -1 : INT32_MAX;
|
||||
int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
|
||||
|
|
@ -289,9 +291,8 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe
|
|||
pQuery->fileId = fid;
|
||||
pSummary->numOfFiles++;
|
||||
|
||||
SQueryFileInfo *pQueryFileInfo = &pRuntimeEnv->pVnodeFiles[fileIdx];
|
||||
char *pHeaderData = vnodeGetHeaderFileData(pRuntimeEnv, vnodeId, fileIdx);
|
||||
if (pHeaderData == NULL) { // failed to mmap header file into buffer, ignore current file, try next
|
||||
char *pHeaderFileData = vnodeGetHeaderFileData(pRuntimeEnv, vnodeId, fileIdx);
|
||||
if (pHeaderFileData == NULL) { // failed to mmap header file into buffer, ignore current file, try next
|
||||
fid += step;
|
||||
continue;
|
||||
}
|
||||
|
|
@ -308,20 +309,21 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe
|
|||
return NULL;
|
||||
}
|
||||
|
||||
dTrace("QInfo:%p file:%s, %d meters qualified", pQInfo, pQueryFileInfo->dataFilePath, numOfQualifiedMeters);
|
||||
dTrace("QInfo:%p file:%s, %d meters qualified", pQInfo, pVnodeFileInfo->dataFilePath, numOfQualifiedMeters);
|
||||
|
||||
// none of meters in query set have pHeaderData in this file, try next file
|
||||
// none of meters in query set have pHeaderFileData in this file, try next file
|
||||
if (numOfQualifiedMeters == 0) {
|
||||
fid += step;
|
||||
tfree(pReqMeterDataInfo);
|
||||
continue;
|
||||
}
|
||||
|
||||
uint32_t numOfBlocks = getDataBlocksForMeters(pSupporter, pQuery, pHeaderData, numOfQualifiedMeters, pQueryFileInfo,
|
||||
pReqMeterDataInfo);
|
||||
uint32_t numOfBlocks = getDataBlocksForMeters(pSupporter, pQuery, pHeaderFileData, numOfQualifiedMeters,
|
||||
pVnodeFileInfo->headerFilePath, pReqMeterDataInfo);
|
||||
|
||||
dTrace("QInfo:%p file:%s, %d meters contains %d blocks to be checked", pQInfo, pQueryFileInfo->dataFilePath,
|
||||
dTrace("QInfo:%p file:%s, %d meters contains %d blocks to be checked", pQInfo, pVnodeFileInfo->dataFilePath,
|
||||
numOfQualifiedMeters, numOfBlocks);
|
||||
|
||||
if (numOfBlocks == 0) {
|
||||
fid += step;
|
||||
tfree(pReqMeterDataInfo);
|
||||
|
|
@ -346,7 +348,7 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe
|
|||
|
||||
totalBlocks += numOfBlocks;
|
||||
|
||||
// sequentially scan the pHeaderData file
|
||||
// sequentially scan the pHeaderFileData file
|
||||
int32_t j = QUERY_IS_ASC_QUERY(pQuery) ? 0 : numOfBlocks - 1;
|
||||
|
||||
for (; j < numOfBlocks && j >= 0; j += step) {
|
||||
|
|
@ -428,7 +430,7 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe
|
|||
}
|
||||
|
||||
int64_t time = taosGetTimestampUs() - st;
|
||||
dTrace("QInfo:%p complete check %d files, %d blocks, elapsed time:%.3fms", pQInfo, pRuntimeEnv->numOfFiles,
|
||||
dTrace("QInfo:%p complete check %d files, %d blocks, elapsed time:%.3fms", pQInfo, pVnodeFileInfo->numOfFiles,
|
||||
totalBlocks, time / 1000.0);
|
||||
|
||||
pSummary->fileTimeUs += time;
|
||||
|
|
|
|||
Loading…
Reference in New Issue