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

remove test information

This commit is contained in:
AlexDuan 2021-08-24 14:14:27 +08:00
parent 951ff0071a
commit a1d8119aac
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/query/src/queryMain.c
View File

@ -215,6 +215,7 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qi
return code; return code;
} }
#ifdef TEST_IMPL
// wait moment // wait moment
int waitMoment(SQInfo* pQInfo){ int waitMoment(SQInfo* pQInfo){
if(pQInfo->sql) { if(pQInfo->sql) {
@ -239,7 +240,7 @@ int waitMoment(SQInfo* pQInfo){
} }
} }
printf("wait sleep %dms ... sql=%s\n", ms, pQInfo->sql); printf("wait sleep %dms. sql=%s\n", ms, pQInfo->sql);
if(ms < 1000) { if(ms < 1000) {
taosMsleep(ms); taosMsleep(ms);
@ -257,7 +258,7 @@ int waitMoment(SQInfo* pQInfo){
} }
return 1; return 1;
} }
#endif
bool qTableQuery(qinfo_t qinfo, uint64_t *qId) { bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
SQInfo *pQInfo = (SQInfo *)qinfo; SQInfo *pQInfo = (SQInfo *)qinfo;
@ -303,8 +304,9 @@ bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
int64_t st = taosGetTimestampUs(); int64_t st = taosGetTimestampUs();
pRuntimeEnv->outputBuf = pRuntimeEnv->proot->exec(pRuntimeEnv->proot, &newgroup); pRuntimeEnv->outputBuf = pRuntimeEnv->proot->exec(pRuntimeEnv->proot, &newgroup);
pQInfo->summary.elapsedTime += (taosGetTimestampUs() - st); pQInfo->summary.elapsedTime += (taosGetTimestampUs() - st);
#ifdef TEST_IMPL
waitMoment(pQInfo); waitMoment(pQInfo);
#endif
publishOperatorProfEvent(pRuntimeEnv->proot, QUERY_PROF_AFTER_OPERATOR_EXEC); publishOperatorProfEvent(pRuntimeEnv->proot, QUERY_PROF_AFTER_OPERATOR_EXEC);
pRuntimeEnv->resultInfo.total += GET_NUM_OF_RESULTS(pRuntimeEnv); pRuntimeEnv->resultInfo.total += GET_NUM_OF_RESULTS(pRuntimeEnv);
@ -730,7 +732,6 @@ bool qFixedNoBlock(void* pRepo, void* pMgmt, int32_t longQueryMs) {
SLongQuery* plq; SLongQuery* plq;
for(i=0; i < cnt; i++) { for(i=0; i < cnt; i++) {
plq = (SLongQuery* )taosArrayGetP(qids, i); plq = (SLongQuery* )taosArrayGetP(qids, i);
printf(" sort i=%d span=%d qid=0x%"PRIx64" exeTime=0x%"PRIx64". \n",(int)i, (int)(now - plq->startExecTs), plq->qId, plq->startExecTs);
if(plq->startExecTs > now) continue; if(plq->startExecTs > now) continue;
if(now - plq->startExecTs >= longQueryMs) { if(now - plq->startExecTs >= longQueryMs) {
qKillQueryByQId(pMgmt, plq->qId, 500, 10); // wait 50*100 ms qKillQueryByQId(pMgmt, plq->qId, 500, 10); // wait 50*100 ms
@ -752,7 +753,7 @@ bool qFixedNoBlock(void* pRepo, void* pMgmt, int32_t longQueryMs) {
//solve tsdb no block to commit //solve tsdb no block to commit
bool qSolveCommitNoBlock(void* pRepo, void* pMgmt) { bool qSolveCommitNoBlock(void* pRepo, void* pMgmt) {
qWarn("start solve no block problem."); qWarn("pRepo=%p start solve no block problem.", pRepo);
if(qFixedNoBlock(pRepo, pMgmt, 20*1000)) { if(qFixedNoBlock(pRepo, pMgmt, 20*1000)) {
return true; return true;
} }

7
src/tsdb/src/tsdbBuffer.c
View File

@ -63,11 +63,6 @@ int tsdbOpenBufPool(STsdbRepo *pRepo) {
STsdbBufPool *pPool = pRepo->pPool; STsdbBufPool *pPool = pRepo->pPool;
ASSERT(pPool != NULL); ASSERT(pPool != NULL);
// debug test
pCfg->cacheBlockSize = 1;
pCfg->totalBlocks = 4;
pPool->bufBlockSize = pCfg->cacheBlockSize * 1024 * 1024; // MB pPool->bufBlockSize = pCfg->cacheBlockSize * 1024 * 1024; // MB
pPool->tBufBlocks = pCfg->totalBlocks; pPool->tBufBlocks = pCfg->totalBlocks;
pPool->nBufBlocks = 0; pPool->nBufBlocks = 0;
@ -126,7 +121,7 @@ SListNode *tsdbAllocBufBlockFromPool(STsdbRepo *pRepo) {
if(tsDeathLockKillQuery) { if(tsDeathLockKillQuery) {
// supply new Block // supply new Block
if(tsdbInsertNewBlock(pRepo) > 0) { if(tsdbInsertNewBlock(pRepo) > 0) {
tsdbWarn("vgId:%d Insert elastic new block to solve.", REPO_ID(pRepo)); tsdbWarn("vgId:%d add new elastic block . elasticBlocks=%d totalBlocks=%d", REPO_ID(pRepo), pBufPool->nElasticBlocks, pBufPool->nBufBlocks);
break; break;
} else { } else {
// no newBlock, kill query free // no newBlock, kill query free

1
src/tsdb/src/tsdbHealth.c
View File

@ -40,7 +40,6 @@ int32_t tsdbInsertNewBlock(STsdbRepo * pRepo) {
} else { } else {
pPool->nElasticBlocks ++; pPool->nElasticBlocks ++;
cnt ++ ; cnt ++ ;
printf(" elastic block add one ok. current blocks=%d \n", pPool->nElasticBlocks);
} }
} }
} }