diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c index 99fda7e81c..6a096b900f 100644 --- a/source/dnode/mnode/impl/src/mndStream.c +++ b/source/dnode/mnode/impl/src/mndStream.c @@ -1250,7 +1250,6 @@ static int32_t mndCheckNodeStatus(SMnode *pMnode) { if (taosArrayGetSize(execInfo.pNodeList) == 0) { mDebug("stream task node change checking done, no vgroups exist, do nothing"); execInfo.ts = ts; - // goto _EXIT; } for (int32_t i = 0; i < taosArrayGetSize(execInfo.pTaskList); ++i) { STaskId * p = taosArrayGet(execInfo.pTaskList, i); diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c index b9041198ac..a1f632d8c2 100644 --- a/source/libs/stream/src/streamBackendRocksdb.c +++ b/source/libs/stream/src/streamBackendRocksdb.c @@ -1740,9 +1740,10 @@ STaskDbWrapper* taskDbOpenImpl(char* key, char* statePath, char* dbPath) { rocksdb_list_column_families_destroy(cfNames, nCf); } taosMemoryFree(err); + err = NULL; cfNames = rocksdb_list_column_families(pTaskDb->dbOpt, dbPath, &nCf, &err); - ASSERT(err != NULL); + ASSERT(err == NULL); } if (taskDbOpenCfs(pTaskDb, dbPath, cfNames, nCf) != 0) { @@ -1751,10 +1752,11 @@ STaskDbWrapper* taskDbOpenImpl(char* key, char* statePath, char* dbPath) { if (cfNames != NULL) { rocksdb_list_column_families_destroy(cfNames, nCf); + cfNames = NULL; } qDebug("succ to init stream backend at %s, backend:%p", dbPath, pTaskDb); - + return pTaskDb; _EXIT: taskDbDestroy(pTaskDb); @@ -1769,10 +1771,10 @@ STaskDbWrapper* taskDbOpen(char* path, char* key, int64_t chkpId) { if (rebuildDirFromChkp2(path, key, chkpId, &statePath, &dbPath) != 0) { return NULL; } - // taosMemoryFree(statePath); STaskDbWrapper* pTaskDb = taskDbOpenImpl(key, statePath, dbPath); taosMemoryFree(dbPath); + taosMemoryFree(statePath); return pTaskDb; }