From 59f56db956ab55f3e840061d0c7195edf219736d Mon Sep 17 00:00:00 2001
From: maosy <630014370@qq.com>
Date: Tue, 12 Sep 2023 10:10:23 +0000
Subject: [PATCH] fix max_ls_id not fix during upgrade from 4.1 to 4.2

---
 src/share/ob_upgrade_utils.cpp | 36 +++++++++++++++++-----------------
 src/share/ob_upgrade_utils.h   |  4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/share/ob_upgrade_utils.cpp b/src/share/ob_upgrade_utils.cpp
index 41b8cd777a..cec7b292c7 100755
--- a/src/share/ob_upgrade_utils.cpp
+++ b/src/share/ob_upgrade_utils.cpp
@@ -818,8 +818,6 @@ int ObUpgradeFor4100Processor::post_upgrade()
     LOG_WARN("fail to check inner stat", KR(ret));
   } else if (OB_FAIL(recompile_all_views_and_synonyms(tenant_id))) {
     LOG_WARN("fail to init rewrite rule version", K(ret), K(tenant_id));
-  } else if (OB_FAIL(post_upgrade_for_max_ls_id_())) {//TODO for 4200 upgrade
-    LOG_WARN("failed to update max ls id", KR(ret));
   }
   return ret;
 }
@@ -973,7 +971,24 @@ int ObUpgradeFor4100Processor::recompile_all_views_and_synonyms(const uint64_t t
 }
 /* =========== 4100 upgrade processor end ============= */
 
-int ObUpgradeFor4100Processor::post_upgrade_for_max_ls_id_()
+int ObUpgradeFor4200Processor::post_upgrade()
+{
+  int ret = OB_SUCCESS;
+  if (OB_FAIL(check_inner_stat())) {
+    LOG_WARN("fail to check inner stat", KR(ret));
+  } else if (OB_FAIL(post_upgrade_for_grant_create_database_link_priv())) {
+    LOG_WARN("grant create database link failed", K(ret));
+  } else if (OB_FAIL(post_upgrade_for_grant_drop_database_link_priv())) {
+    LOG_WARN("grant drop database link failed", K(ret));
+  } else if (OB_FAIL(post_upgrade_for_heartbeat_and_server_zone_op_service())) {
+    LOG_WARN("post upgrade for heartbeat and server zone op service failed", KR(ret));
+  } else if (OB_FAIL(post_upgrade_for_max_ls_id_())) {
+    LOG_WARN("failed to update max ls id", KR(ret));
+  }
+  return ret;
+}
+
+int ObUpgradeFor4200Processor::post_upgrade_for_max_ls_id_()
 {
   int ret = OB_SUCCESS;
   if (OB_ISNULL(sql_proxy_) || !is_valid_tenant_id(tenant_id_)) {
@@ -1005,21 +1020,6 @@ int ObUpgradeFor4100Processor::post_upgrade_for_max_ls_id_()
   return ret;
 }
 
-int ObUpgradeFor4200Processor::post_upgrade()
-{
-  int ret = OB_SUCCESS;
-  if (OB_FAIL(check_inner_stat())) {
-    LOG_WARN("fail to check inner stat", KR(ret));
-  } else if (OB_FAIL(post_upgrade_for_grant_create_database_link_priv())) {
-    LOG_WARN("grant create database link failed", K(ret));
-  } else if (OB_FAIL(post_upgrade_for_grant_drop_database_link_priv())) {
-    LOG_WARN("grant drop database link failed", K(ret));
-  } else if (OB_FAIL(post_upgrade_for_heartbeat_and_server_zone_op_service())) {
-    LOG_WARN("post upgrade for heartbeat and server zone op service failed", KR(ret));
-  }
-  return ret;
-}
-
 int ObUpgradeFor4200Processor::post_upgrade_for_grant_create_database_link_priv()
 {
   int ret = OB_SUCCESS;
diff --git a/src/share/ob_upgrade_utils.h b/src/share/ob_upgrade_utils.h
index 6585a51b0e..61ee9dcd72 100755
--- a/src/share/ob_upgrade_utils.h
+++ b/src/share/ob_upgrade_utils.h
@@ -189,8 +189,6 @@ private:
   int post_upgrade_for_backup();
   int init_rewrite_rule_version(const uint64_t tenant_id);
   static int recompile_all_views_and_synonyms(const uint64_t tenant_id);
-   //TODO upgrade for 4200
-   int post_upgrade_for_max_ls_id_();
 };
 
 DEF_SIMPLE_UPGRARD_PROCESSER(4, 1, 0, 1)
@@ -207,6 +205,8 @@ private:
   int post_upgrade_for_grant_create_database_link_priv();
   int post_upgrade_for_grant_drop_database_link_priv();
   int post_upgrade_for_heartbeat_and_server_zone_op_service();
+  int post_upgrade_for_max_ls_id_();
+
 };
 
 DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 0)