From b5ccc3db92ef7ae268c6d9f22baee895aae8916b Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao> Date: Mon, 15 Jul 2024 18:19:05 +0800 Subject: [PATCH] adj stream function result --- source/libs/stream/src/streamUpdate.c | 7 +++++-- source/util/src/tbloomfilter.c | 3 ++- source/util/src/tscalablebf.c | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/source/libs/stream/src/streamUpdate.c b/source/libs/stream/src/streamUpdate.c index 0dc1eafb03..61b7e02a4c 100644 --- a/source/libs/stream/src/streamUpdate.c +++ b/source/libs/stream/src/streamUpdate.c @@ -563,9 +563,12 @@ int32_t updateInfoDeserialize(void* buf, int32_t bufLen, SUpdateInfo* pInfo) { if (tDecodeI64(&decoder, &pInfo->interval) < 0) return -1; if (tDecodeI64(&decoder, &pInfo->watermark) < 0) return -1; if (tDecodeI64(&decoder, &pInfo->minTS) < 0) return -1; - pInfo->pCloseWinSBF = NULL; + code = tScalableBfDecode(&decoder, &pInfo->pCloseWinSBF); - TSDB_CHECK_CODE(code, lino, _error); + if (code != TSDB_CODE_SUCCESS) { + pInfo->pCloseWinSBF = NULL; + code = TSDB_CODE_SUCCESS; + } int32_t mapSize = 0; if (tDecodeI32(&decoder, &mapSize) < 0) return -1; diff --git a/source/util/src/tbloomfilter.c b/source/util/src/tbloomfilter.c index 9093fb9d91..1cf4ecf72e 100644 --- a/source/util/src/tbloomfilter.c +++ b/source/util/src/tbloomfilter.c @@ -188,11 +188,12 @@ int32_t tBloomFilterDecode(SDecoder* pDecoder, SBloomFilter** ppBF) { pBF->hashFn1 = HASH_FUNCTION_1; pBF->hashFn2 = HASH_FUNCTION_2; (*ppBF) = pBF; + return TSDB_CODE_SUCCESS; _error: tBloomFilterDestroy(pBF); uError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); - return TSDB_CODE_FAILED; + return code; } bool tBloomFilterIsFull(const SBloomFilter* pBF) { return pBF->size >= pBF->expectedEntries; } diff --git a/source/util/src/tscalablebf.c b/source/util/src/tscalablebf.c index 0979000981..4a4dfd2653 100644 --- a/source/util/src/tscalablebf.c +++ b/source/util/src/tscalablebf.c @@ -254,8 +254,9 @@ int32_t tScalableBfDecode(SDecoder* pDecoder, SScalableBf** ppSBf) { (*ppSBf) = pSBf; _error: - tScalableBfDestroy(pSBf); + if (code != TSDB_CODE_SUCCESS) { + tScalableBfDestroy(pSBf); uError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); } return code;