From 0617120f8bc3c5b3f22dc3a0eb70966aea4402cc Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 9 Dec 2024 19:13:01 +0800 Subject: [PATCH] fix deadlock --- source/libs/stream/src/streamBackendRocksdb.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c index f56a3c4852..11d2385d1c 100644 --- a/source/libs/stream/src/streamBackendRocksdb.c +++ b/source/libs/stream/src/streamBackendRocksdb.c @@ -4293,13 +4293,9 @@ void streamStateParTagSeekKeyNext_rocksdb(SStreamState* pState, const int64_t gr } } -<<<<<<< HEAD int32_t streamStateParTagGetKVByCur_rocksdb(SStreamStateCur* pCur, int64_t* pGroupId, const void** pVal, int32_t* pVLen) { stDebug("streamStateFillGetKVByCur_rocksdb"); -======= -int32_t streamStateParTagGetKVByCur_rocksdb(SStreamStateCur* pCur, int64_t* pGroupId, const void** pVal, int32_t* pVLen) { ->>>>>>> origin/main if (!pCur) { return -1; }