From 927f6861becdd6aa53d02439c71ed188708db705 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 20 Jun 2023 10:41:24 +0800
Subject: [PATCH] more code

---
 cmake/cmake.options                      | 10 ----------
 source/dnode/vnode/src/tsdb/tsdbOpen.c   | 14 +-------------
 source/dnode/vnode/src/vnd/vnodeCommit.c | 14 --------------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/cmake/cmake.options b/cmake/cmake.options
index 1d31c94dd8..555b72cbdf 100644
--- a/cmake/cmake.options
+++ b/cmake/cmake.options
@@ -189,13 +189,3 @@ option(
    "If build release version"
    OFF
 )
-
-# open this flag to use dev code, make sure it is off in release version
-option(
-   USE_DEV_CODE
-   "If use dev code" 
-   ON 
-)
-if (${USE_DEV_CODE})
-    add_definitions(-DUSE_DEV_CODE)
-endif(USE_DEV_CODE)
\ No newline at end of file
diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c
index ae75b31da1..c684ad5184 100644
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
@@ -14,9 +14,7 @@
  */
 
 #include "tsdb.h"
-#ifdef USE_DEV_CODE
 #include "tsdbFS2.h"
-#endif
 
 int32_t tsdbSetKeepCfg(STsdb *pTsdb, STsdbCfg *pCfg) {
   STsdbKeepCfg *pKeepCfg = &pTsdb->keepCfg;
@@ -68,16 +66,10 @@ int tsdbOpen(SVnode *pVnode, STsdb **ppTsdb, const char *dir, STsdbKeepCfg *pKee
     taosMkDir(pTsdb->path);
   }
 
-// open tsdb
-#ifdef USE_DEV_CODE
+  // open tsdb
   if (tsdbOpenFS(pTsdb, &pTsdb->pFS, rollback) < 0) {
     goto _err;
   }
-#else
-  if (tsdbFSOpen(pTsdb, rollback) < 0) {
-    goto _err;
-  }
-#endif
 
   if (tsdbOpenCache(pTsdb) < 0) {
     goto _err;
@@ -103,11 +95,7 @@ int tsdbClose(STsdb **pTsdb) {
 
     taosThreadRwlockDestroy(&(*pTsdb)->rwLock);
 
-#ifndef USE_DEV_CODE
-    tsdbFSClose(*pTsdb);
-#else
     tsdbCloseFS(&(*pTsdb)->pFS);
-#endif
     tsdbCloseCache(*pTsdb);
     taosMemoryFreeClear(*pTsdb);
   }
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index 5d1f0de127..1187b5ff53 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -16,12 +16,10 @@
 #include "vnd.h"
 #include "vnodeInt.h"
 
-#ifdef USE_DEV_CODE
 extern int32_t tsdbPreCommit(STsdb *pTsdb);
 extern int32_t tsdbCommitBegin(STsdb *pTsdb, SCommitInfo *pInfo);
 extern int32_t tsdbCommitCommit(STsdb *pTsdb);
 extern int32_t tsdbCommitAbort(STsdb *pTsdb);
-#endif
 
 #define VND_INFO_FNAME_TMP "vnode_tmp.json"
 
@@ -309,11 +307,7 @@ static int32_t vnodePrepareCommit(SVnode *pVnode, SCommitInfo *pInfo) {
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
-#ifdef USE_DEV_CODE
   tsdbPreCommit(pVnode->pTsdb);
-#else
-  tsdbPrepareCommit(pVnode->pTsdb);
-#endif
 
   metaPrepareAsyncCommit(pVnode->pMeta);
 
@@ -446,11 +440,7 @@ static int vnodeCommitImpl(SCommitInfo *pInfo) {
 
   syncBeginSnapshot(pVnode->sync, pInfo->info.state.committed);
 
-#ifdef USE_DEV_CODE
   code = tsdbCommitBegin(pVnode->pTsdb, pInfo);
-#else
-  code = tsdbCommit(pVnode->pTsdb, pInfo);
-#endif
   TSDB_CHECK_CODE(code, lino, _exit);
 
   if (!TSDB_CACHE_NO(pVnode->config)) {
@@ -474,11 +464,7 @@ static int vnodeCommitImpl(SCommitInfo *pInfo) {
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
-#ifdef USE_DEV_CODE
   code = tsdbCommitCommit(pVnode->pTsdb);
-#else
-  code = tsdbFinishCommit(pVnode->pTsdb);
-#endif
   TSDB_CHECK_CODE(code, lino, _exit);
 
   if (VND_IS_RSMA(pVnode)) {