Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/vnode_compact

packaging/tools/tdengine.iss

@@ -3,7 +3,7 @@
 #define MyAppURL "http://www.taosdata.com/"
 #define MyAppBeforeInstallTxt "windows_before_install.txt"
 #define MyAppIco "favicon.ico"
-#define MyAppInstallDir "C:\{#CusName}"
+#define MyAppInstallDir "C:\TDengine"
 #define MyAppOutputDir "./"
 #define MyAppSourceDir "C:\TDengine"
 ;#define MyAppAllFile "\*"

source/client/CMakeLists.txt

@@ -60,6 +60,6 @@ target_link_libraries(
     PRIVATE os util common transport nodes parser command planner catalog scheduler function qcom
 )
 
-#if(${BUILD_TEST})
+if(${BUILD_TEST})
     ADD_SUBDIRECTORY(test)
-#endif(${BUILD_TEST})
\ No newline at end of file
+endif(${BUILD_TEST})
\ No newline at end of file

source/libs/transport/src/tmsgcb.c

@@ -60,11 +60,15 @@ void tmsgReleaseHandle(SRpcHandleInfo* pHandle, int8_t type) { (*defaultMsgCb.re
 void tmsgReportStartup(const char* name, const char* desc) { (*defaultMsgCb.reportStartupFp)(name, desc); }
 
 bool tmsgUpdateDnodeInfo(int32_t* dnodeId, int64_t* clusterId, char* fqdn, uint16_t* port) {
-  return (*defaultMsgCb.updateDnodeInfoFp)(defaultMsgCb.data, dnodeId, clusterId, fqdn, port);
+  if (defaultMsgCb.updateDnodeInfoFp) {
+    return (*defaultMsgCb.updateDnodeInfoFp)(defaultMsgCb.data, dnodeId, clusterId, fqdn, port);
+  } else {
+    return false;
+  }
 }
 
 void tmsgUpdateDnodeEpSet(SEpSet* epset) {
   for (int32_t i = 0; i < epset->numOfEps; ++i) {
     tmsgUpdateDnodeInfo(NULL, NULL, epset->eps[i].fqdn, &epset->eps[i].port);
   }
-}
\ No newline at end of file
+}