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

Merge branch '3.0' into enh/refactorBackend

This commit is contained in:
yihaoDeng 2023-11-20 10:48:49 +08:00
parent 20de2f3cb5
commit 734bf07317
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/dnode/mnode/impl/src/mndStream.c
View File

@ -1250,7 +1250,6 @@ static int32_t mndCheckNodeStatus(SMnode *pMnode) {
if (taosArrayGetSize(execInfo.pNodeList) == 0) { if (taosArrayGetSize(execInfo.pNodeList) == 0) {
mDebug("stream task node change checking done, no vgroups exist, do nothing"); mDebug("stream task node change checking done, no vgroups exist, do nothing");
execInfo.ts = ts; execInfo.ts = ts;
// goto _EXIT;
} }
for (int32_t i = 0; i < taosArrayGetSize(execInfo.pTaskList); ++i) { for (int32_t i = 0; i < taosArrayGetSize(execInfo.pTaskList); ++i) {
STaskId * p = taosArrayGet(execInfo.pTaskList, i); STaskId * p = taosArrayGet(execInfo.pTaskList, i);

8
source/libs/stream/src/streamBackendRocksdb.c
View File

@ -1740,9 +1740,10 @@ STaskDbWrapper* taskDbOpenImpl(char* key, char* statePath, char* dbPath) {
rocksdb_list_column_families_destroy(cfNames, nCf); rocksdb_list_column_families_destroy(cfNames, nCf);
} }
taosMemoryFree(err); taosMemoryFree(err);
err = NULL;
cfNames = rocksdb_list_column_families(pTaskDb->dbOpt, dbPath, &nCf, &err); cfNames = rocksdb_list_column_families(pTaskDb->dbOpt, dbPath, &nCf, &err);
ASSERT(err != NULL); ASSERT(err == NULL);
} }
if (taskDbOpenCfs(pTaskDb, dbPath, cfNames, nCf) != 0) { if (taskDbOpenCfs(pTaskDb, dbPath, cfNames, nCf) != 0) {
@ -1751,10 +1752,11 @@ STaskDbWrapper* taskDbOpenImpl(char* key, char* statePath, char* dbPath) {
if (cfNames != NULL) { if (cfNames != NULL) {
rocksdb_list_column_families_destroy(cfNames, nCf); rocksdb_list_column_families_destroy(cfNames, nCf);
cfNames = NULL;
} }
qDebug("succ to init stream backend at %s, backend:%p", dbPath, pTaskDb); qDebug("succ to init stream backend at %s, backend:%p", dbPath, pTaskDb);
return pTaskDb;
_EXIT: _EXIT:
taskDbDestroy(pTaskDb); taskDbDestroy(pTaskDb);
@ -1769,10 +1771,10 @@ STaskDbWrapper* taskDbOpen(char* path, char* key, int64_t chkpId) {
if (rebuildDirFromChkp2(path, key, chkpId, &statePath, &dbPath) != 0) { if (rebuildDirFromChkp2(path, key, chkpId, &statePath, &dbPath) != 0) {
return NULL; return NULL;
} }
// taosMemoryFree(statePath);
STaskDbWrapper* pTaskDb = taskDbOpenImpl(key, statePath, dbPath); STaskDbWrapper* pTaskDb = taskDbOpenImpl(key, statePath, dbPath);
taosMemoryFree(dbPath); taosMemoryFree(dbPath);
taosMemoryFree(statePath);
return pTaskDb; return pTaskDb;
} }