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

fix:remove log for time cost

This commit is contained in:
wangmm0220 2022-08-16 14:48:31 +08:00
parent 19c5051b8c
commit c4d25ccb90
2 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
source/dnode/vnode/src/meta/metaQuery.c
View File

@ -53,79 +53,79 @@ _err:
return -1; return -1;
} }
int metaGetTableEntryByUidTest(void* meta, SArray *uidList) { //int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
//
SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader)); // SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader));
SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey)); // SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
SMeta *pMeta = meta; // SMeta *pMeta = meta;
int64_t version; // int64_t version;
SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK); // SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
//
int64_t stt1 = taosGetTimestampUs(); // int64_t stt1 = taosGetTimestampUs();
for(int i = 0; i < taosArrayGetSize(uidList); i++) { // for(int i = 0; i < taosArrayGetSize(uidList); i++) {
void* ppVal = NULL; // void* ppVal = NULL;
int vlen = 0; // int vlen = 0;
uint64_t * uid = taosArrayGet(uidList, i); // uint64_t * uid = taosArrayGet(uidList, i);
// query uid.idx // // query uid.idx
if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) { // if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) {
continue; // continue;
} // }
version = *(int64_t *)ppVal; // version = *(int64_t *)ppVal;
//
STbDbKey tbDbKey = {.version = version, .uid = *uid}; // STbDbKey tbDbKey = {.version = version, .uid = *uid};
taosArrayPush(uidVersion, &tbDbKey); // taosArrayPush(uidVersion, &tbDbKey);
taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t)); // taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t));
} // }
int64_t stt2 = taosGetTimestampUs(); // int64_t stt2 = taosGetTimestampUs();
qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1); // qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
//
TBC *pCur = NULL; // TBC *pCur = NULL;
tdbTbcOpen(pMeta->pTbDb, &pCur, NULL); // tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
tdbTbcMoveToFirst(pCur); // tdbTbcMoveToFirst(pCur);
void *pKey = NULL; // void *pKey = NULL;
int kLen = 0; // int kLen = 0;
//
while(1){ // while(1){
SMetaReader pReader = {0}; // SMetaReader pReader = {0};
int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf); // int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf);
if (ret < 0) break; // if (ret < 0) break;
STbDbKey *tmp = (STbDbKey*)pKey; // STbDbKey *tmp = (STbDbKey*)pKey;
int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t)); // int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t));
if(ver == NULL || *ver != tmp->version) continue; // if(ver == NULL || *ver != tmp->version) continue;
taosArrayPush(readerList, &pReader); // taosArrayPush(readerList, &pReader);
} // }
tdbTbcClose(pCur); // tdbTbcClose(pCur);
//
taosArrayClear(readerList); // taosArrayClear(readerList);
int64_t stt3 = taosGetTimestampUs(); // int64_t stt3 = taosGetTimestampUs();
qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2); // qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
for(int i = 0; i < taosArrayGetSize(uidVersion); i++) { // for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
SMetaReader pReader = {0}; // SMetaReader pReader = {0};
//
STbDbKey *tbDbKey = taosArrayGet(uidVersion, i); // STbDbKey *tbDbKey = taosArrayGet(uidVersion, i);
// query table.db // // query table.db
if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) { // if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) {
continue; // continue;
} // }
taosArrayPush(readerList, &pReader); // taosArrayPush(readerList, &pReader);
} // }
int64_t stt4 = taosGetTimestampUs(); // int64_t stt4 = taosGetTimestampUs();
qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3); // qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3);
//
for(int i = 0; i < taosArrayGetSize(readerList); i++){ // for(int i = 0; i < taosArrayGetSize(readerList); i++){
SMetaReader* pReader = taosArrayGet(readerList, i); // SMetaReader* pReader = taosArrayGet(readerList, i);
metaReaderInit(pReader, meta, 0); // metaReaderInit(pReader, meta, 0);
// decode the entry // // decode the entry
tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf); // tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf);
//
if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) { // if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) {
} // }
metaReaderClear(pReader); // metaReaderClear(pReader);
} // }
int64_t stt5 = taosGetTimestampUs(); // int64_t stt5 = taosGetTimestampUs();
qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4); // qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4);
return 0; // return 0;
} //}
int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) { int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) {
SMeta *pMeta = pReader->pMeta; SMeta *pMeta = pReader->pMeta;

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

@ -396,7 +396,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
blockDataAppendColInfo(pResBlock, &colInfo); blockDataAppendColInfo(pResBlock, &colInfo);
} }
int64_t stt = taosGetTimestampUs(); // int64_t stt = taosGetTimestampUs();
tags = taosArrayInit(8, POINTER_BYTES); tags = taosArrayInit(8, POINTER_BYTES);
code = metaGetTableTags(metaHandle, suid, uidList, tags); code = metaGetTableTags(metaHandle, suid, uidList, tags);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
@ -408,8 +408,8 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
if(rows == 0){ if(rows == 0){
goto end; goto end;
} }
int64_t stt1 = taosGetTimestampUs(); // int64_t stt1 = taosGetTimestampUs();
qDebug("generate tag meta rows:%d, cost:%ld us", rows, stt1-stt); // qDebug("generate tag meta rows:%d, cost:%ld us", rows, stt1-stt);
code = blockDataEnsureCapacity(pResBlock, rows); code = blockDataEnsureCapacity(pResBlock, rows);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
@ -417,7 +417,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
goto end; goto end;
} }
int64_t st = taosGetTimestampUs(); // int64_t st = taosGetTimestampUs();
for (int32_t i = 0; i < rows; i++) { for (int32_t i = 0; i < rows; i++) {
void* tag = taosArrayGetP(tags, i); void* tag = taosArrayGetP(tags, i);
int64_t* uid = taosArrayGet(uidList, i); int64_t* uid = taosArrayGet(uidList, i);
@ -451,8 +451,8 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
} }
pResBlock->info.rows = rows; pResBlock->info.rows = rows;
int64_t st1 = taosGetTimestampUs(); // int64_t st1 = taosGetTimestampUs();
qDebug("generate tag block rows:%d, cost:%ld us", 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);
@ -467,8 +467,8 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
if(code != TSDB_CODE_SUCCESS){ if(code != TSDB_CODE_SUCCESS){
terrno = code; terrno = code;
} }
int64_t st2 = taosGetTimestampUs(); // int64_t st2 = taosGetTimestampUs();
qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1); // qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
end: end:
taosArrayDestroyP(tags, taosMemoryFree); taosArrayDestroyP(tags, taosMemoryFree);
@ -497,15 +497,15 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
SIndexMetaArg metaArg = { SIndexMetaArg metaArg = {
.metaEx = metaHandle, .idx = tsdbGetIdx(metaHandle), .ivtIdx = tsdbGetIvtIdx(metaHandle), .suid = tableUid}; .metaEx = metaHandle, .idx = tsdbGetIdx(metaHandle), .ivtIdx = tsdbGetIvtIdx(metaHandle), .suid = tableUid};
int64_t stt = taosGetTimestampUs(); // int64_t stt = taosGetTimestampUs();
SIdxFltStatus status = SFLT_NOT_INDEX; SIdxFltStatus status = SFLT_NOT_INDEX;
code = doFilterTag(pTagIndexCond, &metaArg, res, &status); code = doFilterTag(pTagIndexCond, &metaArg, res, &status);
if (code != 0 || status == SFLT_NOT_INDEX) { if (code != 0 || status == SFLT_NOT_INDEX) {
qError("failed to get tableIds from index, reason:%s, suid:%" PRIu64, tstrerror(code), tableUid); qError("failed to get tableIds from index, reason:%s, suid:%" PRIu64, tstrerror(code), tableUid);
} }
int64_t stt1 = taosGetTimestampUs(); // int64_t stt1 = taosGetTimestampUs();
qDebug("generate table list, cost:%ld us", stt1-stt); // qDebug("generate table list, cost:%ld us", stt1-stt);
}else if(!pTagCond){ }else if(!pTagCond){
vnodeGetCtbIdList(pVnode, pScanNode->suid, res); vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
} }