xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Hongze Cheng 2023-02-09 14:27:30 +08:00
parent 943e86c22e 402cf13f0f
commit b24d3049f5
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/tools/tdengine.iss
View File

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

4
source/client/CMakeLists.txt
View File

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

6
source/libs/transport/src/tmsgcb.c
View File

@ -60,7 +60,11 @@ void tmsgReleaseHandle(SRpcHandleInfo* pHandle, int8_t type) { (*defaultMsgCb.re
void tmsgReportStartup(const char* name, const char* desc) { (*defaultMsgCb.reportStartupFp)(name, desc); } 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) { 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) { void tmsgUpdateDnodeEpSet(SEpSet* epset) {