From f14618802ccfee59b51cdcfce8563cfabb21ac58 Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Tue, 3 Jan 2023 14:38:21 +0000
Subject: [PATCH] fix gis mysqltest in slave mode

---
 src/sql/das/ob_das_dml_ctx_define.cpp | 5 +++--
 src/sql/das/ob_das_update_op.cpp      | 5 +++--
 src/sql/das/ob_das_utils.cpp          | 7 +++----
 src/sql/das/ob_das_utils.h            | 1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/sql/das/ob_das_dml_ctx_define.cpp b/src/sql/das/ob_das_dml_ctx_define.cpp
index 3175af93d3..6265a75fe0 100644
--- a/src/sql/das/ob_das_dml_ctx_define.cpp
+++ b/src/sql/das/ob_das_dml_ctx_define.cpp
@@ -151,7 +151,6 @@ int ObDASDMLIterator::get_next_spatial_index_row(ObNewRow *&row)
           ret = OB_INVALID_ARGUMENT;
           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,
-                                                                  write_buffer.get_tenant_id(),
                                                                   *row_projector_, *sr, *spatial_rows))) {
           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_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 {
     if (OB_SUCC(ret)) {
diff --git a/src/sql/das/ob_das_update_op.cpp b/src/sql/das/ob_das_update_op.cpp
index c197173188..5589c1a678 100644
--- a/src/sql/das/ob_das_update_op.cpp
+++ b/src/sql/das/ob_das_update_op.cpp
@@ -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_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_) {
     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);
         ObString geo_wkb = sr->cells()[geo_idx].get_string();
         if (OB_FAIL(ObDASUtils::generate_spatial_index_rows(allocator_, *das_ctdef_, geo_wkb,
-                                                            write_buffer.get_tenant_id(),
                                                             cur_proj, *sr, *spatial_rows))) {
           LOG_WARN("generate spatial_index_rows failed", K(ret), K(geo_idx), K(geo_wkb), K(rowkey_num));
         }
diff --git a/src/sql/das/ob_das_utils.cpp b/src/sql/das/ob_das_utils.cpp
index cbc1d8853a..613552504d 100644
--- a/src/sql/das/ob_das_utils.cpp
+++ b/src/sql/das/ob_das_utils.cpp
@@ -295,7 +295,6 @@ int ObDASUtils::generate_spatial_index_rows(
     ObIAllocator &allocator,
     const ObDASDMLBaseCtDef &das_ctdef,
     const ObString &wkb_str,
-    uint64_t tenant_id,
     const IntFixedArray &row_projector,
     const ObDASWriteBuffer::DmlRow &dml_row,
     ObSpatIndexRow &spat_rows)
@@ -310,11 +309,11 @@ int ObDASUtils::generate_spatial_index_rows(
   if (OB_FAIL(ObGeoTypeUtil::get_srid_from_wkb(wkb_str, srid))) {
     LOG_WARN("failed to get srid", K(ret), K(wkb_str));
   } else if (srid != 0 &&
-      OB_FAIL(OTSRS_MGR.get_tenant_srs_guard(tenant_id, srs_guard))) {
-    LOG_WARN("failed to get srs guard", K(ret), K(tenant_id), K(srid));
+      OB_FAIL(OTSRS_MGR.get_tenant_srs_guard(MTL_ID(), srs_guard))) {
+    LOG_WARN("failed to get srs guard", K(ret), K(MTL_ID()), K(srid));
   } else if (srid != 0 &&
       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())) &&
               OB_FAIL(OTSRS_MGR.get_srs_bounds(srid, srs_item, srs_bound))) {
     LOG_WARN("failed to get srs bound", K(ret), K(srid));
diff --git a/src/sql/das/ob_das_utils.h b/src/sql/das/ob_das_utils.h
index 2c24a29004..b5f00199aa 100644
--- a/src/sql/das/ob_das_utils.h
+++ b/src/sql/das/ob_das_utils.h
@@ -58,7 +58,6 @@ public:
   static int generate_spatial_index_rows(ObIAllocator &allocator,
                                          const ObDASDMLBaseCtDef &das_ctdef,
                                          const ObString &wkb_str,
-                                         uint64_t tenant_id,
                                          const IntFixedArray &row_projector,
                                          const ObDASWriteBuffer::DmlRow &dml_row,
                                          ObSpatIndexRow &spat_rows);