From 0e8c226085bc8acb0154a52ff623c586014007f2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 3 Jan 2022 18:19:30 +0800
Subject: [PATCH] the starting version of wal is 0

---
 source/dnode/mnode/impl/test/acct/CMakeLists.txt | 8 ++++----
 source/dnode/mnode/impl/test/acct/acct.cpp       | 4 ++--
 source/dnode/mnode/impl/test/user/CMakeLists.txt | 8 ++++----
 source/dnode/mnode/impl/test/user/user.cpp       | 4 ++--
 source/dnode/mnode/sdb/src/sdb.c                 | 4 +++-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/source/dnode/mnode/impl/test/acct/CMakeLists.txt b/source/dnode/mnode/impl/test/acct/CMakeLists.txt
index a06becd127..8c8bf54bc4 100644
--- a/source/dnode/mnode/impl/test/acct/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/acct/CMakeLists.txt
@@ -1,11 +1,11 @@
 aux_source_directory(. ACCT_SRC)
-add_executable(dnode_test_acct ${ACCT_SRC})
+add_executable(mnode_test_acct ${ACCT_SRC})
 target_link_libraries(
-    dnode_test_acct
+    mnode_test_acct
     PUBLIC sut
 )
 
 add_test(
-    NAME dnode_test_acct
-    COMMAND dnode_test_acct
+    NAME mnode_test_acct
+    COMMAND mnode_test_acct
 )
diff --git a/source/dnode/mnode/impl/test/acct/acct.cpp b/source/dnode/mnode/impl/test/acct/acct.cpp
index be0ad4ab0f..934a2d96b4 100644
--- a/source/dnode/mnode/impl/test/acct/acct.cpp
+++ b/source/dnode/mnode/impl/test/acct/acct.cpp
@@ -1,7 +1,7 @@
 /**
  * @file acct.cpp
  * @author slguan (slguan@taosdata.com)
- * @brief DNODE module acct-msg tests
+ * @brief MNODE module acct-msg tests
  * @version 0.1
  * @date 2021-12-15
  *
@@ -13,7 +13,7 @@
 
 class DndTestAcct : public ::testing::Test {
  protected:
-  static void SetUpTestSuite() { test.Init("/tmp/dnode_test_acct", 9012); }
+  static void SetUpTestSuite() { test.Init("/tmp/mnode_test_acct", 9012); }
   static void TearDownTestSuite() { test.Cleanup(); }
 
   static Testbase test;
diff --git a/source/dnode/mnode/impl/test/user/CMakeLists.txt b/source/dnode/mnode/impl/test/user/CMakeLists.txt
index 5068660eba..c6aeef7221 100644
--- a/source/dnode/mnode/impl/test/user/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/user/CMakeLists.txt
@@ -1,11 +1,11 @@
 aux_source_directory(. USER_SRC)
-add_executable(dnode_test_user ${USER_SRC})
+add_executable(mnode_test_user ${USER_SRC})
 target_link_libraries(
-    dnode_test_user
+    mnode_test_user
     PUBLIC sut
 )
 
 add_test(
-    NAME dnode_test_user
-    COMMAND dnode_test_user
+    NAME mnode_test_user
+    COMMAND mnode_test_user
 )
diff --git a/source/dnode/mnode/impl/test/user/user.cpp b/source/dnode/mnode/impl/test/user/user.cpp
index aa160304c8..00153e778c 100644
--- a/source/dnode/mnode/impl/test/user/user.cpp
+++ b/source/dnode/mnode/impl/test/user/user.cpp
@@ -1,7 +1,7 @@
 /**
  * @file user.cpp
  * @author slguan (slguan@taosdata.com)
- * @brief DNODE module user-msg tests
+ * @brief MNODE module user-msg tests
  * @version 0.1
  * @date 2021-12-15
  *
@@ -13,7 +13,7 @@
 
 class DndTestUser : public ::testing::Test {
  protected:
-  static void SetUpTestSuite() { test.Init("/tmp/dnode_test_user", 9140); }
+  static void SetUpTestSuite() { test.Init("/tmp/mnode_test_user", 9140); }
   static void TearDownTestSuite() { test.Cleanup(); }
 
   static Testbase test;
diff --git a/source/dnode/mnode/sdb/src/sdb.c b/source/dnode/mnode/sdb/src/sdb.c
index 7df5052d6e..fb6ac7bb37 100644
--- a/source/dnode/mnode/sdb/src/sdb.c
+++ b/source/dnode/mnode/sdb/src/sdb.c
@@ -51,6 +51,8 @@ SSdb *sdbInit(SSdbOpt *pOption) {
     taosInitRWLatch(&pSdb->locks[i]);
   }
 
+  pSdb->curVer = -1;
+  pSdb->lastCommitVer = -1;
   pSdb->pMnode = pOption->pMnode;
   mDebug("sdb init successfully");
   return pSdb;
@@ -162,5 +164,5 @@ static int32_t sdbCreateDir(SSdb *pSdb) {
 
 int64_t sdbUpdateVer(SSdb *pSdb, int32_t val) {
   pSdb->curVer += val;
-  return val;
+  return pSdb->curVer;
 }
\ No newline at end of file
-- 
GitLab