From 680a88381c441a8ef5310f7fdfc300a13722ea34 Mon Sep 17 00:00:00 2001
From: yishenglanlingzui <395329313@qq.com>
Date: Tue, 7 Feb 2023 00:12:40 +0800
Subject: [PATCH] fix bug Concurrent ddl operations cause the table tablet_id
 to change, and defensive_check  with error 4377

---
 src/sql/engine/dml/ob_dml_service.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/sql/engine/dml/ob_dml_service.cpp b/src/sql/engine/dml/ob_dml_service.cpp
index 3c6ce00097..b5aba78002 100644
--- a/src/sql/engine/dml/ob_dml_service.cpp
+++ b/src/sql/engine/dml/ob_dml_service.cpp
@@ -1731,18 +1731,34 @@ int ObDMLService::check_dml_tablet_validity(ObDMLRtCtx &dml_rtctx,
         dml_rtdef.check_location_ = new(location_buf) ObTableLocation(allocator);
         tmp_location = dml_rtdef.check_location_;
         ObSchemaGetterGuard *schema_guard = dml_rtctx.get_exec_ctx().get_sql_ctx()->schema_guard_;
+        ObSQLSessionInfo *session = dml_rtctx.get_exec_ctx().get_my_session();
         ObSqlSchemaGuard sql_schema_guard;
         sql_schema_guard.set_schema_guard(schema_guard);
-        if (OB_FAIL(tmp_location->init_table_location_with_column_ids(sql_schema_guard,
-                                                                      table_id,
-                                                                      dml_ctdef.column_ids_,
-                                                                      dml_rtctx.get_exec_ctx()))) {
+        const ObTableSchema *table_schema = nullptr;
+        // Here, judge the schema version at the check table level.
+        // If the table-level schema_version is not equal, directly report an error schema_again
+        if (OB_ISNULL(schema_guard) || OB_ISNULL(session)) {
+          ret = OB_ERR_UNEXPECTED;
+          LOG_WARN("unexpected null", K(ret), K(schema_guard), K(session));
+        } else if (OB_FAIL(tmp_location->init_table_location_with_column_ids(
+            sql_schema_guard, table_id, dml_ctdef.column_ids_, dml_rtctx.get_exec_ctx()))) {
           LOG_WARN("init table location with column ids failed", K(ret), K(dml_ctdef), K(table_id));
+        } else if (OB_FAIL(schema_guard->get_table_schema(
+            session->get_effective_tenant_id(), table_id, table_schema))) {
+          LOG_WARN("failed to get table schema", K(ret));
+        } else if (OB_ISNULL(table_schema)) {
+          ret = OB_SCHEMA_ERROR;
+          LOG_WARN("failed to get schema", K(ret));
+        } else if (table_schema->get_schema_version() != dml_ctdef.das_base_ctdef_.schema_version_) {
+          ret = OB_SCHEMA_EAGAIN;
+          LOG_WARN("table version mismatch", K(ret), K(table_id),
+              K(table_schema->get_schema_version()), K(dml_ctdef.das_base_ctdef_.schema_version_));
         }
       }
     } else {
       tmp_location = dml_rtdef.check_location_;
     }
+
     if (OB_SUCC(ret)) {
       if (OB_FAIL(convert_exprs_to_row(row,
                                        dml_rtctx.get_eval_ctx(),