From dbe3b2561836726f8dd7f4eacb14ae3444a1ab0c Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao> Date: Thu, 25 Apr 2024 17:37:59 +0800 Subject: [PATCH 1/3] save stream tbname --- source/libs/stream/src/streamState.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/source/libs/stream/src/streamState.c b/source/libs/stream/src/streamState.c index 4c16e47163..dfec9a0fe6 100644 --- a/source/libs/stream/src/streamState.c +++ b/source/libs/stream/src/streamState.c @@ -1094,13 +1094,8 @@ _end: int32_t streamStatePutParName(SStreamState* pState, int64_t groupId, const char tbname[TSDB_TABLE_NAME_LEN]) { #ifdef USE_ROCKSDB - if (tSimpleHashGetSize(pState->parNameMap) > MAX_TABLE_NAME_NUM) { - if (tSimpleHashGet(pState->parNameMap, &groupId, sizeof(int64_t)) == NULL) { - streamStatePutParName_rocksdb(pState, groupId, tbname); - } - return TSDB_CODE_SUCCESS; - } tSimpleHashPut(pState->parNameMap, &groupId, sizeof(int64_t), tbname, TSDB_TABLE_NAME_LEN); + streamStatePutParName_rocksdb(pState, groupId, tbname); return TSDB_CODE_SUCCESS; #else return tdbTbUpsert(pState->pTdbState->pParNameDb, &groupId, sizeof(int64_t), tbname, TSDB_TABLE_NAME_LEN, @@ -1112,10 +1107,11 @@ int32_t streamStateGetParName(SStreamState* pState, int64_t groupId, void** pVal #ifdef USE_ROCKSDB void* pStr = tSimpleHashGet(pState->parNameMap, &groupId, sizeof(int64_t)); if (!pStr) { - if (tSimpleHashGetSize(pState->parNameMap) > MAX_TABLE_NAME_NUM) { - return streamStateGetParName_rocksdb(pState, groupId, pVal); + int32_t code = streamStateGetParName_rocksdb(pState, groupId, pVal); + if (code == TSDB_CODE_SUCCESS) { + tSimpleHashPut(pState->parNameMap, &groupId, sizeof(int64_t), pVal, TSDB_TABLE_NAME_LEN); } - return TSDB_CODE_FAILED; + return code; } *pVal = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN); memcpy(*pVal, pStr, TSDB_TABLE_NAME_LEN); From 220a31d02fcb3b23f54070cb523251a5763845c0 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao> Date: Thu, 25 Apr 2024 17:48:32 +0800 Subject: [PATCH 2/3] save stream tbname --- source/libs/stream/src/streamState.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/libs/stream/src/streamState.c b/source/libs/stream/src/streamState.c index dfec9a0fe6..3928437ef8 100644 --- a/source/libs/stream/src/streamState.c +++ b/source/libs/stream/src/streamState.c @@ -1094,8 +1094,10 @@ _end: int32_t streamStatePutParName(SStreamState* pState, int64_t groupId, const char tbname[TSDB_TABLE_NAME_LEN]) { #ifdef USE_ROCKSDB - tSimpleHashPut(pState->parNameMap, &groupId, sizeof(int64_t), tbname, TSDB_TABLE_NAME_LEN); - streamStatePutParName_rocksdb(pState, groupId, tbname); + if (tSimpleHashGet(pState->parNameMap, &groupId, sizeof(int64_t)) == NULL) { + tSimpleHashPut(pState->parNameMap, &groupId, sizeof(int64_t), tbname, TSDB_TABLE_NAME_LEN); + streamStatePutParName_rocksdb(pState, groupId, tbname); + } return TSDB_CODE_SUCCESS; #else return tdbTbUpsert(pState->pTdbState->pParNameDb, &groupId, sizeof(int64_t), tbname, TSDB_TABLE_NAME_LEN, From 0551c1189d830494c26e0c339318686e7ca2f0d9 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao> Date: Thu, 25 Apr 2024 18:46:13 +0800 Subject: [PATCH 3/3] save stream tbname --- source/libs/stream/src/streamState.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/stream/src/streamState.c b/source/libs/stream/src/streamState.c index 3928437ef8..52002b7ea8 100644 --- a/source/libs/stream/src/streamState.c +++ b/source/libs/stream/src/streamState.c @@ -1111,7 +1111,7 @@ int32_t streamStateGetParName(SStreamState* pState, int64_t groupId, void** pVal if (!pStr) { int32_t code = streamStateGetParName_rocksdb(pState, groupId, pVal); if (code == TSDB_CODE_SUCCESS) { - tSimpleHashPut(pState->parNameMap, &groupId, sizeof(int64_t), pVal, TSDB_TABLE_NAME_LEN); + tSimpleHashPut(pState->parNameMap, &groupId, sizeof(int64_t), *pVal, TSDB_TABLE_NAME_LEN); } return code; }