diff --git a/source/dnode/vnode/src/meta/metaCache.c b/source/dnode/vnode/src/meta/metaCache.c
index 98f5615f5e..7577b9ec0c 100644
--- a/source/dnode/vnode/src/meta/metaCache.c
+++ b/source/dnode/vnode/src/meta/metaCache.c
@@ -503,7 +503,6 @@ static int checkAllEntriesInCache(const STagFilterResEntry* pEntry, SArray* pInv
 }
 
 static FORCE_INLINE void setMD5DigestInKey(uint64_t* pBuf, const char* key, int32_t keyLen) {
-  //  ASSERT(keyLen == sizeof(int64_t) * 2);
   memcpy(&pBuf[2], key, keyLen);
 }
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
index d920e289e2..df572ff852 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@@ -626,8 +626,8 @@ static int32_t tsdbCloseCommitter(SCommitter2 *committer, int32_t eno) {
   if (eno == 0) {
     TAOS_CHECK_GOTO(tsdbFSEditBegin(committer->tsdb->pFS, committer->fopArray, TSDB_FEDIT_COMMIT), &lino, _exit);
   } else {
-    // TODO
-    ASSERT(0);
+    tsdbError("vgId:%d %s failed at %s:%d since %s", TD_VID(committer->tsdb->pVnode), __func__, __FILE__, lino,
+              tstrerror(eno));
   }
 
   TARRAY2_DESTROY(committer->dataIterArray, NULL);
diff --git a/source/dnode/vnode/src/tsdb/tsdbDataFileRAW.c b/source/dnode/vnode/src/tsdb/tsdbDataFileRAW.c
index 6469160536..886a6f31a2 100644
--- a/source/dnode/vnode/src/tsdb/tsdbDataFileRAW.c
+++ b/source/dnode/vnode/src/tsdb/tsdbDataFileRAW.c
@@ -113,7 +113,7 @@ _exit:
 }
 
 static int32_t tsdbDataFileRAWWriterCloseAbort(SDataFileRAWWriter *writer) {
-  ASSERT(0);
+  tsdbError("vgId:%d %s failed since not implemented", TD_VID(writer->config->tsdb->pVnode), __func__);
   return 0;
 }
 
@@ -122,8 +122,6 @@ static int32_t tsdbDataFileRAWWriterDoClose(SDataFileRAWWriter *writer) { return
 static int32_t tsdbDataFileRAWWriterCloseCommit(SDataFileRAWWriter *writer, TFileOpArray *opArr) {
   int32_t code = 0;
   int32_t lino = 0;
-  ASSERT(writer->ctx->offset <= writer->file.size);
-  ASSERT(writer->config->fid == writer->file.fid);
 
   STFileOp op = (STFileOp){
       .optype = TSDB_FOP_CREATE,
diff --git a/source/dnode/vnode/src/tsdb/tsdbFS2.c b/source/dnode/vnode/src/tsdb/tsdbFS2.c
index b8669055d4..6dec456be7 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS2.c
@@ -894,7 +894,6 @@ int32_t tsdbFSEditCommit(STFileSystem *fs) {
 
   // commit
   code = commit_edit(fs);
-  ASSERT(code == 0);
   TSDB_CHECK_CODE(code, lino, _exit);
 
   // schedule merge
@@ -1052,7 +1051,6 @@ static SHashObj *tsdbFSetRangeArrayToHash(TFileSetRangeArray *pRanges) {
     STFileSetRange *u = TARRAY2_GET(pRanges, i);
     int32_t         fid = u->fid;
     int32_t         code = taosHashPut(pHash, &fid, sizeof(fid), u, sizeof(*u));
-    ASSERT(code == 0);
     tsdbDebug("range diff hash fid:%d, sver:%" PRId64 ", ever:%" PRId64, u->fid, u->sver, u->ever);
   }
   return pHash;
@@ -1192,7 +1190,6 @@ int32_t tsdbBeginTaskOnFileSet(STsdb *tsdb, int32_t fid, STFileSet **fset) {
         (void)taosThreadCondWait(&(*fset)->beginTask, &tsdb->mutex);
 
         (void)tsdbFSGetFSet(tsdb->pFS, fid, fset);
-        ASSERT(fset != NULL);
 
         (*fset)->numWaitTask--;
       } else {
diff --git a/source/dnode/vnode/src/tsdb/tsdbFSet2.c b/source/dnode/vnode/src/tsdb/tsdbFSet2.c
index 78e1a6a13d..05ce1b23f5 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFSet2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFSet2.c
@@ -106,7 +106,9 @@ static void tsdbSttLvlRemove(SSttLvl **lvl) {
 static int32_t tsdbSttLvlApplyEdit(STsdb *pTsdb, const SSttLvl *lvl1, SSttLvl *lvl2) {
   int32_t code = 0;
 
-  ASSERT(lvl1->level == lvl2->level);
+  if (lvl1->level != lvl2->level) {
+    return TSDB_CODE_INVALID_PARA;
+  }
 
   int32_t i1 = 0, i2 = 0;
   while (i1 < TARRAY2_SIZE(lvl1->fobjArr) || i2 < TARRAY2_SIZE(lvl2->fobjArr)) {
@@ -331,29 +333,24 @@ int32_t tsdbTFileSetEdit(STsdb *pTsdb, STFileSet *fset, const STFileOp *op) {
       code = TARRAY2_SORT_INSERT(lvl->fobjArr, fobj, tsdbTFileObjCmpr);
       if (code) return code;
     } else {
-      ASSERT(fset->farr[fobj->f->type] == NULL);
       fset->farr[fobj->f->type] = fobj;
     }
   } else if (op->optype == TSDB_FOP_REMOVE) {
     // delete a file
     if (op->of.type == TSDB_FTYPE_STT) {
       SSttLvl *lvl = tsdbTFileSetGetSttLvl(fset, op->of.stt->level);
-      ASSERT(lvl);
 
       STFileObj  tfobj = {.f[0] = {.cid = op->of.cid}};
       STFileObj *tfobjp = &tfobj;
       int32_t    idx = TARRAY2_SEARCH_IDX(lvl->fobjArr, &tfobjp, tsdbTFileObjCmpr, TD_EQ);
-      ASSERT(idx >= 0);
       TARRAY2_REMOVE(lvl->fobjArr, idx, tsdbSttLvlClearFObj);
     } else {
-      ASSERT(tsdbIsSameTFile(&op->of, fset->farr[op->of.type]->f));
       (void)tsdbTFileObjUnref(fset->farr[op->of.type]);
       fset->farr[op->of.type] = NULL;
     }
   } else {
     if (op->nf.type == TSDB_FTYPE_STT) {
       SSttLvl *lvl = tsdbTFileSetGetSttLvl(fset, op->of.stt->level);
-      ASSERT(lvl);
 
       STFileObj   tfobj = {.f[0] = {.cid = op->of.cid}}, *tfobjp = &tfobj;
       STFileObj **fobjPtr = TARRAY2_SEARCH(lvl->fobjArr, &tfobjp, tsdbTFileObjCmpr, TD_EQ);
@@ -374,7 +371,9 @@ int32_t tsdbTFileSetEdit(STsdb *pTsdb, STFileSet *fset, const STFileOp *op) {
 int32_t tsdbTFileSetApplyEdit(STsdb *pTsdb, const STFileSet *fset1, STFileSet *fset2) {
   int32_t code = 0;
 
-  ASSERT(fset1->fid == fset2->fid);
+  if (fset1->fid != fset2->fid) {
+    return TSDB_CODE_INVALID_PARA;
+  }
 
   for (tsdb_ftype_t ftype = TSDB_FTYPE_MIN; ftype < TSDB_FTYPE_MAX; ++ftype) {
     if (!fset1->farr[ftype] && !fset2->farr[ftype]) continue;
diff --git a/source/dnode/vnode/src/tsdb/tsdbFSetRAW.c b/source/dnode/vnode/src/tsdb/tsdbFSetRAW.c
index 1adca31347..09db2ef4ef 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFSetRAW.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFSetRAW.c
@@ -154,13 +154,11 @@ _exit:
   return code;
 }
 
-int32_t tsdbFSetRAWWriteBlockData(SFSetRAWWriter *writer, STsdbDataRAWBlockHeader *bHdr, int32_t encryptAlgorithm, 
-                                  char* encryptKey) {
+int32_t tsdbFSetRAWWriteBlockData(SFSetRAWWriter *writer, STsdbDataRAWBlockHeader *bHdr, int32_t encryptAlgorithm,
+                                  char *encryptKey) {
   int32_t code = 0;
   int32_t lino = 0;
 
-  ASSERT(writer->ctx->offset >= 0 && writer->ctx->offset <= writer->ctx->file.size);
-
   if (writer->ctx->offset == writer->ctx->file.size) {
     code = tsdbFSetRAWWriteFileDataEnd(writer);
     TSDB_CHECK_CODE(code, lino, _exit);
@@ -173,7 +171,6 @@ int32_t tsdbFSetRAWWriteBlockData(SFSetRAWWriter *writer, STsdbDataRAWBlockHeade
   TSDB_CHECK_CODE(code, lino, _exit);
 
   writer->ctx->offset += bHdr->dataLength;
-  ASSERT(writer->ctx->offset == writer->dataWriter->ctx->offset);
 
 _exit:
   if (code) {
diff --git a/source/dnode/vnode/src/tsdb/tsdbFSetRW.c b/source/dnode/vnode/src/tsdb/tsdbFSetRW.c
index 3ccf833ddd..4a35316f35 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFSetRW.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFSetRW.c
@@ -73,8 +73,6 @@ static int32_t tsdbFSetWriteTableDataEnd(SFSetWriter *writer) {
   int32_t numRow = ((writer->blockData[pidx].nRow + writer->blockData[cidx].nRow) >> 1);
 
   if (writer->blockData[pidx].nRow > 0 && numRow >= writer->config->minRow) {
-    ASSERT(writer->blockData[pidx].nRow == writer->config->maxRow);
-
     SRowInfo row = {
         .suid = writer->ctx->tbid->suid,
         .uid = writer->ctx->tbid->uid,
diff --git a/source/dnode/vnode/src/tsdb/tsdbFile2.c b/source/dnode/vnode/src/tsdb/tsdbFile2.c
index 57db838752..50272a689c 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFile2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFile2.c
@@ -243,7 +243,13 @@ int32_t tsdbTFileObjInit(STsdb *pTsdb, const STFile *f, STFileObj **fobj) {
 int32_t tsdbTFileObjRef(STFileObj *fobj) {
   int32_t nRef;
   (void)taosThreadMutexLock(&fobj->mutex);
-  ASSERT(fobj->ref > 0 && fobj->state == TSDB_FSTATE_LIVE);
+
+  if (fobj->ref <= 0 || fobj->state != TSDB_FSTATE_LIVE) {
+    (void)taosThreadMutexUnlock(&fobj->mutex);
+    tsdbError("file %s, fobj:%p ref %d", fobj->fname, fobj, fobj->ref);
+    return TSDB_CODE_FAILED;
+  }
+
   nRef = ++fobj->ref;
   (void)taosThreadMutexUnlock(&fobj->mutex);
   tsdbTrace("ref file %s, fobj:%p ref %d", fobj->fname, fobj, nRef);
@@ -254,7 +260,12 @@ int32_t tsdbTFileObjUnref(STFileObj *fobj) {
   (void)taosThreadMutexLock(&fobj->mutex);
   int32_t nRef = --fobj->ref;
   (void)taosThreadMutexUnlock(&fobj->mutex);
-  ASSERT(nRef >= 0);
+
+  if (nRef < 0) {
+    tsdbError("file %s, fobj:%p ref %d", fobj->fname, fobj, nRef);
+    return TSDB_CODE_FAILED;
+  }
+
   tsdbTrace("unref file %s, fobj:%p ref %d", fobj->fname, fobj, nRef);
   if (nRef == 0) {
     if (fobj->state == TSDB_FSTATE_DEAD) {
@@ -319,7 +330,11 @@ static void tsdbTFileObjRemoveLC(STFileObj *fobj, bool remove_all) {
 
 int32_t tsdbTFileObjRemove(STFileObj *fobj) {
   (void)taosThreadMutexLock(&fobj->mutex);
-  ASSERT(fobj->state == TSDB_FSTATE_LIVE && fobj->ref > 0);
+  if (fobj->state != TSDB_FSTATE_LIVE || fobj->ref <= 0) {
+    (void)taosThreadMutexUnlock(&fobj->mutex);
+    tsdbError("file %s, fobj:%p ref %d", fobj->fname, fobj, fobj->ref);
+    return TSDB_CODE_FAILED;
+  }
   fobj->state = TSDB_FSTATE_DEAD;
   int32_t nRef = --fobj->ref;
   (void)taosThreadMutexUnlock(&fobj->mutex);
@@ -333,7 +348,13 @@ int32_t tsdbTFileObjRemove(STFileObj *fobj) {
 
 int32_t tsdbTFileObjRemoveUpdateLC(STFileObj *fobj) {
   (void)taosThreadMutexLock(&fobj->mutex);
-  ASSERT(fobj->state == TSDB_FSTATE_LIVE && fobj->ref > 0);
+
+  if (fobj->state != TSDB_FSTATE_LIVE || fobj->ref <= 0) {
+    (void)taosThreadMutexUnlock(&fobj->mutex);
+    tsdbError("file %s, fobj:%p ref %d", fobj->fname, fobj, fobj->ref);
+    return TSDB_CODE_FAILED;
+  }
+
   fobj->state = TSDB_FSTATE_DEAD;
   int32_t nRef = --fobj->ref;
   (void)taosThreadMutexUnlock(&fobj->mutex);
diff --git a/source/dnode/vnode/src/tsdb/tsdbIter.c b/source/dnode/vnode/src/tsdb/tsdbIter.c
index 0de9ba9822..5f9e838ccc 100644
--- a/source/dnode/vnode/src/tsdb/tsdbIter.c
+++ b/source/dnode/vnode/src/tsdb/tsdbIter.c
@@ -547,8 +547,7 @@ int32_t tsdbIterOpen(const STsdbIterConfig *config, STsdbIter **iter) {
       code = tsdbMemTombIterOpen(iter[0]);
       break;
     default:
-      code = TSDB_CODE_INVALID_PARA;
-      ASSERTS(false, "Not implemented");
+      return TSDB_CODE_INVALID_PARA;
   }
 
   if (code) {
@@ -588,7 +587,7 @@ int32_t tsdbIterClose(STsdbIter **iter) {
     case TSDB_ITER_TYPE_MEMT_TOMB:
       break;
     default:
-      ASSERT(false);
+      return TSDB_CODE_INVALID_PARA;
   }
   taosMemoryFree(iter[0]);
   iter[0] = NULL;
@@ -610,7 +609,7 @@ int32_t tsdbIterNext(STsdbIter *iter) {
     case TSDB_ITER_TYPE_MEMT_TOMB:
       return tsdbMemTombIterNext(iter, NULL);
     default:
-      ASSERT(false);
+      return TSDB_CODE_INVALID_PARA;
   }
   return 0;
 }
@@ -630,7 +629,7 @@ static int32_t tsdbIterSkipTableData(STsdbIter *iter, const TABLEID *tbid) {
     case TSDB_ITER_TYPE_MEMT_TOMB:
       return tsdbMemTombIterNext(iter, tbid);
     default:
-      ASSERT(false);
+      return TSDB_CODE_INVALID_PARA;
   }
   return 0;
 }
@@ -691,7 +690,10 @@ int32_t tsdbIterMergerOpen(const TTsdbIterArray *iterArray, SIterMerger **merger
   TARRAY2_FOREACH(iterArray, iter) {
     if (iter->noMoreData) continue;
     node = tRBTreePut(merger[0]->iterTree, iter->node);
-    ASSERT(node);
+    if (node == NULL) {
+      taosMemoryFree(merger[0]);
+      return TSDB_CODE_INVALID_PARA;
+    }
   }
 
   return tsdbIterMergerNext(merger[0]);
@@ -718,10 +720,8 @@ int32_t tsdbIterMergerNext(SIterMerger *merger) {
       merger->iter = NULL;
     } else if ((node = tRBTreeMin(merger->iterTree))) {
       c = merger->iterTree->cmprFn(merger->iter->node, node);
-      ASSERT(c);
       if (c > 0) {
         node = tRBTreePut(merger->iterTree, merger->iter->node);
-        ASSERT(node);
         merger->iter = NULL;
       }
     }
@@ -734,15 +734,9 @@ int32_t tsdbIterMergerNext(SIterMerger *merger) {
   return 0;
 }
 
-SRowInfo *tsdbIterMergerGetData(SIterMerger *merger) {
-  ASSERT(!merger->isTomb);
-  return merger->iter ? merger->iter->row : NULL;
-}
+SRowInfo *tsdbIterMergerGetData(SIterMerger *merger) { return merger->iter ? merger->iter->row : NULL; }
 
-STombRecord *tsdbIterMergerGetTombRecord(SIterMerger *merger) {
-  ASSERT(merger->isTomb);
-  return merger->iter ? merger->iter->record : NULL;
-}
+STombRecord *tsdbIterMergerGetTombRecord(SIterMerger *merger) { return merger->iter ? merger->iter->record : NULL; }
 
 int32_t tsdbIterMergerSkipTableData(SIterMerger *merger, const TABLEID *tbid) {
   int32_t      code;
@@ -757,10 +751,8 @@ int32_t tsdbIterMergerSkipTableData(SIterMerger *merger, const TABLEID *tbid) {
       merger->iter = NULL;
     } else if ((node = tRBTreeMin(merger->iterTree))) {
       c = merger->iterTree->cmprFn(merger->iter->node, node);
-      ASSERT(c);
       if (c > 0) {
         node = tRBTreePut(merger->iterTree, merger->iter->node);
-        ASSERT(node);
         merger->iter = NULL;
       }
     }
diff --git a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
index 9f5f72e0aa..57405c0e48 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
@@ -194,7 +194,7 @@ int32_t initRowKey(SRowKey* pKey, int64_t ts, int32_t numOfPks, int32_t type, in
             break;
           }
           default:
-            ASSERT(0);
+            return TSDB_CODE_INVALID_PARA;
         }
       } else {
         switch (type) {
@@ -223,7 +223,7 @@ int32_t initRowKey(SRowKey* pKey, int64_t ts, int32_t numOfPks, int32_t type, in
             pKey->pks[0].val = UINT8_MAX;
             break;
           default:
-            ASSERT(0);
+            return TSDB_CODE_INVALID_PARA;
         }
       }
     } else {
diff --git a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
index eaedbca464..8632603fd6 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
@@ -151,7 +151,6 @@ static int32_t tsdbWriteFilePage(STsdbFD *pFD, int32_t encryptAlgorithm, char *e
 
       offset -= chunkoffset;
     }
-    ASSERT(offset >= 0);
 
     int64_t n = taosLSeekFile(pFD->pFD, offset, SEEK_SET);
     if (n < 0) {
@@ -217,7 +216,6 @@ static int32_t tsdbReadFilePage(STsdbFD *pFD, int64_t pgno, int32_t encryptAlgor
 
     offset -= chunkoffset;
   }
-  ASSERT(offset >= 0);
 
   // seek
   int64_t n = taosLSeekFile(pFD->pFD, offset, SEEK_SET);
diff --git a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
index 2b63d5b6e6..680b1250f9 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
@@ -67,9 +67,6 @@ static int32_t tsdbSnapReadFileSetOpenReader(STsdbSnapReader* reader) {
   int32_t code = 0;
   int32_t lino = 0;
 
-  ASSERT(reader->dataReader == NULL);
-  ASSERT(TARRAY2_SIZE(reader->sttReaderArr) == 0);
-
   // data
   SDataFileReaderConfig config = {
       .tsdb = reader->tsdb,
@@ -125,11 +122,6 @@ static int32_t tsdbSnapReadFileSetOpenIter(STsdbSnapReader* reader) {
   int32_t code = 0;
   int32_t lino = 0;
 
-  ASSERT(reader->dataIterMerger == NULL);
-  ASSERT(reader->tombIterMerger == NULL);
-  ASSERT(TARRAY2_SIZE(reader->dataIterArr) == 0);
-  ASSERT(TARRAY2_SIZE(reader->tombIterArr) == 0);
-
   STsdbIter*      iter;
   STsdbIterConfig config = {
       .filterByVersion = true,
@@ -210,8 +202,6 @@ static int32_t tsdbSnapReadRangeBegin(STsdbSnapReader* reader) {
   int32_t code = 0;
   int32_t lino = 0;
 
-  ASSERT(reader->ctx->fsr == NULL);
-
   if (reader->ctx->fsrArrIdx < TARRAY2_SIZE(reader->fsrArr)) {
     reader->ctx->fsr = TARRAY2_GET(reader->fsrArr, reader->ctx->fsrArrIdx++);
     reader->ctx->isDataDone = false;
@@ -335,7 +325,6 @@ static int32_t tsdbSnapReadTimeSeriesData(STsdbSnapReader* reader, uint8_t** dat
   }
 
   if (reader->blockData->nRow > 0) {
-    ASSERT(reader->blockData->suid || reader->blockData->uid);
     code = tsdbSnapCmprData(reader, data);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
@@ -616,7 +605,6 @@ static int32_t tsdbSnapWriteTimeSeriesRow(STsdbSnapWriter* writer, SRowInfo* row
   }
 
   if (row->suid == INT64_MAX) {
-    ASSERT(writer->ctx->hasData == false);
     goto _exit;
   }
 
@@ -634,9 +622,6 @@ static int32_t tsdbSnapWriteFileSetOpenReader(STsdbSnapWriter* writer) {
   int32_t code = 0;
   int32_t lino = 0;
 
-  ASSERT(writer->ctx->dataReader == NULL);
-  ASSERT(TARRAY2_SIZE(writer->ctx->sttReaderArr) == 0);
-
   if (writer->ctx->fset) {
     // open data reader
     SDataFileReaderConfig dataFileReaderConfig = {
@@ -825,8 +810,6 @@ static int32_t tsdbSnapWriteFileSetBegin(STsdbSnapWriter* writer, int32_t fid) {
   int32_t code = 0;
   int32_t lino = 0;
 
-  ASSERT(writer->ctx->fsetWriteBegin == false);
-
   STFileSet* fset = &(STFileSet){.fid = fid};
 
   writer->ctx->fid = fid;
@@ -885,7 +868,6 @@ static int32_t tsdbSnapWriteTombRecord(STsdbSnapWriter* writer, const STombRecor
   }
 
   if (record->suid == INT64_MAX) {
-    ASSERT(writer->ctx->hasTomb == false);
     goto _exit;
   }
 
@@ -996,7 +978,6 @@ static int32_t tsdbSnapWriteDecmprTombBlock(SSnapDataHdr* hdr, STombBlock* tombB
   TAOS_UNUSED(tTombBlockClear(tombBlock));
 
   int64_t size = hdr->size;
-  ASSERT(size % TOMB_RECORD_ELEM_NUM == 0);
   size = size / TOMB_RECORD_ELEM_NUM;
   tombBlock->numOfRecords = size / sizeof(int64_t);
 
@@ -1043,8 +1024,6 @@ static int32_t tsdbSnapWriteTombData(STsdbSnapWriter* writer, SSnapDataHdr* hdr)
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
-  ASSERT(writer->ctx->hasData == false);
-
   for (int32_t i = 0; i < TOMB_BLOCK_SIZE(tombBlock); ++i) {
     code = tTombBlockGet(tombBlock, i, &record);
     TSDB_CHECK_CODE(code, lino, _exit);
@@ -1177,7 +1156,7 @@ int32_t tsdbSnapWrite(STsdbSnapWriter* writer, SSnapDataHdr* hdr) {
     code = tsdbSnapWriteTombData(writer, hdr);
     TSDB_CHECK_CODE(code, lino, _exit);
   } else {
-    ASSERT(0);
+    TSDB_CHECK_CODE(code = TSDB_CODE_INVALID_PARA, lino, _exit);
   }
 
 _exit:
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index 9e3accb469..f70b0aad26 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -583,7 +583,8 @@ int32_t tsdbFidLevel(int32_t fid, STsdbKeepCfg *pKeepCfg, int64_t nowSec) {
   } else if (pKeepCfg->precision == TSDB_TIME_PRECISION_NANO) {
     nowSec = nowSec * 1000000000l;
   } else {
-    ASSERT(0);
+    tsdbError("invalid time precision:%d", pKeepCfg->precision);
+    return 0;
   }
 
   nowSec = nowSec - pKeepCfg->keepTimeOffset * tsTickPerHour[pKeepCfg->precision];
@@ -897,76 +898,6 @@ int32_t tsdbRowMergerGetRow(SRowMerger *pMerger, SRow **ppRow) {
   return tRowBuild(pMerger->pArray, pMerger->pTSchema, ppRow);
 }
 
-/*
-// delete skyline ======================================================
-static int32_t tsdbMergeSkyline2(SArray *aSkyline1, SArray *aSkyline2, SArray *aSkyline) {
-  int32_t  code = 0;
-  int32_t  i1 = 0;
-  int32_t  n1 = taosArrayGetSize(aSkyline1);
-  int32_t  i2 = 0;
-  int32_t  n2 = taosArrayGetSize(aSkyline2);
-  TSDBKEY *pSkyline1;
-  TSDBKEY *pSkyline2;
-  TSDBKEY  item;
-  int64_t  version1 = 0;
-  int64_t  version2 = 0;
-
-  ASSERT(n1 > 0 && n2 > 0);
-
-  taosArrayClear(aSkyline);
-
-  while (i1 < n1 && i2 < n2) {
-    pSkyline1 = (TSDBKEY *)taosArrayGet(aSkyline1, i1);
-    pSkyline2 = (TSDBKEY *)taosArrayGet(aSkyline2, i2);
-
-    if (pSkyline1->ts < pSkyline2->ts) {
-      version1 = pSkyline1->version;
-      i1++;
-    } else if (pSkyline1->ts > pSkyline2->ts) {
-      version2 = pSkyline2->version;
-      i2++;
-    } else {
-      version1 = pSkyline1->version;
-      version2 = pSkyline2->version;
-      i1++;
-      i2++;
-    }
-
-    item.ts = TMIN(pSkyline1->ts, pSkyline2->ts);
-    item.version = TMAX(version1, version2);
-    if (taosArrayPush(aSkyline, &item) == NULL) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      goto _exit;
-    }
-  }
-
-  while (i1 < n1) {
-    pSkyline1 = (TSDBKEY *)taosArrayGet(aSkyline1, i1);
-    item.ts = pSkyline1->ts;
-    item.version = pSkyline1->version;
-    if (taosArrayPush(aSkyline, &item) == NULL) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      goto _exit;
-    }
-    i1++;
-  }
-
-  while (i2 < n2) {
-    pSkyline2 = (TSDBKEY *)taosArrayGet(aSkyline2, i2);
-    item.ts = pSkyline2->ts;
-    item.version = pSkyline2->version;
-    if (taosArrayPush(aSkyline, &item) == NULL) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      goto _exit;
-    }
-    i2++;
-  }
-
-_exit:
-  return code;
-}
-*/
-
 // delete skyline ======================================================
 static void tsdbMergeSkyline(SArray *pSkyline1, SArray *pSkyline2, SArray *pSkyline) {
   int32_t  i1 = 0;
@@ -978,8 +909,6 @@ static void tsdbMergeSkyline(SArray *pSkyline1, SArray *pSkyline2, SArray *pSkyl
   int64_t  version1 = 0;
   int64_t  version2 = 0;
 
-  ASSERT(n1 > 0 && n2 > 0);
-
   taosArrayClear(pSkyline);
   TSDBKEY **pItem = TARRAY_GET_ELEM(pSkyline, 0);
 
@@ -1212,7 +1141,9 @@ _exit:
 int32_t tBlockDataInit(SBlockData *pBlockData, TABLEID *pId, STSchema *pTSchema, int16_t *aCid, int32_t nCid) {
   int32_t code = 0;
 
-  ASSERT(pId->suid || pId->uid);
+  if (!pId->suid && !pId->uid) {
+    return TSDB_CODE_INVALID_PARA;
+  }
 
   pBlockData->suid = pId->suid;
   pBlockData->uid = pId->uid;
@@ -1272,8 +1203,6 @@ void tBlockDataReset(SBlockData *pBlockData) {
 }
 
 void tBlockDataClear(SBlockData *pBlockData) {
-  ASSERT(pBlockData->suid || pBlockData->uid);
-
   pBlockData->nRow = 0;
   for (int32_t iColData = 0; iColData < pBlockData->nColData; iColData++) {
     tColDataClear(tBlockDataGetColDataByIdx(pBlockData, iColData));
@@ -1281,7 +1210,9 @@ void tBlockDataClear(SBlockData *pBlockData) {
 }
 
 int32_t tBlockDataAddColData(SBlockData *pBlockData, int16_t cid, int8_t type, int8_t cflag, SColData **ppColData) {
-  ASSERT(pBlockData->nColData == 0 || pBlockData->aColData[pBlockData->nColData - 1].cid < cid);
+  if (pBlockData->nColData != 0 && pBlockData->aColData[pBlockData->nColData - 1].cid >= cid) {
+    return TSDB_CODE_INVALID_PARA;
+  }
 
   SColData *newColData = taosMemoryRealloc(pBlockData->aColData, sizeof(SColData) * (pBlockData->nColData + 1));
   if (newColData == NULL) {
@@ -1345,7 +1276,9 @@ int32_t tBlockDataAppendRow(SBlockData *pBlockData, TSDBROW *pRow, STSchema *pTS
 
   // uid
   if (pBlockData->uid == 0) {
-    ASSERT(uid);
+    if (!uid) {
+      return TSDB_CODE_INVALID_PARA;
+    }
     code = tRealloc((uint8_t **)&pBlockData->aUid, sizeof(int64_t) * (pBlockData->nRow + 1));
     if (code) goto _exit;
     pBlockData->aUid[pBlockData->nRow] = uid;
@@ -1379,7 +1312,9 @@ int32_t tBlockDataUpdateRow(SBlockData *pBlockData, TSDBROW *pRow, STSchema *pTS
   // version
   int64_t lversion = pBlockData->aVersion[pBlockData->nRow - 1];
   int64_t rversion = TSDBROW_VERSION(pRow);
-  ASSERT(lversion != rversion);
+  if (lversion == rversion) {
+    return TSDB_CODE_INVALID_PARA;
+  }
   if (rversion > lversion) {
     pBlockData->aVersion[pBlockData->nRow - 1] = rversion;
   }
@@ -1393,7 +1328,8 @@ int32_t tBlockDataUpdateRow(SBlockData *pBlockData, TSDBROW *pRow, STSchema *pTS
     code = tBlockDataUpsertBlockRow(pBlockData, pRow->pBlockData, pRow->iRow, (rversion > lversion) ? 1 : -1);
     if (code) goto _exit;
   } else {
-    ASSERT(0);
+    code = TSDB_CODE_INVALID_PARA;
+    goto _exit;
   }
 
 _exit:
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index dc84b73c10..e34862247f 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -934,20 +934,23 @@ _exit:
 }
 
 static int32_t vnodeProcessDropTtlTbReq(SVnode *pVnode, int64_t ver, void *pReq, int32_t len, SRpcMsg *pRsp) {
+  int               ret = 0;
   SVDropTtlTableReq ttlReq = {0};
   if (tDeserializeSVDropTtlTableReq(pReq, len, &ttlReq) != 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
+    ret = TSDB_CODE_INVALID_MSG;
     goto end;
   }
 
-  ASSERT(ttlReq.nUids == taosArrayGetSize(ttlReq.pTbUids));
+  if (ttlReq.nUids != taosArrayGetSize(ttlReq.pTbUids)) {
+    ret = TSDB_CODE_INVALID_MSG;
+    goto end;
+  }
 
   if (ttlReq.nUids != 0) {
     vInfo("vgId:%d, drop ttl table req will be processed, time:%d, ntbUids:%d", pVnode->config.vgId,
           ttlReq.timestampSec, ttlReq.nUids);
   }
 
-  int ret = 0;
   if (ttlReq.nUids > 0) {
     metaDropTables(pVnode->pMeta, ttlReq.pTbUids);
     (void)tqUpdateTbUidList(pVnode->pTq, ttlReq.pTbUids, false);
@@ -1787,8 +1790,7 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t ver, void *pReq, in
       }
 
       if (info.suid) {
-        code = metaGetInfo(pVnode->pMeta, info.suid, &info, NULL);
-        ASSERT(code == 0);
+        (void)metaGetInfo(pVnode->pMeta, info.suid, &info, NULL);
       }
 
       if (pSubmitTbData->sver != info.skmVer) {