Skip to content

fix: possible snapshot message size error and log info #33525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hzcheng merged 1 commit into from
Nov 11, 2025
+23 −0
Merged

fix: possible snapshot message size error and log info #33525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions source/dnode/vnode/src/tsdb/tsdbSnapshot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,26 @@ static int64_t tBlockDataSize(SBlockData* pBlockData) {
int64_t nData = 0;
for (int32_t iCol = 0; iCol < pBlockData->nColData; iCol++) {
SColData* pColData = tBlockDataGetColDataByIdx(pBlockData, iCol);
if (pColData->flag == HAS_NONE || pColData->flag == HAS_NULL) {
continue;
}

if (pColData->flag != HAS_VALUE) {
if (pColData->flag == (HAS_NONE | HAS_NULL | HAS_VALUE)) {
nData += BIT2_SIZE(pColData->nVal);
} else {
nData += BIT1_SIZE(pColData->nVal);
}
}

if (pColData->flag == (HAS_NONE | HAS_NULL)) {
continue;
}

if (IS_VAR_DATA_TYPE(pColData->type)) {
nData += pColData->nVal * sizeof(int32_t); // var data offset
}

nData += pColData->nData;
}
return nData;
Expand Down Expand Up @@ -332,6 +352,9 @@ static int32_t tsdbSnapReadTimeSeriesData(STsdbSnapReader* reader, uint8_t** dat
_exit:
if (code) {
TSDB_ERROR_LOG(TD_VID(reader->tsdb->pVnode), code, lino);
} else {
tsdbDebug("vgId:%d, tsdb snapshot read time-series data done, data size:%" PRId64 "", TD_VID(reader->tsdb->pVnode),
data[0] ? ((SSnapDataHdr*)(data[0]))->size : 0);
}
return code;
}
Expand Down
Loading