more work
This commit is contained in:
parent
1baacb3c3b
commit
1d012a47e5
|
@ -476,7 +476,7 @@ static int32_t tsdbMergeTableData(SCommitter *pCommitter, STbDataIter *pIter, SB
|
||||||
}
|
}
|
||||||
|
|
||||||
_append_block_row:
|
_append_block_row:
|
||||||
code = tBlockDataAppendRow(pBlockData, pRow1, NULL);
|
code = tBlockDataAppendRow(pBlockData, pRow2, NULL);
|
||||||
if (code) goto _err;
|
if (code) goto _err;
|
||||||
|
|
||||||
if (pRow2->iRow + 1 < pBlockDataMerge->nRow) {
|
if (pRow2->iRow + 1 < pBlockDataMerge->nRow) {
|
||||||
|
|
|
@ -107,7 +107,7 @@ int32_t tsdbWriteDelData(SDelFWriter *pWriter, SArray *aDelData, uint8_t **ppBuf
|
||||||
*(SBlockDataHdr *)(*ppBuf) = hdr;
|
*(SBlockDataHdr *)(*ppBuf) = hdr;
|
||||||
n += sizeof(hdr);
|
n += sizeof(hdr);
|
||||||
for (int32_t iDelData = 0; iDelData < taosArrayGetSize(aDelData); iDelData++) {
|
for (int32_t iDelData = 0; iDelData < taosArrayGetSize(aDelData); iDelData++) {
|
||||||
size += tPutDelData(*ppBuf + n, taosArrayGet(aDelData, iDelData));
|
n += tPutDelData(*ppBuf + n, taosArrayGet(aDelData, iDelData));
|
||||||
}
|
}
|
||||||
taosCalcChecksumAppend(0, *ppBuf, size);
|
taosCalcChecksumAppend(0, *ppBuf, size);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue