Merge remote-tracking branch 'origin/main' into fix/TD-21644

cmake/taosadapter_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taosadapter
 ExternalProject_Add(taosadapter
         GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
-        GIT_TAG a2e9920
+        GIT_TAG 69eee2e
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

source/dnode/mgmt/node_mgmt/src/dmEnv.c

@@ -16,9 +16,9 @@
 #define _DEFAULT_SOURCE
 #include "dmMgmt.h"
 
-static SDnode global = {0};
+static SDnode globalDnode = {0};
 
-SDnode *dmInstance() { return &global; }
+SDnode *dmInstance() { return &globalDnode; }
 
 static int32_t dmCheckRepeatInit(SDnode *pDnode) {
   if (atomic_val_compare_exchange_8(&pDnode->once, DND_ENV_INIT, DND_ENV_READY) != DND_ENV_INIT) {
@@ -270,6 +270,6 @@ void dmReportStartup(const char *pName, const char *pDesc) {
 }
 
 int64_t dmGetClusterId() {
-  return global.data.clusterId;
+  return globalDnode.data.clusterId;
 }
 

source/dnode/vnode/src/vnd/vnodeCommit.c

@@ -329,8 +329,7 @@ static int vnodeCommitImpl(SCommitInfo *pInfo) {
     snprintf(dir, TSDB_FILENAME_LEN, "%s", pVnode->path);
   }
 
-  // walBeginSnapshot(pVnode->pWal, pVnode->state.applied);
-  syncBeginSnapshot(pVnode->sync, pVnode->state.applied);
+  syncBeginSnapshot(pVnode->sync, pInfo->info.state.committed);
 
   // commit each sub-system
   code = tsdbCommit(pVnode->pTsdb, pInfo);
@@ -372,7 +371,6 @@ static int vnodeCommitImpl(SCommitInfo *pInfo) {
     return -1;
   }
 
-  // walEndSnapshot(pVnode->pWal);
   syncEndSnapshot(pVnode->sync);
 
 _exit: