xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix deadlock

This commit is contained in:
yihaoDeng 2024-12-09 19:13:01 +08:00
parent 91d0fe5c8b
commit 0617120f8b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libs/stream/src/streamBackendRocksdb.c
View File

@ -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 streamStateParTagGetKVByCur_rocksdb(SStreamStateCur* pCur, int64_t* pGroupId, const void** pVal,
int32_t* pVLen) { int32_t* pVLen) {
stDebug("streamStateFillGetKVByCur_rocksdb"); stDebug("streamStateFillGetKVByCur_rocksdb");
=======
int32_t streamStateParTagGetKVByCur_rocksdb(SStreamStateCur* pCur, int64_t* pGroupId, const void** pVal, int32_t* pVLen) {
>>>>>>> origin/main
if (!pCur) { if (!pCur) {
return -1; return -1;
} }