fix(stream):use terrno
This commit is contained in:
parent
4321d7eb43
commit
6225f7fa2f
|
@ -631,10 +631,10 @@ int32_t updateInfoDeserialize(void* buf, int32_t bufLen, SUpdateInfo* pInfo) {
|
||||||
if (tDecodeI8(&decoder, &pInfo->pkColType) < 0) return -1;
|
if (tDecodeI8(&decoder, &pInfo->pkColType) < 0) return -1;
|
||||||
|
|
||||||
pInfo->pKeyBuff = taosMemoryCalloc(1, sizeof(TSKEY) + sizeof(int64_t) + pInfo->pkColLen);
|
pInfo->pKeyBuff = taosMemoryCalloc(1, sizeof(TSKEY) + sizeof(int64_t) + pInfo->pkColLen);
|
||||||
QUERY_CHECK_NULL(pInfo->pKeyBuff, code, lino, _error, errno);
|
QUERY_CHECK_NULL(pInfo->pKeyBuff, code, lino, _error, terrno);
|
||||||
|
|
||||||
pInfo->pValueBuff = taosMemoryCalloc(1, sizeof(TSKEY) + pInfo->pkColLen);
|
pInfo->pValueBuff = taosMemoryCalloc(1, sizeof(TSKEY) + pInfo->pkColLen);
|
||||||
QUERY_CHECK_NULL(pInfo->pValueBuff, code, lino, _error, errno);
|
QUERY_CHECK_NULL(pInfo->pValueBuff, code, lino, _error, terrno);
|
||||||
|
|
||||||
if (pInfo->pkColLen != 0) {
|
if (pInfo->pkColLen != 0) {
|
||||||
pInfo->comparePkRowFn = compareKeyTsAndPk;
|
pInfo->comparePkRowFn = compareKeyTsAndPk;
|
||||||
|
|
|
@ -494,7 +494,7 @@ SRowBuffPos* getNewRowPos(SStreamFileState* pFileState) {
|
||||||
|
|
||||||
if (pFileState->curRowCount < pFileState->maxRowCount) {
|
if (pFileState->curRowCount < pFileState->maxRowCount) {
|
||||||
pBuff = taosMemoryCalloc(1, pFileState->rowSize);
|
pBuff = taosMemoryCalloc(1, pFileState->rowSize);
|
||||||
QUERY_CHECK_NULL(pBuff, code, lino, _error, errno);
|
QUERY_CHECK_NULL(pBuff, code, lino, _error, terrno);
|
||||||
pPos->pRowBuff = pBuff;
|
pPos->pRowBuff = pBuff;
|
||||||
pFileState->curRowCount++;
|
pFileState->curRowCount++;
|
||||||
goto _end;
|
goto _end;
|
||||||
|
@ -725,7 +725,7 @@ void flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot, boo
|
||||||
}
|
}
|
||||||
|
|
||||||
void* pSKey = pFileState->stateBuffCreateStateKeyFn(pPos, ((SStreamState*)pFileState->pFileStore)->number);
|
void* pSKey = pFileState->stateBuffCreateStateKeyFn(pPos, ((SStreamState*)pFileState->pFileStore)->number);
|
||||||
QUERY_CHECK_NULL(pSKey, code, lino, _end, errno);
|
QUERY_CHECK_NULL(pSKey, code, lino, _end, terrno);
|
||||||
|
|
||||||
code = streamStatePutBatchOptimize(pFileState->pFileStore, idx, batch, pSKey, pPos->pRowBuff, pFileState->rowSize,
|
code = streamStatePutBatchOptimize(pFileState->pFileStore, idx, batch, pSKey, pPos->pRowBuff, pFileState->rowSize,
|
||||||
0, buf);
|
0, buf);
|
||||||
|
|
Loading…
Reference in New Issue