From 6bf279b60a7a60804564a4c25c597c316c1489c2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 29 Sep 2021 19:40:40 +0800
Subject: [PATCH]  [TD-10430] minor changes

---
 include/server/vnode/vnode.h         | 16 ++++++++--------
 source/server/dnode/CMakeLists.txt   |  5 +++++
 source/server/dnode/inc/dnodeCfg.h   |  2 +-
 source/server/dnode/inc/dnodeCheck.h |  2 +-
 source/server/dnode/inc/dnodeEps.h   |  2 +-
 source/server/dnode/src/dnodeCfg.c   |  2 +-
 source/server/dnode/src/dnodeCheck.c |  2 +-
 source/server/dnode/src/dnodeEps.c   |  2 +-
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/include/server/vnode/vnode.h b/include/server/vnode/vnode.h
index 748b93c8eb..8aebd5aa9b 100644
--- a/include/server/vnode/vnode.h
+++ b/include/server/vnode/vnode.h
@@ -86,14 +86,6 @@ typedef struct {
  */
 int32_t vnodeGetStatistics(struct Vnode *vnode, SVnodeStat *stat);
 
-/**
- * Interface for processing messages.
- *
- * @param vnode, instance of vnode module.
- * @param msg, message to be processed.
- */
-void vnodeProcessMsg(struct Vnode *vnode, SRpcMsg *msg);
-
 /**
  * Get the status of all vnodes.
  *
@@ -111,6 +103,14 @@ void vnodeGetStatus(struct Vnode *vnode, struct SStatusMsg *status);
  */
 void vnodeSetAccess(struct Vnode *vnode, struct SVgroupAccess *access, int32_t numOfVnodes);
 
+/**
+ * Interface for processing messages.
+ *
+ * @param vnode, instance of vnode module.
+ * @param msg, message to be processed.
+ */
+void vnodeProcessMsg(struct Vnode *vnode, SRpcMsg *msg);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/server/dnode/CMakeLists.txt b/source/server/dnode/CMakeLists.txt
index db80bf727d..dbb4bd7c99 100644
--- a/source/server/dnode/CMakeLists.txt
+++ b/source/server/dnode/CMakeLists.txt
@@ -1,5 +1,10 @@
 aux_source_directory(src DNODE_SRC)
 add_library(dnode ${DNODE_SRC})
+target_link_libraries(
+    dnode
+    PUBLIC os
+    PUBLIC cJson
+)
 target_include_directories(
     dnode
     PUBLIC "${CMAKE_SOURCE_DIR}/include/server/dnode"
diff --git a/source/server/dnode/inc/dnodeCfg.h b/source/server/dnode/inc/dnodeCfg.h
index ec9cc397e1..2284486e51 100644
--- a/source/server/dnode/inc/dnodeCfg.h
+++ b/source/server/dnode/inc/dnodeCfg.h
@@ -31,7 +31,7 @@ typedef struct DnCfg {
 } DnCfg;
 
 int32_t dnodeInitCfg(Dnode *dnode, DnCfg **cfg);
-void    dnodeCleanupCfg(Dnode *dnode, DnCfg **cfg);
+void    dnodeCleanupCfg(DnCfg **cfg);
 void    dnodeUpdateCfg(DnCfg *cfg, SDnodeCfg *data);
 int32_t dnodeGetDnodeId(DnCfg *cfg);
 void    dnodeGetClusterId(DnCfg *cfg, char *clusterId);
diff --git a/source/server/dnode/inc/dnodeCheck.h b/source/server/dnode/inc/dnodeCheck.h
index b8d6d2ae56..84232fbc1d 100644
--- a/source/server/dnode/inc/dnodeCheck.h
+++ b/source/server/dnode/inc/dnodeCheck.h
@@ -26,7 +26,7 @@ typedef struct DnCheck {
 } DnCheck;
 
 int32_t dnodeInitCheck(Dnode *dnode, DnCheck **check);
-void    dnodeCleanupCheck(Dnode *dnode, DnCheck **check);
+void    dnodeCleanupCheck(DnCheck **check);
 
 #ifdef __cplusplus
 }
diff --git a/source/server/dnode/inc/dnodeEps.h b/source/server/dnode/inc/dnodeEps.h
index fa7e99d113..aec412ee59 100644
--- a/source/server/dnode/inc/dnodeEps.h
+++ b/source/server/dnode/inc/dnodeEps.h
@@ -33,7 +33,7 @@ typedef struct DnEps {
 } DnEps;
 
 int32_t dnodeInitEps(Dnode *dnode, DnEps **eps);
-void    dnodeCleanupEps(Dnode *dnode, DnEps **eps);
+void    dnodeCleanupEps(DnEps **eps);
 void    dnodeUpdateEps(DnEps *eps, SDnodeEps *data);
 bool    dnodeIsDnodeEpChanged(DnEps *eps, int32_t dnodeId, char *epstr);
 void    dnodeGetDnodeEp(Dnode *dnode, int32_t dnodeId, char *epstr, char *fqdn, uint16_t *port);
diff --git a/source/server/dnode/src/dnodeCfg.c b/source/server/dnode/src/dnodeCfg.c
index f4e26fd721..a004ad7290 100644
--- a/source/server/dnode/src/dnodeCfg.c
+++ b/source/server/dnode/src/dnodeCfg.c
@@ -128,7 +128,7 @@ int32_t dnodeInitCfg(Dnode *dnode, DnCfg **out) {
   return ret;
 }
 
-void dnodeCleanupCfg(Dnode *dnode, DnCfg **out) {
+void dnodeCleanupCfg(DnCfg **out) {
   DnCfg* cfg = *out;
   *out = NULL;
 
diff --git a/source/server/dnode/src/dnodeCheck.c b/source/server/dnode/src/dnodeCheck.c
index 6a7f18f63d..402ef0d333 100644
--- a/source/server/dnode/src/dnodeCheck.c
+++ b/source/server/dnode/src/dnodeCheck.c
@@ -194,7 +194,7 @@ int32_t dnodeInitCheck(Dnode *dnode, DnCheck **out) {
   return 0;
 }
 
-void dnodeCleanupCheck(Dnode *dnode, DnCheck **out) {
+void dnodeCleanupCheck(DnCheck **out) {
   DnCheck *check = *out;
   *out = NULL;
 
diff --git a/source/server/dnode/src/dnodeEps.c b/source/server/dnode/src/dnodeEps.c
index c178c01c9f..725e54bb91 100644
--- a/source/server/dnode/src/dnodeEps.c
+++ b/source/server/dnode/src/dnodeEps.c
@@ -204,7 +204,7 @@ int32_t dnodeInitEps(Dnode *dnode, DnEps **out) {
   return ret;
 }
 
-void dnodeCleanupEps(Dnode *dnode, DnEps **out) {
+void dnodeCleanupEps(DnEps **out) {
   DnEps *eps = *out;
   *out = NULL;
 
-- 
GitLab