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

opti:logic for get table list

This commit is contained in:
wangmm0220 2022-08-11 14:35:38 +08:00
parent 8be1396268
commit 4f03e2e4f5
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/libs/executor/src/executil.c
View File

@ -315,8 +315,6 @@ static EDealRes getColumn(SNode* pNode, void* pContext) {
SColumnInfo cInfo = {.colId = pSColumnNode->colId, .type = pSColumnNode->node.resType.type, .bytes = pSColumnNode->node.resType.bytes}; SColumnInfo cInfo = {.colId = pSColumnNode->colId, .type = pSColumnNode->node.resType.type, .bytes = pSColumnNode->node.resType.bytes};
taosArrayPush(pData->cInfoList, &cInfo); taosArrayPush(pData->cInfoList, &cInfo);
} }
return DEAL_RES_END;
} }
return DEAL_RES_CONTINUE; return DEAL_RES_CONTINUE;
} }
@ -388,34 +386,42 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
for (int32_t i = 0; i < rows; i++) { for (int32_t i = 0; i < rows; i++) {
STableKeyInfo* info = taosArrayGet(pTableList, i); STableKeyInfo* info = taosArrayGet(pTableList, i);
// int64_t stt = taosGetTimestampUs();
SMetaReader mr = {0}; SMetaReader mr = {0};
metaReaderInit(&mr, metaHandle, 0); metaReaderInit(&mr, metaHandle, 0);
code = metaGetTableEntryByUid(&mr, info->uid); code = metaGetTableEntryByUid(&mr, info->uid);
if (TSDB_CODE_SUCCESS == code) { // int64_t stt1 = taosGetTimestampUs();
// qDebug("generate tag get meta rows:%d, cost:%ld ms", rows, stt1-stt);
for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){ for(int32_t j = 0; j < taosArrayGetSize(pResBlock->pDataBlock); j++){
SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j); SColumnInfoData* pColInfo = (SColumnInfoData*)taosArrayGet(pResBlock->pDataBlock, j);
STagVal tagVal = {0}; STagVal tagVal = {0};
tagVal.cid = pColInfo->info.colId; tagVal.cid = pColInfo->info.colId;
// int64_t t1 = taosGetTimestampUs();
const char* p = metaGetTableTagVal(&mr.me, pColInfo->info.type, &tagVal); const char* p = metaGetTableTagVal(&mr.me, pColInfo->info.type, &tagVal);
// int64_t t2 = taosGetTimestampUs();
// qDebug("generate tag inner1 rows:%d, cost:%ld ms", rows, t2-t1);
if (IS_VAR_DATA_TYPE(pColInfo->info.type)) { if (p == NULL){
char* tmp = taosMemoryCalloc(tagVal.nData + VARSTR_HEADER_SIZE, 1); colDataAppend(pColInfo, i, p, true);
memcpy(varDataVal(tmp), tagVal.pData, tagVal.nData); } else if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
char *tmp = (char*)(tagVal.pData - VARSTR_HEADER_SIZE);
varDataSetLen(tmp, tagVal.nData); varDataSetLen(tmp, tagVal.nData);
colDataAppend(pColInfo, i, tmp, p == NULL); colDataAppend(pColInfo, i, tmp, p == NULL);
taosMemoryFree(tmp);
} else { } else {
colDataAppend(pColInfo, i, p, p == NULL); colDataAppend(pColInfo, i, p, false);
} }
// int64_t t3 = taosGetTimestampUs();
// qDebug("generate tag inner2 rows:%d, cost:%ld ms", rows, t3-t2);
} }
// int64_t stt2 = taosGetTimestampUs();
} // qDebug("generate tag get block rows:%d, cost:%ld us", rows, stt2-stt1);
metaReaderClear(&mr); metaReaderClear(&mr);
} }
pResBlock->info.rows = rows; pResBlock->info.rows = rows;
int64_t st1 = taosGetTimestampUs(); int64_t st1 = taosGetTimestampUs();
qDebug("generate tag block rows:%d, cost:%lf ms", rows, st1-st); qDebug("generate tag block rows:%d, cost:%ld us", rows, st1-st);
pBlockList = taosArrayInit(2, POINTER_BYTES); pBlockList = taosArrayInit(2, POINTER_BYTES);
taosArrayPush(pBlockList, &pResBlock); taosArrayPush(pBlockList, &pResBlock);
@ -431,7 +437,7 @@ SColumnInfoData* getColInfoResult(void* metaHandle, SArray* pTableList, SNode* p
terrno = code; terrno = code;
} }
int64_t st2 = taosGetTimestampUs(); int64_t st2 = taosGetTimestampUs();
qDebug("calculate tag block rows:%d, cost:%lf ms", rows, st2-st1); qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
end: end:
taosHashCleanup(ctx.colHash); taosHashCleanup(ctx.colHash);
@ -489,7 +495,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
taosArrayPush(pListInfo->pTableList, &info); taosArrayPush(pListInfo->pTableList, &info);
} }
if (pTagCond) { if (pTagCond && taosArrayGetSize(pListInfo->pTableList) > 0) {
SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->pTableList, pTagCond); SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->pTableList, pTagCond);
if(terrno != TDB_CODE_SUCCESS){ if(terrno != TDB_CODE_SUCCESS){
colDataDestroy(pColInfoData); colDataDestroy(pColInfoData);