From 22afdaa6a44473b205f7eaeae0cacdf72702bf80 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 19 Apr 2023 14:15:17 +0000 Subject: [PATCH] change write opt --- source/libs/stream/src/streamStateRocksdb.c | 28 ++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/source/libs/stream/src/streamStateRocksdb.c b/source/libs/stream/src/streamStateRocksdb.c index 3f2c2426a3..3afa1f67e8 100644 --- a/source/libs/stream/src/streamStateRocksdb.c +++ b/source/libs/stream/src/streamStateRocksdb.c @@ -416,22 +416,20 @@ void streamCleanBackend(SStreamState* pState) { qInfo("rocksdb already free"); return; } + int cfLen = sizeof(ginitDict) / sizeof(ginitDict[0]); rocksdbCfParam* param = pState->pTdbState->param; for (int i = 0; i < cfLen; i++) { rocksdb_column_family_handle_destroy(pState->pTdbState->pHandle[i]); - rocksdb_options_destroy(pState->pTdbState->cfOpts[i]); - rocksdb_comparator_destroy(pState->pTdbState->pCompare[i]); + // rocksdb_options_destroy(pState->pTdbState->cfOpts[i]); + // rocksdb_comparator_destroy(pState->pTdbState->pCompare[i]); - rocksdb_cache_destroy(param[i].lru); - rocksdb_block_based_options_destroy(param[i].tableOpt); + // rocksdb_cache_destroy(param[i].lru); + // rocksdb_block_based_options_destroy(param[i].tableOpt); } - taosMemoryFree(pState->pTdbState->param); - rocksdb_options_destroy(pState->pTdbState->dbOpt); - taosMemoryFreeClear(pState->pTdbState->pHandle); - taosMemoryFreeClear(pState->pTdbState->cfOpts); - taosMemoryFree(pState->pTdbState->pCompare); + + rocksdb_options_destroy(pState->pTdbState->dbOpt); rocksdb_writeoptions_destroy(pState->pTdbState->writeOpts); pState->pTdbState->writeOpts = NULL; @@ -441,6 +439,18 @@ void streamCleanBackend(SStreamState* pState) { rocksdb_close(pState->pTdbState->rocksdb); rocksdb_env_destroy(pState->pTdbState->env); + for (int i = 0; i < cfLen; i++) { + // rocksdb_column_family_handle_destroy(pState->pTdbState->pHandle[i]); + rocksdb_options_destroy(pState->pTdbState->cfOpts[i]); + rocksdb_comparator_destroy(pState->pTdbState->pCompare[i]); + + rocksdb_cache_destroy(param[i].lru); + rocksdb_block_based_options_destroy(param[i].tableOpt); + } + taosMemoryFreeClear(pState->pTdbState->cfOpts); + taosMemoryFree(pState->pTdbState->pCompare); + taosMemoryFree(pState->pTdbState->param); + pState->pTdbState->rocksdb = NULL; } -- GitLab