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

bug/50761089 spatial index das update iterator should handle empty index column

Browse Source
This commit is contained in:
shadowao
2023-07-07 10:53:39 +00:00
committed by ob-robot
parent ddf7854eb4
commit 2538dec984
1 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/sql/das/ob_das_update_op.cpp
View File

@ -197,48 +197,52 @@ int ObDASUpdIterator::get_next_spatial_index_row(ObNewRow *&row)
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
ObDASWriteBuffer &write_buffer = get_write_buffer(); ObDASWriteBuffer &write_buffer = get_write_buffer();
ObSpatIndexRow *spatial_rows = get_spatial_index_rows(); ObSpatIndexRow *spatial_rows = get_spatial_index_rows();
if (OB_ISNULL(spatial_rows) || spatial_row_idx_ >= spatial_rows->count()) { bool got_row = false;
const ObChunkDatumStore::StoredRow *sr = nullptr; while (OB_SUCC(ret) && ! got_row) {
spatial_row_idx_ = 0; if (OB_ISNULL(spatial_rows) || spatial_row_idx_ >= spatial_rows->count()) {
if (OB_FAIL(result_iter_.get_next_row(sr))) { const ObChunkDatumStore::StoredRow *sr = nullptr;
if (OB_ITER_END != ret) { spatial_row_idx_ = 0;
LOG_WARN("get next row from result iterator failed", K(ret)); if (OB_FAIL(result_iter_.get_next_row(sr))) {
} else if (!got_old_row_) { if (OB_ITER_END != ret) {
// ret == OB_ITER_END, old row is finished, get next new row LOG_WARN("get next row from result iterator failed", K(ret));
old_row_ = NULL; } else if (!got_old_row_) {
got_old_row_ = true; // ret == OB_ITER_END, old row is finished, get next new row
old_row_ = NULL;
got_old_row_ = true;
}
} else if (OB_ISNULL(spatial_rows)) {
if (OB_FAIL(create_spatial_index_store())) {
LOG_WARN("create spatila index rows store failed", K(ret));
} else {
spatial_rows = get_spatial_index_rows();
}
} }
} else if (OB_ISNULL(spatial_rows)) { if (OB_NOT_NULL(spatial_rows)) {
if (OB_FAIL(create_spatial_index_store())) { spatial_rows->reuse();
LOG_WARN("create spatila index rows store failed", K(ret)); }
} else {
spatial_rows = get_spatial_index_rows(); if(OB_SUCC(ret)) {
// get full row successfully
const IntFixedArray &cur_proj = got_old_row_ ? das_ctdef_->new_row_projector_ : das_ctdef_->old_row_projector_;
int64_t geo_idx = cur_proj.at(rowkey_num);
ObString geo_wkb = sr->cells()[geo_idx].get_string();
if (OB_FAIL(ObTextStringHelper::read_real_string_data(&allocator_, ObGeometryType,
CS_TYPE_UTF8MB4_BIN, true, geo_wkb))) {
LOG_WARN("fail to get real string data", K(ret), K(geo_wkb));
} else if (OB_FAIL(ObDASUtils::generate_spatial_index_rows(allocator_, *das_ctdef_, geo_wkb,
cur_proj, *sr, *spatial_rows))) {
LOG_WARN("generate spatial_index_rows failed", K(ret), K(geo_idx), K(geo_wkb), K(rowkey_num));
}
} }
}
if (OB_NOT_NULL(spatial_rows)) {
spatial_rows->reuse();
} }
if(OB_SUCC(ret)) { if (OB_SUCC(ret) && spatial_row_idx_ < spatial_rows->count()) {
// get full row successfully row = &(*spatial_rows)[spatial_row_idx_];
const IntFixedArray &cur_proj = got_old_row_ ? das_ctdef_->new_row_projector_ : das_ctdef_->old_row_projector_; old_row_ = row;
int64_t geo_idx = cur_proj.at(rowkey_num); spatial_row_idx_++;
ObString geo_wkb = sr->cells()[geo_idx].get_string(); got_row = true;
if (OB_FAIL(ObTextStringHelper::read_real_string_data(&allocator_, ObGeometryType,
CS_TYPE_UTF8MB4_BIN, true, geo_wkb))) {
LOG_WARN("fail to get real string data", K(ret), K(geo_wkb));
} else if (OB_FAIL(ObDASUtils::generate_spatial_index_rows(allocator_, *das_ctdef_, geo_wkb,
cur_proj, *sr, *spatial_rows))) {
LOG_WARN("generate spatial_index_rows failed", K(ret), K(geo_idx), K(geo_wkb), K(rowkey_num));
}
} }
} }
if (OB_SUCC(ret)) {
row = &(*spatial_rows)[spatial_row_idx_];
old_row_ = row;
spatial_row_idx_++;
}
} }
return ret; return ret;
} }