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

fix gis mysqltest in slave mode

Browse Source
This commit is contained in:
obdev
2023-01-03 14:38:21 +00:00
committed by ob-robot
parent 55f915e051
commit f14618802c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/das/ob_das_dml_ctx_define.cpp
View File

@ -151,7 +151,6 @@ int ObDASDMLIterator::get_next_spatial_index_row(ObNewRow *&row)
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("can't get geo col idx", K(ret), K(geo_col_id)); LOG_WARN("can't get geo col idx", K(ret), K(geo_col_id));
} else if (OB_FAIL(ObDASUtils::generate_spatial_index_rows(allocator_, *das_ctdef_, geo_wkb, } else if (OB_FAIL(ObDASUtils::generate_spatial_index_rows(allocator_, *das_ctdef_, geo_wkb,
write_buffer.get_tenant_id(),
*row_projector_, *sr, *spatial_rows))) { *row_projector_, *sr, *spatial_rows))) {
LOG_WARN("generate spatial_index_rows failed", K(ret), K(geo_col_id), K(geo_wkb)); LOG_WARN("generate spatial_index_rows failed", K(ret), K(geo_col_id), K(geo_wkb));
} }
@ -180,7 +179,9 @@ int ObDASDMLIterator::get_next_row(ObNewRow *&row)
if (OB_SUCC(ret) && das_ctdef_->table_param_.get_data_table().is_spatial_index()) { if (OB_SUCC(ret) && das_ctdef_->table_param_.get_data_table().is_spatial_index()) {
if (OB_FAIL(get_next_spatial_index_row(row))) { if (OB_FAIL(get_next_spatial_index_row(row))) {
LOG_WARN("get next spatial index row failed", K(ret), K(das_ctdef_->table_param_.get_data_table())); if (OB_ITER_END != ret) {
LOG_WARN("get next spatial index row failed", K(ret), K(das_ctdef_->table_param_.get_data_table()));
}
} }
} else { } else {
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {

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

@ -94,7 +94,9 @@ int ObDASUpdIterator::get_next_row(ObNewRow *&row)
if (OB_UNLIKELY(das_ctdef_->table_param_.get_data_table().is_spatial_index())) { if (OB_UNLIKELY(das_ctdef_->table_param_.get_data_table().is_spatial_index())) {
if (OB_FAIL(get_next_spatial_index_row(row))) { if (OB_FAIL(get_next_spatial_index_row(row))) {
LOG_WARN("get next spatial index row failed", K(ret)); if (OB_ITER_END != ret) {
LOG_WARN("get next spatial index row failed", K(ret));
}
} }
} else if (!got_old_row_) { } else if (!got_old_row_) {
got_old_row_ = true; got_old_row_ = true;
@ -222,7 +224,6 @@ int ObDASUpdIterator::get_next_spatial_index_row(ObNewRow *&row)
int64_t geo_idx = cur_proj.at(rowkey_num); int64_t geo_idx = cur_proj.at(rowkey_num);
ObString geo_wkb = sr->cells()[geo_idx].get_string(); ObString geo_wkb = sr->cells()[geo_idx].get_string();
if (OB_FAIL(ObDASUtils::generate_spatial_index_rows(allocator_, *das_ctdef_, geo_wkb, if (OB_FAIL(ObDASUtils::generate_spatial_index_rows(allocator_, *das_ctdef_, geo_wkb,
write_buffer.get_tenant_id(),
cur_proj, *sr, *spatial_rows))) { cur_proj, *sr, *spatial_rows))) {
LOG_WARN("generate spatial_index_rows failed", K(ret), K(geo_idx), K(geo_wkb), K(rowkey_num)); LOG_WARN("generate spatial_index_rows failed", K(ret), K(geo_idx), K(geo_wkb), K(rowkey_num));
} }

7
src/sql/das/ob_das_utils.cpp
View File

@ -295,7 +295,6 @@ int ObDASUtils::generate_spatial_index_rows(
ObIAllocator &allocator, ObIAllocator &allocator,
const ObDASDMLBaseCtDef &das_ctdef, const ObDASDMLBaseCtDef &das_ctdef,
const ObString &wkb_str, const ObString &wkb_str,
uint64_t tenant_id,
const IntFixedArray &row_projector, const IntFixedArray &row_projector,
const ObDASWriteBuffer::DmlRow &dml_row, const ObDASWriteBuffer::DmlRow &dml_row,
ObSpatIndexRow &spat_rows) ObSpatIndexRow &spat_rows)
@ -310,11 +309,11 @@ int ObDASUtils::generate_spatial_index_rows(
if (OB_FAIL(ObGeoTypeUtil::get_srid_from_wkb(wkb_str, srid))) { if (OB_FAIL(ObGeoTypeUtil::get_srid_from_wkb(wkb_str, srid))) {
LOG_WARN("failed to get srid", K(ret), K(wkb_str)); LOG_WARN("failed to get srid", K(ret), K(wkb_str));
} else if (srid != 0 && } else if (srid != 0 &&
OB_FAIL(OTSRS_MGR.get_tenant_srs_guard(tenant_id, srs_guard))) { OB_FAIL(OTSRS_MGR.get_tenant_srs_guard(MTL_ID(), srs_guard))) {
LOG_WARN("failed to get srs guard", K(ret), K(tenant_id), K(srid)); LOG_WARN("failed to get srs guard", K(ret), K(MTL_ID()), K(srid));
} else if (srid != 0 && } else if (srid != 0 &&
OB_FAIL(srs_guard.get_srs_item(srid, srs_item))) { OB_FAIL(srs_guard.get_srs_item(srid, srs_item))) {
LOG_WARN("failed to get srs item", K(ret), K(tenant_id), K(srid)); LOG_WARN("failed to get srs item", K(ret), K(MTL_ID()), K(srid));
} else if (((srid == 0) || !(srs_item->is_geographical_srs())) && } else if (((srid == 0) || !(srs_item->is_geographical_srs())) &&
OB_FAIL(OTSRS_MGR.get_srs_bounds(srid, srs_item, srs_bound))) { OB_FAIL(OTSRS_MGR.get_srs_bounds(srid, srs_item, srs_bound))) {
LOG_WARN("failed to get srs bound", K(ret), K(srid)); LOG_WARN("failed to get srs bound", K(ret), K(srid));

1
src/sql/das/ob_das_utils.h
View File

@ -58,7 +58,6 @@ public:
static int generate_spatial_index_rows(ObIAllocator &allocator, static int generate_spatial_index_rows(ObIAllocator &allocator,
const ObDASDMLBaseCtDef &das_ctdef, const ObDASDMLBaseCtDef &das_ctdef,
const ObString &wkb_str, const ObString &wkb_str,
uint64_t tenant_id,
const IntFixedArray &row_projector, const IntFixedArray &row_projector,
const ObDASWriteBuffer::DmlRow &dml_row, const ObDASWriteBuffer::DmlRow &dml_row,
ObSpatIndexRow &spat_rows); ObSpatIndexRow &spat_rows);