hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add defensive code for ObClusterColumnReader

Browse Source
This commit is contained in:
wudidapaopao
2023-06-29 02:12:14 +00:00
committed by ob-robot
parent 3497dbfa19
commit b11eccefa9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/blocksstable/ob_row_reader.cpp
View File

@ -161,13 +161,14 @@ int ObClusterColumnReader::read_storage_datum(const int64_t column_idx, ObStorag
if (-1 == idx) { if (-1 == idx) {
datum.set_nop(); datum.set_nop();
} else if (idx >= 0) { } else if (idx >= 0 && idx < column_cnt_) {
if (OB_FAIL(read_datum(idx, datum))) { if (OB_FAIL(read_datum(idx, datum))) {
LOG_WARN("read datum fail", K(ret), KP(cluster_buf_), K(cell_end_pos_), K(idx), K(column_idx)); LOG_WARN("read datum fail", K(ret), KP(cluster_buf_), K(cell_end_pos_), K(idx), K(column_idx));
} else { } else {
LOG_DEBUG("read_storage_datum", K(idx), K(datum)); LOG_DEBUG("read_storage_datum", K(idx), K(datum));
} }
} else { } else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("invalid idx for read datum", K(ret), K(column_idx), K(idx), K(datum)); LOG_WARN("invalid idx for read datum", K(ret), K(column_idx), K(idx), K(datum));
} }
} }
@ -196,11 +197,12 @@ int ObClusterColumnReader::sequence_read_datum(const int64_t column_idx, ObStora
} }
if (-1 == idx) { if (-1 == idx) {
datum.set_nop(); datum.set_nop();
} else if (idx >= 0) { } else if (idx >= 0 && idx < column_cnt_) {
if (OB_FAIL(read_datum(idx, datum))) { if (OB_FAIL(read_datum(idx, datum))) {
LOG_WARN("read datum fail", K(ret), KP(cluster_buf_), K(cell_end_pos_), K(idx), K(column_idx)); LOG_WARN("read datum fail", K(ret), KP(cluster_buf_), K(cell_end_pos_), K(idx), K(column_idx));
} }
} else { } else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("invalid idx for sequence read obj", K(column_idx), K(idx), K(datum)); LOG_WARN("invalid idx for sequence read obj", K(column_idx), K(idx), K(datum));
} }
} }