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

refactor: make more object global

This commit is contained in:
Shengliang Guan 2022-05-16 22:34:43 +08:00
parent 1f886b1117
commit ddf55f25aa
5 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/mgmt/node_mgmt/src/dmNodes.c
View File

@ -260,7 +260,7 @@ static void dmWatchNodes(SDnode *pDnode) {
taosThreadMutexUnlock(&pDnode->mutex); taosThreadMutexUnlock(&pDnode->mutex);
} }
int32_t dnRunDnode(SDnode *pDnode) { int32_t dmRunDnode(SDnode *pDnode) {
if (dmOpenNodes(pDnode) != 0) { if (dmOpenNodes(pDnode) != 0) {
dError("failed to open nodes since %s", terrstr()); dError("failed to open nodes since %s", terrstr());
return -1; return -1;

13
source/dnode/mgmt/test/sut/inc/server.h
View File

@ -24,15 +24,14 @@ class TestServer {
bool DoStart(); bool DoStart();
private: private:
SDnodeOpt BuildOption(const char* path, const char* fqdn, uint16_t port, const char* firstEp); void BuildOption(const char* path, const char* fqdn, uint16_t port, const char* firstEp);
private: private:
SDnode* pDnode; TdThread threadId;
TdThread threadId; char path[PATH_MAX];
char path[PATH_MAX]; char fqdn[TSDB_FQDN_LEN];
char fqdn[TSDB_FQDN_LEN]; char firstEp[TSDB_EP_LEN];
char firstEp[TSDB_EP_LEN]; uint16_t port;
uint16_t port;
}; };
#endif /* _TD_TEST_SERVER_H_ */ #endif /* _TD_TEST_SERVER_H_ */

36
source/dnode/mgmt/test/sut/src/server.cpp
View File

@ -16,35 +16,29 @@
#include "sut.h" #include "sut.h"
void* serverLoop(void* param) { void* serverLoop(void* param) {
SDnode* pDnode = (SDnode*)param; dmRun();
dmRun(pDnode);
return NULL; return NULL;
} }
SDnodeOpt TestServer::BuildOption(const char* path, const char* fqdn, uint16_t port, const char* firstEp) { void TestServer::BuildOption(const char* path, const char* fqdn, uint16_t port, const char* firstEp) {
SDnodeOpt option = {0}; tsNumOfSupportVnodes = 16;
option.numOfSupportVnodes = 16; tsServerPort = port;
option.serverPort = port; strcpy(tsDataDir, path);
strcpy(option.dataDir, path); snprintf(tsLocalEp, TSDB_EP_LEN, "%s:%u", fqdn, port);
snprintf(option.localEp, TSDB_EP_LEN, "%s:%u", fqdn, port); snprintf(tsLocalFqdn, TSDB_FQDN_LEN, "%s", fqdn);
snprintf(option.localFqdn, TSDB_FQDN_LEN, "%s", fqdn); snprintf(tsFirst, TSDB_EP_LEN, "%s", firstEp);
snprintf(option.firstEp, TSDB_EP_LEN, "%s", firstEp); taosMkDir(path);
return option;
} }
bool TestServer::DoStart() { bool TestServer::DoStart() {
SDnodeOpt option = BuildOption(path, fqdn, port, firstEp); if (dmInit(0) != 0) {
taosMkDir(path);
pDnode = dmCreate(&option);
if (pDnode == NULL) {
return false; return false;
} }
TdThreadAttr thAttr; TdThreadAttr thAttr;
taosThreadAttrInit(&thAttr); taosThreadAttrInit(&thAttr);
taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE); taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE);
taosThreadCreate(&threadId, &thAttr, serverLoop, pDnode); taosThreadCreate(&threadId, &thAttr, serverLoop, NULL);
taosThreadAttrDestroy(&thAttr); taosThreadAttrDestroy(&thAttr);
taosMsleep(2100); taosMsleep(2100);
return true; return true;
@ -68,11 +62,7 @@ bool TestServer::Start(const char* path, const char* fqdn, uint16_t port, const
} }
void TestServer::Stop() { void TestServer::Stop() {
dmSetEvent(pDnode, DND_EVENT_STOP); dmStop();
taosThreadJoin(threadId, NULL); taosThreadJoin(threadId, NULL);
dmCleanup();
if (pDnode != NULL) {
dmClose(pDnode);
pDnode = NULL;
}
} }

2
source/dnode/mgmt/test/sut/src/sut.cpp
View File

@ -40,7 +40,7 @@ void Testbase::InitLog(const char* path) {
} }
void Testbase::Init(const char* path, int16_t port) { void Testbase::Init(const char* path, int16_t port) {
dmInit(); dmInit(0);
char fqdn[] = "localhost"; char fqdn[] = "localhost";
char firstEp[TSDB_EP_LEN] = {0}; char firstEp[TSDB_EP_LEN] = {0};

2
source/dnode/mnode/impl/test/trans/trans2.cpp
View File

@ -15,7 +15,7 @@
#include "mndUser.h" #include "mndUser.h"
#include "tcache.h" #include "tcache.h"
void reportStartup(SMgmtWrapper *pWrapper, const char *name, const char *desc) {} void reportStartup(const char *name, const char *desc) {}
class MndTestTrans2 : public ::testing::Test { class MndTestTrans2 : public ::testing::Test {
protected: protected: