Merge branch 'enh/3.0' into enh/triggerCheckPoint2
This commit is contained in:
parent
000e39aa18
commit
ab9490101f
|
@ -94,7 +94,7 @@ SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskExpand expandF
|
|||
taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
|
||||
pMeta->chkpSaved = taosArrayInit(4, sizeof(int64_t));
|
||||
pMeta->chkpInUse = taosArrayInit(4, sizeof(int64_t));
|
||||
pMeta->chkpCap = 2;
|
||||
pMeta->chkpCap = 8;
|
||||
taosInitRWLatch(&pMeta->chkpDirLock);
|
||||
|
||||
int64_t chkpId = streamGetLatestCheckpointId(pMeta);
|
||||
|
|
|
@ -165,6 +165,7 @@ int32_t tDecodeStreamTaskChkInfo(SDecoder* pDecoder, SCheckpointInfo* pChkpInfo)
|
|||
if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
|
||||
if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
|
||||
if (tDecodeSEpSet(pDecoder, &epSet) < 0) return -1;
|
||||
if (tDecodeSEpSet(pDecoder, &epSet) < 0) return -1;
|
||||
|
||||
if (tDecodeI64(pDecoder, &pChkpInfo->checkpointId) < 0) return -1;
|
||||
if (tDecodeI64(pDecoder, &pChkpInfo->checkpointVer) < 0) return -1;
|
||||
|
|
Loading…
Reference in New Issue