diff --git a/src/query/src/queryMain.c b/src/query/src/queryMain.c
index c880dc2aaa8198b3267976f5e4c8b8e0881a74bf..5e26bb534acd1a4773b6f1f93cb70535c31e0453 100644
--- a/src/query/src/queryMain.c
+++ b/src/query/src/queryMain.c
@@ -215,6 +215,7 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qi
   return code;
 }
 
+#ifdef TEST_IMPL
 // wait moment
 int waitMoment(SQInfo* pQInfo){
   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) {
       taosMsleep(ms);
@@ -257,7 +258,7 @@ int waitMoment(SQInfo* pQInfo){
   }
   return 1;
 }
-
+#endif
 
 bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
   SQInfo *pQInfo = (SQInfo *)qinfo;
@@ -303,8 +304,9 @@ bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
   int64_t st = taosGetTimestampUs();
   pRuntimeEnv->outputBuf = pRuntimeEnv->proot->exec(pRuntimeEnv->proot, &newgroup);
   pQInfo->summary.elapsedTime += (taosGetTimestampUs() - st);
+#ifdef TEST_IMPL
   waitMoment(pQInfo);
-
+#endif
   publishOperatorProfEvent(pRuntimeEnv->proot, QUERY_PROF_AFTER_OPERATOR_EXEC);
   pRuntimeEnv->resultInfo.total += GET_NUM_OF_RESULTS(pRuntimeEnv);
 
@@ -730,7 +732,6 @@ bool qFixedNoBlock(void* pRepo, void* pMgmt, int32_t longQueryMs) {
   SLongQuery* plq;
   for(i=0; i < cnt; 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(now - plq->startExecTs >= longQueryMs) {
       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
 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)) {
     return true;
   }
diff --git a/src/tsdb/src/tsdbBuffer.c b/src/tsdb/src/tsdbBuffer.c
index ec385ef83e8ff519989b20577b3517c397279e28..be64f9ee1bdeffaaa4229c5e8c99d5ad5ebf847f 100644
--- a/src/tsdb/src/tsdbBuffer.c
+++ b/src/tsdb/src/tsdbBuffer.c
@@ -63,11 +63,6 @@ int tsdbOpenBufPool(STsdbRepo *pRepo) {
   STsdbBufPool *pPool = pRepo->pPool;
 
   ASSERT(pPool != NULL);
-
-  // debug test
-  pCfg->cacheBlockSize = 1;
-  pCfg->totalBlocks = 4;
-
   pPool->bufBlockSize = pCfg->cacheBlockSize * 1024 * 1024; // MB
   pPool->tBufBlocks = pCfg->totalBlocks;
   pPool->nBufBlocks = 0;
@@ -126,7 +121,7 @@ SListNode *tsdbAllocBufBlockFromPool(STsdbRepo *pRepo) {
     if(tsDeathLockKillQuery) {
       // supply new Block 
       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;
       } else {
         // no newBlock, kill query free
diff --git a/src/tsdb/src/tsdbHealth.c b/src/tsdb/src/tsdbHealth.c
index cc6bae02b0dd7cc97a688a03200e0471ec7ecb69..63dffff3dda3ada5fad8921319bf9d32bb368895 100644
--- a/src/tsdb/src/tsdbHealth.c
+++ b/src/tsdb/src/tsdbHealth.c
@@ -39,8 +39,7 @@ int32_t tsdbInsertNewBlock(STsdbRepo * pRepo) {
           tsdbFreeBufBlock(pBufBlock);
         } else {
           pPool->nElasticBlocks ++;
-          cnt ++ ; 
-          printf(" elastic block add one ok. current blocks=%d \n", pPool->nElasticBlocks);
+          cnt ++ ;
         }
     }
  }