fix scn legacy issues

deps/oblib/src/lib/compress/ob_compressor.h

@@ -40,6 +40,7 @@ public:
                          int64_t &dst_data_size) = 0;
   virtual int get_max_overflow_size(const int64_t src_data_size,
                                     int64_t &max_overflow_size) const = 0;
+  virtual void reset_mem() {}
 
   virtual const char *get_compressor_name() const = 0;
   virtual ObCompressorType get_compressor_type() const = 0;

deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.cpp

@@ -65,6 +65,11 @@ void ObZstdCtxAllocator::reuse()
   allocator_.reuse();
 }
 
+void ObZstdCtxAllocator::reset()
+{
+  allocator_.reset();
+}
+
 /**
  * ----------------------------ObZstdCompressor---------------------------
  */
@@ -147,6 +152,14 @@ int ObZstdCompressor::decompress(const char *src_buffer,
   return ret;
 }
 
+void ObZstdCompressor::reset_mem()
+{
+  ObZstdCtxAllocator *zstd_allocator = GET_TSI_MULT(ObZstdCtxAllocator, 1);
+  if (NULL != zstd_allocator) {
+    zstd_allocator->reset();
+  }
+}
+
 const char *ObZstdCompressor::get_compressor_name() const
 {
   return all_compressor_name[ObCompressorType::ZSTD_COMPRESSOR];

deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.h

@@ -31,6 +31,7 @@ public:
   void *alloc(size_t size);
   void free(void *addr);
   void reuse();
+  void reset();
 private:
   ObArenaAllocator allocator_;
 };
@@ -54,6 +55,7 @@ public:
   ObCompressorType get_compressor_type() const;
   int get_max_overflow_size(const int64_t src_data_size,
                                    int64_t &max_overflow_size) const;
+  void reset_mem();
 
 };
 } // namespace zstd

deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.cpp

@@ -66,6 +66,11 @@ void ObZstdCtxAllocator::reuse()
   allocator_.reuse();
 }
 
+void ObZstdCtxAllocator::reset()
+{
+  allocator_.reset();
+}
+
 /**
  * ----------------------------ObZstdCompressor---------------------------
  */
@@ -148,6 +153,14 @@ int ObZstdCompressor_1_3_8::decompress(const char *src_buffer,
   return ret;
 }
 
+void ObZstdCompressor_1_3_8::reset_mem()
+{
+  ObZstdCtxAllocator *zstd_allocator = GET_TSI_MULT(ObZstdCtxAllocator, 1);
+  if (NULL != zstd_allocator) {
+    zstd_allocator->reset();
+  }
+}
+
 const char *ObZstdCompressor_1_3_8::get_compressor_name() const
 {
   return all_compressor_name[ObCompressorType::ZSTD_1_3_8_COMPRESSOR];

deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.h

@@ -31,6 +31,7 @@ public:
   void *alloc(size_t size);
   void free(void *addr);
   void reuse();
+  void reset();
 private:
   ObArenaAllocator allocator_;
 };
@@ -54,6 +55,7 @@ public:
   ObCompressorType get_compressor_type() const;
   int get_max_overflow_size(const int64_t src_data_size,
                             int64_t &max_overflow_size) const;
+  void reset_mem();
 
 };
 } // namespace zstd_1_3_8

deps/oblib/src/lib/ob_define.h

@@ -775,6 +775,7 @@ const char *const OB_DIAG_TENANT_NAME = "diag";
 //for sync ddl (ClusterID_TenantID_SchemaVersion)
 const char *const OB_DDL_ID_VAR_NAME = "__oceanbase_ddl_id";
 const int64_t OB_MAX_DDL_ID_STR_LENGTH = 64;
+const int64_t OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT = 7L * 24L * 60L * 60L * 1000L * 1000L; // 7days
 
 // The default user name of the standby database to log in to the main database
 const char *const OB_STANDBY_USER_NAME = "__oceanbase_inner_standby_user";

deps/oblib/src/rpc/obrpc/ob_net_keepalive.cpp

@@ -28,10 +28,13 @@
 #include "lib/utility/ob_defer.h"
 #include "lib/thread/ob_thread_name.h"
 #include "lib/time/ob_time_utility.h"
+#include "lib/utility/serialization.h"
+#include "lib/utility/utility.h"
 #include "rpc/frame/ob_net_easy.h"
 #include "io/easy_negotiation.h"
 
 using namespace oceanbase::common;
+using namespace oceanbase::common::serialization;
 using namespace oceanbase::lib;
 using namespace oceanbase::rpc::frame;
 namespace oceanbase
@@ -44,6 +47,43 @@ namespace obrpc
 #define WINDOW_MAX_FAILS   4                  // 4 times
 #define MAX_CREDIBLE_WINDOW 10 * 1000 * 1000  // 10s
 
+constexpr int32_t KP_MAGIC = 0x2c15c364;
+struct Header
+{
+public:
+  Header(int32_t data_len = 0)
+    : magic_(KP_MAGIC), data_len_(data_len) {}
+  int encode(char *buf, const int64_t buf_len, int64_t &pos)
+  {
+    int ret = OB_SUCCESS;
+    if (OB_FAIL(encode_i32(buf, buf_len, pos, magic_))) {
+      _LOG_WARN("encode magic failed, ret: %d, pos: %ld", ret, pos);
+    } else if (OB_FAIL(encode_i32(buf, buf_len, pos, data_len_))) {
+      _LOG_WARN("encode data len failed, ret: %d, pos: %ld", ret, pos);
+    }
+    return ret;
+  }
+  int decode(const char *buf, const int64_t buf_len, int64_t &pos)
+  {
+    int ret = OB_SUCCESS;
+    if (OB_FAIL(decode_i32(buf, buf_len, pos, &magic_))) {
+      _LOG_WARN("decode magic failed, ret: %d, pos: %ld", ret, pos);
+    } else if (magic_ != KP_MAGIC) {
+      ret = OB_ERR_UNEXPECTED;
+      _LOG_WARN("unexpected magic, magic: %d", magic_);
+    } else if (OB_FAIL(decode_i32(buf, buf_len, pos, &data_len_))) {
+      _LOG_WARN("decode data len failed, ret: %d, pos: %ld", ret, pos);
+    }
+    return ret;
+  }
+  int32_t get_encoded_size() const
+  {
+    return encoded_length_i32(magic_) + encoded_length_i32(data_len_);
+  }
+  int32_t magic_;
+  int32_t data_len_;
+};
+
 enum {
   UNCONNECT = 0,
   CONNECTING,
@@ -333,6 +373,7 @@ void ObNetKeepAlive::do_server_loop()
     for (int i = 0; i < cnt; i++) {
       struct server *s = (struct server *)events[i].data.ptr;
       int ev_fd = NULL == s? pipefd_ : s->fd_;
+      bool need_disconn = false;
       if (NULL == s)  {
         struct server *s = (struct server *)ob_malloc(sizeof(struct server), "KeepAliveServer");
         if (NULL == s) {
@@ -383,10 +424,26 @@ void ObNetKeepAlive::do_server_loop()
           char data = PROTOCOL_DATA;
           while ((n = read(ev_fd, &data, sizeof data)) < 0 && errno == EINTR);
           if (n <= 0) break;
-          while ((n = write(ev_fd, &PROTOCOL_DATA, sizeof PROTOCOL_DATA)) < 0 && errno == EINTR);
+          char buf[128];
+          const int64_t buf_len = sizeof buf;
+          int32_t data_len = 1;
+          Header header(data_len);
+          int tmp_ret = OB_SUCCESS;
+          int64_t pos = 0;
+          if (OB_SUCCESS != (tmp_ret = header.encode(buf, buf_len, pos))) {
+            _LOG_WARN("encode failed, ret: %d, pos: %ld", tmp_ret, pos);
+          } else if (FALSE_IT(pos += data_len)/*TODO: encode data*/) {
+            _LOG_WARN("encode data failed: %d", data_len);
+          } else {
+            while ((n = write(ev_fd, buf, pos)) < 0 && errno == EINTR);
+            need_disconn = n < pos;
+          }
         }
       }
-      if (events[i].events & (EPOLLRDHUP | EPOLLHUP)) {
+      if (!need_disconn) {
+        need_disconn = events[i].events & (EPOLLRDHUP | EPOLLHUP);
+      }
+      if (need_disconn) {
         _LOG_INFO("server connection closed, fd: %d, addr: %s", ev_fd, NULL == s? "" : addr_to_string(s->cli_addr_));
         epoll_ctl(epfd, EPOLL_CTL_DEL, ev_fd, NULL);
         close(ev_fd);
@@ -464,9 +521,24 @@ void ObNetKeepAlive::do_client_loop()
           _LOG_DEBUG("update read ts, addr: %s, fd: %d, ts: %ld", addr_to_string(rs->svr_addr_), ev_fd, rs->last_read_ts_);
           for (;;) {
             ssize_t n = -1;
-            char data = PROTOCOL_DATA;
-            while ((n = read(ev_fd, &data, sizeof data)) < 0 && errno == EINTR);
+            char buf[128];
+            Header header;
+            int32_t read_len = header.get_encoded_size();
+            while ((n = read(ev_fd, buf, read_len)) < 0 && errno == EINTR);
             if (n <= 0) break;
+            int tmp_ret = OB_SUCCESS;
+            int64_t pos = 0;
+            if (OB_SUCCESS != (tmp_ret = header.decode(buf, read_len, pos))) {
+              _LOG_WARN("decode failed, ret: %d, pos: %ld", tmp_ret, pos);
+            } else {
+              char data[512]; // TODO
+              if (header.data_len_ > sizeof data) {
+                tmp_ret = OB_BUF_NOT_ENOUGH;
+                _LOG_WARN("data buf not enough: %d", header.data_len_);
+              } else {
+                while ((n = read(ev_fd, data, header.data_len_)) < 0 && errno == EINTR);
+              }
+            }
             do_rpin(client2rs(c));
           }
         }

src/logservice/leader_coordinator/election_priority_impl/election_priority_impl.h

@@ -92,43 +92,6 @@ OB_SERIALIZE_MEMBER_TEMP(inline, PriorityV0, is_valid_, port_number_);
 // 适用于[4_0_0, latest]
 struct PriorityV1 : public AbstractPriority
 {
-/**********************this is for some strange compact reason***********************/
-  struct SCN_WRAPPER {
-    SCN_WRAPPER() {value_.set_min();}
-    int serialize(char *buf, const int64_t buf_len, int64_t &pos) const {
-      int ret = OB_SUCCESS;
-      int64_t new_pos = pos;
-
-      if (NULL == buf && buf_len <= 0) {
-        ret = OB_INVALID_ARGUMENT;
-      } else if (OB_FAIL(value_.fixed_serialize(buf, buf_len, new_pos))) {
-        ret = OB_BUF_NOT_ENOUGH;
-      } else {
-        pos = new_pos;
-      }
-      return ret;
-    }
-    int deserialize(const char *buf, const int64_t data_len, int64_t &pos)
-    {
-      int ret = OB_SUCCESS;
-      int64_t new_pos = pos;
-      if (NULL == buf && data_len <= 0) {
-        ret = OB_INVALID_ARGUMENT;
-      } else if (OB_FAIL(value_.fixed_deserialize(buf, data_len, new_pos))) {
-        ret = OB_BUF_NOT_ENOUGH;
-      } else {
-        pos = new_pos;
-      }
-      return ret;
-    }
-    int64_t get_serialize_size() const
-    {
-      int64_t size = 0 ;
-      size += value_.get_fixed_serialize_size();
-      return size;
-    }
-    palf::SCN value_;
-  };
 /*********************************************************************************/
   static constexpr int64_t MAX_UNREPLAYED_LOG_TS_DIFF_THRESHOLD_US = 2 * 1000 * 1000L;
   friend class unittest::TestElectionPriority;
@@ -136,7 +99,7 @@ struct PriorityV1 : public AbstractPriority
 public:
   PriorityV1() : is_observer_stopped_(false), is_server_stopped_(false), is_zone_stopped_(false),
                  is_primary_region_(false), is_in_blacklist_(false),  is_manual_leader_(false),
-                 zone_priority_(INT64_MAX) {}
+                 zone_priority_(INT64_MAX) {scn_.set_min();}
   // 判断该优先级策略是否适用于特定的版本
   virtual uint64_t get_started_version() const override { return CLUSTER_VERSION_4_0_0_0; }
   // 相同优先级版本的比较策略
@@ -144,7 +107,7 @@ public:
   // int assign(const PriorityV1 &rhs);
   TO_STRING_KV(K_(is_valid), K_(is_observer_stopped), K_(is_server_stopped), K_(is_zone_stopped),
                K_(fatal_failures), K_(is_primary_region), K_(serious_failures), K_(is_in_blacklist),
-               K_(in_blacklist_reason), K_(scn_.value), K_(is_manual_leader), K_(zone_priority));
+               K_(in_blacklist_reason), K_(scn), K_(is_manual_leader), K_(zone_priority));
 protected:
   // 刷新优先级的方法
   virtual int refresh_(const share::ObLSID &ls_id) override;
@@ -167,7 +130,7 @@ private:
   common::ObSArray<FailureEvent> fatal_failures_;// negative infos
   bool is_primary_region_;
   common::ObSArray<FailureEvent> serious_failures_;// negative infos
-  SCN_WRAPPER scn_;
+  palf::SCN scn_;
   bool is_in_blacklist_;
   common::ObStringHolder in_blacklist_reason_;
   bool is_manual_leader_;

src/logservice/leader_coordinator/election_priority_impl/election_priority_v1.cpp

@@ -54,12 +54,6 @@ int PriorityV1::compare(const AbstractPriority &rhs, int &result, ObStringHolder
   } else if (COMPARE_OUT(compare_fatal_failures_(ret, rhs_impl))) {// 比较致命的异常
     (void) reason.assign("FATAL FAILURE");
     COORDINATOR_LOG_(TRACE, "compare done! get compared result from fatal_failures_");
-  } else if (COMPARE_OUT(compare_primary_region_(ret, rhs_impl))) {// 通常Leader不能选出primary region
-    (void) reason.assign("PRIMARY REGION");
-    COORDINATOR_LOG_(TRACE, "compare done! get compared result from primary_region_");
-  } else if (COMPARE_OUT(compare_serious_failures_(ret, rhs_impl))) {// 比较会导致切主的异常
-    (void) reason.assign("SERIOUS FAILURE");
-    COORDINATOR_LOG_(TRACE, "compare done! get compared result from serious_failures_");
   } else if (COMPARE_OUT(compare_scn_(ret, rhs_impl))) {// 避免切换至回放位点过小的副本
     (void) reason.assign("LOG TS");
     COORDINATOR_LOG_(TRACE, "compare done! get compared resultfrom scn_");
@@ -68,6 +62,12 @@ int PriorityV1::compare(const AbstractPriority &rhs, int &result, ObStringHolder
   } else if (COMPARE_OUT(compare_manual_leader_flag_(ret, rhs_impl))) {// 比较是否存在用户指定的leader
     (void) reason.assign("MANUAL LEADER");
     COORDINATOR_LOG_(TRACE, "compare done! get compared result from manual_leader_flag_");
+  } else if (COMPARE_OUT(compare_primary_region_(ret, rhs_impl))) {// 通常Leader不能选出primary region
+    (void) reason.assign("PRIMARY REGION");
+    COORDINATOR_LOG_(TRACE, "compare done! get compared result from primary_region_");
+  } else if (COMPARE_OUT(compare_serious_failures_(ret, rhs_impl))) {// 比较会导致切主的异常
+    (void) reason.assign("SERIOUS FAILURE");
+    COORDINATOR_LOG_(TRACE, "compare done! get compared result from serious_failures_");
   } else if (COMPARE_OUT(compare_zone_priority_(ret, rhs_impl))) {// 比较RS设置的zone priority
     (void) reason.assign("ZONE PRIORITY");
     COORDINATOR_LOG_(TRACE, "compare done! get compared result from zone_priority_");
@@ -91,6 +91,7 @@ int PriorityV1::get_scn_(const share::ObLSID &ls_id, palf::SCN &scn)
     COORDINATOR_LOG_(WARN, "open_palf failed");
   } else if (OB_FAIL(palf_handle_guard.get_palf_handle()->get_access_mode(access_mode))) {
     COORDINATOR_LOG_(WARN, "get_access_mode failed");
+  } else {
     common::ObRole role;
     int64_t unused_pid = -1;
     palf::SCN min_unreplay_scn;
@@ -149,7 +150,7 @@ int PriorityV1::refresh_(const share::ObLSID &ls_id)
     is_primary_region_ = election_reference_info.element<6>();
     is_observer_stopped_ = (observer::ObServer::get_instance().is_stopped()
         || observer::ObServer::get_instance().is_prepare_stopped());
-    scn_.value_ = scn;
+    scn_ = scn;
   }
   return ret;
   #undef PRINT_WRAPPERd
@@ -313,19 +314,19 @@ int PriorityV1::compare_scn_(int &ret, const PriorityV1&rhs) const
 {
   int compare_result = 0;
   if (OB_SUCC(ret)) {
-    if (scn_.value_ == rhs.scn_.value_) {
+    if (scn_ == rhs.scn_) {
       compare_result = 0;
-    } else if (scn_.value_.is_valid() && rhs.scn_.value_.is_valid()) {
-      if (std::max(scn_.value_, rhs.scn_.value_).convert_to_ts() - std::min(scn_.value_, rhs.scn_.value_).convert_to_ts() <= MAX_UNREPLAYED_LOG_TS_DIFF_THRESHOLD_US) {
+    } else if (scn_.is_valid() && rhs.scn_.is_valid()) {
+      if (std::max(scn_, rhs.scn_).convert_to_ts() - std::min(scn_, rhs.scn_).convert_to_ts() <= MAX_UNREPLAYED_LOG_TS_DIFF_THRESHOLD_US) {
         compare_result = 0;
-      } else if (std::max(scn_.value_, rhs.scn_.value_) == scn_.value_) {
+      } else if (std::max(scn_, rhs.scn_) == scn_) {
         compare_result = 1;
       } else {
         compare_result = -1;
       }
-    } else if (scn_.value_.is_valid() && (!rhs.scn_.value_.is_valid())) {
+    } else if (scn_.is_valid() && (!rhs.scn_.is_valid())) {
       compare_result = 1;
-    } else if ((!scn_.value_.is_valid()) && rhs.scn_.value_.is_valid()) {
+    } else if ((!scn_.is_valid()) && rhs.scn_.is_valid()) {
       compare_result = -1;
     }
   }

src/logservice/palf/log_state_mgr.cpp

@@ -1050,9 +1050,9 @@ int LogStateMgr::disable_sync()
   int ret = OB_SUCCESS;
   if (IS_NOT_INIT) {
     ret = OB_NOT_INIT;
-  } else if (true == is_follower_pending_()) {
-    ret = OB_STATE_NOT_MATCH;
-    PALF_LOG(WARN, "can not disable sycn in follower pending", K(ret), KPC(this));
+//  } else if (true == is_follower_pending_()) {
+//    ret = OB_STATE_NOT_MATCH;
+//    PALF_LOG(WARN, "can not disable sycn in follower pending", K(ret), KPC(this));
   } else {
     ATOMIC_STORE(&is_sync_enabled_, false);
     PALF_LOG(INFO, "disable_sync success", K(ret), K_(palf_id), K(self_));

src/logservice/palf/palf_env_impl.cpp

@@ -638,6 +638,7 @@ bool PalfEnvImpl::LogGetRecycableFileCandidate::operator()(const LSKey &palf_id,
       // first uncommitted log before base_lsn.
     } else if (OB_ENTRY_NOT_EXIST == ret
                || OB_NO_SUCH_FILE_OR_DIRECTORY == ret
+               || min_using_block_id < min_block_id
                || min_using_block_id - min_block_id < 2) {
       PALF_LOG(TRACE, "can not recycle blocks, need keep at least two blocks or has been concurrently"
           " with rebuild, skip it",

src/logservice/palf/scn.cpp

@@ -236,13 +236,17 @@ SCN SCN::scn_dec(const SCN &ref)
   return result;
 }
 
-int64_t SCN::convert_to_ts() const
+int64_t SCN::convert_to_ts(bool ignore_invalid) const
 {
   int64_t ts_us = 0;
   if (is_valid()) {
     ts_us = ts_ns_ / 1000UL;
   } else {
-    PALF_LOG(ERROR, "invalid scn should not convert to ts ", K(val_), K(lbt()));
+    if (ignore_invalid) {
+      PALF_LOG(WARN, "invalid scn should not convert to ts ", K(val_));
+    } else {
+      PALF_LOG(ERROR, "invalid scn should not convert to ts ", K(val_), K(lbt()));
+    }
   }
   return ts_us;
 }

src/logservice/palf/scn.h

@@ -57,7 +57,7 @@ public:
   /*******convert functions******/
   //[convert scn to timestamp(us)
   // @result[out]: timestamp in us
-  int64_t convert_to_ts() const;
+  int64_t convert_to_ts(bool ignore_invalid = false) const;
 
   // @param[in] :timestamp with us
   int convert_from_ts(uint64_t ts_us);

src/logservice/rcservice/ob_role_change_handler.cpp

@@ -151,6 +151,18 @@ int ObRoleChangeHandler::switch_to_follower_gracefully()
   return ret;
 }
 
+int ObRoleChangeHandler::resume_to_leader()
+{
+  int ret = OB_SUCCESS;
+  int cursor = ObLogBaseType::MAX_LOG_BASE_TYPE;
+  if (OB_FAIL(resume_leader_when_switch_failure_(cursor))) {
+    CLOG_LOG(WARN, "resume_leader_when_switch_failure_ failed");
+  } else {
+    CLOG_LOG(INFO, "resume_to_leader success");
+  }
+  return ret;
+}
+
 int ObRoleChangeHandler::resume_leader_when_switch_failure_(const int64_t cursor)
 {
   int ret = OB_SUCCESS;

src/logservice/rcservice/ob_role_change_handler.h

@@ -38,6 +38,7 @@ public:
   // 2. OB_LS_NEED_REVOKE, ObRoleChangeService need revoke this LS.
   // 3. OTHERS, switch_to_follower_gracefully failed, but no need to revoke leader.
   int switch_to_follower_gracefully();
+  int resume_to_leader();
 
 private:
   int resume_leader_when_switch_failure_(int64_t cursor);

src/logservice/rcservice/ob_role_change_service.cpp

@@ -541,11 +541,19 @@ int ObRoleChangeService::switch_leader_to_follower_gracefully_(
   //     we must ensure that the 'end_lsn' provid by 'apply_service_' is correctly.
   // just switch_role to follower firstly, avoid sync log failed because palf has changed leader.
   } else if (FALSE_IT(log_handler->switch_role(new_role, curr_proposal_id))) {
+  // apply service will not update end_lsn after switch_to_follower, so wait apply done first here
   } else if (FALSE_IT(time_guard.click("wait_apply_service_apply_done_when_change_leader_"))
       || OB_FAIL(wait_apply_service_apply_done_when_change_leader_(log_handler, curr_proposal_id, ls_id, end_lsn))) {
     CLOG_LOG(WARN, "wait_apply_service_apply_done_when_change_leader_ failed", K(ret),
 				K(new_role), K(new_proposal_id), K(dst_addr));
-  // apply service will not update end_lsn after switch_to_follower, so wait apply done first here
+    // wait apply service done my fail, we need :
+    // 1. switch log handler to origin status.
+    // 2. resume role change handler
+    log_handler->switch_role(LEADER, curr_proposal_id);
+    if (OB_FAIL(role_change_handler->resume_to_leader())) {
+      CLOG_LOG(WARN, "resume to leader failed", K(ret), KPC(ls));
+    }
+  // NB: the following steps mustn't be failed.
   } else if (FALSE_IT(time_guard.click("apply_service->switch_to_follower"))
       || OB_FAIL(apply_service_->switch_to_follower(ls_id))) {
     CLOG_LOG(WARN, "apply_service_ switch_to_follower failed", K(ret), K(new_role), K(new_proposal_id), K(dst_addr));
@@ -737,6 +745,8 @@ int ObRoleChangeService::wait_apply_service_apply_done_when_change_leader_(
   while (OB_SUCC(ret) && (false == is_done || end_lsn != max_lsn)) {
     if (OB_FAIL(apply_service_->is_apply_done(ls_id, is_done, end_lsn))) {
       CLOG_LOG(WARN, "apply_service_ is_apply_done failed", K(ret), K(is_done), K(end_lsn));
+      // NB: ApplyService execute on_failure only when it's FOLLOWER, therefore ApplyService my not return apply done
+      //     when it's LEADER, we need check the role of palf when has changed.
     } else if (OB_FAIL(log_handler->get_max_lsn(max_lsn))) {
       CLOG_LOG(WARN, "get_end_lsn from palf failed", K(ret), K(ls_id), K(end_lsn));
     } else if (OB_FAIL(log_handler->prepare_switch_role(unused_curr_role, unused_curr_proposal_id,

src/observer/virtual_table/ob_all_virtual_log_stat.cpp

@@ -172,49 +172,34 @@ int ObAllVirtualPalfStat::insert_log_stat_(const logservice::ObLogStat &log_stat
         break;
       }
       case OB_APP_MIN_COLUMN_ID + 10: {
-        cur_row_.cells_[i].set_bool(palf_stat.allow_vote_);
-        break;
-      }
-      case OB_APP_MIN_COLUMN_ID + 11: {
         cur_row_.cells_[i].set_bool(log_stat.in_sync_);
         break;
       }
-      case OB_APP_MIN_COLUMN_ID + 12: {
-        if (OB_FAIL(palf::log_replica_type_to_string(palf_stat.replica_type_, replica_type_str_, sizeof(replica_type_str_)))) {
-          SERVER_LOG(WARN, "log_replica_type_to_string failed", K(ret), K(palf_stat));
-        } else {
-          cur_row_.cells_[i].set_varchar(ObString::make_string(replica_type_str_));
-          cur_row_.cells_[i].set_collation_type(ObCharset::get_default_collation(
-                                                ObCharset::get_default_charset()));
-        }
-        break;
-      }
-      case OB_APP_MIN_COLUMN_ID + 13: {
-        //TODO SCN
+      case OB_APP_MIN_COLUMN_ID + 11: {
         cur_row_.cells_[i].set_uint64(palf_stat.base_lsn_.val_);
         break;
       }
-      case OB_APP_MIN_COLUMN_ID + 14: {
+      case OB_APP_MIN_COLUMN_ID + 12: {
         cur_row_.cells_[i].set_uint64(palf_stat.begin_lsn_.val_);
         break;
       }
-      case OB_APP_MIN_COLUMN_ID + 15: {
+      case OB_APP_MIN_COLUMN_ID + 13: {
         cur_row_.cells_[i].set_uint64(palf_stat.begin_scn_.get_val_for_inner_table_field());
         break;
       }
-      case OB_APP_MIN_COLUMN_ID + 16: {
+      case OB_APP_MIN_COLUMN_ID + 14: {
         cur_row_.cells_[i].set_uint64(palf_stat.end_lsn_.val_);
         break;
       }
-      case OB_APP_MIN_COLUMN_ID + 17: {
+      case OB_APP_MIN_COLUMN_ID + 15: {
         cur_row_.cells_[i].set_uint64(palf_stat.end_scn_.get_val_for_inner_table_field());
         break;
       }
-      case OB_APP_MIN_COLUMN_ID + 18: {
+      case OB_APP_MIN_COLUMN_ID + 16: {
         cur_row_.cells_[i].set_uint64(palf_stat.max_lsn_.val_);
         break;
       }
-      case OB_APP_MIN_COLUMN_ID + 19: {
+      case OB_APP_MIN_COLUMN_ID + 17: {
         cur_row_.cells_[i].set_uint64(palf_stat.max_scn_.get_val_for_inner_table_field());
         break;
       }

src/observer/virtual_table/ob_all_virtual_tablet_ddl_kv_info.cpp

@@ -90,11 +90,11 @@ int ObAllVirtualTabletDDLKVInfo::get_next_ls(ObLS *&ls)
   return ret;
 }
 
-int ObAllVirtualTabletDDLKVInfo::get_next_tablet(ObTabletHandle &tablet_handle)
+int ObAllVirtualTabletDDLKVInfo::get_next_ddl_kv_mgr(ObDDLKvMgrHandle &ddl_kv_mgr_handle)
 {
   int ret = OB_SUCCESS;
   while (OB_SUCC(ret)) {
-    if (OB_FAIL(ls_tablet_iter_.get_next_tablet(tablet_handle))) {
+    if (OB_FAIL(ls_tablet_iter_.get_next_ddl_kv_mgr(ddl_kv_mgr_handle))) {
       if (!ls_tablet_iter_.is_valid() || OB_ITER_END == ret) {
         ret = OB_SUCCESS; // continue to next ls
         ObLS *ls = nullptr;
@@ -106,10 +106,10 @@ int ObAllVirtualTabletDDLKVInfo::get_next_tablet(ObTabletHandle &tablet_handle)
           SERVER_LOG(WARN, "fail to get tablet iter", K(ret));
         }
       } else {
-        SERVER_LOG(WARN, "fail to get next tablet", K(ret));
+        SERVER_LOG(WARN, "fail to get next ddl kv mgr", K(ret));
       }
     } else {
-      curr_tablet_id_ = tablet_handle.get_obj()->get_tablet_meta().tablet_id_;
+      curr_tablet_id_ = ddl_kv_mgr_handle.get_obj()->get_tablet_id();
       break;
     }
   }
@@ -123,16 +123,9 @@ int ObAllVirtualTabletDDLKVInfo::get_next_ddl_kv(ObDDLKV *&ddl_kv)
   while (OB_SUCC(ret)) {
     if (ddl_kv_idx_ < 0 || ddl_kv_idx_ >= ddl_kvs_handle_.get_count()) {
       ObDDLKvMgrHandle ddl_kv_mgr_handle;
-      if (OB_FAIL(get_next_tablet(tablet_handle))) {
+      if (OB_FAIL(get_next_ddl_kv_mgr(ddl_kv_mgr_handle))) {
         if (OB_ITER_END != ret) {
-          SERVER_LOG(WARN, "get_next_tablet failed", K(ret));
-        }
-      } else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_mgr(ddl_kv_mgr_handle))) {
-        if (OB_ENTRY_NOT_EXIST != ret) {
-          SERVER_LOG(WARN, "fail to get freezed ddl kv", K(ret));
-        } else {
-          ddl_kv_idx_ = -1; // to get next tablet
-          ret = OB_SUCCESS;
+          SERVER_LOG(WARN, "get_next_ddl_kv_mgr failed", K(ret));
         }
       } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->get_ddl_kvs(false/*frozen_only*/, ddl_kvs_handle_))) {
         SERVER_LOG(WARN, "fail to get ddl kvs", K(ret));

src/observer/virtual_table/ob_all_virtual_tablet_ddl_kv_info.h

@@ -41,7 +41,7 @@ private:
   virtual void release_last_tenant() override;
 
   int get_next_ls(ObLS *&ls);
-  int get_next_tablet(storage::ObTabletHandle &tablet_handle);
+  int get_next_ddl_kv_mgr(storage::ObDDLKvMgrHandle &ddl_kv_mgr_handle);
   int get_next_ddl_kv(ObDDLKV *&ddl_kv);
 private:
   common::ObAddr addr_;

src/rootserver/ddl_task/ob_column_redefinition_task.cpp

@@ -176,7 +176,7 @@ int ObColumnRedefinitionTask::check_build_single_replica(bool &is_end)
   } else if (OB_FAIL(replica_builder_.check_build_end(is_end, complete_sstable_job_ret_code_))) {
     LOG_WARN("fail to check build end", K(ret));
   } else if (!is_end) {
-    if (sstable_complete_request_time_ + GCONF.global_index_build_single_replica_timeout < ObTimeUtility::current_time()) {   // timeout, retry
+    if (sstable_complete_request_time_ + OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT < ObTimeUtility::current_time()) {   // timeout, retry
       is_sstable_complete_task_submitted_ = false;
       sstable_complete_request_time_ = 0;
     }

src/rootserver/ddl_task/ob_constraint_task.cpp

@@ -95,9 +95,9 @@ int ObCheckConstraintValidationTask::process()
       if (check_expr_str.empty()) {
         ret = OB_ERR_UNEXPECTED;
         LOG_WARN("check_expr_str is empty", K(ret));
-      } else if (OB_FAIL(timeout_ctx.set_trx_timeout_us(OB_MAX_USER_SPECIFIED_TIMEOUT))) {
+      } else if (OB_FAIL(timeout_ctx.set_trx_timeout_us(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
         LOG_WARN("set trx timeout failed", K(ret));
-      } else if (OB_FAIL(timeout_ctx.set_timeout(OB_MAX_USER_SPECIFIED_TIMEOUT))) {
+      } else if (OB_FAIL(timeout_ctx.set_timeout(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
         LOG_WARN("set timeout failed", K(ret));
       } else if (OB_FAIL(ObDDLUtil::generate_ddl_schema_hint_str(table_name, table_schema->get_schema_version(), is_oracle_mode, ddl_schema_hint_str))) {
         LOG_WARN("failed to generate ddl schema hint str", K(ret));
@@ -339,9 +339,9 @@ int ObForeignKeyConstraintValidationTask::check_fk_constraint_data_valid(
       ObSqlString child_ddl_schema_hint_str;
       ObSqlString parent_ddl_schema_hint_str;
       // print str like "select c1, c2 from db.t2 where c1 is not null and c2 is not null minus select c3, c4 from db.t1"
-      if (OB_FAIL(timeout_ctx.set_trx_timeout_us(OB_MAX_USER_SPECIFIED_TIMEOUT))) {
+      if (OB_FAIL(timeout_ctx.set_trx_timeout_us(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
         LOG_WARN("set trx timeout failed", K(ret));
-      } else if (OB_FAIL(timeout_ctx.set_timeout(OB_MAX_USER_SPECIFIED_TIMEOUT))) {
+      } else if (OB_FAIL(timeout_ctx.set_timeout(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
         LOG_WARN("set timeout failed", K(ret));
       } else if (OB_FAIL(ObDDLUtil::generate_ddl_schema_hint_str(child_table_schema.get_table_name_str(), child_table_schema.get_schema_version(), is_oracle_mode, child_ddl_schema_hint_str))) {
         LOG_WARN("failed to generate ddl schema hint", K(ret));
@@ -796,7 +796,7 @@ int ObConstraintTask::check_replica_end(bool &is_end)
   }
 
   if (OB_SUCC(ret) && !is_end) {
-    const int64_t timeout = GCONF.global_index_build_single_replica_timeout;
+    const int64_t timeout = OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT;
     if (check_replica_request_time_ + timeout < ObTimeUtility::current_time()) {
       check_replica_request_time_ = 0;
     }

src/rootserver/ddl_task/ob_ddl_redefinition_task.cpp

@@ -133,9 +133,9 @@ int ObDDLRedefinitionSSTableBuildTask::process()
     }
     LOG_INFO("execute sql" , K(sql_string), K(data_table_id_), K(tenant_id_),
              "is_strict_mode", is_strict_mode(sql_mode_), K(sql_mode_), K(parallelism_));
-    if (OB_FAIL(timeout_ctx.set_trx_timeout_us(GCONF.global_index_build_single_replica_timeout.get()))) {
+    if (OB_FAIL(timeout_ctx.set_trx_timeout_us(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
       LOG_WARN("set trx timeout failed", K(ret));
-    } else if (OB_FAIL(timeout_ctx.set_timeout(GCONF.global_index_build_single_replica_timeout.get()))) {
+    } else if (OB_FAIL(timeout_ctx.set_timeout(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
       LOG_WARN("set timeout failed", K(ret));
     } else {
       if (OB_FAIL(user_sql_proxy->write(tenant_id_, sql_string.ptr(), affected_rows,

src/rootserver/ddl_task/ob_index_build_task.cpp

@@ -116,9 +116,9 @@ int ObIndexSSTableBuildTask::process()
     DEBUG_SYNC(BEFORE_INDEX_SSTABLE_BUILD_TASK_SEND_SQL);
     ObTimeoutCtx timeout_ctx;
     LOG_INFO("execute sql" , K(sql_string), K(data_table_id_), K(tenant_id_));
-    if (OB_FAIL(timeout_ctx.set_trx_timeout_us(GCONF.global_index_build_single_replica_timeout.get()))) {
+    if (OB_FAIL(timeout_ctx.set_trx_timeout_us(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
       LOG_WARN("set trx timeout failed", K(ret));
-    } else if (OB_FAIL(timeout_ctx.set_timeout(GCONF.global_index_build_single_replica_timeout.get()))) {
+    } else if (OB_FAIL(timeout_ctx.set_timeout(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
       LOG_WARN("set timeout failed", K(ret));
     } else if (OB_FAIL(user_sql_proxy->write(tenant_id_, sql_string.ptr(), affected_rows,
                 oracle_mode ? ObCompatibilityMode::ORACLE_MODE : ObCompatibilityMode::MYSQL_MODE, &session_param))) {
@@ -587,7 +587,7 @@ int ObIndexBuildTask::send_build_single_replica_request()
     ret = OB_NOT_INIT;
     LOG_WARN("ObIndexBuildTask has not been inited", K(ret));
   } else {
-    const int64_t timeout = GCONF.global_index_build_single_replica_timeout;
+    const int64_t timeout = OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT;
     const int64_t abs_timeout_us = ObTimeUtility::current_time() + timeout;
     ObIndexSSTableBuildTask task(
         task_id_,
@@ -638,7 +638,7 @@ int ObIndexBuildTask::check_build_single_replica(bool &is_end)
   }
 
   if (OB_SUCC(ret) && !is_end) {
-    const int64_t timeout = GCONF.global_index_build_single_replica_timeout;
+    const int64_t timeout = OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT;
     if (sstable_complete_request_time_ + timeout < ObTimeUtility::current_time()) {
       is_sstable_complete_task_submitted_ = false;
       sstable_complete_request_time_ = 0;
@@ -781,7 +781,7 @@ int ObIndexBuildTask::verify_checksum()
 
   // send column checksum calculation request and wait finish, then verify column checksum
   if (OB_SUCC(ret) && !state_finished && check_unique_snapshot_ > 0) {
-    static int64_t checksum_wait_timeout = max(GCONF.global_index_build_single_replica_timeout / 50, 3600L * 1000L * 1000L);
+    static int64_t checksum_wait_timeout = max(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT / 50, 3600L * 1000L * 1000L);
     bool is_column_checksum_ready = false;
     bool dummy_equal = false;
     if (!wait_column_checksum_ctx_.is_inited() && OB_FAIL(wait_column_checksum_ctx_.init(

src/rootserver/ddl_task/ob_modify_autoinc_task.cpp

@@ -91,9 +91,9 @@ int ObUpdateAutoincSequenceTask::process()
         // if data_table_id != dest_table_id, meaning this is happening in ddl double write
         session_param.ddl_info_.set_source_table_hidden(data_table_id_ != dest_table_id_);
         ObObj obj;
-        if (OB_FAIL(timeout_ctx.set_trx_timeout_us(GCONF.global_index_build_single_replica_timeout.get()))) {
+        if (OB_FAIL(timeout_ctx.set_trx_timeout_us(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
           LOG_WARN("set trx timeout failed", K(ret));
-        } else if (OB_FAIL(timeout_ctx.set_timeout(GCONF.global_index_build_single_replica_timeout.get()))) {
+        } else if (OB_FAIL(timeout_ctx.set_timeout(OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT))) {
           LOG_WARN("set timeout failed", K(ret));
         } else if (OB_FAIL(sql.assign_fmt("SELECT /*+no_rewrite*/ CAST(MAX(%s) AS SIGNED) AS MAX_VALUE FROM %s.%s",
                                     column_schema->get_column_name(),

src/rootserver/ddl_task/ob_table_redefinition_task.cpp

@@ -181,7 +181,7 @@ int ObTableRedefinitionTask::check_build_replica_timeout()
     ret = OB_NOT_INIT;
     LOG_WARN("ObTableRedefinitionTask has not been inited", K(ret));
   } else if (build_replica_request_time_ > 0) {
-    const int64_t timeout = GCONF.global_index_build_single_replica_timeout;
+    const int64_t timeout = OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT;
     const int64_t current_time = ObTimeUtility::current_time();
     if (build_replica_request_time_ + timeout < current_time) {
       ret = OB_TIMEOUT;

src/rootserver/ob_root_inspection.cpp

@@ -1243,9 +1243,8 @@ int ObRootInspection::check_sys_table_schemas_(
       share::sys_table_schema_creators,
       share::virtual_table_schema_creators,
       share::sys_view_schema_creators,
-      // TODO: will check sys index when compat case changed.
-      //share::core_index_table_schema_creators,
-      //share::sys_index_table_schema_creators,
+      share::core_index_table_schema_creators,
+      share::sys_index_table_schema_creators,
       NULL };
 
     int back_ret = OB_SUCCESS;

src/share/backup/ob_backup_struct.h

@@ -256,7 +256,7 @@ const char *const OB_STR_MAX_FILE_ID = "max_file_id";
 const char *const OB_STR_LOG_ARCHIVE_SOURCE_ID = "id";
 const char *const OB_STR_LOG_ARCHIVE_SOURCE_TYPE = "type";
 const char *const OB_STR_LOG_ARCHIVE_SOURCE_VALUE = "value";
-const char *const OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_TS = "recovery_until_ts";
+const char *const OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_SCN = "recovery_until_scn";
 
 const char *const OB_STR_TENANT = "tenant";
 const char *const OB_STR_DATA = "data";

src/share/inner_table/generate_inner_table_schema.py

@@ -369,7 +369,7 @@ def print_timestamp_column(column_name, rowkey_id, index_id, part_key_pos, colum
     if column_id != 0:
       if column_scale > 0 :
         line = """
-  if (OB_SUCC(ret) {{
+  if (OB_SUCC(ret)) {{
     ObObj gmt_default;
     ObObj gmt_default_null;
 
@@ -468,7 +468,7 @@ def print_timestamp_column(column_name, rowkey_id, index_id, part_key_pos, colum
     if column_id != 0:
       if column_scale > 0 :
         line = """
-  if (OB_SUCC(ret) {{
+  if (OB_SUCC(ret)) {{
     ObObj gmt_default;
     ObObj gmt_default_null;
 
@@ -509,7 +509,7 @@ def print_timestamp_column(column_name, rowkey_id, index_id, part_key_pos, colum
       {12}); //is_on_update_for_timestamp
   }}
 """
-      cpp_f.write(line.format(column_name, column_id, rowkey_id, index_id, part_key_pos, column_type, column_collation_type, column_length, column_precision, column_scale, is_nullable, is_autoincrementi, is_on_update_for_timestamp))
+      cpp_f.write(line.format(column_name, column_id, rowkey_id, index_id, part_key_pos, column_type, column_collation_type, column_length, column_precision, column_scale, is_nullable, is_autoincrement, is_on_update_for_timestamp))
     else:
       if column_scale > 0 :
         line = """
@@ -1184,8 +1184,8 @@ def generate_sys_index_table_misc_data(f):
   f.write('\n\n#ifdef SYS_INDEX_TABLE_ID_SWITCH\n' + sys_index_table_id_switch + '\n#endif\n')
 
   sys_index_data_table_id_switch = '\n'
-  for kw in sys_index_tables:
-    sys_index_data_table_id_switch += 'case ' + table_name2tid(kw['table_name']) + ':\n'
+  for data_table_name in data_table_dict.keys():
+    sys_index_data_table_id_switch += 'case ' + table_name2tid(data_table_name) + ':\n'
   f.write('\n\n#ifdef SYS_INDEX_DATA_TABLE_ID_SWITCH\n' + sys_index_data_table_id_switch + '\n#endif\n')
 
   sys_index_data_table_id_to_index_ids_switch = '\n'
@@ -1204,12 +1204,11 @@ def generate_sys_index_table_misc_data(f):
     sys_index_data_table_id_to_index_schema_switch += 'case ' + table_name2tid(data_table_name) + ': {\n'
     for kw in sys_indexs:
       method_name = kw['table_name'].replace('$', '_').strip('_').lower() + '_' + kw['index_name'].lower() + '_schema'
+      sys_index_data_table_id_to_index_schema_switch += '  index_schema.reset();\n'
       sys_index_data_table_id_to_index_schema_switch += '  if (FAILEDx(ObInnerTableSchema::' + method_name +'(index_schema))) {\n'
       sys_index_data_table_id_to_index_schema_switch += '    LOG_WARN(\"fail to create index schema\", KR(ret), K(tenant_id), K(data_table_id));\n'
-      sys_index_data_table_id_to_index_schema_switch += '  } else if (!is_sys_tenant(tenant_id) && OB_FAIL(ObSchemaUtils::construct_tenant_space_full_table(tenant_id, index_schema))) {\n'
-      sys_index_data_table_id_to_index_schema_switch += '    LOG_WARN(\"fail to construct full table\", KR(ret), K(tenant_id), K(data_table_id));\n'
-      sys_index_data_table_id_to_index_schema_switch += '  } else if (OB_FAIL(tables.push_back(index_schema))) {\n'
-      sys_index_data_table_id_to_index_schema_switch += '    LOG_WARN(\"fail to push back index\", KR(ret), K(tenant_id), K(data_table_id));\n'
+      sys_index_data_table_id_to_index_schema_switch += '  } else if (OB_FAIL(append_table_(tenant_id, index_schema, tables))) {\n'
+      sys_index_data_table_id_to_index_schema_switch += '    LOG_WARN(\"fail to append\", KR(ret), K(tenant_id), K(data_table_id));\n'
       sys_index_data_table_id_to_index_schema_switch += '  }\n'
     sys_index_data_table_id_to_index_schema_switch += '  break;\n'
     sys_index_data_table_id_to_index_schema_switch += '}\n'
@@ -1589,6 +1588,7 @@ def def_table_schema(**keywords):
   index_def = ''
   calculate_rowkey_column_num(keywords)
   is_oracle_sys_table = False
+  column_collation = 'CS_TYPE_INVALID'
 
   ##virtual table will set index_using_type to USING_HASH by default
   if is_virtual_table(keywords['table_id']):

src/share/inner_table/ob_inner_table_schema.12101_12150.cpp

@@ -9995,7 +9995,7 @@ int ObInnerTableSchema::all_virtual_tenant_profile_schema(ObTableSchema &table_s
       0, //part_key_pos
       ObVarcharType, //column_type
       CS_TYPE_INVALID, //column_collation_type
-      OB_MAX_SQL_LENGTH, //column_length
+      MAX_ORACLE_NAME_LENGTH, //column_length
       -1, //column_precision
       -1, //column_scale
       false, //is_nullable
@@ -10286,7 +10286,7 @@ int ObInnerTableSchema::all_virtual_tenant_profile_history_schema(ObTableSchema
       0, //part_key_pos
       ObVarcharType, //column_type
       CS_TYPE_INVALID, //column_collation_type
-      OB_MAX_SQL_LENGTH, //column_length
+      MAX_ORACLE_NAME_LENGTH, //column_length
       -1, //column_precision
       -1, //column_scale
       true, //is_nullable

src/share/inner_table/ob_inner_table_schema.12201_12250.cpp

@@ -512,6 +512,25 @@ int ObInnerTableSchema::all_virtual_ddl_task_status_schema(ObTableSchema &table_
       task_version_default); //default_value
   }
 
+  if (OB_SUCC(ret)) {
+    ObObj execution_id_default;
+    execution_id_default.set_int(0);
+    ADD_COLUMN_SCHEMA_T("execution_id", //column_name
+      ++column_id, //column_id
+      0, //rowkey_id
+      0, //index_id
+      0, //part_key_pos
+      ObIntType, //column_type
+      CS_TYPE_INVALID, //column_collation_type
+      sizeof(int64_t), //column_length
+      -1, //column_precision
+      -1, //column_scale
+      false, //is_nullable
+      false, //is_autoincrement
+      execution_id_default,
+      execution_id_default); //default_value
+  }
+
   if (OB_SUCC(ret)) {
     ADD_COLUMN_SCHEMA("ddl_stmt_str", //column_name
       ++column_id, //column_id

src/share/inner_table/ob_inner_table_schema.12251_12300.cpp

@@ -998,21 +998,6 @@ int ObInnerTableSchema::all_virtual_log_stat_schema(ObTableSchema &table_schema)
       false); //is_autoincrement
   }
 
-  if (OB_SUCC(ret)) {
-    ADD_COLUMN_SCHEMA("allow_vote", //column_name
-      ++column_id, //column_id
-      0, //rowkey_id
-      0, //index_id
-      0, //part_key_pos
-      ObTinyIntType, //column_type
-      CS_TYPE_INVALID, //column_collation_type
-      1, //column_length
-      -1, //column_precision
-      -1, //column_scale
-      false, //is_nullable
-      false); //is_autoincrement
-  }
-
   if (OB_SUCC(ret)) {
     ADD_COLUMN_SCHEMA("in_sync", //column_name
       ++column_id, //column_id
@@ -1028,21 +1013,6 @@ int ObInnerTableSchema::all_virtual_log_stat_schema(ObTableSchema &table_schema)
       false); //is_autoincrement
   }
 
-  if (OB_SUCC(ret)) {
-    ADD_COLUMN_SCHEMA("replica_type", //column_name
-      ++column_id, //column_id
-      0, //rowkey_id
-      0, //index_id
-      0, //part_key_pos
-      ObVarcharType, //column_type
-      CS_TYPE_INVALID, //column_collation_type
-      32, //column_length
-      -1, //column_precision
-      -1, //column_scale
-      false, //is_nullable
-      false); //is_autoincrement
-  }
-
   if (OB_SUCC(ret)) {
     ADD_COLUMN_SCHEMA("base_lsn", //column_name
       ++column_id, //column_id
@@ -2180,7 +2150,7 @@ int ObInnerTableSchema::all_virtual_ddl_checksum_schema(ObTableSchema &table_sch
   }
 
   if (OB_SUCC(ret)) {
-    ADD_COLUMN_SCHEMA("tablet_id", //column_name
+    ADD_COLUMN_SCHEMA("ddl_task_id", //column_name
       ++column_id, //column_id
       4, //rowkey_id
       0, //index_id

src/share/inner_table/ob_inner_table_schema.12301_12350.cpp

@@ -5662,7 +5662,7 @@ int ObInnerTableSchema::all_virtual_mock_fk_parent_table_column_history_schema(O
   return ret;
 }
 
-int ObInnerTableSchema::all_virtual_log_archive_source_schema(ObTableSchema &table_schema)
+int ObInnerTableSchema::all_virtual_log_restore_source_schema(ObTableSchema &table_schema)
 {
   int ret = OB_SUCCESS;
   uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1;
@@ -5671,7 +5671,7 @@ int ObInnerTableSchema::all_virtual_log_archive_source_schema(ObTableSchema &tab
   table_schema.set_tenant_id(OB_SYS_TENANT_ID);
   table_schema.set_tablegroup_id(OB_INVALID_ID);
   table_schema.set_database_id(OB_SYS_DATABASE_ID);
-  table_schema.set_table_id(OB_ALL_VIRTUAL_LOG_ARCHIVE_SOURCE_TID);
+  table_schema.set_table_id(OB_ALL_VIRTUAL_LOG_RESTORE_SOURCE_TID);
   table_schema.set_rowkey_split_pos(0);
   table_schema.set_is_use_bloomfilter(false);
   table_schema.set_progressive_merge_num(0);
@@ -5682,7 +5682,7 @@ int ObInnerTableSchema::all_virtual_log_archive_source_schema(ObTableSchema &tab
   table_schema.set_def_type(TABLE_DEF_TYPE_INTERNAL);
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_table_name(OB_ALL_VIRTUAL_LOG_ARCHIVE_SOURCE_TNAME))) {
+    if (OB_FAIL(table_schema.set_table_name(OB_ALL_VIRTUAL_LOG_RESTORE_SOURCE_TNAME))) {
       LOG_ERROR("fail to set table_name", K(ret));
     }
   }
@@ -5789,14 +5789,14 @@ int ObInnerTableSchema::all_virtual_log_archive_source_schema(ObTableSchema &tab
   }
 
   if (OB_SUCC(ret)) {
-    ADD_COLUMN_SCHEMA("recovery_until_ts", //column_name
+    ADD_COLUMN_SCHEMA("recovery_until_scn", //column_name
       ++column_id, //column_id
       0, //rowkey_id
       0, //index_id
       0, //part_key_pos
-      ObIntType, //column_type
+      ObUInt64Type, //column_type
       CS_TYPE_INVALID, //column_collation_type
-      sizeof(int64_t), //column_length
+      sizeof(uint64_t), //column_length
       -1, //column_precision
       -1, //column_scale
       false, //is_nullable

src/share/inner_table/ob_inner_table_schema.15151_15200.cpp

@@ -260,7 +260,7 @@ int ObInnerTableSchema::all_virtual_tenant_profile_real_agent_ora_schema(ObTable
       0, //part_key_pos
       ObVarcharType, //column_type
       CS_TYPE_UTF8MB4_BIN, //column_collation_type
-      OB_MAX_SQL_LENGTH, //column_length
+      MAX_ORACLE_NAME_LENGTH, //column_length
       2, //column_precision
       -1, //column_scale
       false, //is_nullable

src/share/inner_table/ob_inner_table_schema.151_200.cpp

@@ -5418,7 +5418,7 @@ int ObInnerTableSchema::all_ddl_checksum_schema(ObTableSchema &table_schema)
   }
 
   if (OB_SUCC(ret)) {
-    ADD_COLUMN_SCHEMA("tablet_id", //column_name
+    ADD_COLUMN_SCHEMA("ddl_task_id", //column_name
       ++column_id, //column_id
       4, //rowkey_id
       0, //index_id

src/share/inner_table/ob_inner_table_schema.15251_15300.cpp

@@ -3124,21 +3124,6 @@ int ObInnerTableSchema::all_virtual_log_stat_ora_schema(ObTableSchema &table_sch
       false); //is_autoincrement
   }
 
-  if (OB_SUCC(ret)) {
-    ADD_COLUMN_SCHEMA("ALLOW_VOTE", //column_name
-      ++column_id, //column_id
-      0, //rowkey_id
-      0, //index_id
-      0, //part_key_pos
-      ObNumberType, //column_type
-      CS_TYPE_INVALID, //column_collation_type
-      38, //column_length
-      38, //column_precision
-      0, //column_scale
-      false, //is_nullable
-      false); //is_autoincrement
-  }
-
   if (OB_SUCC(ret)) {
     ADD_COLUMN_SCHEMA("IN_SYNC", //column_name
       ++column_id, //column_id
@@ -3154,21 +3139,6 @@ int ObInnerTableSchema::all_virtual_log_stat_ora_schema(ObTableSchema &table_sch
       false); //is_autoincrement
   }
 
-  if (OB_SUCC(ret)) {
-    ADD_COLUMN_SCHEMA("REPLICA_TYPE", //column_name
-      ++column_id, //column_id
-      0, //rowkey_id
-      0, //index_id
-      0, //part_key_pos
-      ObVarcharType, //column_type
-      CS_TYPE_UTF8MB4_BIN, //column_collation_type
-      32, //column_length
-      2, //column_precision
-      -1, //column_scale
-      false, //is_nullable
-      false); //is_autoincrement
-  }
-
   if (OB_SUCC(ret)) {
     ADD_COLUMN_SCHEMA("BASE_LSN", //column_name
       ++column_id, //column_id

src/share/inner_table/ob_inner_table_schema.21101_21150.cpp

@@ -609,7 +609,7 @@ int ObInnerTableSchema::cdb_ob_archivelog_piece_files_schema(ObTableSchema &tabl
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     DEST_ID,     ROUND_ID,     PIECE_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     MAX_SCN,     END_SCN,     COMPATIBLE,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     FILE_STATUS,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PIECE_FILES )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     DEST_ID,     ROUND_ID,     PIECE_ID,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     MAX_SCN,     END_SCN,     COMPATIBLE,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     FILE_STATUS,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PIECE_FILES )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -659,7 +659,7 @@ int ObInnerTableSchema::cdb_ob_backup_set_files_schema(ObTableSchema &table_sche
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     BACKUP_SET_ID,     DEST_ID,     INCARNATION,     BACKUP_TYPE,     PREV_FULL_BACKUP_SET_ID,     PREV_INC_BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE       WHEN END_TS = 0           THEN ''       ELSE           USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     FILE_STATUS,     CASE       WHEN END_TS = 0         THEN 0       ELSE         ROUND((END_TS - START_TS)/1000/1000,0)        END AS ELAPSED_SECONDES,     PLUS_ARCHIVELOG,     START_REPLAY_SCN,     CASE        WHEN START_REPLAY_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_REPLAY_SCN)        END AS START_REPLAY_SCN_DISPLAY,     MIN_RESTORE_SCN,     CASE      WHEN MIN_RESTORE_SCN = 0       THEN ''     ELSE        SCN_TO_TIMESTAMP(MIN_RESTORE_SCN)     END AS MIN_RESTORE_SCN_DISPLAY,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     ENCRYPTION_MODE,     PASSWD,     TENANT_COMPATIBLE,     BACKUP_COMPATIBLE,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_SET_FILES )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     BACKUP_SET_ID,     DEST_ID,     BACKUP_TYPE,     PREV_FULL_BACKUP_SET_ID,     PREV_INC_BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE       WHEN END_TS = 0           THEN ''       ELSE           USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     FILE_STATUS,     CASE       WHEN END_TS = 0         THEN 0       ELSE         ROUND((END_TS - START_TS)/1000/1000,0)        END AS ELAPSED_SECONDES,     PLUS_ARCHIVELOG,     START_REPLAY_SCN,     CASE        WHEN START_REPLAY_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_REPLAY_SCN)        END AS START_REPLAY_SCN_DISPLAY,     MIN_RESTORE_SCN,     CASE      WHEN MIN_RESTORE_SCN = 0       THEN ''     ELSE        SCN_TO_TIMESTAMP(MIN_RESTORE_SCN)     END AS MIN_RESTORE_SCN_DISPLAY,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     ENCRYPTION_MODE,     PASSWD,     TENANT_COMPATIBLE,     BACKUP_COMPATIBLE,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_SET_FILES )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }

src/share/inner_table/ob_inner_table_schema.21151_21200.cpp

@@ -159,7 +159,7 @@ int ObInnerTableSchema::cdb_ob_backup_jobs_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     RESULT,     COMMENT,     DESCRIPTION,     PATH     FROM OCEANBASE.__all_virtual_backup_job )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     JOB_ID,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     RESULT,     COMMENT,     DESCRIPTION,     PATH     FROM OCEANBASE.__all_virtual_backup_job )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -209,7 +209,7 @@ int ObInnerTableSchema::cdb_ob_backup_job_history_schema(ObTableSchema &table_sc
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     RESULT,     COMMENT,     DESCRIPTION,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_JOB_HISTORY )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     JOB_ID,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     RESULT,     COMMENT,     DESCRIPTION,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_JOB_HISTORY )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -259,7 +259,7 @@ int ObInnerTableSchema::cdb_ob_backup_tasks_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     TASK_ID,     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE       WHEN END_TS = 0         THEN 0       ELSE          OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     PATH     FROM OCEANBASE.__all_virtual_backup_task )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     TASK_ID,     JOB_ID,     BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE       WHEN END_TS = 0         THEN 0       ELSE          OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     PATH     FROM OCEANBASE.__all_virtual_backup_task )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -309,7 +309,7 @@ int ObInnerTableSchema::cdb_ob_backup_task_history_schema(ObTableSchema &table_s
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     TASK_ID,     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE       WHEN END_TS = 0         THEN 0       ELSE          OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_TASK_HISTORY )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     TASK_ID,     JOB_ID,     BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE       WHEN END_TS = 0         THEN 0       ELSE          OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_TASK_HISTORY )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }

src/share/inner_table/ob_inner_table_schema.21201_21250.cpp

@@ -2159,7 +2159,7 @@ int ObInnerTableSchema::cdb_ob_backup_delete_jobs_schema(ObTableSchema &table_sc
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TENANT_ID,       JOB_ID,       INCARNATION,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       USEC_TO_TIME(PARAMETER) AS PARAMETER,       JOB_LEVEL,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       COMMENT     FROM oceanbase.__all_virtual_backup_delete_job )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TENANT_ID,       JOB_ID,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       USEC_TO_TIME(PARAMETER) AS PARAMETER,       JOB_LEVEL,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       COMMENT     FROM oceanbase.__all_virtual_backup_delete_job )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2209,7 +2209,7 @@ int ObInnerTableSchema::cdb_ob_backup_delete_job_history_schema(ObTableSchema &t
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TENANT_ID,       JOB_ID,       INCARNATION,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       USEC_TO_TIME(PARAMETER) AS PARAMETER,       JOB_LEVEL,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       COMMENT     FROM oceanbase.__all_virtual_backup_delete_job_history )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TENANT_ID,       JOB_ID,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       USEC_TO_TIME(PARAMETER) AS PARAMETER,       JOB_LEVEL,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       COMMENT     FROM oceanbase.__all_virtual_backup_delete_job_history )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2259,7 +2259,7 @@ int ObInnerTableSchema::cdb_ob_backup_delete_tasks_schema(ObTableSchema &table_s
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TENANT_ID,       TASK_ID,       INCARNATION,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       COMMENT,       PATH     FROM oceanbase.__all_virtual_backup_delete_task )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TENANT_ID,       TASK_ID,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       COMMENT,       PATH     FROM oceanbase.__all_virtual_backup_delete_task )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2309,7 +2309,7 @@ int ObInnerTableSchema::cdb_ob_backup_delete_task_history_schema(ObTableSchema &
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TENANT_ID,       TASK_ID,       INCARNATION,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       COMMENT,       PATH     FROM oceanbase.__all_virtual_backup_delete_task_history )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TENANT_ID,       TASK_ID,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       COMMENT,       PATH     FROM oceanbase.__all_virtual_backup_delete_task_history )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }

src/share/inner_table/ob_inner_table_schema.21251_21300.cpp

@@ -559,7 +559,7 @@ int ObInnerTableSchema::dba_ob_backup_jobs_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     RESULT,     COMMENT,     DESCRIPTION,     PATH     FROM OCEANBASE.__all_virtual_backup_job     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     JOB_ID,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     RESULT,     COMMENT,     DESCRIPTION,     PATH     FROM OCEANBASE.__all_virtual_backup_job     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -609,7 +609,7 @@ int ObInnerTableSchema::dba_ob_backup_job_history_schema(ObTableSchema &table_sc
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     RESULT,     COMMENT,     DESCRIPTION,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_JOB_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     JOB_ID,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     RESULT,     COMMENT,     DESCRIPTION,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_JOB_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -659,7 +659,7 @@ int ObInnerTableSchema::dba_ob_backup_tasks_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TASK_ID,     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE       WHEN END_TS = 0         THEN 0       ELSE          OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     PATH     FROM OCEANBASE.__all_virtual_backup_task     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TASK_ID,     JOB_ID,     BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE       WHEN END_TS = 0         THEN 0       ELSE          OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     PATH     FROM OCEANBASE.__all_virtual_backup_task     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -709,7 +709,7 @@ int ObInnerTableSchema::dba_ob_backup_task_history_schema(ObTableSchema &table_s
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TASK_ID,     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE       WHEN END_TS = 0         THEN 0       ELSE          OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_TASK_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TASK_ID,     JOB_ID,     BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE       WHEN END_TS = 0         THEN 0       ELSE          OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_TASK_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -759,7 +759,7 @@ int ObInnerTableSchema::dba_ob_backup_set_files_schema(ObTableSchema &table_sche
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     BACKUP_SET_ID,     DEST_ID,     INCARNATION,     BACKUP_TYPE,     PREV_FULL_BACKUP_SET_ID,     PREV_INC_BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE       WHEN END_TS = 0           THEN ''       ELSE           USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     FILE_STATUS,     CASE       WHEN END_TS = 0         THEN 0       ELSE         ROUND((END_TS - START_TS)/1000/1000,0)        END AS ELAPSED_SECONDES,     PLUS_ARCHIVELOG,     START_REPLAY_SCN,     CASE        WHEN START_REPLAY_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_REPLAY_SCN)        END AS START_REPLAY_SCN_DISPLAY,     MIN_RESTORE_SCN,     CASE      WHEN MIN_RESTORE_SCN = 0       THEN ''     ELSE        SCN_TO_TIMESTAMP(MIN_RESTORE_SCN)     END AS MIN_RESTORE_SCN_DISPLAY,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     ENCRYPTION_MODE,     PASSWD,     TENANT_COMPATIBLE,     BACKUP_COMPATIBLE,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_SET_FILES     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     BACKUP_SET_ID,     DEST_ID,     BACKUP_TYPE,     PREV_FULL_BACKUP_SET_ID,     PREV_INC_BACKUP_SET_ID,     USEC_TO_TIME(START_TS) AS START_TIMESTAMP,     CASE       WHEN END_TS = 0           THEN ''       ELSE           USEC_TO_TIME(END_TS)        END AS END_TIMESTAMP,     STATUS,     FILE_STATUS,     CASE       WHEN END_TS = 0         THEN 0       ELSE         ROUND((END_TS - START_TS)/1000/1000,0)        END AS ELAPSED_SECONDES,     PLUS_ARCHIVELOG,     START_REPLAY_SCN,     CASE        WHEN START_REPLAY_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_REPLAY_SCN)        END AS START_REPLAY_SCN_DISPLAY,     MIN_RESTORE_SCN,     CASE      WHEN MIN_RESTORE_SCN = 0       THEN ''     ELSE        SCN_TO_TIMESTAMP(MIN_RESTORE_SCN)     END AS MIN_RESTORE_SCN_DISPLAY,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     COMMENT,     ENCRYPTION_MODE,     PASSWD,     TENANT_COMPATIBLE,     BACKUP_COMPATIBLE,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_SET_FILES     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1459,7 +1459,7 @@ int ObInnerTableSchema::dba_ob_backup_delete_jobs_schema(ObTableSchema &table_sc
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       JOB_ID,       INCARNATION,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       USEC_TO_TIME(PARAMETER) AS PARAMETER,       JOB_LEVEL,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       COMMENT     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_DELETE_JOB     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       JOB_ID,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       USEC_TO_TIME(PARAMETER) AS PARAMETER,       JOB_LEVEL,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       COMMENT     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_DELETE_JOB     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1509,7 +1509,7 @@ int ObInnerTableSchema::dba_ob_backup_delete_job_history_schema(ObTableSchema &t
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       JOB_ID,       INCARNATION,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       USEC_TO_TIME(PARAMETER) AS PARAMETER,       JOB_LEVEL,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       COMMENT     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_DELETE_JOB_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       JOB_ID,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       USEC_TO_TIME(PARAMETER) AS PARAMETER,       JOB_LEVEL,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       COMMENT     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_DELETE_JOB_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1559,7 +1559,7 @@ int ObInnerTableSchema::dba_ob_backup_delete_tasks_schema(ObTableSchema &table_s
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TASK_ID,       INCARNATION,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       COMMENT,       PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_DELETE_TASK     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TASK_ID,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       COMMENT,       PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_DELETE_TASK     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1609,7 +1609,7 @@ int ObInnerTableSchema::dba_ob_backup_delete_task_history_schema(ObTableSchema &
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TASK_ID,       INCARNATION,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       COMMENT,       PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_DELETE_TASK_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TASK_ID,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       USEC_TO_TIME(START_TS) AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE            USEC_TO_TIME(END_TS)         END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       COMMENT,       PATH     FROM OCEANBASE.__ALL_VIRTUAL_BACKUP_DELETE_TASK_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1909,7 +1909,7 @@ int ObInnerTableSchema::dba_ob_archivelog_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,     CASE       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) = 0         THEN 0       ELSE         ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) / (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES), 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     COMMENT,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,     CASE       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) = 0         THEN 0       ELSE         ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) / (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES), 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     COMMENT,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1959,7 +1959,7 @@ int ObInnerTableSchema::dba_ob_archivelog_summary_schema(ObTableSchema &table_sc
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     PATH,     COMMENT     FROM  ( SELECT DEST_ID,        ROUND_ID,        INCARNATION,        DEST_NO,        STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,        (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        COMMENT        FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS        WHERE TENANT_ID = EFFECTIVE_TENANT_ID() AND STATUS != 'STOP' UNION SELECT DEST_ID,        ROUND_ID,        INCARNATION,        DEST_NO,        'STOP' AS STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        INPUT_BYTES,        OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        COMMENT        FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_HISTORY        WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     PATH,     COMMENT     FROM  ( SELECT DEST_ID,        ROUND_ID,        DEST_NO,        STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,        (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        COMMENT        FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS        WHERE TENANT_ID = EFFECTIVE_TENANT_ID() AND STATUS != 'STOP' UNION SELECT DEST_ID,        ROUND_ID,        DEST_NO,        'STOP' AS STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        INPUT_BYTES,        OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        COMMENT        FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_HISTORY        WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2009,7 +2009,7 @@ int ObInnerTableSchema::dba_ob_archivelog_piece_files_schema(ObTableSchema &tabl
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     PIECE_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     MAX_SCN,     END_SCN,     COMPATIBLE,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     FILE_STATUS,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PIECE_FILES     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     PIECE_ID,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     MAX_SCN,     END_SCN,     COMPATIBLE,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     FILE_STATUS,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PIECE_FILES     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2159,7 +2159,7 @@ int ObInnerTableSchema::cdb_ob_archivelog_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     DEST_ID,     ROUND_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,     CASE       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) = 0         THEN 0       ELSE         ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) / (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES), 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     COMMENT,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     DEST_ID,     ROUND_ID,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,     CASE       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) = 0         THEN 0       ELSE         ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) / (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES), 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     COMMENT,     PATH     FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2209,7 +2209,7 @@ int ObInnerTableSchema::cdb_ob_archivelog_summary_schema(ObTableSchema &table_sc
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     DEST_ID,     ROUND_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     PATH,     COMMENT     FROM  ( SELECT TENANT_ID,        DEST_ID,        ROUND_ID,        INCARNATION,        DEST_NO,        STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,        (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        COMMENT        FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS        WHERE STATUS != 'STOP' UNION SELECT TENANT_ID,        DEST_ID,        ROUND_ID,        INCARNATION,        DEST_NO,        'STOP' AS STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        INPUT_BYTES,        OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        COMMENT        FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_HISTORY) )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TENANT_ID,     DEST_ID,     ROUND_ID,     DEST_NO,     STATUS,     START_SCN,     CASE       WHEN START_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(START_SCN)       END AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     CASE       WHEN CHECKPOINT_SCN = 0         THEN ''       ELSE          SCN_TO_TIMESTAMP(CHECKPOINT_SCN)       END AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     PATH,     COMMENT     FROM  ( SELECT TENANT_ID,        DEST_ID,        ROUND_ID,        DEST_NO,        STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,        (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        COMMENT        FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS        WHERE STATUS != 'STOP' UNION SELECT TENANT_ID,        DEST_ID,        ROUND_ID,        DEST_NO,        'STOP' AS STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        INPUT_BYTES,        OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        COMMENT        FROM OCEANBASE.__ALL_VIRTUAL_LOG_ARCHIVE_HISTORY) )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }

src/share/inner_table/ob_inner_table_schema.21301_21350.cpp

@@ -59,7 +59,7 @@ int ObInnerTableSchema::gv_ob_log_stat_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(   SELECT     TENANT_ID,     LS_ID,     SVR_IP,     SVR_PORT,     ROLE,     PROPOSAL_ID,     CONFIG_VERSION,     ACCESS_MODE,     PAXOS_MEMBER_LIST,     PAXOS_REPLICA_NUM,     CASE allow_vote       WHEN 1 THEN 'YES'       ELSE 'NO' END     AS ALLOW_VOTE,     CASE in_sync       WHEN 1 THEN 'YES'       ELSE 'NO' END     AS IN_SYNC,     REPLICA_TYPE,     BASE_LSN,     BEGIN_LSN,     BEGIN_SCN,     END_LSN,     END_SCN,     MAX_LSN,     MAX_SCN   FROM oceanbase.__all_virtual_log_stat )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(   SELECT     TENANT_ID,     LS_ID,     SVR_IP,     SVR_PORT,     ROLE,     PROPOSAL_ID,     CONFIG_VERSION,     ACCESS_MODE,     PAXOS_MEMBER_LIST,     PAXOS_REPLICA_NUM,     CASE in_sync       WHEN 1 THEN 'YES'       ELSE 'NO' END     AS IN_SYNC,     BASE_LSN,     BEGIN_LSN,     BEGIN_SCN,     END_LSN,     END_SCN,     MAX_LSN,     MAX_SCN   FROM oceanbase.__all_virtual_log_stat )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }

src/share/inner_table/ob_inner_table_schema.25151_25200.cpp

@@ -1359,7 +1359,7 @@ int ObInnerTableSchema::dba_ob_backup_jobs_ora_schema(ObTableSchema &table_schem
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     RESULT,     "COMMENT",     DESCRIPTION,     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_JOB     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     JOB_ID,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     RESULT,     "COMMENT",     DESCRIPTION,     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_JOB     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1409,7 +1409,7 @@ int ObInnerTableSchema::dba_ob_backup_job_history_ora_schema(ObTableSchema &tabl
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     RESULT,     "COMMENT",     DESCRIPTION,     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_JOB_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     JOB_ID,     BACKUP_SET_ID,     INITIATOR_TENANT_ID,     INITIATOR_JOB_ID,     EXECUTOR_TENANT_ID,     PLUS_ARCHIVELOG,     BACKUP_TYPE,     JOB_LEVEL,     ENCRYPTION_MODE,     PASSWD,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     RESULT,     "COMMENT",     DESCRIPTION,     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_JOB_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1459,7 +1459,7 @@ int ObInnerTableSchema::dba_ob_backup_tasks_ora_schema(ObTableSchema &table_sche
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TASK_ID,     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     "COMMENT",     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_TASK     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TASK_ID,     JOB_ID,     BACKUP_SET_ID,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     "COMMENT",     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_TASK     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1509,7 +1509,7 @@ int ObInnerTableSchema::dba_ob_backup_task_history_ora_schema(ObTableSchema &tab
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TASK_ID,     JOB_ID,     INCARNATION,     BACKUP_SET_ID,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     "COMMENT",     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_TASK_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     TASK_ID,     JOB_ID,     BACKUP_SET_ID,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE        WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     START_SCN,     END_SCN,     USER_LS_START_SCN,     ENCRYPTION_MODE,     PASSWD,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     "COMMENT",     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_TASK_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1559,7 +1559,7 @@ int ObInnerTableSchema::dba_ob_backup_set_files_ora_schema(ObTableSchema &table_
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     BACKUP_SET_ID,     DEST_ID,     INCARNATION,     BACKUP_TYPE,     PREV_FULL_BACKUP_SET_ID,     PREV_INC_BACKUP_SET_ID,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE       WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     FILE_STATUS,     CASE        WHEN END_TS = 0         THEN 0       ELSE          ROUND((END_TS - START_TS)/1000/1000,0)        END AS ELAPSED_SECONDES,     PLUS_ARCHIVELOG,     START_REPLAY_SCN,     SCN_TO_TIMESTAMP(START_REPLAY_SCN) AS START_REPLAY_SCN_DISPLAY,     MIN_RESTORE_SCN,     SCN_TO_TIMESTAMP(MIN_RESTORE_SCN) AS MIN_RESTORE_SCN_DISPLAY,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     "COMMENT",     ENCRYPTION_MODE,     PASSWD,     TENANT_COMPATIBLE,     BACKUP_COMPATIBLE,     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_SET_FILES     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     BACKUP_SET_ID,     DEST_ID,     BACKUP_TYPE,     PREV_FULL_BACKUP_SET_ID,     PREV_INC_BACKUP_SET_ID,     TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,     CASE       WHEN END_TS = 0         THEN ''       ELSE         TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')        END AS END_TIMESTAMP,     STATUS,     FILE_STATUS,     CASE        WHEN END_TS = 0         THEN 0       ELSE          ROUND((END_TS - START_TS)/1000/1000,0)        END AS ELAPSED_SECONDES,     PLUS_ARCHIVELOG,     START_REPLAY_SCN,     SCN_TO_TIMESTAMP(START_REPLAY_SCN) AS START_REPLAY_SCN_DISPLAY,     MIN_RESTORE_SCN,     SCN_TO_TIMESTAMP(MIN_RESTORE_SCN) AS MIN_RESTORE_SCN_DISPLAY,     INPUT_BYTES,     OUTPUT_BYTES,     CASE        WHEN END_TS = 0         THEN 0       ELSE         OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000)        END AS OUTPUT_RATE_BYTES,     EXTRA_BYTES AS EXTRA_META_BYTES,     TABLET_COUNT,     FINISH_TABLET_COUNT,     MACRO_BLOCK_COUNT,     FINISH_MACRO_BLOCK_COUNT,     FILE_COUNT,     META_TURN_ID,     DATA_TURN_ID,     RESULT,     "COMMENT",     ENCRYPTION_MODE,     PASSWD,     TENANT_COMPATIBLE,     BACKUP_COMPATIBLE,     PATH     FROM SYS.ALL_VIRTUAL_BACKUP_SET_FILES     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1909,7 +1909,7 @@ int ObInnerTableSchema::dba_ob_backup_delete_jobs_ora_schema(ObTableSchema &tabl
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       JOB_ID,       INCARNATION,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       TO_CHAR(PARAMETER / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS PARAMETER,       JOB_LEVEL,       TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE           TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')          END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       "COMMENT"     FROM SYS.ALL_VIRTUAL_BACKUP_DELETE_JOB     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       JOB_ID,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       TO_CHAR(PARAMETER / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS PARAMETER,       JOB_LEVEL,       TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE           TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')          END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       "COMMENT"     FROM SYS.ALL_VIRTUAL_BACKUP_DELETE_JOB     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -1959,7 +1959,7 @@ int ObInnerTableSchema::dba_ob_backup_delete_job_history_ora_schema(ObTableSchem
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       JOB_ID,       INCARNATION,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       TO_CHAR(PARAMETER / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS PARAMETER,       JOB_LEVEL,       TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE           TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')          END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       "COMMENT"     FROM SYS.ALL_VIRTUAL_BACKUP_DELETE_JOB_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       JOB_ID,       INITIATOR_TENANT_ID,       INITIATOR_JOB_ID,       EXECUTOR_TENANT_ID,       TYPE,       TO_CHAR(PARAMETER / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS PARAMETER,       JOB_LEVEL,       TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE           TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')          END AS END_TIMESTAMP,       STATUS,       TASK_COUNT,       SUCCESS_TASK_COUNT,       RESULT,       "COMMENT"     FROM SYS.ALL_VIRTUAL_BACKUP_DELETE_JOB_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2009,7 +2009,7 @@ int ObInnerTableSchema::dba_ob_backup_delete_tasks_ora_schema(ObTableSchema &tab
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TASK_ID,       INCARNATION,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE           TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')          END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       "COMMENT",       PATH     FROM SYS.ALL_VIRTUAL_BACKUP_DELETE_TASK     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TASK_ID,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE           TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')          END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       "COMMENT",       PATH     FROM SYS.ALL_VIRTUAL_BACKUP_DELETE_TASK     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2059,7 +2059,7 @@ int ObInnerTableSchema::dba_ob_backup_delete_task_history_ora_schema(ObTableSche
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TASK_ID,       INCARNATION,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE           TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')          END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       "COMMENT",       PATH     FROM SYS.ALL_VIRTUAL_BACKUP_DELETE_TASK_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       TASK_ID,       JOB_ID,       TASK_TYPE,       ID,       ROUND_ID,       DEST_ID,       TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP,       CASE         WHEN END_TS = 0           THEN ''         ELSE           TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss')          END AS END_TIMESTAMP,       STATUS,       TOTAL_LS_COUNT,       FINISH_LS_COUNT,       RESULT,       "COMMENT",       PATH     FROM SYS.ALL_VIRTUAL_BACKUP_DELETE_TASK_HISTORY     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2259,7 +2259,7 @@ int ObInnerTableSchema::dba_ob_archivelog_ora_schema(ObTableSchema &table_schema
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     SCN_TO_TIMESTAMP(START_SCN) AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     SCN_TO_TIMESTAMP(CHECKPOINT_SCN) AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,     CASE       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) = 0         THEN 0       ELSE         ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) / (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES), 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     "COMMENT",     PATH     FROM SYS.ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     DEST_NO,     STATUS,     START_SCN,     SCN_TO_TIMESTAMP(START_SCN) AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     SCN_TO_TIMESTAMP(CHECKPOINT_SCN) AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES)/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,     CASE       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024/1024,2), 'PB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024/1024,2), 'TB')       WHEN (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) >= 1024*1024*1024         THEN CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES)/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) = 0         THEN 0       ELSE         ROUND((FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) / (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES), 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     "COMMENT",     PATH     FROM SYS.ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2309,7 +2309,7 @@ int ObInnerTableSchema::dba_ob_archivelog_summary_ora_schema(ObTableSchema &tabl
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     SCN_TO_TIMESTAMP(START_SCN) AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     SCN_TO_TIMESTAMP(CHECKPOINT_SCN) AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     PATH,     "COMMENT"     FROM  ( SELECT DEST_ID,        ROUND_ID,        INCARNATION,        DEST_NO,        STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,        (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        "COMMENT"        FROM SYS.ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS        WHERE TENANT_ID = EFFECTIVE_TENANT_ID() AND STATUS != 'STOP' UNION SELECT DEST_ID,        ROUND_ID,        INCARNATION,        DEST_NO,        'STOP' AS STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        INPUT_BYTES,        OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        "COMMENT"        FROM SYS.ALL_VIRTUAL_LOG_ARCHIVE_HISTORY        WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     DEST_NO,     STATUS,     START_SCN,     SCN_TO_TIMESTAMP(START_SCN) AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     SCN_TO_TIMESTAMP(CHECKPOINT_SCN) AS CHECKPOINT_SCN_DISPLAY,     COMPATIBLE,     BASE_PIECE_ID,     USED_PIECE_ID,     PIECE_SWITCH_INTERVAL,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     DELETED_INPUT_BYTES,     CASE       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_INPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_INPUT_BYTES_DISPLAY,     DELETED_OUTPUT_BYTES,     CASE       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN DELETED_OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(DELETED_OUTPUT_BYTES/1024/1024,2), 'MB')       END AS DELETED_OUTPUT_BYTES_DISPLAY,     PATH,     "COMMENT"     FROM  ( SELECT DEST_ID,        ROUND_ID,        DEST_NO,        STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        (FROZEN_INPUT_BYTES + ACTIVE_INPUT_BYTES) AS INPUT_BYTES,        (FROZEN_OUTPUT_BYTES + ACTIVE_OUTPUT_BYTES) AS OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        "COMMENT"        FROM SYS.ALL_VIRTUAL_LOG_ARCHIVE_PROGRESS        WHERE TENANT_ID = EFFECTIVE_TENANT_ID() AND STATUS != 'STOP' UNION SELECT DEST_ID,        ROUND_ID,        DEST_NO,        'STOP' AS STATUS,        START_SCN,        CHECKPOINT_SCN,        COMPATIBLE,        BASE_PIECE_ID,        USED_PIECE_ID,        PIECE_SWITCH_INTERVAL,        UNIT_SIZE,        COMPRESSION,        INPUT_BYTES,        OUTPUT_BYTES,        DELETED_INPUT_BYTES,        DELETED_OUTPUT_BYTES,        PATH,        "COMMENT"        FROM SYS.ALL_VIRTUAL_LOG_ARCHIVE_HISTORY        WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }
@@ -2359,7 +2359,7 @@ int ObInnerTableSchema::dba_ob_archivelog_piece_files_ora_schema(ObTableSchema &
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     PIECE_ID,     INCARNATION,     DEST_NO,     STATUS,     START_SCN,     SCN_TO_TIMESTAMP(START_SCN) AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     SCN_TO_TIMESTAMP(CHECKPOINT_SCN) AS CHECKPOINT_SCN_DISPLAY,     MAX_SCN,     END_SCN,     COMPATIBLE,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     FILE_STATUS,     PATH     FROM SYS.ALL_VIRTUAL_LOG_ARCHIVE_PIECE_FILES     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT     DEST_ID,     ROUND_ID,     PIECE_ID,     DEST_NO,     STATUS,     START_SCN,     SCN_TO_TIMESTAMP(START_SCN) AS START_SCN_DISPLAY,     CHECKPOINT_SCN,     SCN_TO_TIMESTAMP(CHECKPOINT_SCN) AS CHECKPOINT_SCN_DISPLAY,     MAX_SCN,     END_SCN,     COMPATIBLE,     UNIT_SIZE,     COMPRESSION,     INPUT_BYTES,     CASE       WHEN INPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN INPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN INPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(INPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(INPUT_BYTES/1024/1024,2), 'MB')       END AS INPUT_BYTES_DISPLAY,     OUTPUT_BYTES,     CASE       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024/1024,2), 'PB')       WHEN OUTPUT_BYTES >= 1024*1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024/1024,2), 'TB')       WHEN OUTPUT_BYTES >= 1024*1024*1024         THEN CONCAT(ROUND(OUTPUT_BYTES/1024/1024/1024,2), 'GB')       ELSE         CONCAT(ROUND(OUTPUT_BYTES/1024/1024,2), 'MB')       END AS OUTPUT_BYTES_DISPLAY,     CASE       WHEN INPUT_BYTES = 0         THEN 0       ELSE         ROUND(OUTPUT_BYTES / INPUT_BYTES, 2)       END AS COMPRESSION_RATIO,     FILE_STATUS,     PATH     FROM SYS.ALL_VIRTUAL_LOG_ARCHIVE_PIECE_FILES     WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }

src/share/inner_table/ob_inner_table_schema.251_300.cpp

@@ -142,7 +142,7 @@ int ObInnerTableSchema::all_tenant_profile_schema(ObTableSchema &table_schema)
       0, //part_key_pos
       ObVarcharType, //column_type
       CS_TYPE_INVALID, //column_collation_type
-      OB_MAX_SQL_LENGTH, //column_length
+      MAX_ORACLE_NAME_LENGTH, //column_length
       -1, //column_precision
       -1, //column_scale
       false, //is_nullable
@@ -449,7 +449,7 @@ int ObInnerTableSchema::all_tenant_profile_history_schema(ObTableSchema &table_s
       0, //part_key_pos
       ObVarcharType, //column_type
       CS_TYPE_INVALID, //column_collation_type
-      OB_MAX_SQL_LENGTH, //column_length
+      MAX_ORACLE_NAME_LENGTH, //column_length
       -1, //column_precision
       -1, //column_scale
       true, //is_nullable

src/share/inner_table/ob_inner_table_schema.28101_28150.cpp

@@ -2409,7 +2409,7 @@ int ObInnerTableSchema::gv_ob_log_stat_ora_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(   SELECT     TENANT_ID,     LS_ID,     SVR_IP,     SVR_PORT,     ROLE,     PROPOSAL_ID,     CONFIG_VERSION,     ACCESS_MODE,     PAXOS_MEMBER_LIST,     PAXOS_REPLICA_NUM,     CASE allow_vote       WHEN 1 THEN 'YES'       ELSE 'NO' END     AS ALLOW_VOTE,     CASE in_sync       WHEN 1 THEN 'YES'       ELSE 'NO' END     AS IN_SYNC,     REPLICA_TYPE,     BASE_LSN,     BEGIN_LSN,     BEGIN_SCN,     END_LSN,     END_SCN,     MAX_LSN,     MAX_SCN   FROM SYS.ALL_VIRTUAL_LOG_STAT )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(   SELECT     TENANT_ID,     LS_ID,     SVR_IP,     SVR_PORT,     ROLE,     PROPOSAL_ID,     CONFIG_VERSION,     ACCESS_MODE,     PAXOS_MEMBER_LIST,     PAXOS_REPLICA_NUM,     CASE in_sync       WHEN 1 THEN 'YES'       ELSE 'NO' END     AS IN_SYNC,     BASE_LSN,     BEGIN_LSN,     BEGIN_SCN,     END_LSN,     END_SCN,     MAX_LSN,     MAX_SCN   FROM SYS.ALL_VIRTUAL_LOG_STAT )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }

src/share/inner_table/ob_inner_table_schema.301_350.cpp

@@ -2146,6 +2146,25 @@ int ObInnerTableSchema::all_ddl_task_status_schema(ObTableSchema &table_schema)
       task_version_default); //default_value
   }
 
+  if (OB_SUCC(ret)) {
+    ObObj execution_id_default;
+    execution_id_default.set_int(0);
+    ADD_COLUMN_SCHEMA_T("execution_id", //column_name
+      ++column_id, //column_id
+      0, //rowkey_id
+      0, //index_id
+      0, //part_key_pos
+      ObIntType, //column_type
+      CS_TYPE_INVALID, //column_collation_type
+      sizeof(int64_t), //column_length
+      -1, //column_precision
+      -1, //column_scale
+      false, //is_nullable
+      false, //is_autoincrement
+      execution_id_default,
+      execution_id_default); //default_value
+  }
+
   if (OB_SUCC(ret)) {
     ADD_COLUMN_SCHEMA("ddl_stmt_str", //column_name
       ++column_id, //column_id

src/share/inner_table/ob_inner_table_schema.401_450.cpp

@@ -2038,7 +2038,7 @@ int ObInnerTableSchema::all_mock_fk_parent_table_column_history_schema(ObTableSc
   return ret;
 }
 
-int ObInnerTableSchema::all_log_archive_source_schema(ObTableSchema &table_schema)
+int ObInnerTableSchema::all_log_restore_source_schema(ObTableSchema &table_schema)
 {
   int ret = OB_SUCCESS;
   uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1;
@@ -2047,7 +2047,7 @@ int ObInnerTableSchema::all_log_archive_source_schema(ObTableSchema &table_schem
   table_schema.set_tenant_id(OB_SYS_TENANT_ID);
   table_schema.set_tablegroup_id(OB_SYS_TABLEGROUP_ID);
   table_schema.set_database_id(OB_SYS_DATABASE_ID);
-  table_schema.set_table_id(OB_ALL_LOG_ARCHIVE_SOURCE_TID);
+  table_schema.set_table_id(OB_ALL_LOG_RESTORE_SOURCE_TID);
   table_schema.set_rowkey_split_pos(0);
   table_schema.set_is_use_bloomfilter(false);
   table_schema.set_progressive_merge_num(0);
@@ -2058,7 +2058,7 @@ int ObInnerTableSchema::all_log_archive_source_schema(ObTableSchema &table_schem
   table_schema.set_def_type(TABLE_DEF_TYPE_INTERNAL);
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_table_name(OB_ALL_LOG_ARCHIVE_SOURCE_TNAME))) {
+    if (OB_FAIL(table_schema.set_table_name(OB_ALL_LOG_RESTORE_SOURCE_TNAME))) {
       LOG_ERROR("fail to set table_name", K(ret));
     }
   }
@@ -2179,14 +2179,14 @@ int ObInnerTableSchema::all_log_archive_source_schema(ObTableSchema &table_schem
   }
 
   if (OB_SUCC(ret)) {
-    ADD_COLUMN_SCHEMA("recovery_until_ts", //column_name
+    ADD_COLUMN_SCHEMA("recovery_until_scn", //column_name
       ++column_id, //column_id
       0, //rowkey_id
       0, //index_id
       0, //part_key_pos
-      ObIntType, //column_type
+      ObUInt64Type, //column_type
       CS_TYPE_INVALID, //column_collation_type
-      sizeof(int64_t), //column_length
+      sizeof(uint64_t), //column_length
       -1, //column_precision
       -1, //column_scale
       false, //is_nullable
@@ -2197,9 +2197,9 @@ int ObInnerTableSchema::all_log_archive_source_schema(ObTableSchema &table_schem
   table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL);
   table_schema.set_progressive_merge_round(1);
   table_schema.set_storage_format_version(3);
-  table_schema.set_tablet_id(OB_ALL_LOG_ARCHIVE_SOURCE_TID);
-  table_schema.set_aux_lob_meta_tid(OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TID);
-  table_schema.set_aux_lob_piece_tid(OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TID);
+  table_schema.set_tablet_id(OB_ALL_LOG_RESTORE_SOURCE_TID);
+  table_schema.set_aux_lob_meta_tid(OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TID);
+  table_schema.set_aux_lob_piece_tid(OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TID);
 
   table_schema.set_max_used_column_id(column_id);
   return ret;

src/share/inner_table/ob_inner_table_schema.50401_50450.cpp

@@ -1239,7 +1239,7 @@ int ObInnerTableSchema::all_mock_fk_parent_table_column_history_aux_lob_meta_sch
   return ret;
 }
 
-int ObInnerTableSchema::all_log_archive_source_aux_lob_meta_schema(ObTableSchema &table_schema)
+int ObInnerTableSchema::all_log_restore_source_aux_lob_meta_schema(ObTableSchema &table_schema)
 {
   int ret = OB_SUCCESS;
   uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1;
@@ -1248,7 +1248,7 @@ int ObInnerTableSchema::all_log_archive_source_aux_lob_meta_schema(ObTableSchema
   table_schema.set_tenant_id(OB_SYS_TENANT_ID);
   table_schema.set_tablegroup_id(OB_SYS_TABLEGROUP_ID);
   table_schema.set_database_id(OB_SYS_DATABASE_ID);
-  table_schema.set_table_id(OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TID);
+  table_schema.set_table_id(OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TID);
   table_schema.set_rowkey_split_pos(0);
   table_schema.set_is_use_bloomfilter(false);
   table_schema.set_progressive_merge_num(0);
@@ -1259,7 +1259,7 @@ int ObInnerTableSchema::all_log_archive_source_aux_lob_meta_schema(ObTableSchema
   table_schema.set_def_type(TABLE_DEF_TYPE_INTERNAL);
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_table_name(OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TNAME))) {
+    if (OB_FAIL(table_schema.set_table_name(OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TNAME))) {
       LOG_ERROR("fail to set table_name", K(ret));
     }
   }
@@ -1367,8 +1367,8 @@ int ObInnerTableSchema::all_log_archive_source_aux_lob_meta_schema(ObTableSchema
   table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL);
   table_schema.set_progressive_merge_round(1);
   table_schema.set_storage_format_version(3);
-  table_schema.set_tablet_id(OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TID);
-  table_schema.set_data_table_id(OB_ALL_LOG_ARCHIVE_SOURCE_TID);
+  table_schema.set_tablet_id(OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TID);
+  table_schema.set_data_table_id(OB_ALL_LOG_RESTORE_SOURCE_TID);
 
   table_schema.set_max_used_column_id(column_id);
   return ret;

src/share/inner_table/ob_inner_table_schema.60401_60450.cpp

@@ -834,7 +834,7 @@ int ObInnerTableSchema::all_mock_fk_parent_table_column_history_aux_lob_piece_sc
   return ret;
 }
 
-int ObInnerTableSchema::all_log_archive_source_aux_lob_piece_schema(ObTableSchema &table_schema)
+int ObInnerTableSchema::all_log_restore_source_aux_lob_piece_schema(ObTableSchema &table_schema)
 {
   int ret = OB_SUCCESS;
   uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1;
@@ -843,7 +843,7 @@ int ObInnerTableSchema::all_log_archive_source_aux_lob_piece_schema(ObTableSchem
   table_schema.set_tenant_id(OB_SYS_TENANT_ID);
   table_schema.set_tablegroup_id(OB_SYS_TABLEGROUP_ID);
   table_schema.set_database_id(OB_SYS_DATABASE_ID);
-  table_schema.set_table_id(OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TID);
+  table_schema.set_table_id(OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TID);
   table_schema.set_rowkey_split_pos(0);
   table_schema.set_is_use_bloomfilter(false);
   table_schema.set_progressive_merge_num(0);
@@ -854,7 +854,7 @@ int ObInnerTableSchema::all_log_archive_source_aux_lob_piece_schema(ObTableSchem
   table_schema.set_def_type(TABLE_DEF_TYPE_INTERNAL);
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_table_name(OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TNAME))) {
+    if (OB_FAIL(table_schema.set_table_name(OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TNAME))) {
       LOG_ERROR("fail to set table_name", K(ret));
     }
   }
@@ -917,8 +917,8 @@ int ObInnerTableSchema::all_log_archive_source_aux_lob_piece_schema(ObTableSchem
   table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL);
   table_schema.set_progressive_merge_round(1);
   table_schema.set_storage_format_version(3);
-  table_schema.set_tablet_id(OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TID);
-  table_schema.set_data_table_id(OB_ALL_LOG_ARCHIVE_SOURCE_TID);
+  table_schema.set_tablet_id(OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TID);
+  table_schema.set_data_table_id(OB_ALL_LOG_RESTORE_SOURCE_TID);
 
   table_schema.set_max_used_column_id(column_id);
   return ret;

src/share/inner_table/ob_inner_table_schema.h

@@ -492,7 +492,7 @@ public:
   static int all_mock_fk_parent_table_history_schema(share::schema::ObTableSchema &table_schema);
   static int all_mock_fk_parent_table_column_schema(share::schema::ObTableSchema &table_schema);
   static int all_mock_fk_parent_table_column_history_schema(share::schema::ObTableSchema &table_schema);
-  static int all_log_archive_source_schema(share::schema::ObTableSchema &table_schema);
+  static int all_log_restore_source_schema(share::schema::ObTableSchema &table_schema);
   static int all_service_epoch_schema(share::schema::ObTableSchema &table_schema);
   static int all_column_checksum_error_info_schema(share::schema::ObTableSchema &table_schema);
   static int tenant_virtual_all_table_schema(share::schema::ObTableSchema &table_schema);
@@ -825,7 +825,7 @@ public:
   static int all_virtual_mock_fk_parent_table_history_schema(share::schema::ObTableSchema &table_schema);
   static int all_virtual_mock_fk_parent_table_column_schema(share::schema::ObTableSchema &table_schema);
   static int all_virtual_mock_fk_parent_table_column_history_schema(share::schema::ObTableSchema &table_schema);
-  static int all_virtual_log_archive_source_schema(share::schema::ObTableSchema &table_schema);
+  static int all_virtual_log_restore_source_schema(share::schema::ObTableSchema &table_schema);
   static int all_virtual_query_response_time_schema(share::schema::ObTableSchema &table_schema);
   static int all_virtual_column_checksum_error_info_schema(share::schema::ObTableSchema &table_schema);
   static int all_virtual_kvcache_handle_leak_info_schema(share::schema::ObTableSchema &table_schema);
@@ -1841,7 +1841,7 @@ public:
   static int all_mock_fk_parent_table_history_aux_lob_meta_schema(share::schema::ObTableSchema &table_schema);
   static int all_mock_fk_parent_table_column_aux_lob_meta_schema(share::schema::ObTableSchema &table_schema);
   static int all_mock_fk_parent_table_column_history_aux_lob_meta_schema(share::schema::ObTableSchema &table_schema);
-  static int all_log_archive_source_aux_lob_meta_schema(share::schema::ObTableSchema &table_schema);
+  static int all_log_restore_source_aux_lob_meta_schema(share::schema::ObTableSchema &table_schema);
   static int all_service_epoch_aux_lob_meta_schema(share::schema::ObTableSchema &table_schema);
   static int all_column_checksum_error_info_aux_lob_meta_schema(share::schema::ObTableSchema &table_schema);
   static int all_table_aux_lob_piece_schema(share::schema::ObTableSchema &table_schema);
@@ -2056,7 +2056,7 @@ public:
   static int all_mock_fk_parent_table_history_aux_lob_piece_schema(share::schema::ObTableSchema &table_schema);
   static int all_mock_fk_parent_table_column_aux_lob_piece_schema(share::schema::ObTableSchema &table_schema);
   static int all_mock_fk_parent_table_column_history_aux_lob_piece_schema(share::schema::ObTableSchema &table_schema);
-  static int all_log_archive_source_aux_lob_piece_schema(share::schema::ObTableSchema &table_schema);
+  static int all_log_restore_source_aux_lob_piece_schema(share::schema::ObTableSchema &table_schema);
   static int all_service_epoch_aux_lob_piece_schema(share::schema::ObTableSchema &table_schema);
   static int all_column_checksum_error_info_aux_lob_piece_schema(share::schema::ObTableSchema &table_schema);
   static int all_virtual_plan_cache_stat_all_virtual_plan_cache_stat_i1_schema(share::schema::ObTableSchema &table_schema);
@@ -2076,10 +2076,93 @@ public:
   static int all_virtual_sysstat_ora_all_virtual_sysstat_i1_schema(share::schema::ObTableSchema &table_schema);
   static int all_virtual_system_event_ora_all_virtual_system_event_i1_schema(share::schema::ObTableSchema &table_schema);
   static int all_virtual_sql_plan_monitor_ora_all_virtual_sql_plan_monitor_i1_schema(share::schema::ObTableSchema &table_schema);
+  static int all_table_idx_data_table_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_table_idx_db_tb_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_table_idx_tb_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_column_idx_tb_column_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_column_idx_column_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_ddl_operation_idx_ddl_type_schema(share::schema::ObTableSchema &table_schema);
   static int all_table_history_idx_data_table_id_schema(share::schema::ObTableSchema &table_schema);
   static int all_log_archive_piece_files_idx_status_schema(share::schema::ObTableSchema &table_schema);
   static int all_backup_set_files_idx_status_schema(share::schema::ObTableSchema &table_schema);
   static int all_ddl_task_status_idx_task_key_schema(share::schema::ObTableSchema &table_schema);
+  static int all_user_idx_ur_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_database_idx_db_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tablegroup_idx_tg_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_history_idx_tenant_deleted_schema(share::schema::ObTableSchema &table_schema);
+  static int all_rootservice_event_history_idx_rs_module_schema(share::schema::ObTableSchema &table_schema);
+  static int all_rootservice_event_history_idx_rs_event_schema(share::schema::ObTableSchema &table_schema);
+  static int all_recyclebin_idx_recyclebin_db_type_schema(share::schema::ObTableSchema &table_schema);
+  static int all_part_idx_part_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_sub_part_idx_sub_part_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_def_sub_part_idx_def_sub_part_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_server_event_history_idx_server_module_schema(share::schema::ObTableSchema &table_schema);
+  static int all_server_event_history_idx_server_event_schema(share::schema::ObTableSchema &table_schema);
+  static int all_rootservice_job_idx_rs_job_type_schema(share::schema::ObTableSchema &table_schema);
+  static int all_foreign_key_idx_fk_child_tid_schema(share::schema::ObTableSchema &table_schema);
+  static int all_foreign_key_idx_fk_parent_tid_schema(share::schema::ObTableSchema &table_schema);
+  static int all_foreign_key_idx_fk_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_foreign_key_history_idx_fk_his_child_tid_schema(share::schema::ObTableSchema &table_schema);
+  static int all_foreign_key_history_idx_fk_his_parent_tid_schema(share::schema::ObTableSchema &table_schema);
+  static int all_synonym_idx_db_synonym_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_synonym_idx_synonym_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_ddl_checksum_idx_ddl_checksum_task_schema(share::schema::ObTableSchema &table_schema);
+  static int all_routine_idx_db_routine_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_routine_idx_routine_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_routine_idx_routine_pkg_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_routine_param_idx_routine_param_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_package_idx_db_pkg_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_package_idx_pkg_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_acquired_snapshot_idx_snapshot_tablet_schema(share::schema::ObTableSchema &table_schema);
+  static int all_constraint_idx_cst_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_type_idx_db_type_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_type_idx_type_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_type_attr_idx_type_attr_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_coll_type_idx_coll_name_type_schema(share::schema::ObTableSchema &table_schema);
+  static int all_dblink_idx_owner_dblink_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_dblink_idx_dblink_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_role_grantee_map_idx_grantee_role_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_role_grantee_map_history_idx_grantee_his_role_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_keystore_idx_keystore_master_key_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_keystore_history_idx_keystore_his_master_key_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_ols_policy_idx_ols_policy_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_ols_policy_idx_ols_policy_col_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_ols_component_idx_ols_com_policy_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_ols_label_idx_ols_lab_policy_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_ols_label_idx_ols_lab_tag_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_ols_label_idx_ols_lab_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_ols_user_level_idx_ols_level_uid_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_ols_user_level_idx_ols_level_policy_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_profile_idx_profile_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_security_audit_idx_audit_type_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_trigger_idx_trigger_base_obj_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_trigger_idx_db_trigger_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_trigger_idx_trigger_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_trigger_history_idx_trigger_his_base_obj_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_objauth_idx_objauth_grantor_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_objauth_idx_objauth_grantee_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_object_type_idx_obj_type_db_obj_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_object_type_idx_obj_type_obj_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_global_transaction_idx_xa_trans_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_dependency_idx_dependency_ref_obj_schema(share::schema::ObTableSchema &table_schema);
+  static int all_ddl_error_message_idx_ddl_error_object_schema(share::schema::ObTableSchema &table_schema);
+  static int all_table_stat_history_idx_table_stat_his_savtime_schema(share::schema::ObTableSchema &table_schema);
+  static int all_column_stat_history_idx_column_stat_his_savtime_schema(share::schema::ObTableSchema &table_schema);
+  static int all_histogram_stat_history_idx_histogram_stat_his_savtime_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tablet_to_ls_idx_tablet_to_ls_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tablet_to_ls_idx_tablet_to_table_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_pending_transaction_idx_pending_tx_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_context_idx_ctx_namespace_schema(share::schema::ObTableSchema &table_schema);
+  static int all_plan_baseline_item_idx_spm_item_sql_id_schema(share::schema::ObTableSchema &table_schema);
+  static int all_plan_baseline_item_idx_spm_item_value_schema(share::schema::ObTableSchema &table_schema);
+  static int all_tenant_directory_idx_directory_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_job_idx_job_powner_schema(share::schema::ObTableSchema &table_schema);
+  static int all_sequence_object_idx_seq_obj_db_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_sequence_object_idx_seq_obj_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_recyclebin_idx_recyclebin_ori_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_table_privilege_idx_tb_priv_db_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_table_privilege_idx_tb_priv_tb_name_schema(share::schema::ObTableSchema &table_schema);
+  static int all_database_privilege_idx_db_priv_db_name_schema(share::schema::ObTableSchema &table_schema);
 
 private:
   DISALLOW_COPY_AND_ASSIGN(ObInnerTableSchema);
@@ -2307,7 +2390,7 @@ const schema_create_func sys_table_schema_creators [] = {
   ObInnerTableSchema::all_mock_fk_parent_table_history_schema,
   ObInnerTableSchema::all_mock_fk_parent_table_column_schema,
   ObInnerTableSchema::all_mock_fk_parent_table_column_history_schema,
-  ObInnerTableSchema::all_log_archive_source_schema,
+  ObInnerTableSchema::all_log_restore_source_schema,
   ObInnerTableSchema::all_service_epoch_schema,
   ObInnerTableSchema::all_column_checksum_error_info_schema,
   NULL,};
@@ -2643,7 +2726,7 @@ const schema_create_func virtual_table_schema_creators [] = {
   ObInnerTableSchema::all_virtual_mock_fk_parent_table_history_schema,
   ObInnerTableSchema::all_virtual_mock_fk_parent_table_column_schema,
   ObInnerTableSchema::all_virtual_mock_fk_parent_table_column_history_schema,
-  ObInnerTableSchema::all_virtual_log_archive_source_schema,
+  ObInnerTableSchema::all_virtual_log_restore_source_schema,
   ObInnerTableSchema::all_virtual_query_response_time_schema,
   ObInnerTableSchema::all_virtual_column_checksum_error_info_schema,
   ObInnerTableSchema::all_virtual_kvcache_handle_leak_info_schema,
@@ -3470,6 +3553,12 @@ const schema_create_func sys_view_schema_creators [] = {
   NULL,};
 
 const schema_create_func core_index_table_schema_creators [] = {
+  ObInnerTableSchema::all_table_idx_data_table_id_schema,
+  ObInnerTableSchema::all_table_idx_db_tb_name_schema,
+  ObInnerTableSchema::all_table_idx_tb_name_schema,
+  ObInnerTableSchema::all_column_idx_tb_column_name_schema,
+  ObInnerTableSchema::all_column_idx_column_name_schema,
+  ObInnerTableSchema::all_ddl_operation_idx_ddl_type_schema,
   NULL,};
 
 const schema_create_func sys_index_table_schema_creators [] = {
@@ -3477,6 +3566,83 @@ const schema_create_func sys_index_table_schema_creators [] = {
   ObInnerTableSchema::all_log_archive_piece_files_idx_status_schema,
   ObInnerTableSchema::all_backup_set_files_idx_status_schema,
   ObInnerTableSchema::all_ddl_task_status_idx_task_key_schema,
+  ObInnerTableSchema::all_user_idx_ur_name_schema,
+  ObInnerTableSchema::all_database_idx_db_name_schema,
+  ObInnerTableSchema::all_tablegroup_idx_tg_name_schema,
+  ObInnerTableSchema::all_tenant_history_idx_tenant_deleted_schema,
+  ObInnerTableSchema::all_rootservice_event_history_idx_rs_module_schema,
+  ObInnerTableSchema::all_rootservice_event_history_idx_rs_event_schema,
+  ObInnerTableSchema::all_recyclebin_idx_recyclebin_db_type_schema,
+  ObInnerTableSchema::all_part_idx_part_name_schema,
+  ObInnerTableSchema::all_sub_part_idx_sub_part_name_schema,
+  ObInnerTableSchema::all_def_sub_part_idx_def_sub_part_name_schema,
+  ObInnerTableSchema::all_server_event_history_idx_server_module_schema,
+  ObInnerTableSchema::all_server_event_history_idx_server_event_schema,
+  ObInnerTableSchema::all_rootservice_job_idx_rs_job_type_schema,
+  ObInnerTableSchema::all_foreign_key_idx_fk_child_tid_schema,
+  ObInnerTableSchema::all_foreign_key_idx_fk_parent_tid_schema,
+  ObInnerTableSchema::all_foreign_key_idx_fk_name_schema,
+  ObInnerTableSchema::all_foreign_key_history_idx_fk_his_child_tid_schema,
+  ObInnerTableSchema::all_foreign_key_history_idx_fk_his_parent_tid_schema,
+  ObInnerTableSchema::all_synonym_idx_db_synonym_name_schema,
+  ObInnerTableSchema::all_synonym_idx_synonym_name_schema,
+  ObInnerTableSchema::all_ddl_checksum_idx_ddl_checksum_task_schema,
+  ObInnerTableSchema::all_routine_idx_db_routine_name_schema,
+  ObInnerTableSchema::all_routine_idx_routine_name_schema,
+  ObInnerTableSchema::all_routine_idx_routine_pkg_id_schema,
+  ObInnerTableSchema::all_routine_param_idx_routine_param_name_schema,
+  ObInnerTableSchema::all_package_idx_db_pkg_name_schema,
+  ObInnerTableSchema::all_package_idx_pkg_name_schema,
+  ObInnerTableSchema::all_acquired_snapshot_idx_snapshot_tablet_schema,
+  ObInnerTableSchema::all_constraint_idx_cst_name_schema,
+  ObInnerTableSchema::all_type_idx_db_type_name_schema,
+  ObInnerTableSchema::all_type_idx_type_name_schema,
+  ObInnerTableSchema::all_type_attr_idx_type_attr_name_schema,
+  ObInnerTableSchema::all_coll_type_idx_coll_name_type_schema,
+  ObInnerTableSchema::all_dblink_idx_owner_dblink_name_schema,
+  ObInnerTableSchema::all_dblink_idx_dblink_name_schema,
+  ObInnerTableSchema::all_tenant_role_grantee_map_idx_grantee_role_id_schema,
+  ObInnerTableSchema::all_tenant_role_grantee_map_history_idx_grantee_his_role_id_schema,
+  ObInnerTableSchema::all_tenant_keystore_idx_keystore_master_key_id_schema,
+  ObInnerTableSchema::all_tenant_keystore_history_idx_keystore_his_master_key_id_schema,
+  ObInnerTableSchema::all_tenant_ols_policy_idx_ols_policy_name_schema,
+  ObInnerTableSchema::all_tenant_ols_policy_idx_ols_policy_col_name_schema,
+  ObInnerTableSchema::all_tenant_ols_component_idx_ols_com_policy_id_schema,
+  ObInnerTableSchema::all_tenant_ols_label_idx_ols_lab_policy_id_schema,
+  ObInnerTableSchema::all_tenant_ols_label_idx_ols_lab_tag_schema,
+  ObInnerTableSchema::all_tenant_ols_label_idx_ols_lab_schema,
+  ObInnerTableSchema::all_tenant_ols_user_level_idx_ols_level_uid_schema,
+  ObInnerTableSchema::all_tenant_ols_user_level_idx_ols_level_policy_id_schema,
+  ObInnerTableSchema::all_tenant_profile_idx_profile_name_schema,
+  ObInnerTableSchema::all_tenant_security_audit_idx_audit_type_schema,
+  ObInnerTableSchema::all_tenant_trigger_idx_trigger_base_obj_id_schema,
+  ObInnerTableSchema::all_tenant_trigger_idx_db_trigger_name_schema,
+  ObInnerTableSchema::all_tenant_trigger_idx_trigger_name_schema,
+  ObInnerTableSchema::all_tenant_trigger_history_idx_trigger_his_base_obj_id_schema,
+  ObInnerTableSchema::all_tenant_objauth_idx_objauth_grantor_schema,
+  ObInnerTableSchema::all_tenant_objauth_idx_objauth_grantee_schema,
+  ObInnerTableSchema::all_tenant_object_type_idx_obj_type_db_obj_name_schema,
+  ObInnerTableSchema::all_tenant_object_type_idx_obj_type_obj_name_schema,
+  ObInnerTableSchema::all_tenant_global_transaction_idx_xa_trans_id_schema,
+  ObInnerTableSchema::all_tenant_dependency_idx_dependency_ref_obj_schema,
+  ObInnerTableSchema::all_ddl_error_message_idx_ddl_error_object_schema,
+  ObInnerTableSchema::all_table_stat_history_idx_table_stat_his_savtime_schema,
+  ObInnerTableSchema::all_column_stat_history_idx_column_stat_his_savtime_schema,
+  ObInnerTableSchema::all_histogram_stat_history_idx_histogram_stat_his_savtime_schema,
+  ObInnerTableSchema::all_tablet_to_ls_idx_tablet_to_ls_id_schema,
+  ObInnerTableSchema::all_tablet_to_ls_idx_tablet_to_table_id_schema,
+  ObInnerTableSchema::all_pending_transaction_idx_pending_tx_id_schema,
+  ObInnerTableSchema::all_context_idx_ctx_namespace_schema,
+  ObInnerTableSchema::all_plan_baseline_item_idx_spm_item_sql_id_schema,
+  ObInnerTableSchema::all_plan_baseline_item_idx_spm_item_value_schema,
+  ObInnerTableSchema::all_tenant_directory_idx_directory_name_schema,
+  ObInnerTableSchema::all_job_idx_job_powner_schema,
+  ObInnerTableSchema::all_sequence_object_idx_seq_obj_db_name_schema,
+  ObInnerTableSchema::all_sequence_object_idx_seq_obj_name_schema,
+  ObInnerTableSchema::all_recyclebin_idx_recyclebin_ori_name_schema,
+  ObInnerTableSchema::all_table_privilege_idx_tb_priv_db_name_schema,
+  ObInnerTableSchema::all_table_privilege_idx_tb_priv_tb_name_schema,
+  ObInnerTableSchema::all_database_privilege_idx_db_priv_db_name_schema,
   NULL,};
 
 const schema_create_func information_schema_table_schema_creators[] = {
@@ -3505,6 +3671,10 @@ const uint64_t tenant_space_tables [] = {
   OB_TENANT_PARAMETER_TID,
   OB_ALL_SYS_VARIABLE_TID,
   OB_ALL_SYS_STAT_TID,
+  OB_HELP_TOPIC_TID,
+  OB_HELP_CATEGORY_TID,
+  OB_HELP_KEYWORD_TID,
+  OB_HELP_RELATION_TID,
   OB_ALL_DUMMY_TID,
   OB_ALL_OUTLINE_TID,
   OB_ALL_OUTLINE_HISTORY_TID,
@@ -3676,7 +3846,7 @@ const uint64_t tenant_space_tables [] = {
   OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_TID,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_TID,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_TID,
-  OB_ALL_LOG_ARCHIVE_SOURCE_TID,
+  OB_ALL_LOG_RESTORE_SOURCE_TID,
   OB_ALL_SERVICE_EPOCH_TID,
   OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_TID,
   OB_TENANT_VIRTUAL_ALL_TABLE_TID,
@@ -4568,10 +4738,87 @@ const uint64_t tenant_space_tables [] = {
   OB_V_OB_GLOBAL_TRANSACTION_ORA_TID,
   OB_DBA_OB_LS_ORA_TID,
   OB_DBA_OB_TABLE_LOCATIONS_ORA_TID,
+  OB_ALL_TABLE_IDX_DATA_TABLE_ID_TID,
+  OB_ALL_TABLE_IDX_DB_TB_NAME_TID,
+  OB_ALL_TABLE_IDX_TB_NAME_TID,
+  OB_ALL_COLUMN_IDX_TB_COLUMN_NAME_TID,
+  OB_ALL_COLUMN_IDX_COLUMN_NAME_TID,
+  OB_ALL_DDL_OPERATION_IDX_DDL_TYPE_TID,
   OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TID,
   OB_ALL_LOG_ARCHIVE_PIECE_FILES_IDX_STATUS_TID,
   OB_ALL_BACKUP_SET_FILES_IDX_STATUS_TID,
   OB_ALL_DDL_TASK_STATUS_IDX_TASK_KEY_TID,
+  OB_ALL_USER_IDX_UR_NAME_TID,
+  OB_ALL_DATABASE_IDX_DB_NAME_TID,
+  OB_ALL_TABLEGROUP_IDX_TG_NAME_TID,
+  OB_ALL_RECYCLEBIN_IDX_RECYCLEBIN_DB_TYPE_TID,
+  OB_ALL_PART_IDX_PART_NAME_TID,
+  OB_ALL_SUB_PART_IDX_SUB_PART_NAME_TID,
+  OB_ALL_DEF_SUB_PART_IDX_DEF_SUB_PART_NAME_TID,
+  OB_ALL_FOREIGN_KEY_IDX_FK_CHILD_TID_TID,
+  OB_ALL_FOREIGN_KEY_IDX_FK_PARENT_TID_TID,
+  OB_ALL_FOREIGN_KEY_IDX_FK_NAME_TID,
+  OB_ALL_FOREIGN_KEY_HISTORY_IDX_FK_HIS_CHILD_TID_TID,
+  OB_ALL_FOREIGN_KEY_HISTORY_IDX_FK_HIS_PARENT_TID_TID,
+  OB_ALL_SYNONYM_IDX_DB_SYNONYM_NAME_TID,
+  OB_ALL_SYNONYM_IDX_SYNONYM_NAME_TID,
+  OB_ALL_DDL_CHECKSUM_IDX_DDL_CHECKSUM_TASK_TID,
+  OB_ALL_ROUTINE_IDX_DB_ROUTINE_NAME_TID,
+  OB_ALL_ROUTINE_IDX_ROUTINE_NAME_TID,
+  OB_ALL_ROUTINE_IDX_ROUTINE_PKG_ID_TID,
+  OB_ALL_ROUTINE_PARAM_IDX_ROUTINE_PARAM_NAME_TID,
+  OB_ALL_PACKAGE_IDX_DB_PKG_NAME_TID,
+  OB_ALL_PACKAGE_IDX_PKG_NAME_TID,
+  OB_ALL_ACQUIRED_SNAPSHOT_IDX_SNAPSHOT_TABLET_TID,
+  OB_ALL_CONSTRAINT_IDX_CST_NAME_TID,
+  OB_ALL_TYPE_IDX_DB_TYPE_NAME_TID,
+  OB_ALL_TYPE_IDX_TYPE_NAME_TID,
+  OB_ALL_TYPE_ATTR_IDX_TYPE_ATTR_NAME_TID,
+  OB_ALL_COLL_TYPE_IDX_COLL_NAME_TYPE_TID,
+  OB_ALL_DBLINK_IDX_OWNER_DBLINK_NAME_TID,
+  OB_ALL_DBLINK_IDX_DBLINK_NAME_TID,
+  OB_ALL_TENANT_ROLE_GRANTEE_MAP_IDX_GRANTEE_ROLE_ID_TID,
+  OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_IDX_GRANTEE_HIS_ROLE_ID_TID,
+  OB_ALL_TENANT_KEYSTORE_IDX_KEYSTORE_MASTER_KEY_ID_TID,
+  OB_ALL_TENANT_KEYSTORE_HISTORY_IDX_KEYSTORE_HIS_MASTER_KEY_ID_TID,
+  OB_ALL_TENANT_OLS_POLICY_IDX_OLS_POLICY_NAME_TID,
+  OB_ALL_TENANT_OLS_POLICY_IDX_OLS_POLICY_COL_NAME_TID,
+  OB_ALL_TENANT_OLS_COMPONENT_IDX_OLS_COM_POLICY_ID_TID,
+  OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_POLICY_ID_TID,
+  OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_TAG_TID,
+  OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_TID,
+  OB_ALL_TENANT_OLS_USER_LEVEL_IDX_OLS_LEVEL_UID_TID,
+  OB_ALL_TENANT_OLS_USER_LEVEL_IDX_OLS_LEVEL_POLICY_ID_TID,
+  OB_ALL_TENANT_PROFILE_IDX_PROFILE_NAME_TID,
+  OB_ALL_TENANT_SECURITY_AUDIT_IDX_AUDIT_TYPE_TID,
+  OB_ALL_TENANT_TRIGGER_IDX_TRIGGER_BASE_OBJ_ID_TID,
+  OB_ALL_TENANT_TRIGGER_IDX_DB_TRIGGER_NAME_TID,
+  OB_ALL_TENANT_TRIGGER_IDX_TRIGGER_NAME_TID,
+  OB_ALL_TENANT_TRIGGER_HISTORY_IDX_TRIGGER_HIS_BASE_OBJ_ID_TID,
+  OB_ALL_TENANT_OBJAUTH_IDX_OBJAUTH_GRANTOR_TID,
+  OB_ALL_TENANT_OBJAUTH_IDX_OBJAUTH_GRANTEE_TID,
+  OB_ALL_TENANT_OBJECT_TYPE_IDX_OBJ_TYPE_DB_OBJ_NAME_TID,
+  OB_ALL_TENANT_OBJECT_TYPE_IDX_OBJ_TYPE_OBJ_NAME_TID,
+  OB_ALL_TENANT_GLOBAL_TRANSACTION_IDX_XA_TRANS_ID_TID,
+  OB_ALL_TENANT_DEPENDENCY_IDX_DEPENDENCY_REF_OBJ_TID,
+  OB_ALL_DDL_ERROR_MESSAGE_IDX_DDL_ERROR_OBJECT_TID,
+  OB_ALL_TABLE_STAT_HISTORY_IDX_TABLE_STAT_HIS_SAVTIME_TID,
+  OB_ALL_COLUMN_STAT_HISTORY_IDX_COLUMN_STAT_HIS_SAVTIME_TID,
+  OB_ALL_HISTOGRAM_STAT_HISTORY_IDX_HISTOGRAM_STAT_HIS_SAVTIME_TID,
+  OB_ALL_TABLET_TO_LS_IDX_TABLET_TO_LS_ID_TID,
+  OB_ALL_TABLET_TO_LS_IDX_TABLET_TO_TABLE_ID_TID,
+  OB_ALL_PENDING_TRANSACTION_IDX_PENDING_TX_ID_TID,
+  OB_ALL_CONTEXT_IDX_CTX_NAMESPACE_TID,
+  OB_ALL_PLAN_BASELINE_ITEM_IDX_SPM_ITEM_SQL_ID_TID,
+  OB_ALL_PLAN_BASELINE_ITEM_IDX_SPM_ITEM_VALUE_TID,
+  OB_ALL_TENANT_DIRECTORY_IDX_DIRECTORY_NAME_TID,
+  OB_ALL_JOB_IDX_JOB_POWNER_TID,
+  OB_ALL_SEQUENCE_OBJECT_IDX_SEQ_OBJ_DB_NAME_TID,
+  OB_ALL_SEQUENCE_OBJECT_IDX_SEQ_OBJ_NAME_TID,
+  OB_ALL_RECYCLEBIN_IDX_RECYCLEBIN_ORI_NAME_TID,
+  OB_ALL_TABLE_PRIVILEGE_IDX_TB_PRIV_DB_NAME_TID,
+  OB_ALL_TABLE_PRIVILEGE_IDX_TB_PRIV_TB_NAME_TID,
+  OB_ALL_DATABASE_PRIVILEGE_IDX_DB_PRIV_DB_NAME_TID,
   OB_ALL_TABLE_AUX_LOB_META_TID,
   OB_ALL_COLUMN_AUX_LOB_META_TID,
   OB_ALL_DDL_OPERATION_AUX_LOB_META_TID,
@@ -4590,6 +4837,10 @@ const uint64_t tenant_space_tables [] = {
   OB_TENANT_PARAMETER_AUX_LOB_META_TID,
   OB_ALL_SYS_VARIABLE_AUX_LOB_META_TID,
   OB_ALL_SYS_STAT_AUX_LOB_META_TID,
+  OB_HELP_TOPIC_AUX_LOB_META_TID,
+  OB_HELP_CATEGORY_AUX_LOB_META_TID,
+  OB_HELP_KEYWORD_AUX_LOB_META_TID,
+  OB_HELP_RELATION_AUX_LOB_META_TID,
   OB_ALL_DUMMY_AUX_LOB_META_TID,
   OB_ALL_OUTLINE_AUX_LOB_META_TID,
   OB_ALL_OUTLINE_HISTORY_AUX_LOB_META_TID,
@@ -4761,7 +5012,7 @@ const uint64_t tenant_space_tables [] = {
   OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_AUX_LOB_META_TID,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_AUX_LOB_META_TID,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_AUX_LOB_META_TID,
-  OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TID,
+  OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TID,
   OB_ALL_SERVICE_EPOCH_AUX_LOB_META_TID,
   OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_AUX_LOB_META_TID,
   OB_ALL_TABLE_AUX_LOB_PIECE_TID,
@@ -4782,6 +5033,10 @@ const uint64_t tenant_space_tables [] = {
   OB_TENANT_PARAMETER_AUX_LOB_PIECE_TID,
   OB_ALL_SYS_VARIABLE_AUX_LOB_PIECE_TID,
   OB_ALL_SYS_STAT_AUX_LOB_PIECE_TID,
+  OB_HELP_TOPIC_AUX_LOB_PIECE_TID,
+  OB_HELP_CATEGORY_AUX_LOB_PIECE_TID,
+  OB_HELP_KEYWORD_AUX_LOB_PIECE_TID,
+  OB_HELP_RELATION_AUX_LOB_PIECE_TID,
   OB_ALL_DUMMY_AUX_LOB_PIECE_TID,
   OB_ALL_OUTLINE_AUX_LOB_PIECE_TID,
   OB_ALL_OUTLINE_HISTORY_AUX_LOB_PIECE_TID,
@@ -4953,7 +5208,7 @@ const uint64_t tenant_space_tables [] = {
   OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_AUX_LOB_PIECE_TID,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_AUX_LOB_PIECE_TID,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_AUX_LOB_PIECE_TID,
-  OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TID,
+  OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TID,
   OB_ALL_SERVICE_EPOCH_AUX_LOB_PIECE_TID,
   OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_AUX_LOB_PIECE_TID,  };
 
@@ -5202,6 +5457,10 @@ const char* const tenant_space_table_names [] = {
   OB_TENANT_PARAMETER_TNAME,
   OB_ALL_SYS_VARIABLE_TNAME,
   OB_ALL_SYS_STAT_TNAME,
+  OB_HELP_TOPIC_TNAME,
+  OB_HELP_CATEGORY_TNAME,
+  OB_HELP_KEYWORD_TNAME,
+  OB_HELP_RELATION_TNAME,
   OB_ALL_DUMMY_TNAME,
   OB_ALL_OUTLINE_TNAME,
   OB_ALL_OUTLINE_HISTORY_TNAME,
@@ -5373,7 +5632,7 @@ const char* const tenant_space_table_names [] = {
   OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_TNAME,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_TNAME,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_TNAME,
-  OB_ALL_LOG_ARCHIVE_SOURCE_TNAME,
+  OB_ALL_LOG_RESTORE_SOURCE_TNAME,
   OB_ALL_SERVICE_EPOCH_TNAME,
   OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_TNAME,
   OB_TENANT_VIRTUAL_ALL_TABLE_TNAME,
@@ -6265,10 +6524,87 @@ const char* const tenant_space_table_names [] = {
   OB_V_OB_GLOBAL_TRANSACTION_ORA_TNAME,
   OB_DBA_OB_LS_ORA_TNAME,
   OB_DBA_OB_TABLE_LOCATIONS_ORA_TNAME,
+  OB_ALL_TABLE_IDX_DATA_TABLE_ID_TNAME,
+  OB_ALL_TABLE_IDX_DB_TB_NAME_TNAME,
+  OB_ALL_TABLE_IDX_TB_NAME_TNAME,
+  OB_ALL_COLUMN_IDX_TB_COLUMN_NAME_TNAME,
+  OB_ALL_COLUMN_IDX_COLUMN_NAME_TNAME,
+  OB_ALL_DDL_OPERATION_IDX_DDL_TYPE_TNAME,
   OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TNAME,
   OB_ALL_LOG_ARCHIVE_PIECE_FILES_IDX_STATUS_TNAME,
   OB_ALL_BACKUP_SET_FILES_IDX_STATUS_TNAME,
   OB_ALL_DDL_TASK_STATUS_IDX_TASK_KEY_TNAME,
+  OB_ALL_USER_IDX_UR_NAME_TNAME,
+  OB_ALL_DATABASE_IDX_DB_NAME_TNAME,
+  OB_ALL_TABLEGROUP_IDX_TG_NAME_TNAME,
+  OB_ALL_RECYCLEBIN_IDX_RECYCLEBIN_DB_TYPE_TNAME,
+  OB_ALL_PART_IDX_PART_NAME_TNAME,
+  OB_ALL_SUB_PART_IDX_SUB_PART_NAME_TNAME,
+  OB_ALL_DEF_SUB_PART_IDX_DEF_SUB_PART_NAME_TNAME,
+  OB_ALL_FOREIGN_KEY_IDX_FK_CHILD_TID_TNAME,
+  OB_ALL_FOREIGN_KEY_IDX_FK_PARENT_TID_TNAME,
+  OB_ALL_FOREIGN_KEY_IDX_FK_NAME_TNAME,
+  OB_ALL_FOREIGN_KEY_HISTORY_IDX_FK_HIS_CHILD_TID_TNAME,
+  OB_ALL_FOREIGN_KEY_HISTORY_IDX_FK_HIS_PARENT_TID_TNAME,
+  OB_ALL_SYNONYM_IDX_DB_SYNONYM_NAME_TNAME,
+  OB_ALL_SYNONYM_IDX_SYNONYM_NAME_TNAME,
+  OB_ALL_DDL_CHECKSUM_IDX_DDL_CHECKSUM_TASK_TNAME,
+  OB_ALL_ROUTINE_IDX_DB_ROUTINE_NAME_TNAME,
+  OB_ALL_ROUTINE_IDX_ROUTINE_NAME_TNAME,
+  OB_ALL_ROUTINE_IDX_ROUTINE_PKG_ID_TNAME,
+  OB_ALL_ROUTINE_PARAM_IDX_ROUTINE_PARAM_NAME_TNAME,
+  OB_ALL_PACKAGE_IDX_DB_PKG_NAME_TNAME,
+  OB_ALL_PACKAGE_IDX_PKG_NAME_TNAME,
+  OB_ALL_ACQUIRED_SNAPSHOT_IDX_SNAPSHOT_TABLET_TNAME,
+  OB_ALL_CONSTRAINT_IDX_CST_NAME_TNAME,
+  OB_ALL_TYPE_IDX_DB_TYPE_NAME_TNAME,
+  OB_ALL_TYPE_IDX_TYPE_NAME_TNAME,
+  OB_ALL_TYPE_ATTR_IDX_TYPE_ATTR_NAME_TNAME,
+  OB_ALL_COLL_TYPE_IDX_COLL_NAME_TYPE_TNAME,
+  OB_ALL_DBLINK_IDX_OWNER_DBLINK_NAME_TNAME,
+  OB_ALL_DBLINK_IDX_DBLINK_NAME_TNAME,
+  OB_ALL_TENANT_ROLE_GRANTEE_MAP_IDX_GRANTEE_ROLE_ID_TNAME,
+  OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_IDX_GRANTEE_HIS_ROLE_ID_TNAME,
+  OB_ALL_TENANT_KEYSTORE_IDX_KEYSTORE_MASTER_KEY_ID_TNAME,
+  OB_ALL_TENANT_KEYSTORE_HISTORY_IDX_KEYSTORE_HIS_MASTER_KEY_ID_TNAME,
+  OB_ALL_TENANT_OLS_POLICY_IDX_OLS_POLICY_NAME_TNAME,
+  OB_ALL_TENANT_OLS_POLICY_IDX_OLS_POLICY_COL_NAME_TNAME,
+  OB_ALL_TENANT_OLS_COMPONENT_IDX_OLS_COM_POLICY_ID_TNAME,
+  OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_POLICY_ID_TNAME,
+  OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_TAG_TNAME,
+  OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_TNAME,
+  OB_ALL_TENANT_OLS_USER_LEVEL_IDX_OLS_LEVEL_UID_TNAME,
+  OB_ALL_TENANT_OLS_USER_LEVEL_IDX_OLS_LEVEL_POLICY_ID_TNAME,
+  OB_ALL_TENANT_PROFILE_IDX_PROFILE_NAME_TNAME,
+  OB_ALL_TENANT_SECURITY_AUDIT_IDX_AUDIT_TYPE_TNAME,
+  OB_ALL_TENANT_TRIGGER_IDX_TRIGGER_BASE_OBJ_ID_TNAME,
+  OB_ALL_TENANT_TRIGGER_IDX_DB_TRIGGER_NAME_TNAME,
+  OB_ALL_TENANT_TRIGGER_IDX_TRIGGER_NAME_TNAME,
+  OB_ALL_TENANT_TRIGGER_HISTORY_IDX_TRIGGER_HIS_BASE_OBJ_ID_TNAME,
+  OB_ALL_TENANT_OBJAUTH_IDX_OBJAUTH_GRANTOR_TNAME,
+  OB_ALL_TENANT_OBJAUTH_IDX_OBJAUTH_GRANTEE_TNAME,
+  OB_ALL_TENANT_OBJECT_TYPE_IDX_OBJ_TYPE_DB_OBJ_NAME_TNAME,
+  OB_ALL_TENANT_OBJECT_TYPE_IDX_OBJ_TYPE_OBJ_NAME_TNAME,
+  OB_ALL_TENANT_GLOBAL_TRANSACTION_IDX_XA_TRANS_ID_TNAME,
+  OB_ALL_TENANT_DEPENDENCY_IDX_DEPENDENCY_REF_OBJ_TNAME,
+  OB_ALL_DDL_ERROR_MESSAGE_IDX_DDL_ERROR_OBJECT_TNAME,
+  OB_ALL_TABLE_STAT_HISTORY_IDX_TABLE_STAT_HIS_SAVTIME_TNAME,
+  OB_ALL_COLUMN_STAT_HISTORY_IDX_COLUMN_STAT_HIS_SAVTIME_TNAME,
+  OB_ALL_HISTOGRAM_STAT_HISTORY_IDX_HISTOGRAM_STAT_HIS_SAVTIME_TNAME,
+  OB_ALL_TABLET_TO_LS_IDX_TABLET_TO_LS_ID_TNAME,
+  OB_ALL_TABLET_TO_LS_IDX_TABLET_TO_TABLE_ID_TNAME,
+  OB_ALL_PENDING_TRANSACTION_IDX_PENDING_TX_ID_TNAME,
+  OB_ALL_CONTEXT_IDX_CTX_NAMESPACE_TNAME,
+  OB_ALL_PLAN_BASELINE_ITEM_IDX_SPM_ITEM_SQL_ID_TNAME,
+  OB_ALL_PLAN_BASELINE_ITEM_IDX_SPM_ITEM_VALUE_TNAME,
+  OB_ALL_TENANT_DIRECTORY_IDX_DIRECTORY_NAME_TNAME,
+  OB_ALL_JOB_IDX_JOB_POWNER_TNAME,
+  OB_ALL_SEQUENCE_OBJECT_IDX_SEQ_OBJ_DB_NAME_TNAME,
+  OB_ALL_SEQUENCE_OBJECT_IDX_SEQ_OBJ_NAME_TNAME,
+  OB_ALL_RECYCLEBIN_IDX_RECYCLEBIN_ORI_NAME_TNAME,
+  OB_ALL_TABLE_PRIVILEGE_IDX_TB_PRIV_DB_NAME_TNAME,
+  OB_ALL_TABLE_PRIVILEGE_IDX_TB_PRIV_TB_NAME_TNAME,
+  OB_ALL_DATABASE_PRIVILEGE_IDX_DB_PRIV_DB_NAME_TNAME,
   OB_ALL_TABLE_AUX_LOB_META_TNAME,
   OB_ALL_COLUMN_AUX_LOB_META_TNAME,
   OB_ALL_DDL_OPERATION_AUX_LOB_META_TNAME,
@@ -6287,6 +6623,10 @@ const char* const tenant_space_table_names [] = {
   OB_TENANT_PARAMETER_AUX_LOB_META_TNAME,
   OB_ALL_SYS_VARIABLE_AUX_LOB_META_TNAME,
   OB_ALL_SYS_STAT_AUX_LOB_META_TNAME,
+  OB_HELP_TOPIC_AUX_LOB_META_TNAME,
+  OB_HELP_CATEGORY_AUX_LOB_META_TNAME,
+  OB_HELP_KEYWORD_AUX_LOB_META_TNAME,
+  OB_HELP_RELATION_AUX_LOB_META_TNAME,
   OB_ALL_DUMMY_AUX_LOB_META_TNAME,
   OB_ALL_OUTLINE_AUX_LOB_META_TNAME,
   OB_ALL_OUTLINE_HISTORY_AUX_LOB_META_TNAME,
@@ -6458,7 +6798,7 @@ const char* const tenant_space_table_names [] = {
   OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_AUX_LOB_META_TNAME,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_AUX_LOB_META_TNAME,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_AUX_LOB_META_TNAME,
-  OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TNAME,
+  OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TNAME,
   OB_ALL_SERVICE_EPOCH_AUX_LOB_META_TNAME,
   OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_AUX_LOB_META_TNAME,
   OB_ALL_TABLE_AUX_LOB_PIECE_TNAME,
@@ -6479,6 +6819,10 @@ const char* const tenant_space_table_names [] = {
   OB_TENANT_PARAMETER_AUX_LOB_PIECE_TNAME,
   OB_ALL_SYS_VARIABLE_AUX_LOB_PIECE_TNAME,
   OB_ALL_SYS_STAT_AUX_LOB_PIECE_TNAME,
+  OB_HELP_TOPIC_AUX_LOB_PIECE_TNAME,
+  OB_HELP_CATEGORY_AUX_LOB_PIECE_TNAME,
+  OB_HELP_KEYWORD_AUX_LOB_PIECE_TNAME,
+  OB_HELP_RELATION_AUX_LOB_PIECE_TNAME,
   OB_ALL_DUMMY_AUX_LOB_PIECE_TNAME,
   OB_ALL_OUTLINE_AUX_LOB_PIECE_TNAME,
   OB_ALL_OUTLINE_HISTORY_AUX_LOB_PIECE_TNAME,
@@ -6650,7 +6994,7 @@ const char* const tenant_space_table_names [] = {
   OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_AUX_LOB_PIECE_TNAME,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_AUX_LOB_PIECE_TNAME,
   OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_AUX_LOB_PIECE_TNAME,
-  OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TNAME,
+  OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TNAME,
   OB_ALL_SERVICE_EPOCH_AUX_LOB_PIECE_TNAME,
   OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_AUX_LOB_PIECE_TNAME,  };
 
@@ -8747,11 +9091,11 @@ LOBMapping const lob_aux_table_mappings [] = {
   },
 
   {
-    OB_ALL_LOG_ARCHIVE_SOURCE_TID,
-    OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TID,
-    OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TID,
-    ObInnerTableSchema::all_log_archive_source_aux_lob_meta_schema,
-    ObInnerTableSchema::all_log_archive_source_aux_lob_piece_schema
+    OB_ALL_LOG_RESTORE_SOURCE_TID,
+    OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TID,
+    OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TID,
+    ObInnerTableSchema::all_log_restore_source_aux_lob_meta_schema,
+    ObInnerTableSchema::all_log_restore_source_aux_lob_piece_schema
   },
 
   {

src/share/inner_table/ob_inner_table_schema_constants.h

@@ -240,7 +240,7 @@ const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_TID = 405; // "__all_mock_fk_parent_t
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_TID = 406; // "__all_mock_fk_parent_table_history"
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_TID = 407; // "__all_mock_fk_parent_table_column"
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_TID = 408; // "__all_mock_fk_parent_table_column_history"
-const uint64_t OB_ALL_LOG_ARCHIVE_SOURCE_TID = 409; // "__all_log_archive_source"
+const uint64_t OB_ALL_LOG_RESTORE_SOURCE_TID = 409; // "__all_log_restore_source"
 const uint64_t OB_ALL_SERVICE_EPOCH_TID = 412; // "__all_service_epoch"
 const uint64_t OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_TID = 416; // "__all_column_checksum_error_info"
 const uint64_t OB_TENANT_VIRTUAL_ALL_TABLE_TID = 10001; // "__tenant_virtual_all_table"
@@ -573,7 +573,7 @@ const uint64_t OB_ALL_VIRTUAL_MOCK_FK_PARENT_TABLE_TID = 12320; // "__all_virtua
 const uint64_t OB_ALL_VIRTUAL_MOCK_FK_PARENT_TABLE_HISTORY_TID = 12321; // "__all_virtual_mock_fk_parent_table_history"
 const uint64_t OB_ALL_VIRTUAL_MOCK_FK_PARENT_TABLE_COLUMN_TID = 12322; // "__all_virtual_mock_fk_parent_table_column"
 const uint64_t OB_ALL_VIRTUAL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_TID = 12323; // "__all_virtual_mock_fk_parent_table_column_history"
-const uint64_t OB_ALL_VIRTUAL_LOG_ARCHIVE_SOURCE_TID = 12324; // "__all_virtual_log_archive_source"
+const uint64_t OB_ALL_VIRTUAL_LOG_RESTORE_SOURCE_TID = 12324; // "__all_virtual_log_restore_source"
 const uint64_t OB_ALL_VIRTUAL_QUERY_RESPONSE_TIME_TID = 12325; // "__all_virtual_query_response_time"
 const uint64_t OB_ALL_VIRTUAL_COLUMN_CHECKSUM_ERROR_INFO_TID = 12330; // "__all_virtual_column_checksum_error_info"
 const uint64_t OB_ALL_VIRTUAL_KVCACHE_HANDLE_LEAK_INFO_TID = 12331; // "__all_virtual_kvcache_handle_leak_info"
@@ -1589,7 +1589,7 @@ const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_AUX_LOB_META_TID = 50405; // "__all_m
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_AUX_LOB_META_TID = 50406; // "__all_mock_fk_parent_table_history_aux_lob_meta"
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_AUX_LOB_META_TID = 50407; // "__all_mock_fk_parent_table_column_aux_lob_meta"
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_AUX_LOB_META_TID = 50408; // "__all_mock_fk_parent_table_column_history_aux_lob_meta"
-const uint64_t OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TID = 50409; // "__all_log_archive_source_aux_lob_meta"
+const uint64_t OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TID = 50409; // "__all_log_restore_source_aux_lob_meta"
 const uint64_t OB_ALL_SERVICE_EPOCH_AUX_LOB_META_TID = 50412; // "__all_service_epoch_aux_lob_meta"
 const uint64_t OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_AUX_LOB_META_TID = 50416; // "__all_column_checksum_error_info_aux_lob_meta"
 const uint64_t OB_ALL_TABLE_AUX_LOB_PIECE_TID = 60003; // "__all_table_aux_lob_piece"
@@ -1804,7 +1804,7 @@ const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_AUX_LOB_PIECE_TID = 60405; // "__all_
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_AUX_LOB_PIECE_TID = 60406; // "__all_mock_fk_parent_table_history_aux_lob_piece"
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_AUX_LOB_PIECE_TID = 60407; // "__all_mock_fk_parent_table_column_aux_lob_piece"
 const uint64_t OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_AUX_LOB_PIECE_TID = 60408; // "__all_mock_fk_parent_table_column_history_aux_lob_piece"
-const uint64_t OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TID = 60409; // "__all_log_archive_source_aux_lob_piece"
+const uint64_t OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TID = 60409; // "__all_log_restore_source_aux_lob_piece"
 const uint64_t OB_ALL_SERVICE_EPOCH_AUX_LOB_PIECE_TID = 60412; // "__all_service_epoch_aux_lob_piece"
 const uint64_t OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_AUX_LOB_PIECE_TID = 60416; // "__all_column_checksum_error_info_aux_lob_piece"
 const uint64_t OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TID = 14999; // "__all_virtual_plan_cache_stat"
@@ -1824,10 +1824,93 @@ const uint64_t OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TID = 19995; //
 const uint64_t OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TID = 19994; // "ALL_VIRTUAL_SYSSTAT_ORA"
 const uint64_t OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TID = 19993; // "ALL_VIRTUAL_SYSTEM_EVENT_ORA"
 const uint64_t OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TID = 19992; // "ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA"
+const uint64_t OB_ALL_TABLE_IDX_DATA_TABLE_ID_TID = 100001; // "__all_table"
+const uint64_t OB_ALL_TABLE_IDX_DB_TB_NAME_TID = 100002; // "__all_table"
+const uint64_t OB_ALL_TABLE_IDX_TB_NAME_TID = 100003; // "__all_table"
+const uint64_t OB_ALL_COLUMN_IDX_TB_COLUMN_NAME_TID = 100004; // "__all_column"
+const uint64_t OB_ALL_COLUMN_IDX_COLUMN_NAME_TID = 100005; // "__all_column"
+const uint64_t OB_ALL_DDL_OPERATION_IDX_DDL_TYPE_TID = 100006; // "__all_ddl_operation"
 const uint64_t OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TID = 101001; // "__all_table_history"
 const uint64_t OB_ALL_LOG_ARCHIVE_PIECE_FILES_IDX_STATUS_TID = 101002; // "__all_log_archive_piece_files"
 const uint64_t OB_ALL_BACKUP_SET_FILES_IDX_STATUS_TID = 101003; // "__all_backup_set_files"
 const uint64_t OB_ALL_DDL_TASK_STATUS_IDX_TASK_KEY_TID = 101004; // "__all_ddl_task_status"
+const uint64_t OB_ALL_USER_IDX_UR_NAME_TID = 101005; // "__all_user"
+const uint64_t OB_ALL_DATABASE_IDX_DB_NAME_TID = 101006; // "__all_database"
+const uint64_t OB_ALL_TABLEGROUP_IDX_TG_NAME_TID = 101007; // "__all_tablegroup"
+const uint64_t OB_ALL_TENANT_HISTORY_IDX_TENANT_DELETED_TID = 101008; // "__all_tenant_history"
+const uint64_t OB_ALL_ROOTSERVICE_EVENT_HISTORY_IDX_RS_MODULE_TID = 101009; // "__all_rootservice_event_history"
+const uint64_t OB_ALL_ROOTSERVICE_EVENT_HISTORY_IDX_RS_EVENT_TID = 101010; // "__all_rootservice_event_history"
+const uint64_t OB_ALL_RECYCLEBIN_IDX_RECYCLEBIN_DB_TYPE_TID = 101011; // "__all_recyclebin"
+const uint64_t OB_ALL_PART_IDX_PART_NAME_TID = 101012; // "__all_part"
+const uint64_t OB_ALL_SUB_PART_IDX_SUB_PART_NAME_TID = 101013; // "__all_sub_part"
+const uint64_t OB_ALL_DEF_SUB_PART_IDX_DEF_SUB_PART_NAME_TID = 101014; // "__all_def_sub_part"
+const uint64_t OB_ALL_SERVER_EVENT_HISTORY_IDX_SERVER_MODULE_TID = 101015; // "__all_server_event_history"
+const uint64_t OB_ALL_SERVER_EVENT_HISTORY_IDX_SERVER_EVENT_TID = 101016; // "__all_server_event_history"
+const uint64_t OB_ALL_ROOTSERVICE_JOB_IDX_RS_JOB_TYPE_TID = 101017; // "__all_rootservice_job"
+const uint64_t OB_ALL_FOREIGN_KEY_IDX_FK_CHILD_TID_TID = 101018; // "__all_foreign_key"
+const uint64_t OB_ALL_FOREIGN_KEY_IDX_FK_PARENT_TID_TID = 101019; // "__all_foreign_key"
+const uint64_t OB_ALL_FOREIGN_KEY_IDX_FK_NAME_TID = 101020; // "__all_foreign_key"
+const uint64_t OB_ALL_FOREIGN_KEY_HISTORY_IDX_FK_HIS_CHILD_TID_TID = 101021; // "__all_foreign_key_history"
+const uint64_t OB_ALL_FOREIGN_KEY_HISTORY_IDX_FK_HIS_PARENT_TID_TID = 101022; // "__all_foreign_key_history"
+const uint64_t OB_ALL_SYNONYM_IDX_DB_SYNONYM_NAME_TID = 101023; // "__all_synonym"
+const uint64_t OB_ALL_SYNONYM_IDX_SYNONYM_NAME_TID = 101024; // "__all_synonym"
+const uint64_t OB_ALL_DDL_CHECKSUM_IDX_DDL_CHECKSUM_TASK_TID = 101025; // "__all_ddl_checksum"
+const uint64_t OB_ALL_ROUTINE_IDX_DB_ROUTINE_NAME_TID = 101026; // "__all_routine"
+const uint64_t OB_ALL_ROUTINE_IDX_ROUTINE_NAME_TID = 101027; // "__all_routine"
+const uint64_t OB_ALL_ROUTINE_IDX_ROUTINE_PKG_ID_TID = 101028; // "__all_routine"
+const uint64_t OB_ALL_ROUTINE_PARAM_IDX_ROUTINE_PARAM_NAME_TID = 101029; // "__all_routine_param"
+const uint64_t OB_ALL_PACKAGE_IDX_DB_PKG_NAME_TID = 101030; // "__all_package"
+const uint64_t OB_ALL_PACKAGE_IDX_PKG_NAME_TID = 101031; // "__all_package"
+const uint64_t OB_ALL_ACQUIRED_SNAPSHOT_IDX_SNAPSHOT_TABLET_TID = 101032; // "__all_acquired_snapshot"
+const uint64_t OB_ALL_CONSTRAINT_IDX_CST_NAME_TID = 101033; // "__all_constraint"
+const uint64_t OB_ALL_TYPE_IDX_DB_TYPE_NAME_TID = 101034; // "__all_type"
+const uint64_t OB_ALL_TYPE_IDX_TYPE_NAME_TID = 101035; // "__all_type"
+const uint64_t OB_ALL_TYPE_ATTR_IDX_TYPE_ATTR_NAME_TID = 101036; // "__all_type_attr"
+const uint64_t OB_ALL_COLL_TYPE_IDX_COLL_NAME_TYPE_TID = 101037; // "__all_coll_type"
+const uint64_t OB_ALL_DBLINK_IDX_OWNER_DBLINK_NAME_TID = 101038; // "__all_dblink"
+const uint64_t OB_ALL_DBLINK_IDX_DBLINK_NAME_TID = 101039; // "__all_dblink"
+const uint64_t OB_ALL_TENANT_ROLE_GRANTEE_MAP_IDX_GRANTEE_ROLE_ID_TID = 101040; // "__all_tenant_role_grantee_map"
+const uint64_t OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_IDX_GRANTEE_HIS_ROLE_ID_TID = 101041; // "__all_tenant_role_grantee_map_history"
+const uint64_t OB_ALL_TENANT_KEYSTORE_IDX_KEYSTORE_MASTER_KEY_ID_TID = 101042; // "__all_tenant_keystore"
+const uint64_t OB_ALL_TENANT_KEYSTORE_HISTORY_IDX_KEYSTORE_HIS_MASTER_KEY_ID_TID = 101043; // "__all_tenant_keystore_history"
+const uint64_t OB_ALL_TENANT_OLS_POLICY_IDX_OLS_POLICY_NAME_TID = 101044; // "__all_tenant_ols_policy"
+const uint64_t OB_ALL_TENANT_OLS_POLICY_IDX_OLS_POLICY_COL_NAME_TID = 101045; // "__all_tenant_ols_policy"
+const uint64_t OB_ALL_TENANT_OLS_COMPONENT_IDX_OLS_COM_POLICY_ID_TID = 101046; // "__all_tenant_ols_component"
+const uint64_t OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_POLICY_ID_TID = 101047; // "__all_tenant_ols_label"
+const uint64_t OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_TAG_TID = 101048; // "__all_tenant_ols_label"
+const uint64_t OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_TID = 101049; // "__all_tenant_ols_label"
+const uint64_t OB_ALL_TENANT_OLS_USER_LEVEL_IDX_OLS_LEVEL_UID_TID = 101050; // "__all_tenant_ols_user_level"
+const uint64_t OB_ALL_TENANT_OLS_USER_LEVEL_IDX_OLS_LEVEL_POLICY_ID_TID = 101051; // "__all_tenant_ols_user_level"
+const uint64_t OB_ALL_TENANT_PROFILE_IDX_PROFILE_NAME_TID = 101052; // "__all_tenant_profile"
+const uint64_t OB_ALL_TENANT_SECURITY_AUDIT_IDX_AUDIT_TYPE_TID = 101053; // "__all_tenant_security_audit"
+const uint64_t OB_ALL_TENANT_TRIGGER_IDX_TRIGGER_BASE_OBJ_ID_TID = 101054; // "__all_tenant_trigger"
+const uint64_t OB_ALL_TENANT_TRIGGER_IDX_DB_TRIGGER_NAME_TID = 101055; // "__all_tenant_trigger"
+const uint64_t OB_ALL_TENANT_TRIGGER_IDX_TRIGGER_NAME_TID = 101056; // "__all_tenant_trigger"
+const uint64_t OB_ALL_TENANT_TRIGGER_HISTORY_IDX_TRIGGER_HIS_BASE_OBJ_ID_TID = 101057; // "__all_tenant_trigger_history"
+const uint64_t OB_ALL_TENANT_OBJAUTH_IDX_OBJAUTH_GRANTOR_TID = 101058; // "__all_tenant_objauth"
+const uint64_t OB_ALL_TENANT_OBJAUTH_IDX_OBJAUTH_GRANTEE_TID = 101059; // "__all_tenant_objauth"
+const uint64_t OB_ALL_TENANT_OBJECT_TYPE_IDX_OBJ_TYPE_DB_OBJ_NAME_TID = 101060; // "__all_tenant_object_type"
+const uint64_t OB_ALL_TENANT_OBJECT_TYPE_IDX_OBJ_TYPE_OBJ_NAME_TID = 101061; // "__all_tenant_object_type"
+const uint64_t OB_ALL_TENANT_GLOBAL_TRANSACTION_IDX_XA_TRANS_ID_TID = 101062; // "__all_tenant_global_transaction"
+const uint64_t OB_ALL_TENANT_DEPENDENCY_IDX_DEPENDENCY_REF_OBJ_TID = 101063; // "__all_tenant_dependency"
+const uint64_t OB_ALL_DDL_ERROR_MESSAGE_IDX_DDL_ERROR_OBJECT_TID = 101064; // "__all_ddl_error_message"
+const uint64_t OB_ALL_TABLE_STAT_HISTORY_IDX_TABLE_STAT_HIS_SAVTIME_TID = 101065; // "__all_table_stat_history"
+const uint64_t OB_ALL_COLUMN_STAT_HISTORY_IDX_COLUMN_STAT_HIS_SAVTIME_TID = 101066; // "__all_column_stat_history"
+const uint64_t OB_ALL_HISTOGRAM_STAT_HISTORY_IDX_HISTOGRAM_STAT_HIS_SAVTIME_TID = 101067; // "__all_histogram_stat_history"
+const uint64_t OB_ALL_TABLET_TO_LS_IDX_TABLET_TO_LS_ID_TID = 101068; // "__all_tablet_to_ls"
+const uint64_t OB_ALL_TABLET_TO_LS_IDX_TABLET_TO_TABLE_ID_TID = 101069; // "__all_tablet_to_ls"
+const uint64_t OB_ALL_PENDING_TRANSACTION_IDX_PENDING_TX_ID_TID = 101070; // "__all_pending_transaction"
+const uint64_t OB_ALL_CONTEXT_IDX_CTX_NAMESPACE_TID = 101071; // "__all_context"
+const uint64_t OB_ALL_PLAN_BASELINE_ITEM_IDX_SPM_ITEM_SQL_ID_TID = 101072; // "__all_plan_baseline_item"
+const uint64_t OB_ALL_PLAN_BASELINE_ITEM_IDX_SPM_ITEM_VALUE_TID = 101073; // "__all_plan_baseline_item"
+const uint64_t OB_ALL_TENANT_DIRECTORY_IDX_DIRECTORY_NAME_TID = 101074; // "__all_tenant_directory"
+const uint64_t OB_ALL_JOB_IDX_JOB_POWNER_TID = 101075; // "__all_job"
+const uint64_t OB_ALL_SEQUENCE_OBJECT_IDX_SEQ_OBJ_DB_NAME_TID = 101076; // "__all_sequence_object"
+const uint64_t OB_ALL_SEQUENCE_OBJECT_IDX_SEQ_OBJ_NAME_TID = 101077; // "__all_sequence_object"
+const uint64_t OB_ALL_RECYCLEBIN_IDX_RECYCLEBIN_ORI_NAME_TID = 101078; // "__all_recyclebin"
+const uint64_t OB_ALL_TABLE_PRIVILEGE_IDX_TB_PRIV_DB_NAME_TID = 101079; // "__all_table_privilege"
+const uint64_t OB_ALL_TABLE_PRIVILEGE_IDX_TB_PRIV_TB_NAME_TID = 101080; // "__all_table_privilege"
+const uint64_t OB_ALL_DATABASE_PRIVILEGE_IDX_DB_PRIV_DB_NAME_TID = 101081; // "__all_database_privilege"
 
 const char *const OB_ALL_CORE_TABLE_TNAME = "__all_core_table";
 const char *const OB_ALL_TABLE_TNAME = "__all_table";
@@ -2042,7 +2125,7 @@ const char *const OB_ALL_MOCK_FK_PARENT_TABLE_TNAME = "__all_mock_fk_parent_tabl
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_TNAME = "__all_mock_fk_parent_table_history";
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_TNAME = "__all_mock_fk_parent_table_column";
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_TNAME = "__all_mock_fk_parent_table_column_history";
-const char *const OB_ALL_LOG_ARCHIVE_SOURCE_TNAME = "__all_log_archive_source";
+const char *const OB_ALL_LOG_RESTORE_SOURCE_TNAME = "__all_log_restore_source";
 const char *const OB_ALL_SERVICE_EPOCH_TNAME = "__all_service_epoch";
 const char *const OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_TNAME = "__all_column_checksum_error_info";
 const char *const OB_TENANT_VIRTUAL_ALL_TABLE_TNAME = "__tenant_virtual_all_table";
@@ -2375,7 +2458,7 @@ const char *const OB_ALL_VIRTUAL_MOCK_FK_PARENT_TABLE_TNAME = "__all_virtual_moc
 const char *const OB_ALL_VIRTUAL_MOCK_FK_PARENT_TABLE_HISTORY_TNAME = "__all_virtual_mock_fk_parent_table_history";
 const char *const OB_ALL_VIRTUAL_MOCK_FK_PARENT_TABLE_COLUMN_TNAME = "__all_virtual_mock_fk_parent_table_column";
 const char *const OB_ALL_VIRTUAL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_TNAME = "__all_virtual_mock_fk_parent_table_column_history";
-const char *const OB_ALL_VIRTUAL_LOG_ARCHIVE_SOURCE_TNAME = "__all_virtual_log_archive_source";
+const char *const OB_ALL_VIRTUAL_LOG_RESTORE_SOURCE_TNAME = "__all_virtual_log_restore_source";
 const char *const OB_ALL_VIRTUAL_QUERY_RESPONSE_TIME_TNAME = "__all_virtual_query_response_time";
 const char *const OB_ALL_VIRTUAL_COLUMN_CHECKSUM_ERROR_INFO_TNAME = "__all_virtual_column_checksum_error_info";
 const char *const OB_ALL_VIRTUAL_KVCACHE_HANDLE_LEAK_INFO_TNAME = "__all_virtual_kvcache_handle_leak_info";
@@ -3391,7 +3474,7 @@ const char *const OB_ALL_MOCK_FK_PARENT_TABLE_AUX_LOB_META_TNAME = "__all_mock_f
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_AUX_LOB_META_TNAME = "__all_mock_fk_parent_table_history_aux_lob_meta";
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_AUX_LOB_META_TNAME = "__all_mock_fk_parent_table_column_aux_lob_meta";
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_AUX_LOB_META_TNAME = "__all_mock_fk_parent_table_column_history_aux_lob_meta";
-const char *const OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_META_TNAME = "__all_log_archive_source_aux_lob_meta";
+const char *const OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_META_TNAME = "__all_log_restore_source_aux_lob_meta";
 const char *const OB_ALL_SERVICE_EPOCH_AUX_LOB_META_TNAME = "__all_service_epoch_aux_lob_meta";
 const char *const OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_AUX_LOB_META_TNAME = "__all_column_checksum_error_info_aux_lob_meta";
 const char *const OB_ALL_TABLE_AUX_LOB_PIECE_TNAME = "__all_table_aux_lob_piece";
@@ -3606,7 +3689,7 @@ const char *const OB_ALL_MOCK_FK_PARENT_TABLE_AUX_LOB_PIECE_TNAME = "__all_mock_
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_HISTORY_AUX_LOB_PIECE_TNAME = "__all_mock_fk_parent_table_history_aux_lob_piece";
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_AUX_LOB_PIECE_TNAME = "__all_mock_fk_parent_table_column_aux_lob_piece";
 const char *const OB_ALL_MOCK_FK_PARENT_TABLE_COLUMN_HISTORY_AUX_LOB_PIECE_TNAME = "__all_mock_fk_parent_table_column_history_aux_lob_piece";
-const char *const OB_ALL_LOG_ARCHIVE_SOURCE_AUX_LOB_PIECE_TNAME = "__all_log_archive_source_aux_lob_piece";
+const char *const OB_ALL_LOG_RESTORE_SOURCE_AUX_LOB_PIECE_TNAME = "__all_log_restore_source_aux_lob_piece";
 const char *const OB_ALL_SERVICE_EPOCH_AUX_LOB_PIECE_TNAME = "__all_service_epoch_aux_lob_piece";
 const char *const OB_ALL_COLUMN_CHECKSUM_ERROR_INFO_AUX_LOB_PIECE_TNAME = "__all_column_checksum_error_info_aux_lob_piece";
 const char *const OB_ALL_VIRTUAL_PLAN_CACHE_STAT_ALL_VIRTUAL_PLAN_CACHE_STAT_I1_TNAME = "__idx_11003_all_virtual_plan_cache_stat_i1";
@@ -3626,10 +3709,93 @@ const char *const OB_ALL_VIRTUAL_SESSTAT_ORA_ALL_VIRTUAL_SESSTAT_I1_TNAME = "__i
 const char *const OB_ALL_VIRTUAL_SYSSTAT_ORA_ALL_VIRTUAL_SYSSTAT_I1_TNAME = "__idx_15043_all_virtual_sysstat_i1";
 const char *const OB_ALL_VIRTUAL_SYSTEM_EVENT_ORA_ALL_VIRTUAL_SYSTEM_EVENT_I1_TNAME = "__idx_15044_all_virtual_system_event_i1";
 const char *const OB_ALL_VIRTUAL_SQL_PLAN_MONITOR_ORA_ALL_VIRTUAL_SQL_PLAN_MONITOR_I1_TNAME = "__idx_15100_all_virtual_sql_plan_monitor_i1";
+const char *const OB_ALL_TABLE_IDX_DATA_TABLE_ID_TNAME = "__idx_3_idx_data_table_id";
+const char *const OB_ALL_TABLE_IDX_DB_TB_NAME_TNAME = "__idx_3_idx_db_tb_name";
+const char *const OB_ALL_TABLE_IDX_TB_NAME_TNAME = "__idx_3_idx_tb_name";
+const char *const OB_ALL_COLUMN_IDX_TB_COLUMN_NAME_TNAME = "__idx_4_idx_tb_column_name";
+const char *const OB_ALL_COLUMN_IDX_COLUMN_NAME_TNAME = "__idx_4_idx_column_name";
+const char *const OB_ALL_DDL_OPERATION_IDX_DDL_TYPE_TNAME = "__idx_5_idx_ddl_type";
 const char *const OB_ALL_TABLE_HISTORY_IDX_DATA_TABLE_ID_TNAME = "__idx_114_idx_data_table_id";
 const char *const OB_ALL_LOG_ARCHIVE_PIECE_FILES_IDX_STATUS_TNAME = "__idx_350_idx_status";
 const char *const OB_ALL_BACKUP_SET_FILES_IDX_STATUS_TNAME = "__idx_315_idx_status";
 const char *const OB_ALL_DDL_TASK_STATUS_IDX_TASK_KEY_TNAME = "__idx_319_idx_task_key";
+const char *const OB_ALL_USER_IDX_UR_NAME_TNAME = "__idx_102_idx_ur_name";
+const char *const OB_ALL_DATABASE_IDX_DB_NAME_TNAME = "__idx_104_idx_db_name";
+const char *const OB_ALL_TABLEGROUP_IDX_TG_NAME_TNAME = "__idx_106_idx_tg_name";
+const char *const OB_ALL_TENANT_HISTORY_IDX_TENANT_DELETED_TNAME = "__idx_109_idx_tenant_deleted";
+const char *const OB_ALL_ROOTSERVICE_EVENT_HISTORY_IDX_RS_MODULE_TNAME = "__idx_140_idx_rs_module";
+const char *const OB_ALL_ROOTSERVICE_EVENT_HISTORY_IDX_RS_EVENT_TNAME = "__idx_140_idx_rs_event";
+const char *const OB_ALL_RECYCLEBIN_IDX_RECYCLEBIN_DB_TYPE_TNAME = "__idx_145_idx_recyclebin_db_type";
+const char *const OB_ALL_PART_IDX_PART_NAME_TNAME = "__idx_146_idx_part_name";
+const char *const OB_ALL_SUB_PART_IDX_SUB_PART_NAME_TNAME = "__idx_148_idx_sub_part_name";
+const char *const OB_ALL_DEF_SUB_PART_IDX_DEF_SUB_PART_NAME_TNAME = "__idx_152_idx_def_sub_part_name";
+const char *const OB_ALL_SERVER_EVENT_HISTORY_IDX_SERVER_MODULE_TNAME = "__idx_154_idx_server_module";
+const char *const OB_ALL_SERVER_EVENT_HISTORY_IDX_SERVER_EVENT_TNAME = "__idx_154_idx_server_event";
+const char *const OB_ALL_ROOTSERVICE_JOB_IDX_RS_JOB_TYPE_TNAME = "__idx_155_idx_rs_job_type";
+const char *const OB_ALL_FOREIGN_KEY_IDX_FK_CHILD_TID_TNAME = "__idx_166_idx_fk_child_tid";
+const char *const OB_ALL_FOREIGN_KEY_IDX_FK_PARENT_TID_TNAME = "__idx_166_idx_fk_parent_tid";
+const char *const OB_ALL_FOREIGN_KEY_IDX_FK_NAME_TNAME = "__idx_166_idx_fk_name";
+const char *const OB_ALL_FOREIGN_KEY_HISTORY_IDX_FK_HIS_CHILD_TID_TNAME = "__idx_167_idx_fk_his_child_tid";
+const char *const OB_ALL_FOREIGN_KEY_HISTORY_IDX_FK_HIS_PARENT_TID_TNAME = "__idx_167_idx_fk_his_parent_tid";
+const char *const OB_ALL_SYNONYM_IDX_DB_SYNONYM_NAME_TNAME = "__idx_180_idx_db_synonym_name";
+const char *const OB_ALL_SYNONYM_IDX_SYNONYM_NAME_TNAME = "__idx_180_idx_synonym_name";
+const char *const OB_ALL_DDL_CHECKSUM_IDX_DDL_CHECKSUM_TASK_TNAME = "__idx_188_idx_ddl_checksum_task";
+const char *const OB_ALL_ROUTINE_IDX_DB_ROUTINE_NAME_TNAME = "__idx_189_idx_db_routine_name";
+const char *const OB_ALL_ROUTINE_IDX_ROUTINE_NAME_TNAME = "__idx_189_idx_routine_name";
+const char *const OB_ALL_ROUTINE_IDX_ROUTINE_PKG_ID_TNAME = "__idx_189_idx_routine_pkg_id";
+const char *const OB_ALL_ROUTINE_PARAM_IDX_ROUTINE_PARAM_NAME_TNAME = "__idx_191_idx_routine_param_name";
+const char *const OB_ALL_PACKAGE_IDX_DB_PKG_NAME_TNAME = "__idx_196_idx_db_pkg_name";
+const char *const OB_ALL_PACKAGE_IDX_PKG_NAME_TNAME = "__idx_196_idx_pkg_name";
+const char *const OB_ALL_ACQUIRED_SNAPSHOT_IDX_SNAPSHOT_TABLET_TNAME = "__idx_202_idx_snapshot_tablet";
+const char *const OB_ALL_CONSTRAINT_IDX_CST_NAME_TNAME = "__idx_206_idx_cst_name";
+const char *const OB_ALL_TYPE_IDX_DB_TYPE_NAME_TNAME = "__idx_220_idx_db_type_name";
+const char *const OB_ALL_TYPE_IDX_TYPE_NAME_TNAME = "__idx_220_idx_type_name";
+const char *const OB_ALL_TYPE_ATTR_IDX_TYPE_ATTR_NAME_TNAME = "__idx_222_idx_type_attr_name";
+const char *const OB_ALL_COLL_TYPE_IDX_COLL_NAME_TYPE_TNAME = "__idx_224_idx_coll_name_type";
+const char *const OB_ALL_DBLINK_IDX_OWNER_DBLINK_NAME_TNAME = "__idx_232_idx_owner_dblink_name";
+const char *const OB_ALL_DBLINK_IDX_DBLINK_NAME_TNAME = "__idx_232_idx_dblink_name";
+const char *const OB_ALL_TENANT_ROLE_GRANTEE_MAP_IDX_GRANTEE_ROLE_ID_TNAME = "__idx_235_idx_grantee_role_id";
+const char *const OB_ALL_TENANT_ROLE_GRANTEE_MAP_HISTORY_IDX_GRANTEE_HIS_ROLE_ID_TNAME = "__idx_236_idx_grantee_his_role_id";
+const char *const OB_ALL_TENANT_KEYSTORE_IDX_KEYSTORE_MASTER_KEY_ID_TNAME = "__idx_237_idx_keystore_master_key_id";
+const char *const OB_ALL_TENANT_KEYSTORE_HISTORY_IDX_KEYSTORE_HIS_MASTER_KEY_ID_TNAME = "__idx_238_idx_keystore_his_master_key_id";
+const char *const OB_ALL_TENANT_OLS_POLICY_IDX_OLS_POLICY_NAME_TNAME = "__idx_239_idx_ols_policy_name";
+const char *const OB_ALL_TENANT_OLS_POLICY_IDX_OLS_POLICY_COL_NAME_TNAME = "__idx_239_idx_ols_policy_col_name";
+const char *const OB_ALL_TENANT_OLS_COMPONENT_IDX_OLS_COM_POLICY_ID_TNAME = "__idx_241_idx_ols_com_policy_id";
+const char *const OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_POLICY_ID_TNAME = "__idx_243_idx_ols_lab_policy_id";
+const char *const OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_TAG_TNAME = "__idx_243_idx_ols_lab_tag";
+const char *const OB_ALL_TENANT_OLS_LABEL_IDX_OLS_LAB_TNAME = "__idx_243_idx_ols_lab";
+const char *const OB_ALL_TENANT_OLS_USER_LEVEL_IDX_OLS_LEVEL_UID_TNAME = "__idx_245_idx_ols_level_uid";
+const char *const OB_ALL_TENANT_OLS_USER_LEVEL_IDX_OLS_LEVEL_POLICY_ID_TNAME = "__idx_245_idx_ols_level_policy_id";
+const char *const OB_ALL_TENANT_PROFILE_IDX_PROFILE_NAME_TNAME = "__idx_250_idx_profile_name";
+const char *const OB_ALL_TENANT_SECURITY_AUDIT_IDX_AUDIT_TYPE_TNAME = "__idx_252_idx_audit_type";
+const char *const OB_ALL_TENANT_TRIGGER_IDX_TRIGGER_BASE_OBJ_ID_TNAME = "__idx_254_idx_trigger_base_obj_id";
+const char *const OB_ALL_TENANT_TRIGGER_IDX_DB_TRIGGER_NAME_TNAME = "__idx_254_idx_db_trigger_name";
+const char *const OB_ALL_TENANT_TRIGGER_IDX_TRIGGER_NAME_TNAME = "__idx_254_idx_trigger_name";
+const char *const OB_ALL_TENANT_TRIGGER_HISTORY_IDX_TRIGGER_HIS_BASE_OBJ_ID_TNAME = "__idx_255_idx_trigger_his_base_obj_id";
+const char *const OB_ALL_TENANT_OBJAUTH_IDX_OBJAUTH_GRANTOR_TNAME = "__idx_262_idx_objauth_grantor";
+const char *const OB_ALL_TENANT_OBJAUTH_IDX_OBJAUTH_GRANTEE_TNAME = "__idx_262_idx_objauth_grantee";
+const char *const OB_ALL_TENANT_OBJECT_TYPE_IDX_OBJ_TYPE_DB_OBJ_NAME_TNAME = "__idx_283_idx_obj_type_db_obj_name";
+const char *const OB_ALL_TENANT_OBJECT_TYPE_IDX_OBJ_TYPE_OBJ_NAME_TNAME = "__idx_283_idx_obj_type_obj_name";
+const char *const OB_ALL_TENANT_GLOBAL_TRANSACTION_IDX_XA_TRANS_ID_TNAME = "__idx_296_idx_xa_trans_id";
+const char *const OB_ALL_TENANT_DEPENDENCY_IDX_DEPENDENCY_REF_OBJ_TNAME = "__idx_297_idx_dependency_ref_obj";
+const char *const OB_ALL_DDL_ERROR_MESSAGE_IDX_DDL_ERROR_OBJECT_TNAME = "__idx_308_idx_ddl_error_object";
+const char *const OB_ALL_TABLE_STAT_HISTORY_IDX_TABLE_STAT_HIS_SAVTIME_TNAME = "__idx_332_idx_table_stat_his_savtime";
+const char *const OB_ALL_COLUMN_STAT_HISTORY_IDX_COLUMN_STAT_HIS_SAVTIME_TNAME = "__idx_333_idx_column_stat_his_savtime";
+const char *const OB_ALL_HISTOGRAM_STAT_HISTORY_IDX_HISTOGRAM_STAT_HIS_SAVTIME_TNAME = "__idx_334_idx_histogram_stat_his_savtime";
+const char *const OB_ALL_TABLET_TO_LS_IDX_TABLET_TO_LS_ID_TNAME = "__idx_343_idx_tablet_to_ls_id";
+const char *const OB_ALL_TABLET_TO_LS_IDX_TABLET_TO_TABLE_ID_TNAME = "__idx_343_idx_tablet_to_table_id";
+const char *const OB_ALL_PENDING_TRANSACTION_IDX_PENDING_TX_ID_TNAME = "__idx_375_idx_pending_tx_id";
+const char *const OB_ALL_CONTEXT_IDX_CTX_NAMESPACE_TNAME = "__idx_381_idx_ctx_namespace";
+const char *const OB_ALL_PLAN_BASELINE_ITEM_IDX_SPM_ITEM_SQL_ID_TNAME = "__idx_397_idx_spm_item_sql_id";
+const char *const OB_ALL_PLAN_BASELINE_ITEM_IDX_SPM_ITEM_VALUE_TNAME = "__idx_397_idx_spm_item_value";
+const char *const OB_ALL_TENANT_DIRECTORY_IDX_DIRECTORY_NAME_TNAME = "__idx_326_idx_directory_name";
+const char *const OB_ALL_JOB_IDX_JOB_POWNER_TNAME = "__idx_324_idx_job_powner";
+const char *const OB_ALL_SEQUENCE_OBJECT_IDX_SEQ_OBJ_DB_NAME_TNAME = "__idx_213_idx_seq_obj_db_name";
+const char *const OB_ALL_SEQUENCE_OBJECT_IDX_SEQ_OBJ_NAME_TNAME = "__idx_213_idx_seq_obj_name";
+const char *const OB_ALL_RECYCLEBIN_IDX_RECYCLEBIN_ORI_NAME_TNAME = "__idx_145_idx_recyclebin_ori_name";
+const char *const OB_ALL_TABLE_PRIVILEGE_IDX_TB_PRIV_DB_NAME_TNAME = "__idx_110_idx_tb_priv_db_name";
+const char *const OB_ALL_TABLE_PRIVILEGE_IDX_TB_PRIV_TB_NAME_TNAME = "__idx_110_idx_tb_priv_tb_name";
+const char *const OB_ALL_DATABASE_PRIVILEGE_IDX_DB_PRIV_DB_NAME_TNAME = "__idx_112_idx_db_priv_db_name";
 
 // initial data for __all_privilege
 struct PrivilegeRow {

src/share/ob_ddl_checksum.cpp

@@ -36,7 +36,7 @@ int ObDDLChecksumOperator::fill_one_item(const ObDDLChecksumItem &item,
       || OB_FAIL(dml.add_pk_column("table_id", ObSchemaUtils::get_extract_schema_id(exec_tenant_id, item.table_id_)))
       // currently tablet id is not necessary, so instead we save task id in this column to distinguish different DDL
       // task_id is the primary key in __all_ddl_task_status, so it can uniquely identify a DDL.
-      || OB_FAIL(dml.add_pk_column("tablet_id", item.ddl_task_id_))
+      || OB_FAIL(dml.add_pk_column("ddl_task_id", item.ddl_task_id_))
       || OB_FAIL(dml.add_pk_column("column_id", item.column_id_))
       || OB_FAIL(dml.add_pk_column("task_id", item.task_id_))
       || OB_FAIL(dml.add_column("checksum", item.checksum_))) {
@@ -223,7 +223,7 @@ int ObDDLChecksumOperator::get_table_column_checksum(
         K(column_checksum_map.created()));
   } else if (OB_FAIL(sql.assign_fmt(
       "SELECT column_id, checksum FROM %s "
-      "WHERE execution_id = %ld AND tenant_id = %ld AND table_id = %ld AND tablet_id = %ld "
+      "WHERE execution_id = %ld AND tenant_id = %ld AND table_id = %ld AND ddl_task_id = %ld "
       "ORDER BY column_id", OB_ALL_DDL_CHECKSUM_TNAME,
       execution_id, ObSchemaUtils::get_extract_tenant_id(exec_tenant_id, tenant_id),
       ObSchemaUtils::get_extract_schema_id(exec_tenant_id, table_id), ddl_task_id))) {
@@ -302,7 +302,7 @@ int ObDDLChecksumOperator::delete_checksum(
     LOG_WARN("invalid argument", K(ret), K(tenant_id), K(execution_id), K(source_table_id), K(dest_table_id));
   } else if (OB_FAIL(sql.assign_fmt(
       "DELETE /*+ use_plan_cache(none) */ FROM %s "
-      "WHERE tenant_id = 0 AND execution_id = %ld AND tablet_id = %ld AND table_id IN (%ld, %ld)",
+      "WHERE tenant_id = 0 AND execution_id = %ld AND ddl_task_id = %ld AND table_id IN (%ld, %ld)",
       OB_ALL_DDL_CHECKSUM_TNAME, execution_id, ddl_task_id, source_table_id, dest_table_id))) {
     LOG_WARN("fail to assign fmt", K(ret));
   } else if (OB_FAIL(sql_proxy.write(tenant_id, sql.ptr(), affected_rows))) {

src/share/parameter/ob_parameter_seed.ipp

@@ -96,7 +96,7 @@ DEF_TIME(trace_log_sampling_interval, OB_CLUSTER_PARAMETER, "10ms", "[0ms,]",
         "logging info regarding ‘slow query’ and ‘white list’ will be printed out. "
         "Range: [0ms,+∞)",
         ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
-DEF_TIME(trace_log_slow_query_watermark, OB_CLUSTER_PARAMETER, "100ms", "[1ms,]",
+DEF_TIME(trace_log_slow_query_watermark, OB_CLUSTER_PARAMETER, "1s", "[1ms,]",
         "the threshold of execution time (in milliseconds) of a query beyond "
         "which it is considered to be a \\'slow query\\'. Range: [1ms,+∞)",
         ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
@@ -462,10 +462,6 @@ DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "4.0.0.0", "the min observer
 DEF_BOOL(enable_ddl, OB_CLUSTER_PARAMETER, "True", "specifies whether DDL operation is turned on. "
          "Value:  True:turned on;  False: turned off",
          ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
-DEF_TIME(global_index_build_single_replica_timeout, OB_CLUSTER_PARAMETER, "48h", "[1h,)",
-         "build single replica task timeout "
-         "when rootservice schedule to build global index. Range: [1h,+∞)",
-         ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
 DEF_BOOL(enable_major_freeze, OB_CLUSTER_PARAMETER, "True", "specifies whether major_freeze function is turned on. "
          "Value:  True:turned on;  False: turned off",
          ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
@@ -1182,10 +1178,6 @@ DEF_INT(connection_control_max_connection_delay, OB_TENANT_PARAMETER, "214748364
         "The maximum delay in milliseconds for server response to failed connection attempts, "
         "if connection_control_failed_connections_threshold is greater than zero",
         ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
-DEF_BOOL(_ob_enable_px_for_inner_sql, OB_CLUSTER_PARAMETER, "true",
-         "specifies whether inner sql uses px. "
-         "The default value is TRUE. Value: TRUE: turned on FALSE: turned off",
-         ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
 DEF_BOOL(ob_proxy_readonly_transaction_routing_policy, OB_TENANT_PARAMETER, "false",
          "Proxy route policy for readonly sql: whether regard begining read only stmts as in transaction",
          ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
@@ -1299,3 +1291,7 @@ DEF_STR_LIST(sanity_whitelist, OB_CLUSTER_PARAMETER, "", "vip who wouldn't leadi
 DEF_TIME(_advance_checkpoint_timeout, OB_CLUSTER_PARAMETER, "30m", "[10s,180m]",
          "the timeout for backup/migrate advance checkpoint Range: [10s,180m]",
          ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
+
+DEF_BOOL(enable_cgroup, OB_CLUSTER_PARAMETER, "True",
+         "when set to false, cgroup will not init; when set to true but cgroup root dir is not ready, print ERROR",
+         ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::STATIC_EFFECTIVE));

src/share/resource_manager/ob_cgroup_ctrl.cpp

@@ -40,7 +40,9 @@ ObCgSet ObCgSet::instance_;
 int ObCgroupCtrl::init()
 {
   int ret = OB_SUCCESS;
-  if (OB_FAIL(init_cgroup_root_dir_(root_cgroup_))) {
+  if (GCONF.enable_cgroup == false) {
+    // not init cgroup when config set to false
+  } else if (OB_FAIL(init_cgroup_root_dir_(root_cgroup_))) {
     LOG_WARN("init cgroup dir failed", K(ret), K(root_cgroup_));
   } else if (OB_FAIL(init_cgroup_dir_(other_cgroup_))) {
     LOG_WARN("init other cgroup dir failed", K(ret), K_(other_cgroup));

src/share/restore/ob_restore_table_operator.cpp

@@ -22,6 +22,7 @@
 #include "share/inner_table/ob_inner_table_schema_constants.h"
 #include "ob_log_archive_source.h"
 #include "share/backup/ob_backup_struct.h"
+#include "logservice/palf/log_define.h"
 
 using namespace oceanbase::share;
 using namespace oceanbase::common;
@@ -63,7 +64,7 @@ int ObTenantRestoreTableOperator::insert_source(const ObLogArchiveSourceItem &it
     LOG_WARN("invalid argument", K(ret), K(item));
   } else if (OB_FAIL(fill_log_archive_source_(item, dml))) {
     LOG_WARN("fill log archive source failed", K(ret), K(item));
-  } else if (OB_FAIL(dml.splice_insert_update_sql(OB_ALL_LOG_ARCHIVE_SOURCE_TNAME, sql))) {
+  } else if (OB_FAIL(dml.splice_insert_update_sql(OB_ALL_LOG_RESTORE_SOURCE_TNAME, sql))) {
     LOG_WARN("splice insert update sql failed", K(ret), K(item));
   } else if (OB_FAIL(proxy_->write(get_exec_tenant_id_(), sql.ptr(), affected_rows))) {
     LOG_WARN("exec sql failed", K(ret), K(item), K(sql), K_(user_tenant_id));
@@ -87,9 +88,9 @@ int ObTenantRestoreTableOperator::update_source_until_ts(const ObLogArchiveSourc
     LOG_WARN("failed to add column", K(ret), K(item.tenant_id_));
   } else if (OB_FAIL(dml.add_pk_column(OB_STR_LOG_ARCHIVE_SOURCE_ID, item.id_))) {
     LOG_WARN("failed to add column", K(ret), K(item.id_));
-  } else if (OB_FAIL(dml.add_uint64_column(OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_TS, item.until_scn_.get_val_for_inner_table_field()))) {
+  } else if (OB_FAIL(dml.add_uint64_column(OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_SCN, item.until_scn_.get_val_for_inner_table_field()))) {
     LOG_WARN("failed to add column", K(ret), K(item.until_scn_));
-  } else if (OB_FAIL(dml.splice_update_sql(OB_ALL_LOG_ARCHIVE_SOURCE_TNAME, sql))) {
+  } else if (OB_FAIL(dml.splice_update_sql(OB_ALL_LOG_RESTORE_SOURCE_TNAME, sql))) {
     LOG_WARN("fill source until_ts failed", K(ret), K(item.id_), K(item.until_scn_));
   } else if (OB_FAIL(proxy_->write(get_exec_tenant_id_(), sql.ptr(), affected_rows))) {
     LOG_WARN("failed to exec sql", K(ret), K(sql), K_(user_tenant_id));
@@ -105,7 +106,7 @@ int ObTenantRestoreTableOperator::delete_source()
   if (IS_NOT_INIT) {
     ret = OB_NOT_INIT;
     LOG_WARN("tenant restore table operator not init", K(ret));
-  } else if (OB_FAIL(sql.append_fmt("delete from %s", OB_ALL_LOG_ARCHIVE_SOURCE_TNAME))) {
+  } else if (OB_FAIL(sql.append_fmt("delete from %s", OB_ALL_LOG_RESTORE_SOURCE_TNAME))) {
     LOG_WARN("sql append failed", K(ret));
   } else if (OB_FAIL(proxy_->write(get_exec_tenant_id_(), sql.ptr(), affected_rows))) {
     LOG_WARN("failed to exec sql", K(ret), K(sql), K_(user_tenant_id));
@@ -160,7 +161,7 @@ int ObTenantRestoreTableOperator::fill_log_archive_source_(const ObLogArchiveSou
     LOG_WARN("failed to add column", K(ret), K(item));
   } else if (OB_FAIL(dml.add_column(OB_STR_LOG_ARCHIVE_SOURCE_VALUE, item.value_.ptr()))) {
     LOG_WARN("failed to add column", K(ret), K(item));
-  } else if (OB_FAIL(dml.add_uint64_column(OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_TS, item.until_scn_.get_val_for_inner_table_field()))) {
+  } else if (OB_FAIL(dml.add_uint64_column(OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_SCN, item.until_scn_.get_val_for_inner_table_field()))) {
     LOG_WARN("failed to add column", K(ret), K(item));
   }
   return ret;
@@ -177,9 +178,9 @@ int ObTenantRestoreTableOperator::fill_select_source_(common::ObSqlString &sql)
     LOG_WARN("sql append failed", K(ret));
   } else if  (OB_FAIL(sql.append_fmt(", %s", OB_STR_LOG_ARCHIVE_SOURCE_VALUE))) {
     LOG_WARN("sql append failed", K(ret));
-  } else if  (OB_FAIL(sql.append_fmt(", %s", OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_TS))) {
+  } else if  (OB_FAIL(sql.append_fmt(", %s", OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_SCN))) {
     LOG_WARN("sql append failed", K(ret));
-  } else if (OB_FAIL(sql.append_fmt(" from %s", OB_ALL_LOG_ARCHIVE_SOURCE_TNAME))) {
+  } else if (OB_FAIL(sql.append_fmt(" from %s", OB_ALL_LOG_RESTORE_SOURCE_TNAME))) {
     LOG_WARN("sql append failed", K(ret));
   }
   return ret;
@@ -198,7 +199,7 @@ int ObTenantRestoreTableOperator::parse_log_archive_source_(ObMySQLResult &resul
     item_local.type_ = ObLogArchiveSourceItem::get_source_type(type);
   }
   EXTRACT_VARCHAR_FIELD_MYSQL_SKIP_RET(result, OB_STR_LOG_ARCHIVE_SOURCE_VALUE, item_local.value_);
-  EXTRACT_INT_FIELD_MYSQL(result, OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_TS, scn, uint64_t); //TODO(yaoying.yyy) adjust table define
+  EXTRACT_UINT_FIELD_MYSQL(result, OB_STR_LOG_ARCHIVE_SOURCE_UNTIL_SCN, scn, uint64_t); //TODO(yaoying.yyy) adjust table define
 
   if (OB_SUCC(ret) && OB_FAIL(item_local.until_scn_.convert_for_inner_table_field(scn))) {
     LOG_WARN("set scn failed", K(ret), K(scn));

src/share/schema/ob_schema_struct.cpp

@@ -303,15 +303,6 @@ int ObSysTableChecker::check_sys_table_name(
     LOG_WARN("table_name is empty", K(ret));
   } else if (!is_sys_database_id(database_id)) {
     is_system_table = false;
-  } else if (is_mysql_database_id(database_id)
-             && !is_sys_tenant(tenant_id)
-             && (0 == table_name.case_compare(OB_HELP_TOPIC_TNAME)
-                 || 0 == table_name.case_compare(OB_HELP_CATEGORY_TNAME)
-                 || 0 == table_name.case_compare(OB_HELP_KEYWORD_TNAME)
-                 || 0 == table_name.case_compare(OB_HELP_RELATION_TNAME))) {
-    // FIXME:(yanmu.ztl) Actually, we should build sys_table_name_map_ with `in_tenant_space` flag.
-    // bugfix: https://work.aone.alibaba-inc.com/issue/35660182
-    is_system_table = false;
   } else {
     ObNameCaseMode mode = OB_ORIGIN_AND_INSENSITIVE;
     const TableNameWrapper table(database_id, mode, table_name);
@@ -484,7 +475,7 @@ int ObSysTableChecker::append_sys_table_index_schemas(
 {
   int ret = OB_SUCCESS;
   if (ObSysTableChecker::is_sys_table_has_index(data_table_id)) {
-    SMART_VAR(ObTableSchema, index_schema) {
+    HEAP_VAR(ObTableSchema, index_schema) {
       switch (data_table_id) {
 #define SYS_INDEX_DATA_TABLE_ID_TO_INDEX_SCHEMAS_SWITCH
 #include "share/inner_table/ob_inner_table_schema_misc.ipp"
@@ -495,7 +486,21 @@ int ObSysTableChecker::append_sys_table_index_schemas(
           break;
         }
       }
-    } // end SMART_VAR
+    } // end HEAP_VAR
+  }
+  return ret;
+}
+
+int ObSysTableChecker::append_table_(
+    const uint64_t tenant_id,
+    share::schema::ObTableSchema &index_schema,
+    common::ObIArray<share::schema::ObTableSchema> &tables)
+{
+  int ret = OB_SUCCESS;
+  if (!is_sys_tenant(tenant_id) && OB_FAIL(ObSchemaUtils::construct_tenant_space_full_table(tenant_id, index_schema))) {
+    LOG_WARN("fail to construct full table", KR(ret), K(tenant_id), "data_table_id", index_schema.get_data_table_id());
+  } else if (OB_FAIL(tables.push_back(index_schema))) {
+    LOG_WARN("fail to push back index", KR(ret), K(tenant_id), "data_table_id", index_schema.get_data_table_id());
   }
   return ret;
 }

src/share/schema/ob_schema_struct.h

@@ -5658,6 +5658,10 @@ private:
   int ob_write_string(
       const common::ObString &src,
       common::ObString &dst);
+  static int append_table_(
+             const uint64_t tenant_id,
+             share::schema::ObTableSchema &index_schema,
+             common::ObIArray<share::schema::ObTableSchema> &tables);
 public:
   static ObSysTableChecker &instance();
   int init();

src/share/stat/ob_opt_stat_sql_service.cpp

@@ -1486,6 +1486,9 @@ int ObOptStatSqlService::get_compressed_llc_bitmap(ObIAllocator &allocator,
       comp_buf = const_cast<char*>(bitmap_buf);
       comp_size = bitmap_size;
     }
+    if (compressor != nullptr) {
+      compressor->reset_mem();
+    }
   }
   return ret;
 }
@@ -1523,6 +1526,8 @@ int ObOptStatSqlService::get_decompressed_llc_bitmap(ObIAllocator &allocator,
     LOG_WARN("decompress bitmap buffer failed.",
                KP(comp_buf), K(comp_size), KP(bitmap_buf),
                K(max_bitmap_size), K(bitmap_size), K(ret));
+  } else {
+    compressor->reset_mem();
   }
   return ret;
 }

src/share/system_variable/ob_sys_var_class_type.h

@@ -129,9 +129,7 @@ enum ObSysVarClassType
   SYS_VAR_OB_LAST_SCHEMA_VERSION = 10013,
   SYS_VAR_OB_GLOBAL_DEBUG_SYNC = 10014,
   SYS_VAR_OB_PROXY_GLOBAL_VARIABLES_VERSION = 10015,
-  SYS_VAR_OB_ENABLE_TRACE_LOG = 10016,
-  SYS_VAR_OB_ENABLE_HASH_GROUP_BY = 10017,
-  SYS_VAR_OB_ENABLE_BLK_NESTEDLOOP_JOIN = 10018,
+  SYS_VAR_OB_ENABLE_SHOW_TRACE = 10016,
   SYS_VAR_OB_BNL_JOIN_CACHE_SIZE = 10019,
   SYS_VAR_OB_PROXY_USER_PRIVILEGE = 10020,
   SYS_VAR_OB_ORG_CLUSTER_ID = 10021,
@@ -161,14 +159,11 @@ enum ObSysVarClassType
   SYS_VAR_AUTO_INCREMENT_CACHE_SIZE = 10047,
   SYS_VAR_OB_ENABLE_JIT = 10048,
   SYS_VAR_OB_TEMP_TABLESPACE_SIZE_PERCENTAGE = 10049,
-  SYS_VAR__OPTIMIZER_ADAPTIVE_CURSOR_SHARING = 10050,
   SYS_VAR_PLUGIN_DIR = 10052,
-  SYS_VAR__OB_USE_PARALLEL_EXECUTION = 10054,
   SYS_VAR_OB_SQL_AUDIT_PERCENTAGE = 10055,
   SYS_VAR_OB_ENABLE_SQL_AUDIT = 10056,
   SYS_VAR_OPTIMIZER_USE_SQL_PLAN_BASELINES = 10057,
   SYS_VAR_OPTIMIZER_CAPTURE_SQL_PLAN_BASELINES = 10058,
-  SYS_VAR_PARALLEL_MAX_SERVERS = 10059,
   SYS_VAR_PARALLEL_SERVERS_TARGET = 10060,
   SYS_VAR_OB_EARLY_LOCK_RELEASE = 10061,
   SYS_VAR_OB_TRX_IDLE_TIMEOUT = 10062,

src/share/system_variable/ob_system_variable_alias.h

@@ -124,9 +124,7 @@ namespace share
   static const char* const OB_SV_LAST_SCHEMA_VERSION = "ob_last_schema_version";
   static const char* const OB_SV_GLOBAL_DEBUG_SYNC = "ob_global_debug_sync";
   static const char* const OB_SV_PROXY_GLOBAL_VARIABLES_VERSION = "ob_proxy_global_variables_version";
-  static const char* const OB_SV_ENABLE_TRACE_LOG = "ob_enable_trace_log";
-  static const char* const OB_SV_ENABLE_HASH_GROUP_BY = "ob_enable_hash_group_by";
-  static const char* const OB_SV_ENABLE_BLK_NESTEDLOOP_JOIN = "ob_enable_blk_nestedloop_join";
+  static const char* const OB_SV_ENABLE_SHOW_TRACE = "ob_enable_show_trace";
   static const char* const OB_SV_BNL_JOIN_CACHE_SIZE = "ob_bnl_join_cache_size";
   static const char* const OB_SV_PROXY_USER_PRIVILEGE = "ob_proxy_user_privilege";
   static const char* const OB_SV_ORG_CLUSTER_ID = "ob_org_cluster_id";
@@ -156,14 +154,11 @@ namespace share
   static const char* const OB_SV_AUTO_INCREMENT_CACHE_SIZE = "auto_increment_cache_size";
   static const char* const OB_SV_ENABLE_JIT = "ob_enable_jit";
   static const char* const OB_SV_TEMP_TABLESPACE_SIZE_PERCENTAGE = "ob_temp_tablespace_size_percentage";
-  static const char* const OB_SV__OPTIMIZER_ADAPTIVE_CURSOR_SHARING = "_optimizer_adaptive_cursor_sharing";
   static const char* const OB_SV_PLUGIN_DIR = "plugin_dir";
-  static const char* const OB_SV__OB_USE_PARALLEL_EXECUTION = "_ob_use_parallel_execution";
   static const char* const OB_SV_SQL_AUDIT_PERCENTAGE = "ob_sql_audit_percentage";
   static const char* const OB_SV_ENABLE_SQL_AUDIT = "ob_enable_sql_audit";
   static const char* const OB_SV_OPTIMIZER_USE_SQL_PLAN_BASELINES = "optimizer_use_sql_plan_baselines";
   static const char* const OB_SV_OPTIMIZER_CAPTURE_SQL_PLAN_BASELINES = "optimizer_capture_sql_plan_baselines";
-  static const char* const OB_SV_PARALLEL_MAX_SERVERS = "parallel_max_servers";
   static const char* const OB_SV_PARALLEL_SERVERS_TARGET = "parallel_servers_target";
   static const char* const OB_SV_EARLY_LOCK_RELEASE = "ob_early_lock_release";
   static const char* const OB_SV_TRX_IDLE_TIMEOUT = "ob_trx_idle_timeout";

src/share/system_variable/ob_system_variable_factory.cpp

@@ -134,8 +134,6 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_NAME[] = {
   "_ob_proxy_session_temporary_table_used",
   "_ob_px_bcast_optimization",
   "_ob_px_slave_mapping_threshold",
-  "_ob_use_parallel_execution",
-  "_optimizer_adaptive_cursor_sharing",
   "_optimizer_null_aware_antijoin",
   "_px_broadcast_fudge_factor",
   "_px_dist_agg_partial_rollup_pushdown",
@@ -231,14 +229,12 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_NAME[] = {
   "ob_compatibility_mode",
   "ob_early_lock_release",
   "ob_enable_aggregation_pushdown",
-  "ob_enable_blk_nestedloop_join",
-  "ob_enable_hash_group_by",
   "ob_enable_index_direct_select",
   "ob_enable_jit",
   "ob_enable_plan_cache",
   "ob_enable_rich_error_msg",
+  "ob_enable_show_trace",
   "ob_enable_sql_audit",
-  "ob_enable_trace_log",
   "ob_enable_transformation",
   "ob_enable_transmission_checksum",
   "ob_enable_truncate_flashback",
@@ -271,7 +267,6 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_NAME[] = {
   "ob_trx_timeout",
   "optimizer_capture_sql_plan_baselines",
   "optimizer_use_sql_plan_baselines",
-  "parallel_max_servers",
   "parallel_servers_target",
   "performance_schema",
   "plsql_ccflags",
@@ -357,8 +352,6 @@ const ObSysVarClassType ObSysVarFactory::SYS_VAR_IDS_SORTED_BY_NAME[] = {
   SYS_VAR__OB_PROXY_SESSION_TEMPORARY_TABLE_USED,
   SYS_VAR__OB_PX_BCAST_OPTIMIZATION,
   SYS_VAR__OB_PX_SLAVE_MAPPING_THRESHOLD,
-  SYS_VAR__OB_USE_PARALLEL_EXECUTION,
-  SYS_VAR__OPTIMIZER_ADAPTIVE_CURSOR_SHARING,
   SYS_VAR__OPTIMIZER_NULL_AWARE_ANTIJOIN,
   SYS_VAR__PX_BROADCAST_FUDGE_FACTOR,
   SYS_VAR__PX_DIST_AGG_PARTIAL_ROLLUP_PUSHDOWN,
@@ -454,14 +447,12 @@ const ObSysVarClassType ObSysVarFactory::SYS_VAR_IDS_SORTED_BY_NAME[] = {
   SYS_VAR_OB_COMPATIBILITY_MODE,
   SYS_VAR_OB_EARLY_LOCK_RELEASE,
   SYS_VAR_OB_ENABLE_AGGREGATION_PUSHDOWN,
-  SYS_VAR_OB_ENABLE_BLK_NESTEDLOOP_JOIN,
-  SYS_VAR_OB_ENABLE_HASH_GROUP_BY,
   SYS_VAR_OB_ENABLE_INDEX_DIRECT_SELECT,
   SYS_VAR_OB_ENABLE_JIT,
   SYS_VAR_OB_ENABLE_PLAN_CACHE,
   SYS_VAR_OB_ENABLE_RICH_ERROR_MSG,
+  SYS_VAR_OB_ENABLE_SHOW_TRACE,
   SYS_VAR_OB_ENABLE_SQL_AUDIT,
-  SYS_VAR_OB_ENABLE_TRACE_LOG,
   SYS_VAR_OB_ENABLE_TRANSFORMATION,
   SYS_VAR_OB_ENABLE_TRANSMISSION_CHECKSUM,
   SYS_VAR_OB_ENABLE_TRUNCATE_FLASHBACK,
@@ -494,7 +485,6 @@ const ObSysVarClassType ObSysVarFactory::SYS_VAR_IDS_SORTED_BY_NAME[] = {
   SYS_VAR_OB_TRX_TIMEOUT,
   SYS_VAR_OPTIMIZER_CAPTURE_SQL_PLAN_BASELINES,
   SYS_VAR_OPTIMIZER_USE_SQL_PLAN_BASELINES,
-  SYS_VAR_PARALLEL_MAX_SERVERS,
   SYS_VAR_PARALLEL_SERVERS_TARGET,
   SYS_VAR_PERFORMANCE_SCHEMA,
   SYS_VAR_PLSQL_CCFLAGS,
@@ -672,9 +662,7 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_ID[] = {
   "ob_last_schema_version",
   "ob_global_debug_sync",
   "ob_proxy_global_variables_version",
-  "ob_enable_trace_log",
-  "ob_enable_hash_group_by",
-  "ob_enable_blk_nestedloop_join",
+  "ob_enable_show_trace",
   "ob_bnl_join_cache_size",
   "ob_proxy_user_privilege",
   "ob_org_cluster_id",
@@ -704,14 +692,11 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_ID[] = {
   "auto_increment_cache_size",
   "ob_enable_jit",
   "ob_temp_tablespace_size_percentage",
-  "_optimizer_adaptive_cursor_sharing",
   "plugin_dir",
-  "_ob_use_parallel_execution",
   "ob_sql_audit_percentage",
   "ob_enable_sql_audit",
   "optimizer_use_sql_plan_baselines",
   "optimizer_capture_sql_plan_baselines",
-  "parallel_max_servers",
   "parallel_servers_target",
   "ob_early_lock_release",
   "ob_trx_idle_timeout",
@@ -1059,9 +1044,7 @@ int ObSysVarFactory::create_all_sys_vars()
         + sizeof(ObSysVarObLastSchemaVersion)
         + sizeof(ObSysVarObGlobalDebugSync)
         + sizeof(ObSysVarObProxyGlobalVariablesVersion)
-        + sizeof(ObSysVarObEnableTraceLog)
-        + sizeof(ObSysVarObEnableHashGroupBy)
-        + sizeof(ObSysVarObEnableBlkNestedloopJoin)
+        + sizeof(ObSysVarObEnableShowTrace)
         + sizeof(ObSysVarObBnlJoinCacheSize)
         + sizeof(ObSysVarObProxyUserPrivilege)
         + sizeof(ObSysVarObOrgClusterId)
@@ -1091,14 +1074,11 @@ int ObSysVarFactory::create_all_sys_vars()
         + sizeof(ObSysVarAutoIncrementCacheSize)
         + sizeof(ObSysVarObEnableJit)
         + sizeof(ObSysVarObTempTablespaceSizePercentage)
-        + sizeof(ObSysVarOptimizerAdaptiveCursorSharing)
         + sizeof(ObSysVarPluginDir)
-        + sizeof(ObSysVarObUseParallelExecution)
         + sizeof(ObSysVarObSqlAuditPercentage)
         + sizeof(ObSysVarObEnableSqlAudit)
         + sizeof(ObSysVarOptimizerUseSqlPlanBaselines)
         + sizeof(ObSysVarOptimizerCaptureSqlPlanBaselines)
-        + sizeof(ObSysVarParallelMaxServers)
         + sizeof(ObSysVarParallelServersTarget)
         + sizeof(ObSysVarObEarlyLockRelease)
         + sizeof(ObSysVarObTrxIdleTimeout)
@@ -2152,30 +2132,12 @@ int ObSysVarFactory::create_all_sys_vars()
       }
     }
     if (OB_SUCC(ret)) {
-      if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObEnableTraceLog())) {
+      if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObEnableShowTrace())) {
         ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarObEnableTraceLog", K(ret));
+        LOG_ERROR("fail to new ObSysVarObEnableShowTrace", K(ret));
       } else {
-        store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR_OB_ENABLE_TRACE_LOG))] = sys_var_ptr;
-        ptr = (void *)((char *)ptr + sizeof(ObSysVarObEnableTraceLog));
-      }
-    }
-    if (OB_SUCC(ret)) {
-      if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObEnableHashGroupBy())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarObEnableHashGroupBy", K(ret));
-      } else {
-        store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR_OB_ENABLE_HASH_GROUP_BY))] = sys_var_ptr;
-        ptr = (void *)((char *)ptr + sizeof(ObSysVarObEnableHashGroupBy));
-      }
-    }
-    if (OB_SUCC(ret)) {
-      if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObEnableBlkNestedloopJoin())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarObEnableBlkNestedloopJoin", K(ret));
-      } else {
-        store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR_OB_ENABLE_BLK_NESTEDLOOP_JOIN))] = sys_var_ptr;
-        ptr = (void *)((char *)ptr + sizeof(ObSysVarObEnableBlkNestedloopJoin));
+        store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR_OB_ENABLE_SHOW_TRACE))] = sys_var_ptr;
+        ptr = (void *)((char *)ptr + sizeof(ObSysVarObEnableShowTrace));
       }
     }
     if (OB_SUCC(ret)) {
@@ -2439,15 +2401,6 @@ int ObSysVarFactory::create_all_sys_vars()
         ptr = (void *)((char *)ptr + sizeof(ObSysVarObTempTablespaceSizePercentage));
       }
     }
-    if (OB_SUCC(ret)) {
-      if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarOptimizerAdaptiveCursorSharing())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarOptimizerAdaptiveCursorSharing", K(ret));
-      } else {
-        store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR__OPTIMIZER_ADAPTIVE_CURSOR_SHARING))] = sys_var_ptr;
-        ptr = (void *)((char *)ptr + sizeof(ObSysVarOptimizerAdaptiveCursorSharing));
-      }
-    }
     if (OB_SUCC(ret)) {
       if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarPluginDir())) {
         ret = OB_ALLOCATE_MEMORY_FAILED;
@@ -2457,15 +2410,6 @@ int ObSysVarFactory::create_all_sys_vars()
         ptr = (void *)((char *)ptr + sizeof(ObSysVarPluginDir));
       }
     }
-    if (OB_SUCC(ret)) {
-      if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObUseParallelExecution())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarObUseParallelExecution", K(ret));
-      } else {
-        store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR__OB_USE_PARALLEL_EXECUTION))] = sys_var_ptr;
-        ptr = (void *)((char *)ptr + sizeof(ObSysVarObUseParallelExecution));
-      }
-    }
     if (OB_SUCC(ret)) {
       if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObSqlAuditPercentage())) {
         ret = OB_ALLOCATE_MEMORY_FAILED;
@@ -2502,15 +2446,6 @@ int ObSysVarFactory::create_all_sys_vars()
         ptr = (void *)((char *)ptr + sizeof(ObSysVarOptimizerCaptureSqlPlanBaselines));
       }
     }
-    if (OB_SUCC(ret)) {
-      if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarParallelMaxServers())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarParallelMaxServers", K(ret));
-      } else {
-        store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR_PARALLEL_MAX_SERVERS))] = sys_var_ptr;
-        ptr = (void *)((char *)ptr + sizeof(ObSysVarParallelMaxServers));
-      }
-    }
     if (OB_SUCC(ret)) {
       if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarParallelServersTarget())) {
         ret = OB_ALLOCATE_MEMORY_FAILED;
@@ -4373,36 +4308,14 @@ int ObSysVarFactory::create_sys_var(ObSysVarClassType sys_var_id, ObBasicSysVar
       }
       break;
     }
-    case SYS_VAR_OB_ENABLE_TRACE_LOG: {
+    case SYS_VAR_OB_ENABLE_SHOW_TRACE: {
       void *ptr = NULL;
-      if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarObEnableTraceLog)))) {
+      if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarObEnableShowTrace)))) {
         ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarObEnableTraceLog)));
-      } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObEnableTraceLog())) {
+        LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarObEnableShowTrace)));
+      } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObEnableShowTrace())) {
         ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarObEnableTraceLog", K(ret));
-      }
-      break;
-    }
-    case SYS_VAR_OB_ENABLE_HASH_GROUP_BY: {
-      void *ptr = NULL;
-      if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarObEnableHashGroupBy)))) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarObEnableHashGroupBy)));
-      } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObEnableHashGroupBy())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarObEnableHashGroupBy", K(ret));
-      }
-      break;
-    }
-    case SYS_VAR_OB_ENABLE_BLK_NESTEDLOOP_JOIN: {
-      void *ptr = NULL;
-      if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarObEnableBlkNestedloopJoin)))) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarObEnableBlkNestedloopJoin)));
-      } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObEnableBlkNestedloopJoin())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarObEnableBlkNestedloopJoin", K(ret));
+        LOG_ERROR("fail to new ObSysVarObEnableShowTrace", K(ret));
       }
       break;
     }
@@ -4725,17 +4638,6 @@ int ObSysVarFactory::create_sys_var(ObSysVarClassType sys_var_id, ObBasicSysVar
       }
       break;
     }
-    case SYS_VAR__OPTIMIZER_ADAPTIVE_CURSOR_SHARING: {
-      void *ptr = NULL;
-      if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarOptimizerAdaptiveCursorSharing)))) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarOptimizerAdaptiveCursorSharing)));
-      } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarOptimizerAdaptiveCursorSharing())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarOptimizerAdaptiveCursorSharing", K(ret));
-      }
-      break;
-    }
     case SYS_VAR_PLUGIN_DIR: {
       void *ptr = NULL;
       if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarPluginDir)))) {
@@ -4747,17 +4649,6 @@ int ObSysVarFactory::create_sys_var(ObSysVarClassType sys_var_id, ObBasicSysVar
       }
       break;
     }
-    case SYS_VAR__OB_USE_PARALLEL_EXECUTION: {
-      void *ptr = NULL;
-      if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarObUseParallelExecution)))) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarObUseParallelExecution)));
-      } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarObUseParallelExecution())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarObUseParallelExecution", K(ret));
-      }
-      break;
-    }
     case SYS_VAR_OB_SQL_AUDIT_PERCENTAGE: {
       void *ptr = NULL;
       if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarObSqlAuditPercentage)))) {
@@ -4802,17 +4693,6 @@ int ObSysVarFactory::create_sys_var(ObSysVarClassType sys_var_id, ObBasicSysVar
       }
       break;
     }
-    case SYS_VAR_PARALLEL_MAX_SERVERS: {
-      void *ptr = NULL;
-      if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarParallelMaxServers)))) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarParallelMaxServers)));
-      } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarParallelMaxServers())) {
-        ret = OB_ALLOCATE_MEMORY_FAILED;
-        LOG_ERROR("fail to new ObSysVarParallelMaxServers", K(ret));
-      }
-      break;
-    }
     case SYS_VAR_PARALLEL_SERVERS_TARGET: {
       void *ptr = NULL;
       if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarParallelServersTarget)))) {

src/share/system_variable/ob_system_variable_factory.h

@@ -787,96 +787,82 @@ public:
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_PROXY_GLOBAL_VARIABLES_VERSION; }
   inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(107); }
 };
-class ObSysVarObEnableTraceLog : public ObBoolSysVar
+class ObSysVarObEnableShowTrace : public ObBoolSysVar
 {
 public:
-  ObSysVarObEnableTraceLog() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
-  inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_TRACE_LOG; }
+  ObSysVarObEnableShowTrace() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
+  inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_SHOW_TRACE; }
   inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(108); }
 };
-class ObSysVarObEnableHashGroupBy : public ObBoolSysVar
-{
-public:
-  ObSysVarObEnableHashGroupBy() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
-  inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_HASH_GROUP_BY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(109); }
-};
-class ObSysVarObEnableBlkNestedloopJoin : public ObBoolSysVar
-{
-public:
-  ObSysVarObEnableBlkNestedloopJoin() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
-  inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_BLK_NESTEDLOOP_JOIN; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(110); }
-};
 class ObSysVarObBnlJoinCacheSize : public ObIntSysVar
 {
 public:
   ObSysVarObBnlJoinCacheSize() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_BNL_JOIN_CACHE_SIZE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(111); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(109); }
 };
 class ObSysVarObProxyUserPrivilege : public ObIntSysVar
 {
 public:
   ObSysVarObProxyUserPrivilege() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_PROXY_USER_PRIVILEGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(112); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(110); }
 };
 class ObSysVarObOrgClusterId : public ObStrictRangeIntSysVar
 {
 public:
   ObSysVarObOrgClusterId() : ObStrictRangeIntSysVar(ObSysVarOnCheckFuncs::check_and_convert_ob_org_cluster_id, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ORG_CLUSTER_ID; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(113); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(111); }
 };
 class ObSysVarObPlanCachePercentage : public ObIntSysVar
 {
 public:
   ObSysVarObPlanCachePercentage() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_PLAN_CACHE_PERCENTAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(114); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(112); }
 };
 class ObSysVarObPlanCacheEvictHighPercentage : public ObIntSysVar
 {
 public:
   ObSysVarObPlanCacheEvictHighPercentage() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_PLAN_CACHE_EVICT_HIGH_PERCENTAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(115); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(113); }
 };
 class ObSysVarObPlanCacheEvictLowPercentage : public ObIntSysVar
 {
 public:
   ObSysVarObPlanCacheEvictLowPercentage() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_PLAN_CACHE_EVICT_LOW_PERCENTAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(116); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(114); }
 };
 class ObSysVarRecyclebin : public ObBoolSysVar
 {
 public:
   ObSysVarRecyclebin() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_RECYCLEBIN; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(117); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(115); }
 };
 class ObSysVarObCapabilityFlag : public ObIntSysVar
 {
 public:
   ObSysVarObCapabilityFlag() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_CAPABILITY_FLAG; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(118); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(116); }
 };
 class ObSysVarIsResultAccurate : public ObBoolSysVar
 {
 public:
   ObSysVarIsResultAccurate() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_IS_RESULT_ACCURATE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(119); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(117); }
 };
 class ObSysVarErrorOnOverlapTime : public ObBoolSysVar
 {
 public:
   ObSysVarErrorOnOverlapTime() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_ERROR_ON_OVERLAP_TIME; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(120); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(118); }
 };
 class ObSysVarObCompatibilityMode : public ObEnumSysVar
 {
@@ -885,21 +871,21 @@ public:
 public:
   ObSysVarObCompatibilityMode() : ObEnumSysVar(OB_COMPATIBILITY_MODE_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_COMPATIBILITY_MODE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(121); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(119); }
 };
 class ObSysVarObSqlWorkAreaPercentage : public ObIntSysVar
 {
 public:
   ObSysVarObSqlWorkAreaPercentage() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_SQL_WORK_AREA_PERCENTAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(122); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(120); }
 };
 class ObSysVarObSafeWeakReadSnapshot : public ObIntSysVar
 {
 public:
   ObSysVarObSafeWeakReadSnapshot() : ObIntSysVar(NULL, ObSysVarOnUpdateFuncs::update_safe_weak_read_snapshot, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_SAFE_WEAK_READ_SNAPSHOT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(123); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(121); }
 };
 class ObSysVarObRoutePolicy : public ObEnumSysVar
 {
@@ -908,98 +894,98 @@ public:
 public:
   ObSysVarObRoutePolicy() : ObEnumSysVar(OB_ROUTE_POLICY_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ROUTE_POLICY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(124); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(122); }
 };
 class ObSysVarObEnableTransmissionChecksum : public ObBoolSysVar
 {
 public:
   ObSysVarObEnableTransmissionChecksum() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_TRANSMISSION_CHECKSUM; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(125); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(123); }
 };
 class ObSysVarForeignKeyChecks : public ObBoolSysVar
 {
 public:
   ObSysVarForeignKeyChecks() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_FOREIGN_KEY_CHECKS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(126); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(124); }
 };
 class ObSysVarObStatementTraceId : public ObVarcharSysVar
 {
 public:
   ObSysVarObStatementTraceId() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_STATEMENT_TRACE_ID; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(127); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(125); }
 };
 class ObSysVarObEnableTruncateFlashback : public ObBoolSysVar
 {
 public:
   ObSysVarObEnableTruncateFlashback() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_TRUNCATE_FLASHBACK; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(128); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(126); }
 };
 class ObSysVarObTcpInvitedNodes : public ObVarcharSysVar
 {
 public:
   ObSysVarObTcpInvitedNodes() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_TCP_INVITED_NODES; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(129); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(127); }
 };
 class ObSysVarSqlThrottleCurrentPriority : public ObIntSysVar
 {
 public:
   ObSysVarSqlThrottleCurrentPriority() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SQL_THROTTLE_CURRENT_PRIORITY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(130); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(128); }
 };
 class ObSysVarSqlThrottlePriority : public ObIntSysVar
 {
 public:
   ObSysVarSqlThrottlePriority() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SQL_THROTTLE_PRIORITY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(131); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(129); }
 };
 class ObSysVarSqlThrottleRt : public ObNumericSysVar
 {
 public:
   ObSysVarSqlThrottleRt() : ObNumericSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SQL_THROTTLE_RT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(132); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(130); }
 };
 class ObSysVarSqlThrottleCpu : public ObNumericSysVar
 {
 public:
   ObSysVarSqlThrottleCpu() : ObNumericSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SQL_THROTTLE_CPU; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(133); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(131); }
 };
 class ObSysVarSqlThrottleIo : public ObIntSysVar
 {
 public:
   ObSysVarSqlThrottleIo() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SQL_THROTTLE_IO; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(134); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(132); }
 };
 class ObSysVarSqlThrottleNetwork : public ObNumericSysVar
 {
 public:
   ObSysVarSqlThrottleNetwork() : ObNumericSysVar(ObSysVarOnCheckFuncs::check_and_convert_sql_throttle_queue_time, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SQL_THROTTLE_NETWORK; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(135); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(133); }
 };
 class ObSysVarSqlThrottleLogicalReads : public ObIntSysVar
 {
 public:
   ObSysVarSqlThrottleLogicalReads() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SQL_THROTTLE_LOGICAL_READS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(136); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(134); }
 };
 class ObSysVarAutoIncrementCacheSize : public ObIntSysVar
 {
 public:
   ObSysVarAutoIncrementCacheSize() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_AUTO_INCREMENT_CACHE_SIZE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(137); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(135); }
 };
 class ObSysVarObEnableJit : public ObEnumSysVar
 {
@@ -1008,91 +994,70 @@ public:
 public:
   ObSysVarObEnableJit() : ObEnumSysVar(OB_ENABLE_JIT_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_JIT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(138); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(136); }
 };
 class ObSysVarObTempTablespaceSizePercentage : public ObIntSysVar
 {
 public:
   ObSysVarObTempTablespaceSizePercentage() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_TEMP_TABLESPACE_SIZE_PERCENTAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(139); }
-};
-class ObSysVarOptimizerAdaptiveCursorSharing : public ObBoolSysVar
-{
-public:
-  ObSysVarOptimizerAdaptiveCursorSharing() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
-  inline virtual ObSysVarClassType get_type() const { return SYS_VAR__OPTIMIZER_ADAPTIVE_CURSOR_SHARING; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(140); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(137); }
 };
 class ObSysVarPluginDir : public ObVarcharSysVar
 {
 public:
   ObSysVarPluginDir() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_PLUGIN_DIR; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(141); }
-};
-class ObSysVarObUseParallelExecution : public ObBoolSysVar
-{
-public:
-  ObSysVarObUseParallelExecution() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
-  inline virtual ObSysVarClassType get_type() const { return SYS_VAR__OB_USE_PARALLEL_EXECUTION; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(142); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(138); }
 };
 class ObSysVarObSqlAuditPercentage : public ObIntSysVar
 {
 public:
   ObSysVarObSqlAuditPercentage() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_SQL_AUDIT_PERCENTAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(143); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(139); }
 };
 class ObSysVarObEnableSqlAudit : public ObBoolSysVar
 {
 public:
   ObSysVarObEnableSqlAudit() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_SQL_AUDIT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(144); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(140); }
 };
 class ObSysVarOptimizerUseSqlPlanBaselines : public ObBoolSysVar
 {
 public:
   ObSysVarOptimizerUseSqlPlanBaselines() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OPTIMIZER_USE_SQL_PLAN_BASELINES; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(145); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(141); }
 };
 class ObSysVarOptimizerCaptureSqlPlanBaselines : public ObBoolSysVar
 {
 public:
   ObSysVarOptimizerCaptureSqlPlanBaselines() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OPTIMIZER_CAPTURE_SQL_PLAN_BASELINES; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(146); }
-};
-class ObSysVarParallelMaxServers : public ObIntSysVar
-{
-public:
-  ObSysVarParallelMaxServers() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
-  inline virtual ObSysVarClassType get_type() const { return SYS_VAR_PARALLEL_MAX_SERVERS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(147); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(142); }
 };
 class ObSysVarParallelServersTarget : public ObIntSysVar
 {
 public:
   ObSysVarParallelServersTarget() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_PARALLEL_SERVERS_TARGET; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(148); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(143); }
 };
 class ObSysVarObEarlyLockRelease : public ObBoolSysVar
 {
 public:
   ObSysVarObEarlyLockRelease() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_EARLY_LOCK_RELEASE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(149); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(144); }
 };
 class ObSysVarObTrxIdleTimeout : public ObIntSysVar
 {
 public:
   ObSysVarObTrxIdleTimeout() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_TRX_IDLE_TIMEOUT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(150); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(145); }
 };
 class ObSysVarBlockEncryptionMode : public ObEnumSysVar
 {
@@ -1101,161 +1066,161 @@ public:
 public:
   ObSysVarBlockEncryptionMode() : ObEnumSysVar(BLOCK_ENCRYPTION_MODE_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_BLOCK_ENCRYPTION_MODE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(151); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(146); }
 };
 class ObSysVarNlsDateFormat : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsDateFormat() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_DATE_FORMAT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(152); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(147); }
 };
 class ObSysVarNlsTimestampFormat : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsTimestampFormat() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_TIMESTAMP_FORMAT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(153); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(148); }
 };
 class ObSysVarNlsTimestampTzFormat : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsTimestampTzFormat() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_TIMESTAMP_TZ_FORMAT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(154); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(149); }
 };
 class ObSysVarObReservedMetaMemoryPercentage : public ObIntSysVar
 {
 public:
   ObSysVarObReservedMetaMemoryPercentage() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_RESERVED_META_MEMORY_PERCENTAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(155); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(150); }
 };
 class ObSysVarObCheckSysVariable : public ObBoolSysVar
 {
 public:
   ObSysVarObCheckSysVariable() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_CHECK_SYS_VARIABLE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(156); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(151); }
 };
 class ObSysVarNlsLanguage : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsLanguage() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_LANGUAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(157); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(152); }
 };
 class ObSysVarNlsTerritory : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsTerritory() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_TERRITORY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(158); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(153); }
 };
 class ObSysVarNlsSort : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsSort() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_SORT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(159); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(154); }
 };
 class ObSysVarNlsComp : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsComp() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_COMP; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(160); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(155); }
 };
 class ObSysVarNlsCharacterset : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsCharacterset() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_CHARACTERSET; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(161); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(156); }
 };
 class ObSysVarNlsNcharCharacterset : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsNcharCharacterset() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_NCHAR_CHARACTERSET; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(162); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(157); }
 };
 class ObSysVarNlsDateLanguage : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsDateLanguage() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_DATE_LANGUAGE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(163); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(158); }
 };
 class ObSysVarNlsLengthSemantics : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsLengthSemantics() : ObVarcharSysVar(ObSysVarOnCheckFuncs::check_and_convert_nls_length_semantics_is_valid, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_LENGTH_SEMANTICS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(164); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(159); }
 };
 class ObSysVarNlsNcharConvExcp : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsNcharConvExcp() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_NCHAR_CONV_EXCP; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(165); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(160); }
 };
 class ObSysVarNlsCalendar : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsCalendar() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_CALENDAR; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(166); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(161); }
 };
 class ObSysVarNlsNumericCharacters : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsNumericCharacters() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_NUMERIC_CHARACTERS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(167); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(162); }
 };
 class ObSysVarNljBatchingEnabled : public ObBoolSysVar
 {
 public:
   ObSysVarNljBatchingEnabled() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__NLJ_BATCHING_ENABLED; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(168); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(163); }
 };
 class ObSysVarTracefileIdentifier : public ObVarcharSysVar
 {
 public:
   ObSysVarTracefileIdentifier() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_TRACEFILE_IDENTIFIER; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(169); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(164); }
 };
 class ObSysVarGroupbyNopushdownCutRatio : public ObIntSysVar
 {
 public:
   ObSysVarGroupbyNopushdownCutRatio() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__GROUPBY_NOPUSHDOWN_CUT_RATIO; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(170); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(165); }
 };
 class ObSysVarPxBroadcastFudgeFactor : public ObIntSysVar
 {
 public:
   ObSysVarPxBroadcastFudgeFactor() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__PX_BROADCAST_FUDGE_FACTOR; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(171); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(166); }
 };
 class ObSysVarTransactionIsolation : public ObSessionSpecialVarcharSysVar
 {
 public:
   ObSysVarTransactionIsolation() : ObSessionSpecialVarcharSysVar(ObSysVarOnCheckFuncs::check_and_convert_tx_isolation, ObSysVarOnUpdateFuncs::update_tx_isolation, ObSysVarSessionSpecialUpdateFuncs::update_tx_isolation, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_TRANSACTION_ISOLATION; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(172); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(167); }
 };
 class ObSysVarObTrxLockTimeout : public ObIntSysVar
 {
 public:
   ObSysVarObTrxLockTimeout() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_TRX_LOCK_TIMEOUT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(173); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(168); }
 };
 class ObSysVarValidatePasswordCheckUserName : public ObEnumSysVar
 {
@@ -1264,28 +1229,28 @@ public:
 public:
   ObSysVarValidatePasswordCheckUserName() : ObEnumSysVar(VALIDATE_PASSWORD_CHECK_USER_NAME_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_VALIDATE_PASSWORD_CHECK_USER_NAME; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(174); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(169); }
 };
 class ObSysVarValidatePasswordLength : public ObIntSysVar
 {
 public:
   ObSysVarValidatePasswordLength() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_VALIDATE_PASSWORD_LENGTH; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(175); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(170); }
 };
 class ObSysVarValidatePasswordMixedCaseCount : public ObIntSysVar
 {
 public:
   ObSysVarValidatePasswordMixedCaseCount() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_VALIDATE_PASSWORD_MIXED_CASE_COUNT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(176); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(171); }
 };
 class ObSysVarValidatePasswordNumberCount : public ObIntSysVar
 {
 public:
   ObSysVarValidatePasswordNumberCount() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_VALIDATE_PASSWORD_NUMBER_COUNT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(177); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(172); }
 };
 class ObSysVarValidatePasswordPolicy : public ObEnumSysVar
 {
@@ -1294,42 +1259,42 @@ public:
 public:
   ObSysVarValidatePasswordPolicy() : ObEnumSysVar(VALIDATE_PASSWORD_POLICY_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_VALIDATE_PASSWORD_POLICY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(178); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(173); }
 };
 class ObSysVarValidatePasswordSpecialCharCount : public ObIntSysVar
 {
 public:
   ObSysVarValidatePasswordSpecialCharCount() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_VALIDATE_PASSWORD_SPECIAL_CHAR_COUNT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(179); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(174); }
 };
 class ObSysVarDefaultPasswordLifetime : public ObIntSysVar
 {
 public:
   ObSysVarDefaultPasswordLifetime() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_DEFAULT_PASSWORD_LIFETIME; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(180); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(175); }
 };
 class ObSysVarObOlsPolicySessionLabels : public ObVarcharSysVar
 {
 public:
   ObSysVarObOlsPolicySessionLabels() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__OB_OLS_POLICY_SESSION_LABELS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(181); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(176); }
 };
 class ObSysVarObTraceInfo : public ObVarcharSysVar
 {
 public:
   ObSysVarObTraceInfo() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_TRACE_INFO; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(182); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(177); }
 };
 class ObSysVarPxPartitionScanThreshold : public ObIntSysVar
 {
 public:
   ObSysVarPxPartitionScanThreshold() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__PX_PARTITION_SCAN_THRESHOLD; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(183); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(178); }
 };
 class ObSysVarObPxBcastOptimization : public ObEnumSysVar
 {
@@ -1338,140 +1303,140 @@ public:
 public:
   ObSysVarObPxBcastOptimization() : ObEnumSysVar(_OB_PX_BCAST_OPTIMIZATION_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__OB_PX_BCAST_OPTIMIZATION; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(184); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(179); }
 };
 class ObSysVarObPxSlaveMappingThreshold : public ObIntSysVar
 {
 public:
   ObSysVarObPxSlaveMappingThreshold() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__OB_PX_SLAVE_MAPPING_THRESHOLD; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(185); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(180); }
 };
 class ObSysVarEnableParallelDml : public ObBoolSysVar
 {
 public:
   ObSysVarEnableParallelDml() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__ENABLE_PARALLEL_DML; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(186); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(181); }
 };
 class ObSysVarPxMinGranulesPerSlave : public ObIntSysVar
 {
 public:
   ObSysVarPxMinGranulesPerSlave() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__PX_MIN_GRANULES_PER_SLAVE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(187); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(182); }
 };
 class ObSysVarSecureFilePriv : public ObVarcharSysVar
 {
 public:
   ObSysVarSecureFilePriv() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SECURE_FILE_PRIV; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(188); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(183); }
 };
 class ObSysVarPlsqlWarnings : public ObVarcharSysVar
 {
 public:
   ObSysVarPlsqlWarnings() : ObVarcharSysVar(ObSysVarOnCheckFuncs::check_and_convert_plsql_warnings, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_PLSQL_WARNINGS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(189); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(184); }
 };
 class ObSysVarEnableParallelQuery : public ObBoolSysVar
 {
 public:
   ObSysVarEnableParallelQuery() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__ENABLE_PARALLEL_QUERY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(190); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(185); }
 };
 class ObSysVarForceParallelQueryDop : public ObIntSysVar
 {
 public:
   ObSysVarForceParallelQueryDop() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__FORCE_PARALLEL_QUERY_DOP; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(191); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(186); }
 };
 class ObSysVarForceParallelDmlDop : public ObIntSysVar
 {
 public:
   ObSysVarForceParallelDmlDop() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__FORCE_PARALLEL_DML_DOP; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(192); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(187); }
 };
 class ObSysVarObPlBlockTimeout : public ObIntSysVar
 {
 public:
   ObSysVarObPlBlockTimeout() : ObIntSysVar(ObSysVarOnCheckFuncs::check_and_convert_timeout_too_large, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_PL_BLOCK_TIMEOUT; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(193); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(188); }
 };
 class ObSysVarTransactionReadOnly : public ObSessionSpecialBoolSysVar
 {
 public:
   ObSysVarTransactionReadOnly() : ObSessionSpecialBoolSysVar(ObSysVarOnCheckFuncs::check_and_convert_tx_read_only, ObSysVarOnUpdateFuncs::update_tx_read_only_no_scope, ObSysVarSessionSpecialUpdateFuncs::update_tx_read_only, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_TRANSACTION_READ_ONLY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(194); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(189); }
 };
 class ObSysVarResourceManagerPlan : public ObVarcharSysVar
 {
 public:
   ObSysVarResourceManagerPlan() : ObVarcharSysVar(ObSysVarOnCheckFuncs::check_update_resource_manager_plan, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_RESOURCE_MANAGER_PLAN; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(195); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(190); }
 };
 class ObSysVarPerformanceSchema : public ObBoolSysVar
 {
 public:
   ObSysVarPerformanceSchema() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_PERFORMANCE_SCHEMA; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(196); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(191); }
 };
 class ObSysVarNlsCurrency : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsCurrency() : ObVarcharSysVar(ObSysVarOnCheckFuncs::check_and_convert_nls_currency_too_long, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_CURRENCY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(197); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(192); }
 };
 class ObSysVarNlsIsoCurrency : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsIsoCurrency() : ObVarcharSysVar(ObSysVarOnCheckFuncs::check_and_convert_nls_iso_currency_is_valid, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_ISO_CURRENCY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(198); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(193); }
 };
 class ObSysVarNlsDualCurrency : public ObVarcharSysVar
 {
 public:
   ObSysVarNlsDualCurrency() : ObVarcharSysVar(ObSysVarOnCheckFuncs::check_and_convert_nls_currency_too_long, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_NLS_DUAL_CURRENCY; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(199); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(194); }
 };
 class ObSysVarPlsqlCcflags : public ObVarcharSysVar
 {
 public:
   ObSysVarPlsqlCcflags() : ObVarcharSysVar(ObSysVarOnCheckFuncs::check_and_convert_plsql_ccflags, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_PLSQL_CCFLAGS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(200); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(195); }
 };
 class ObSysVarObProxySessionTemporaryTableUsed : public ObBoolSysVar
 {
 public:
   ObSysVarObProxySessionTemporaryTableUsed() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__OB_PROXY_SESSION_TEMPORARY_TABLE_USED; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(201); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(196); }
 };
 class ObSysVarEnableParallelDdl : public ObBoolSysVar
 {
 public:
   ObSysVarEnableParallelDdl() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__ENABLE_PARALLEL_DDL; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(202); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(197); }
 };
 class ObSysVarForceParallelDdlDop : public ObIntSysVar
 {
 public:
   ObSysVarForceParallelDdlDop() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__FORCE_PARALLEL_DDL_DOP; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(203); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(198); }
 };
 class ObSysVarCursorSharing : public ObEnumSysVar
 {
@@ -1480,14 +1445,14 @@ public:
 public:
   ObSysVarCursorSharing() : ObEnumSysVar(CURSOR_SHARING_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_CURSOR_SHARING; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(204); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(199); }
 };
 class ObSysVarOptimizerNullAwareAntijoin : public ObBoolSysVar
 {
 public:
   ObSysVarOptimizerNullAwareAntijoin() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__OPTIMIZER_NULL_AWARE_ANTIJOIN; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(205); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(200); }
 };
 class ObSysVarPxPartialRollupPushdown : public ObEnumSysVar
 {
@@ -1496,7 +1461,7 @@ public:
 public:
   ObSysVarPxPartialRollupPushdown() : ObEnumSysVar(_PX_PARTIAL_ROLLUP_PUSHDOWN_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__PX_PARTIAL_ROLLUP_PUSHDOWN; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(206); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(201); }
 };
 class ObSysVarPxDistAggPartialRollupPushdown : public ObEnumSysVar
 {
@@ -1505,91 +1470,91 @@ public:
 public:
   ObSysVarPxDistAggPartialRollupPushdown() : ObEnumSysVar(_PX_DIST_AGG_PARTIAL_ROLLUP_PUSHDOWN_NAMES, NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__PX_DIST_AGG_PARTIAL_ROLLUP_PUSHDOWN; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(207); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(202); }
 };
 class ObSysVarCreateAuditPurgeJob : public ObVarcharSysVar
 {
 public:
   ObSysVarCreateAuditPurgeJob() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__CREATE_AUDIT_PURGE_JOB; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(208); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(203); }
 };
 class ObSysVarDropAuditPurgeJob : public ObVarcharSysVar
 {
 public:
   ObSysVarDropAuditPurgeJob() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__DROP_AUDIT_PURGE_JOB; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(209); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(204); }
 };
 class ObSysVarSetPurgeJobInterval : public ObVarcharSysVar
 {
 public:
   ObSysVarSetPurgeJobInterval() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__SET_PURGE_JOB_INTERVAL; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(210); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(205); }
 };
 class ObSysVarSetPurgeJobStatus : public ObVarcharSysVar
 {
 public:
   ObSysVarSetPurgeJobStatus() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__SET_PURGE_JOB_STATUS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(211); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(206); }
 };
 class ObSysVarSetLastArchiveTimestamp : public ObVarcharSysVar
 {
 public:
   ObSysVarSetLastArchiveTimestamp() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__SET_LAST_ARCHIVE_TIMESTAMP; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(212); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(207); }
 };
 class ObSysVarClearLastArchiveTimestamp : public ObVarcharSysVar
 {
 public:
   ObSysVarClearLastArchiveTimestamp() : ObVarcharSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__CLEAR_LAST_ARCHIVE_TIMESTAMP; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(213); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(208); }
 };
 class ObSysVarAggregationOptimizationSettings : public ObIntSysVar
 {
 public:
   ObSysVarAggregationOptimizationSettings() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__AGGREGATION_OPTIMIZATION_SETTINGS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(214); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(209); }
 };
 class ObSysVarPxSharedHashJoin : public ObBoolSysVar
 {
 public:
   ObSysVarPxSharedHashJoin() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__PX_SHARED_HASH_JOIN; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(215); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(210); }
 };
 class ObSysVarSqlNotes : public ObBoolSysVar
 {
 public:
   ObSysVarSqlNotes() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_SQL_NOTES; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(216); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(211); }
 };
 class ObSysVarInnodbStrictMode : public ObBoolSysVar
 {
 public:
   ObSysVarInnodbStrictMode() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_INNODB_STRICT_MODE; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(217); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(212); }
 };
 class ObSysVarWindowfuncOptimizationSettings : public ObIntSysVar
 {
 public:
   ObSysVarWindowfuncOptimizationSettings() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR__WINDOWFUNC_OPTIMIZATION_SETTINGS; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(218); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(213); }
 };
 class ObSysVarObEnableRichErrorMsg : public ObBoolSysVar
 {
 public:
   ObSysVarObEnableRichErrorMsg() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {}
   inline virtual ObSysVarClassType get_type() const { return SYS_VAR_OB_ENABLE_RICH_ERROR_MSG; }
-  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(219); }
+  inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(214); }
 };
 
 
@@ -1610,7 +1575,7 @@ public:
   static const common::ObString get_sys_var_name_by_id(ObSysVarClassType sys_var_id);
 
   const static int64_t MYSQL_SYS_VARS_COUNT = 94;
-  const static int64_t OB_SYS_VARS_COUNT = 126;
+  const static int64_t OB_SYS_VARS_COUNT = 121;
   const static int64_t ALL_SYS_VARS_COUNT = MYSQL_SYS_VARS_COUNT + OB_SYS_VARS_COUNT;
 
   const static int16_t OB_SPECIFIC_SYS_VAR_ID_OFFSET = 10000;

src/share/system_variable/ob_system_variable_init.json

@@ -1441,42 +1441,18 @@
     "background_cn": "",
     "ref_url": ""
   },
-  "ob_enable_trace_log": {
+  "ob_enable_show_trace": {
     "id": 10016,
-    "name": "ob_enable_trace_log",
+    "name": "ob_enable_show_trace",
     "value": "0",
     "data_type": "bool",
-    "info": "control whether use trace log",
+    "info": "control whether use show trace",
     "flags": "Global | SESSION | NEED_SERIALIZE",
     "publish_version": "",
     "info_cn": "",
     "background_cn": "",
     "ref_url": ""
   },
-  "ob_enable_hash_group_by": {
-    "id": 10017,
-    "name": "ob_enable_hash_group_by",
-    "value": "1",
-    "data_type": "bool",
-    "info": "",
-    "flags": "GLOBAL | SESSION | INFLUENCE_PLAN | NEED_SERIALIZE",
-    "publish_version": "",
-    "info_cn": "",
-    "background_cn": "",
-    "ref_url": ""
-  },
-  "ob_enable_blk_nestedloop_join": {
-    "id": 10018,
-    "name": "ob_enable_blk_nestedloop_join",
-    "value": "0",
-    "data_type": "bool",
-    "info": "",
-    "flags": "GLOBAL | SESSION | INFLUENCE_PLAN | NEED_SERIALIZE",
-    "publish_version": "",
-    "info_cn": "",
-    "background_cn": "",
-    "ref_url": ""
-  },
   "ob_bnl_join_cache_size": {
     "id": 10019,
     "name": "ob_bnl_join_cache_size",
@@ -1865,18 +1841,6 @@
     "background_cn": "",
     "ref_url": ""
   },
-  "_optimizer_adaptive_cursor_sharing": {
-    "id": 10050,
-    "name": "_optimizer_adaptive_cursor_sharing",
-    "value": "0",
-    "data_type": "bool",
-    "info": "Enable use of adaptive cursor sharing",
-    "flags": "GLOBAL | SESSION | INVISIBLE | NEED_SERIALIZE",
-    "publish_version": "",
-    "info_cn": "",
-    "background_cn": "",
-    "ref_url": ""
-  },
   "plugin_dir": {
     "id": 10052,
     "name": "plugin_dir",
@@ -1889,18 +1853,6 @@
     "background_cn": "",
     "ref_url": ""
   },
-  "_ob_use_parallel_execution": {
-    "id": 10054,
-    "name": "_ob_use_parallel_execution",
-    "value": "1",
-    "data_type": "bool",
-    "info": "auto use parallel execution",
-    "flags": "NEED_SERIALIZE | GLOBAL | SESSION | INFLUENCE_PLAN | INVISIBLE",
-    "publish_version": "",
-    "info_cn": "",
-    "background_cn": "",
-    "ref_url": ""
-  },
   "ob_sql_audit_percentage": {
     "id": 10055,
     "name": "ob_sql_audit_percentage",
@@ -1951,20 +1903,6 @@
     "background_cn": "",
     "ref_url": ""
   },
-  "parallel_max_servers": {
-    "id": 10059,
-    "name": "parallel_max_servers",
-    "value": "0",
-    "data_type": "int",
-    "flags": "GLOBAL | INVISIBLE",
-    "info": "number of threads created to run parallel statements for each observer.",
-    "min_val": "0",
-    "max_val": "1800",
-    "publish_version": "",
-    "info_cn": "",
-    "background_cn": "",
-    "ref_url": ""
-  },
   "parallel_servers_target": {
     "id": 10060,
     "name": "parallel_servers_target",

src/sql/engine/dml/ob_table_insert_up_op.h

@@ -109,6 +109,7 @@ public:
     conflict_checker_.destroy();
     insert_up_rtdefs_.release_array();
     insert_up_row_store_.~ObChunkDatumStore();
+    upd_rtctx_.cleanup();
     ObTableModifyOp::destroy();
   }
 

src/sql/engine/expr/ob_expr.cpp

@@ -99,7 +99,6 @@ DEF_TO_STRING(ObEvalInfo)
 OB_DEF_SERIALIZE(ObExpr)
 {
   int ret = OB_SUCCESS;
-  bool is_early_registered = ObExprExtraInfoFactory::is_early_registered(type_);
   LST_DO_CODE(OB_UNIS_ENCODE,
               type_,
               datum_meta_,
@@ -114,14 +113,8 @@ OB_DEF_SERIALIZE(ObExpr)
               datum_off_,
               res_buf_off_,
               res_buf_len_,
-              expr_ctx_id_);
-  if (OB_SUCC(ret)) {
-    if (is_early_registered) {
-      OB_UNIS_ENCODE(*extra_info_);
-    } else {
-      OB_UNIS_ENCODE(extra_)
-    }
-  }
+              expr_ctx_id_,
+              extra_);
 
   LST_DO_CODE(OB_UNIS_ENCODE,
               eval_info_off_,
@@ -132,7 +125,7 @@ OB_DEF_SERIALIZE(ObExpr)
 
   if (OB_SUCC(ret)) {
     ObExprOperatorType type = T_INVALID;
-    if (!is_early_registered && nullptr != extra_info_) {
+    if (nullptr != extra_info_) {
       type = extra_info_->type_;
     }
     // Add a type before extra_info to determine whether extra_info is empty
@@ -164,20 +157,8 @@ OB_DEF_DESERIALIZE(ObExpr)
               datum_off_,
               res_buf_off_,
               res_buf_len_,
-              expr_ctx_id_);
-  if (OB_SUCC(ret)) {
-    if (ObExprExtraInfoFactory::is_early_registered(type_)) {
-      if (OB_FAIL(ObExprExtraInfoFactory::alloc(CURRENT_CONTEXT->get_arena_allocator(),
-                                                type_,
-                                                extra_info_))) {
-        LOG_WARN("fail to alloc expr extra info", K(ret), K(type_));
-      } else if (OB_NOT_NULL(extra_info_)) {
-        OB_UNIS_DECODE(*extra_info_);
-      }
-    } else {
-      OB_UNIS_DECODE(extra_);
-    }
-  }
+              expr_ctx_id_,
+              extra_);
 
   LST_DO_CODE(OB_UNIS_DECODE,
               eval_info_off_,
@@ -202,6 +183,7 @@ OB_DEF_DESERIALIZE(ObExpr)
       OB_UNIS_DECODE(*extra_info_);
     }
   }
+
   if (OB_SUCC(ret)) {
     basic_funcs_ = ObDatumFuncs::get_basic_func(datum_meta_.type_, datum_meta_.cs_type_);
     CK(NULL != basic_funcs_);
@@ -216,7 +198,6 @@ OB_DEF_DESERIALIZE(ObExpr)
 OB_DEF_SERIALIZE_SIZE(ObExpr)
 {
   int64_t len = 0;
-  bool is_early_registered = ObExprExtraInfoFactory::is_early_registered(type_);
   LST_DO_CODE(OB_UNIS_ADD_LEN,
               type_,
               datum_meta_,
@@ -231,12 +212,8 @@ OB_DEF_SERIALIZE_SIZE(ObExpr)
               datum_off_,
               res_buf_off_,
               res_buf_len_,
-              expr_ctx_id_);
-  if (is_early_registered) {
-    OB_UNIS_ADD_LEN(*extra_info_);
-  } else {
-    OB_UNIS_ADD_LEN(extra_);
-  }
+              expr_ctx_id_,
+              extra_);
 
   LST_DO_CODE(OB_UNIS_ADD_LEN,
               eval_info_off_,
@@ -246,12 +223,11 @@ OB_DEF_SERIALIZE_SIZE(ObExpr)
               pvt_skip_off_);
 
   ObExprOperatorType type = T_INVALID;
-  if (!is_early_registered && nullptr != extra_info_) {
+  if (nullptr != extra_info_) {
     type = extra_info_->type_;
   }
-  // Add a type before extra_info to determine whether extra_info is empty
   OB_UNIS_ADD_LEN(type);
-  if (!is_early_registered && nullptr != extra_info_) {
+  if (T_INVALID != type) {
     OB_UNIS_ADD_LEN(*extra_info_);
   }
   OB_UNIS_ADD_LEN(dyn_buf_header_offset_);

src/sql/engine/expr/ob_expr_extra_info_factory.h

@@ -41,26 +41,6 @@ public:
            && NULL != ALLOC_FUNS_[type];
   }
 
-  // In the past, extra_ and extra_info_ were union structures in ObExpr. now move
-  // the extra_info_ in ObExpr from the union structure to the outer layer.
-  // therefore, in order to deal with upgrade compatibility issues, it is necessary to
-  // identify the type registered before moving extra_info_ to the outer layer.
-  // so, this function is used to determine whether the type is registered
-  // before moving extra_info_ to the outer layer of the union structure
-  // WARNING: It is forbidden to add new registration types to this function
-  inline static bool is_early_registered(const ObExprOperatorType &type)
-  {
-    return type == T_FUN_SYS_CALC_PARTITION_ID ||
-           type == T_FUN_SYS_CALC_TABLET_ID ||
-           type == T_FUN_SYS_CALC_PARTITION_TABLET_ID ||
-           type == T_FUN_ENUM_TO_STR ||
-           type == T_FUN_SET_TO_STR ||
-           type == T_FUN_ENUM_TO_INNER_TYPE ||
-           type == T_FUN_SET_TO_INNER_TYPE ||
-           type == T_FUN_COLUMN_CONV ||
-           type == T_FUN_NORMAL_UDF;
-  }
-
 private:
   template <typename T>
   static int alloc(common::ObIAllocator &alloc, ObIExprExtraInfo *&extra_info,

src/sql/engine/ob_physical_plan_ctx.cpp

@@ -104,7 +104,6 @@ ObPhysicalPlanCtx::ObPhysicalPlanCtx(common::ObIAllocator &allocator)
       is_or_expand_transformed_(false),
       is_show_seed_(false),
       is_multi_dml_(false),
-      is_large_query_(false),
       field_array_(nullptr),
       is_ps_protocol_(false),
       plan_start_time_(0),
@@ -681,7 +680,6 @@ OB_DEF_SERIALIZE(ObPhysicalPlanCtx)
   OB_UNIS_ENCODE(unsed_worker_count_since_222rel_);
   OB_UNIS_ENCODE(tenant_schema_version_);
   OB_UNIS_ENCODE(cursor_count);
-  OB_UNIS_ENCODE(is_large_query_);
   OB_UNIS_ENCODE(plan_start_time_);
   return ret;
 }
@@ -763,7 +761,6 @@ OB_DEF_SERIALIZE_SIZE(ObPhysicalPlanCtx)
   OB_UNIS_ADD_LEN(unsed_worker_count_since_222rel_);
   OB_UNIS_ADD_LEN(tenant_schema_version_);
   OB_UNIS_ADD_LEN(cursor_count);
-  OB_UNIS_ADD_LEN(is_large_query_);
   OB_UNIS_ADD_LEN(plan_start_time_);
   return len;
 }
@@ -840,7 +837,6 @@ OB_DEF_DESERIALIZE(ObPhysicalPlanCtx)
       LOG_WARN("init implicit cursor infos failed", K(ret));
     }
   }
-  OB_UNIS_DECODE(is_large_query_);
   OB_UNIS_DECODE(plan_start_time_);
   if (OB_SUCC(ret)) {
     (void)ObSQLUtils::adjust_time_by_ntp_offset(plan_start_time_);

src/sql/engine/ob_physical_plan_ctx.h

@@ -403,8 +403,6 @@ public:
   int64_t get_cur_stmt_id() const { return cur_stmt_id_; }
   int switch_implicit_cursor();
   const ObIArray<int64_t> *get_part_param_idxs(int64_t part_id) const;
-  void set_large_query(bool v) { is_large_query_ = v; }
-  bool is_large_query() { return is_large_query_; }
   void add_px_dml_row_info(const ObPxDmlRowInfo &dml_row_info);
   TO_STRING_KV("tenant_id", tenant_id_);
   void set_field_array(const common::ObIArray<common::ObField> *field_array) { field_array_ = field_array; }
@@ -545,7 +543,6 @@ private:
   bool is_multi_dml_;
 
   ObRemoteSqlInfo remote_sql_info_;
-  bool is_large_query_; // 存储层使用该标记决定是否进行io限流
   //used for expr output pack, do encode according to its field
   const common::ObIArray<ObField> *field_array_;
   //used for expr output pack, do bianry encode or text encode

src/sql/ob_sql.cpp

@@ -1992,14 +1992,6 @@ OB_NOINLINE int ObSql::handle_large_query(int tmp_ret,
         LOG_INFO("compile time is too long, need delay", K(elapsed_time), K(ret));
       }
     }
-    if (OB_SUCC(ret)) {
-      if (OB_ISNULL(exec_ctx.get_physical_plan_ctx())) {
-        ret = OB_ERR_UNEXPECTED;
-        LOG_WARN("phy plan ctx is NULL", K(ret));
-      } else {
-        exec_ctx.get_physical_plan_ctx()->set_large_query(is_large_query);
-      }
-    }
   }
 
   return ret;

src/sql/optimizer/ob_join_order.cpp

@@ -5764,15 +5764,12 @@ int ObJoinOrder::pruning_unstable_access_path(BaseTableOptInfo *table_opt_info,
 {
   int ret = OB_SUCCESS;
   ObSQLSessionInfo *session_info = NULL;
-  bool use_acs = false;
   ObSEArray<uint64_t, 4> unstable_index_id;
   if (OB_UNLIKELY(access_paths.empty()) || OB_ISNULL(get_plan()) ||
       OB_ISNULL(session_info = get_plan()->get_optimizer_context().get_session_info())) {
     ret = OB_ERR_UNEXPECTED;
     LOG_WARN("unexpected null", K(ret), K(access_paths.count()), K(get_plan()), K(session_info));
-  } else if (OB_FAIL(session_info->get_adaptive_cursor_sharing(use_acs))) {
-    LOG_WARN("failed to check is acs enabled", K(ret));
-  } else if (use_acs || access_paths.count() <= 1 ||
+  } else if (access_paths.count() <= 1 ||
              OB_DEFAULT_STAT_EST == table_meta_info_.cost_est_type_) {
     /* do not pruning access path */
   } else if (OB_FAIL(try_pruning_base_table_access_path(access_paths, unstable_index_id))) {

src/sql/optimizer/ob_log_plan.cpp

@@ -1231,6 +1231,8 @@ int ObLogPlan::pre_process_quals(const ObIArray<TableItem*> &table_items,
       } else {
         ret = add_subquery_filter(qual);
       }
+    } else if (qual->is_const_expr()) {
+      ret = add_startup_filter(qual);
     } else if (qual->has_flag(CNT_RAND_FUNC) ||
                qual->has_flag(CNT_USER_VARIABLE) ||
                qual->has_flag(CNT_PL_UDF) ||
@@ -1238,8 +1240,6 @@ int ObLogPlan::pre_process_quals(const ObIArray<TableItem*> &table_items,
       ret = add_special_expr(qual);
     } else if (ObOptimizerUtil::has_hierarchical_expr(*qual)) {
       ret = normal_quals.push_back(qual);
-    } else if (0 == qual->get_relation_ids().num_members()) {
-      ret = add_startup_filter(qual);
     } else {
       ret = normal_quals.push_back(qual);
     }

src/sql/optimizer/ob_select_log_plan.cpp

@@ -389,14 +389,6 @@ int ObSelectLogPlan::get_valid_aggr_algo(const ObIArray<ObRawExpr*> &group_by_ex
     //group_concat and distinct aggregation hold all input rows temporary,
     //too much memory consumption for hash aggregate.
     use_hash_valid = false;
-  } else if (OB_FAIL(session->get_sys_variable(share::SYS_VAR_OB_ENABLE_HASH_GROUP_BY, val))) {
-    LOG_WARN("Get sys variable error", K(ret));
-  } else if (!val.get_bool()) {
-    if (!ignore_hint && groupby_helper.force_use_hash_) {
-      // has use_hash_aggregation hint
-    } else {
-      use_hash_valid = false;
-    }
   }
   return ret;
 }

src/sql/resolver/ddl/ob_ddl_resolver.cpp

@@ -7446,6 +7446,39 @@ int ObDDLResolver::check_foreign_key_reference(
                  K(ret), K(child_table_schema->is_user_table()));
       } else if (arg.is_parent_table_mock_) {
         // skip checking parent table
+        uint64_t database_id = OB_INVALID_ID;
+        const ObMockFKParentTableSchema *mock_fk_parent_table_schema = NULL;
+        if (OB_FAIL(schema_checker_->get_database_id(
+                    arg.tenant_id_, arg.database_name_, database_id))) {
+          LOG_WARN("failed to get_database_id", K(ret), K(arg.tenant_id_),
+                                                K(arg.database_name_), K(database_id));
+        } else if (OB_FAIL(schema_checker_->get_mock_fk_parent_table_with_name(
+                           arg.tenant_id_, database_id,
+                           arg.foreign_key_name_, mock_fk_parent_table_schema))) {
+          LOG_WARN("failed to get_mock_fk_parent_table_schema_with_name", K(ret),
+                    K(arg.tenant_id_), K(database_id),
+                    K(arg.foreign_key_name_));
+        } else if (OB_NOT_NULL(mock_fk_parent_table_schema)) {
+          if (is_alter_table
+              && OB_FAIL(alter_table_stmt->get_alter_table_arg().based_schema_object_infos_.push_back(
+                 ObBasedSchemaObjectInfo(
+                     mock_fk_parent_table_schema->get_mock_fk_parent_table_id(),
+                     MOCK_FK_PARENT_TABLE_SHCEMA,
+                     mock_fk_parent_table_schema->get_schema_version())))) {
+            LOG_WARN("failed to add based_schema_object_info to arg",
+                         K(ret), K(mock_fk_parent_table_schema->get_mock_fk_parent_table_id()),
+                         K(mock_fk_parent_table_schema->get_schema_version()));
+          } else if (!is_alter_table
+                     && OB_FAIL(create_table_stmt->get_create_table_arg().based_schema_object_infos_.push_back(
+                     ObBasedSchemaObjectInfo(
+                         mock_fk_parent_table_schema->get_mock_fk_parent_table_id(),
+                         MOCK_FK_PARENT_TABLE_SHCEMA,
+                         mock_fk_parent_table_schema->get_schema_version())))) {
+            LOG_WARN("failed to add based_schema_object_info to arg",
+                         K(ret), K(mock_fk_parent_table_schema->get_mock_fk_parent_table_id()),
+                         K(mock_fk_parent_table_schema->get_schema_version()));
+          }
+        }
       } else if (!parent_table_schema->is_user_table()) {
         ret = OB_ERR_CANNOT_ADD_FOREIGN;
         LOG_WARN("foreign key cannot be based on non-user table",

src/sql/resolver/dml/ob_dml_stmt.cpp

@@ -2253,6 +2253,22 @@ int ObDMLStmt::get_from_subquery_stmts(ObIArray<ObSelectStmt*> &child_stmts) con
   return ret;
 }
 
+int ObDMLStmt::get_subquery_stmts(common::ObIArray<ObSelectStmt*> &child_stmts) const
+{
+  int ret = OB_SUCCESS;
+  for (int64_t j = 0; OB_SUCC(ret) && j < get_subquery_expr_size(); ++j) {
+    ObQueryRefRawExpr *subquery_ref = subquery_exprs_.at(j);
+    if (OB_ISNULL(subquery_ref) ||
+        OB_ISNULL(subquery_ref->get_ref_stmt())) {
+      ret = OB_ERR_UNEXPECTED;
+      LOG_WARN("subquery reference is null", K(subquery_ref));
+    } else if (OB_FAIL(child_stmts.push_back(subquery_ref->get_ref_stmt()))) {
+      LOG_WARN("stored subquery reference stmt failed", K(ret));
+    }
+  }
+  return ret;
+}
+
 int ObDMLStmt::get_table_item(const ObSQLSessionInfo *session_info,
                               const ObString &database_name,
                               const ObString &object_name,

src/sql/resolver/dml/ob_dml_stmt.h

@@ -739,6 +739,7 @@ public:
   virtual int remove_useless_sharable_expr();
   virtual int clear_sharable_expr_reference();
   virtual int get_from_subquery_stmts(common::ObIArray<ObSelectStmt*> &child_stmts) const;
+  virtual int get_subquery_stmts(common::ObIArray<ObSelectStmt*> &child_stmts) const;
   int is_referred_by_partitioning_expr(const ObRawExpr *expr,
                                        bool &is_referred);
   int64_t get_table_size() const { return table_items_.count(); }

src/sql/resolver/dml/ob_select_stmt.cpp

@@ -869,10 +869,13 @@ int ObSelectStmt::adjust_view_parent_namespace_stmt(ObDMLStmt *new_parent)
   int ret = OB_SUCCESS;
   int32_t subquery_level = (new_parent != NULL ? new_parent->get_current_level() + 1 : 0);
   ObArray<ObSelectStmt *> view_stmts;
+  ObArray<ObSelectStmt *> subquery_stmts;
   set_parent_namespace_stmt(new_parent);
   set_current_level(subquery_level);
   if (OB_FAIL(get_from_subquery_stmts(view_stmts))) {
     LOG_WARN("get from subquery stmts failed", K(ret));
+  } else if (OB_FAIL(get_subquery_stmts(subquery_stmts))) {
+    LOG_WARN("get subquery stmts failed", K(ret));
   }
   for (int64_t i = 0; OB_SUCC(ret) && i < view_stmts.count(); ++i) {
     ObSelectStmt *view_stmt = view_stmts.at(i);
@@ -883,6 +886,15 @@ int ObSelectStmt::adjust_view_parent_namespace_stmt(ObDMLStmt *new_parent)
       LOG_WARN("adjust view parent namespace stmt failed", K(ret));
     }
   }
+  for (int64_t i = 0; OB_SUCC(ret) && i < subquery_stmts.count(); ++i) {
+    ObSelectStmt *subquery = subquery_stmts.at(i);
+    if (OB_ISNULL(subquery)) {
+      ret = OB_ERR_UNEXPECTED;
+      LOG_WARN("table_item is null", K(i));
+    } else if (OB_FAIL(subquery->adjust_view_parent_namespace_stmt(this))) {
+      LOG_WARN("adjust subquery parent namespace stmt failed", K(ret));
+    }
+  }
   return ret;
 }
 

src/sql/rewrite/ob_query_range.cpp

@@ -67,7 +67,6 @@ ObQueryRange::ObQueryRange()
       key_part_store_(allocator_),
       range_exprs_(allocator_),
       has_exec_param_(true),
-      unused_is_rowid_range_(false),
       is_equal_and_(false),
       equal_offs_(allocator_),
       expr_final_infos_(allocator_)
@@ -84,7 +83,6 @@ ObQueryRange::ObQueryRange(ObIAllocator &alloc)
       key_part_store_(allocator_),
       range_exprs_(allocator_),
       has_exec_param_(true),
-      unused_is_rowid_range_(false),
       is_equal_and_(false),
       equal_offs_(allocator_),
       expr_final_infos_(allocator_)
@@ -121,7 +119,6 @@ void ObQueryRange::reset()
   range_exprs_.reset();
   inner_allocator_.reset();
   has_exec_param_ = true;
-  unused_is_rowid_range_= false;
   is_equal_and_ = false;
   equal_offs_.reset();
   expr_final_infos_.reset();
@@ -5569,7 +5566,6 @@ OB_DEF_SERIALIZE(ObQueryRange)
   //新增对contain_row_序列化，放到最后面
   OB_UNIS_ENCODE(contain_row_);
   OB_UNIS_ENCODE(has_exec_param_);
-  OB_UNIS_ENCODE(unused_is_rowid_range_);
   //新增 equal_query_range 序列化
   OB_UNIS_ENCODE(is_equal_and_);
   OB_UNIS_ENCODE(equal_offs_);
@@ -5598,7 +5594,6 @@ OB_DEF_SERIALIZE_SIZE(ObQueryRange)
   //新增对contain_row_序列化，放到最后面
   OB_UNIS_ADD_LEN(contain_row_);
   OB_UNIS_ADD_LEN(has_exec_param_);
-  OB_UNIS_ADD_LEN(unused_is_rowid_range_);
   //新增 equal_query_range 序列化
   OB_UNIS_ADD_LEN(is_equal_and_);
   OB_UNIS_ADD_LEN(equal_offs_);
@@ -5628,7 +5623,6 @@ OB_DEF_DESERIALIZE(ObQueryRange)
     state_ = static_cast<ObQueryRangeState>(state);
   }
   OB_UNIS_DECODE(has_exec_param_);
-  OB_UNIS_DECODE(unused_is_rowid_range_);
   // 新增 equal_query_range 反序列化
   OB_UNIS_DECODE(is_equal_and_);
   OB_UNIS_DECODE(equal_offs_);
@@ -5745,7 +5739,6 @@ OB_NOINLINE int ObQueryRange::deep_copy(const ObQueryRange &other,
   contain_row_ = other.contain_row_;
   column_count_ = other.column_count_;
   has_exec_param_ = other.has_exec_param_;
-  unused_is_rowid_range_= other.unused_is_rowid_range_;
   is_equal_and_ = other.is_equal_and_;
   if (OB_FAIL(range_exprs_.assign(other.range_exprs_))) {
     LOG_WARN("assign range exprs failed", K(ret));

src/sql/rewrite/ob_query_range.h

@@ -714,7 +714,6 @@ private:
   //this flag used by optimizer, so don't need to serialize it
   common::ObFixedArray<ObRawExpr*, common::ObIAllocator> range_exprs_;
   bool has_exec_param_;
-  bool unused_is_rowid_range_;//serialize compatibility preserved
   bool is_equal_and_;
   common::ObFixedArray<ObEqualOff, common::ObIAllocator> equal_offs_;
   common::ObFixedArray<ExprFinalInfo, common::ObIAllocator> expr_final_infos_;

src/sql/session/ob_basic_session_info.cpp

@@ -2179,18 +2179,6 @@ OB_INLINE int ObBasicSessionInfo::process_session_variable(ObSysVarClassType var
       OX (sys_vars_cache_.set_is_result_accurate(int_val != 0));
       break;
     }
-    case SYS_VAR__OB_USE_PARALLEL_EXECUTION: {
-      int64_t int_val = 0;
-      OZ (val.get_int(int_val), val);
-      OX (sys_vars_cache_.set__ob_use_parallel_execution(int_val != 0));
-      break;
-    }
-    case SYS_VAR__OPTIMIZER_ADAPTIVE_CURSOR_SHARING: {
-      int64_t int_val = 0;
-      OZ (val.get_int(int_val), val);
-      OX (sys_vars_cache_.set__optimizer_adaptive_cursor_sharing(int_val != 0));
-      break;
-    }
     case SYS_VAR_OB_ENABLE_TRANSMISSION_CHECKSUM: {
       int64_t int_val = 0;
       OZ (val.get_int(int_val), val);
@@ -2264,7 +2252,7 @@ OB_INLINE int ObBasicSessionInfo::process_session_variable(ObSysVarClassType var
       OX (sys_vars_cache_.set_autocommit(int_val != 0));
       break;
     }
-    case SYS_VAR_OB_ENABLE_TRACE_LOG: {
+    case SYS_VAR_OB_ENABLE_SHOW_TRACE: {
       int64_t int_val = 0;
       OZ (val.get_int(int_val), val);
       OX (sys_vars_cache_.set_ob_enable_trace_log(int_val != 0));
@@ -2616,18 +2604,6 @@ int ObBasicSessionInfo::fill_sys_vars_cache_base_value(
       OX (sys_vars_cache.set_base_is_result_accurate(int_val != 0));
       break;
     }
-    case SYS_VAR__OB_USE_PARALLEL_EXECUTION: {
-      int64_t int_val = 0;
-      OZ (val.get_int(int_val), val);
-      OX (sys_vars_cache.set_base__ob_use_parallel_execution(int_val != 0));
-      break;
-    }
-    case SYS_VAR__OPTIMIZER_ADAPTIVE_CURSOR_SHARING: {
-      int64_t int_val = 0;
-      OZ (val.get_int(int_val), val);
-      OX (sys_vars_cache.set_base__optimizer_adaptive_cursor_sharing(int_val != 0));
-      break;
-    }
     case SYS_VAR_OB_ENABLE_TRANSMISSION_CHECKSUM: {
       int64_t int_val = 0;
       OZ (val.get_int(int_val), val);
@@ -2701,7 +2677,7 @@ int ObBasicSessionInfo::fill_sys_vars_cache_base_value(
       OX (sys_vars_cache.set_base_autocommit(int_val != 0));
       break;
     }
-    case SYS_VAR_OB_ENABLE_TRACE_LOG: {
+    case SYS_VAR_OB_ENABLE_SHOW_TRACE: {
       int64_t int_val = 0;
       OZ (val.get_int(int_val), val);
       OX (sys_vars_cache.set_base_ob_enable_trace_log(int_val != 0));
@@ -3249,13 +3225,6 @@ int ObBasicSessionInfo::get_ob_read_consistency(int64_t &ob_read_consistency) co
   return get_int64_sys_var(SYS_VAR_OB_READ_CONSISTENCY, ob_read_consistency);
 }
 
-int ObBasicSessionInfo::use_parallel_execution(bool &v) const
-{
-  v = sys_vars_cache_.get__ob_use_parallel_execution();
-  LOG_DEBUG("use parallel exeuction", K(v));
-  return OB_SUCCESS;
-}
-
 int ObBasicSessionInfo::get_group_concat_max_len(uint64_t &group_concat_max_len) const
 {
   return get_uint64_sys_var(SYS_VAR_GROUP_CONCAT_MAX_LEN, group_concat_max_len);
@@ -4366,7 +4335,7 @@ int ObBasicSessionInfo::is_sys_var_actully_changed(const ObSysVarClassType &sys_
       case SYS_VAR_OB_ENABLE_PLAN_CACHE:
       case SYS_VAR_OB_ENABLE_SQL_AUDIT:
       case SYS_VAR_AUTOCOMMIT:
-      case SYS_VAR_OB_ENABLE_TRACE_LOG:
+      case SYS_VAR_OB_ENABLE_SHOW_TRACE:
       case SYS_VAR_OB_ORG_CLUSTER_ID:
       case SYS_VAR_OB_QUERY_TIMEOUT:
       case SYS_VAR_OB_TRX_TIMEOUT:

src/sql/session/ob_basic_session_info.h

@@ -617,11 +617,6 @@ public:
     v = sys_vars_cache_.get_optimizer_use_sql_plan_baselines();
     return common::OB_SUCCESS;
   }
-  int get_adaptive_cursor_sharing(bool &acs) const
-  {
-    acs = sys_vars_cache_.get__optimizer_adaptive_cursor_sharing();
-    return common::OB_SUCCESS;
-  }
   int get_nlj_batching_enabled(bool &v) const;
   int get_enable_parallel_dml(bool &v) const;
   int get_enable_parallel_query(bool &v) const;
@@ -1163,8 +1158,6 @@ public:
   void set_curr_trans_last_stmt_end_time(int64_t t) { curr_trans_last_stmt_end_time_ = t; }
   int64_t get_curr_trans_last_stmt_end_time() const { return curr_trans_last_stmt_end_time_; }
 
-  int use_parallel_execution(bool &v) const;
-
   // nested session and sql execute for foreign key.
   bool is_nested_session() const { return nested_count_ > 0; }
   int64_t get_nested_count() const { return nested_count_; }
@@ -1448,8 +1441,6 @@ private:
         optimizer_use_sql_plan_baselines_(false),
         optimizer_capture_sql_plan_baselines_(false),
         is_result_accurate_(false),
-        _ob_use_parallel_execution_(false),
-        _optimizer_adaptive_cursor_sharing_(false),
         ob_enable_transmission_checksum_(false),
         character_set_results_(ObCharsetType::CHARSET_INVALID),
         character_set_connection_(ObCharsetType::CHARSET_INVALID),
@@ -1498,8 +1489,6 @@ private:
       optimizer_use_sql_plan_baselines_ = false;
       optimizer_capture_sql_plan_baselines_ = false;
       is_result_accurate_ = false;
-      _ob_use_parallel_execution_ = false;
-      _optimizer_adaptive_cursor_sharing_ = false;
       ob_enable_transmission_checksum_ = false;
       character_set_results_ = ObCharsetType::CHARSET_INVALID;
       character_set_connection_ = ObCharsetType::CHARSET_INVALID;
@@ -1615,7 +1604,7 @@ private:
                  K(ob_trx_idle_timeout_), K(ob_trx_lock_timeout_), K(nls_collation_), K(nls_nation_collation_),
                  K_(sql_throttle_current_priority), K_(ob_last_schema_version), K_(sql_select_limit),
                  K_(optimizer_use_sql_plan_baselines), K_(optimizer_capture_sql_plan_baselines),
-                 K_(is_result_accurate), K_(_ob_use_parallel_execution), K_(character_set_results),
+                 K_(is_result_accurate), K_(character_set_results),
                  K_(character_set_connection), K_(ob_pl_block_timeout), K_(ob_plsql_ccflags),
                  K_(iso_nls_currency));
   public:
@@ -1636,8 +1625,6 @@ private:
     bool optimizer_use_sql_plan_baselines_;
     bool optimizer_capture_sql_plan_baselines_;
     bool is_result_accurate_;
-    bool _ob_use_parallel_execution_;
-    bool _optimizer_adaptive_cursor_sharing_;
     bool ob_enable_transmission_checksum_;
     ObCharsetType character_set_results_;
     ObCharsetType character_set_connection_;
@@ -1748,8 +1735,6 @@ private:
     DEF_SYS_VAR_CACHE_FUNCS(bool, optimizer_use_sql_plan_baselines);
     DEF_SYS_VAR_CACHE_FUNCS(bool, optimizer_capture_sql_plan_baselines);
     DEF_SYS_VAR_CACHE_FUNCS(bool, is_result_accurate);
-    DEF_SYS_VAR_CACHE_FUNCS(bool, _ob_use_parallel_execution);
-    DEF_SYS_VAR_CACHE_FUNCS(bool, _optimizer_adaptive_cursor_sharing);
     DEF_SYS_VAR_CACHE_FUNCS(bool, ob_enable_transmission_checksum);
     DEF_SYS_VAR_CACHE_FUNCS(ObCharsetType, character_set_results);
     DEF_SYS_VAR_CACHE_FUNCS(ObCharsetType, character_set_connection);
@@ -1811,8 +1796,6 @@ private:
         bool inc_optimizer_use_sql_plan_baselines_:1;
         bool inc_optimizer_capture_sql_plan_baselines_:1;
         bool inc_is_result_accurate_:1;
-        bool inc__ob_use_parallel_execution_:1;
-        bool inc__optimizer_adaptive_cursor_sharing_:1;
         bool inc_ob_enable_transmission_checksum_:1;
         bool inc_character_set_results_:1;
         bool inc_character_set_connection_:1;

src/storage/blocksstable/ob_index_block_builder.cpp

@@ -1460,13 +1460,6 @@ int ObDataIndexBlockBuilder::cal_macro_meta_block_size(
     macro_meta.val_.logic_id_.logic_version_ = data_store_desc_->get_logical_version();
     macro_meta.val_.logic_id_.tablet_id_ = data_store_desc_->tablet_id_.id();
     macro_meta.val_.macro_id_ = ObIndexBlockRowHeader::DEFAULT_IDX_ROW_MACRO_ID;
-    if (data_store_desc_->is_major_merge()) {
-      for (int64_t j = 0; OB_SUCC(ret) && j < column_cnt; ++j) {
-        if (OB_FAIL(macro_meta.val_.column_checksums_.push_back(0))) {
-          STORAGE_LOG(WARN, "fail to push back column checksum", K(ret), K(j), K(column_cnt));
-        }
-      }
-    }
     meta_row_.reuse();
     row_allocator_.reuse();
     if (OB_FAIL(ret)) {
@@ -1486,10 +1479,8 @@ int ObDataIndexBlockBuilder::cal_macro_meta_block_size(
         STORAGE_LOG(WARN, "unexpected meta block desc", K(ret), K(meta_block_desc));
       } else {
         estimate_meta_block_size = meta_block_desc.buf_size_ + meta_block_desc.header_->header_size_;
-        estimate_meta_block_size =
-            data_store_desc_->encrypt_id_ > static_cast<int64_t>(share::ObAesOpMode::ob_invalid_mode)
-            ? share::ObEncryptionUtil::encrypted_length(estimate_meta_block_size)
-            : estimate_meta_block_size;
+        const int64_t encrypted_size = share::ObEncryptionUtil::encrypted_length(estimate_meta_block_size);
+        estimate_meta_block_size = max(estimate_meta_block_size, encrypted_size);
       }
     }
   }

src/storage/blocksstable/ob_macro_block.cpp

@@ -375,13 +375,19 @@ ObMicroBlockCompressor::ObMicroBlockCompressor()
 
 ObMicroBlockCompressor::~ObMicroBlockCompressor()
 {
+  if (compressor_ != nullptr) {
+    compressor_->reset_mem();
+  }
 }
 
 void ObMicroBlockCompressor::reset()
 {
   is_none_ = false;
   micro_block_size_ = 0;
-  compressor_ = NULL;
+  if (compressor_ != nullptr) {
+    compressor_->reset_mem();
+    compressor_ = nullptr;
+  }
   comp_buf_.reuse();
   decomp_buf_.reuse();
 }

src/storage/blocksstable/ob_macro_block_meta.cpp

@@ -294,9 +294,8 @@ int64_t ObDataBlockMetaVal::get_max_serialize_size() const
 {
   int64_t len = sizeof(*this);
   len -= sizeof(column_checksums_);
-  const int64_t column_count = column_checksums_.count();
   len += sizeof(int64_t); // serialize column count
-  len += sizeof(int64_t) * column_count; // serialize each checksum
+  len += sizeof(int64_t) * column_count_; // serialize each checksum
   return len;
 }
 DEFINE_GET_SERIALIZE_SIZE(ObDataBlockMetaVal)

src/storage/blocksstable/ob_macro_block_reader.cpp

@@ -49,6 +49,9 @@ ObMacroBlockReader::~ObMacroBlockReader()
     encryption_->~ObMicroBlockEncryption();
     encryption_ = nullptr;
   }
+  if (nullptr != compressor_) {
+    compressor_->reset_mem();
+  }
 }
 
 

src/storage/compaction/ob_partition_merge_iter.cpp

@@ -94,7 +94,7 @@ int ObPartitionMergeIter::init_query_base_params(const ObMergeParameter &merge_p
 {
   int ret = OB_SUCCESS;
   ObSSTable *sstable = nullptr;
-  palf::SCN tmp_scn;
+  palf::SCN snapshot_version;
   if (OB_UNLIKELY(nullptr == column_ids_ || nullptr == table_)) {
     ret = OB_ERR_UNEXPECTED;
     LOG_WARN("Unexpected null column_ids", K(ret), KPC(this));
@@ -109,39 +109,32 @@ int ObPartitionMergeIter::init_query_base_params(const ObMergeParameter &merge_p
   } else if (OB_FAIL(access_param_.init_merge_param(tablet_id_.id(), tablet_id_,
                                                     read_info_, merge_param.is_multi_version_minor_merge()))) {
     LOG_WARN("Failed to init table access param", K(ret), KPC(this));
-  } else {
-    if (merge_param.version_range_.snapshot_version_ >= palf::OB_MAX_SCN_TS_NS) {
-      tmp_scn.set_max();
-    } else if (OB_FAIL(tmp_scn.convert_for_tx(merge_param.version_range_.snapshot_version_))) {
+  } else if (OB_FAIL(snapshot_version.convert_for_tx(merge_param.version_range_.snapshot_version_))) {
       LOG_WARN("Failed to convert", K(ret), K_(merge_param.version_range_.snapshot_version));
-    }
-  }
-  if (OB_SUCC(ret)) {
-    if (OB_FAIL(store_ctx_.init_for_read(merge_param.ls_handle_,
-                                                INT64_MAX, // query_expire_ts
-                                                -1, // lock_timeout_us
-                                                tmp_scn))) {
-      LOG_WARN("Failed to init store ctx", K(ret), K_(merge_param.ls_id));
+  } else if (OB_FAIL(store_ctx_.init_for_read(merge_param.ls_handle_,
+                                              INT64_MAX, // query_expire_ts
+                                              -1, // lock_timeout_us
+                                              snapshot_version))) {
+    LOG_WARN("Failed to init store ctx", K(ret), K_(merge_param.ls_id), K(snapshot_version));
+  } else {
+    ObQueryFlag query_flag(ObQueryFlag::Forward,
+                           true, /*is daily merge scan*/
+                           true, /*is read multiple macro block*/
+                           true, /*sys task scan, read one macro block in single io*/
+                           false /*full row scan flag, obsoleted*/,
+                           false,/*index back*/
+                           false); /*query_stat*/
+    query_flag.multi_version_minor_merge_ = merge_param.is_multi_version_minor_merge();
+    query_flag.is_sstable_cut_ = merge_param.is_sstable_cut_;
+    if (merge_param.is_sstable_cut_ && !merge_param.is_multi_version_minor_merge()) {
+      ret = OB_ERR_UNEXPECTED;
+      LOG_WARN("Unexpected sstable cut parameter", K(ret), K(merge_param));
+    } else if (OB_FAIL(access_context_.init(query_flag, store_ctx_, allocator_, stmt_allocator_,
+                                            merge_param.version_range_))) {
+      LOG_WARN("Failed to init table access context", K(ret), K(query_flag));
     } else {
-      ObQueryFlag query_flag(ObQueryFlag::Forward,
-                            true, /*is daily merge scan*/
-                            true, /*is read multiple macro block*/
-                            true, /*sys task scan, read one macro block in single io*/
-                            false /*full row scan flag, obsoleted*/,
-                            false,/*index back*/
-                            false); /*query_stat*/
-      query_flag.multi_version_minor_merge_ = merge_param.is_multi_version_minor_merge();
-      query_flag.is_sstable_cut_ = merge_param.is_sstable_cut_;
-      if (merge_param.is_sstable_cut_ && !merge_param.is_multi_version_minor_merge()) {
-        ret = OB_ERR_UNEXPECTED;
-        LOG_WARN("Unexpected sstable cut parameter", K(ret), K(merge_param));
-      } else if (OB_FAIL(access_context_.init(query_flag, store_ctx_, allocator_, stmt_allocator_,
-                                              merge_param.version_range_))) {
-        LOG_WARN("Failed to init table access context", K(ret), K(query_flag));
-      } else {
-        // always use end_scn for safety
-        access_context_.merge_scn_ = merge_param.scn_range_.end_scn_;
-      }
+      // always use end_scn for safety
+      access_context_.merge_scn_ = merge_param.scn_range_.end_scn_;
     }
   }
   return ret;

src/storage/compaction/ob_tablet_merge_task.cpp

@@ -138,7 +138,7 @@ int ObMergeParameter::init(compaction::ObTabletMergeCtx &merge_ctx, const int64_
       // minor compaction always need to read all the data from input table
       // rewrite version to whole version range
       version_range_.base_version_ = 0;
-      version_range_.snapshot_version_ = INT64_MAX - 2;
+      version_range_.snapshot_version_ = MERGE_READ_SNAPSHOT_VERSION;
     }
     scn_range_ = merge_ctx.scn_range_;
     is_full_merge_ = merge_ctx.is_full_merge_;

src/storage/ddl/ob_tablet_ddl_kv_mgr.h

@@ -53,6 +53,7 @@ public:
   bool is_started() const { return start_scn_.is_valid(); }
   int set_commit_success();
   bool is_commit_success() const { return is_commit_success_; }
+  common::ObTabletID get_tablet_id() const { return tablet_id_; }
   int cleanup();
   OB_INLINE void inc_ref() { ATOMIC_INC(&ref_cnt_); }
   OB_INLINE int64_t dec_ref() { return ATOMIC_SAF(&ref_cnt_, 1 /* just sub 1 */); }

src/storage/high_availability/ob_storage_ha_dag.cpp

@@ -649,30 +649,7 @@ int ObStorageHATaskUtils::check_minor_sstable_need_copy_(
     }
 
     if (OB_SUCC(ret) && !found) {
-      const palf::SCN start_scn = minor_sstables.at(0)->get_start_scn();
-      const palf::SCN end_scn = minor_sstables.at(minor_sstables.count() - 1)->get_end_scn();
-      if (param.table_key_.scn_range_.start_scn_ >= start_scn
-          && param.table_key_.scn_range_.end_scn_ <= end_scn) {
-        need_copy = false;
-      } else {
-        need_copy = true;
-      }
-    }
-
-    if (OB_SUCC(ret) && !need_copy) {
-      const ObSSTableArray &minor_sstable_array = tablet->get_table_store().get_minor_sstables();
-      bool has_remote_logical_sstable = false;
-      for (int64_t i = 0; OB_SUCC(ret) && i < minor_sstable_array.count(); ++i) {
-        ObITable *table = minor_sstable_array.get_table(i);
-        if (OB_ISNULL(table)) {
-          ret = OB_ERR_UNEXPECTED;
-          LOG_WARN("table should not be NULL", K(ret), KP(table));
-        } else if (table->is_remote_logical_minor_sstable()) {
-          ret = OB_ERR_UNEXPECTED;
-          LOG_WARN("tablet still has remote logical minor sstable, cannot reuse local sstable",
-              K(ret), KPC(tablet), K(param));
-        }
-      }
+      need_copy = true;
     }
   }
   return ret;

src/storage/high_availability/ob_storage_ha_reader.cpp

@@ -1457,6 +1457,7 @@ int ObCopyTabletsSSTableInfoObProducer::get_next_tablet_sstable_info(
 
 ObCopySSTableInfoObProducer::ObCopySSTableInfoObProducer()
   : is_inited_(false),
+    ls_id_(),
     tablet_sstable_info_(),
     tablet_handle_(),
     iter_(),
@@ -1507,6 +1508,7 @@ int ObCopySSTableInfoObProducer::init(
 
   if (OB_FAIL(ret)) {
   } else {
+    ls_id_ = ls->get_ls_id();
     tablet_sstable_info_ = tablet_sstable_info;
     is_inited_ = true;
   }
@@ -1676,6 +1678,15 @@ int ObCopySSTableInfoObProducer::get_copy_tablet_sstable_header(
       } else if (OB_FAIL(get_copy_sstable_count_(copy_header.sstable_count_))) {
         LOG_WARN("failed to get copy sstable count", K(ret), K(tablet_sstable_info_));
       }
+    } else if (ObCopyTabletStatus::TABLET_NOT_EXIST == status_) {
+      if (OB_FAIL(fake_deleted_tablet_meta_(copy_header.tablet_meta_))) {
+        LOG_WARN("failed to fake deleted tablet meta", K(ret), K(copy_header));
+      } else {
+        copy_header.sstable_count_ = 0;
+      }
+    } else {
+      ret = OB_ERR_UNEXPECTED;
+      LOG_WARN("copy tablet status is unexpected", K(ret), K(status_), K(tablet_sstable_info_));
     }
   }
   return ret;
@@ -1699,6 +1710,43 @@ int ObCopySSTableInfoObProducer::get_tablet_meta_(ObMigrationTabletParam &tablet
   return ret;
 }
 
+int ObCopySSTableInfoObProducer::fake_deleted_tablet_meta_(
+    ObMigrationTabletParam &tablet_meta)
+{
+  int ret = OB_SUCCESS;
+  tablet_meta.reset();
+  const ObTabletRestoreStatus::STATUS restore_status = ObTabletRestoreStatus::FULL;
+  const ObTabletDataStatus::STATUS data_status = ObTabletDataStatus::COMPLETE;
+
+  if (!is_inited_) {
+    ret = OB_NOT_INIT;
+    LOG_WARN("copy sstable info ob producer do not init", K(ret));
+  } else {
+    tablet_meta.ls_id_ = ls_id_;
+    tablet_meta.tablet_id_ = tablet_sstable_info_.tablet_id_;
+    tablet_meta.data_tablet_id_ = tablet_sstable_info_.tablet_id_;
+    tablet_meta.start_scn_ = ObTabletMeta::INIT_CLOG_CHECKPOINT_SCN;
+    tablet_meta.clog_checkpoint_scn_.set_max();
+    tablet_meta.compat_mode_ = lib::Worker::get_compatibility_mode();
+    tablet_meta.multi_version_start_ = 0;
+    tablet_meta.snapshot_version_ = 0;
+    tablet_meta.tx_data_.tablet_status_ = ObTabletStatus::DELETED;
+
+    if (OB_FAIL(tablet_meta.ha_status_.set_restore_status(restore_status))) {
+      LOG_WARN("failed to set restore status", K(ret), K(restore_status));
+    } else if (OB_FAIL(tablet_meta.ha_status_.set_data_status(data_status))) {
+      LOG_WARN("failed to set data status", K(ret), K(data_status));
+    } else if (OB_FAIL(ObMigrationTabletParam::construct_placeholder_storage_schema(tablet_meta.allocator_,
+        tablet_meta.storage_schema_))) {
+      LOG_WARN("failed to construct placeholder storage schema");
+    } else if (!tablet_meta.is_valid()) {
+      ret = OB_INVALID_ARGUMENT;
+      LOG_WARN("create deleted tablet meta is invalid", K(ret), K(tablet_meta));
+    }
+  }
+  return ret;
+}
+
 
 ObCopySSTableMacroObReader::ObCopySSTableMacroObReader()
   : is_inited_(false),

src/storage/high_availability/ob_storage_ha_reader.h

@@ -415,9 +415,11 @@ private:
       bool &need_copy_sstable);
   int get_copy_sstable_count_(int64_t &sstable_count);
   int get_tablet_meta_(ObMigrationTabletParam &tablet_meta);
+  int fake_deleted_tablet_meta_(ObMigrationTabletParam &tablet_meta);
 
 private:
   bool is_inited_;
+  share::ObLSID ls_id_;
   obrpc::ObCopyTabletSSTableInfoArg tablet_sstable_info_;
   ObTabletHandle tablet_handle_;
   ObTableStoreIterator iter_;

src/storage/high_availability/ob_storage_ha_utils.cpp

@@ -72,9 +72,9 @@ int ObStorageHAUtils::fetch_src_tablet_meta_info_(const uint64_t tenant_id, cons
     LOG_WARN("failed to init operator", K(ret));
   } else if (OB_FAIL(op.get(tenant_id, tablet_id, ls_id, src_addr, tablet_replica))) {
     LOG_WARN("failed to get tablet meta info", K(ret), K(tenant_id), K(tablet_id), K(ls_id), K(src_addr));
-  } else {
-    compaction_scn.convert_for_tx(tablet_replica.get_snapshot_version());
-  }
+  } else if (OB_FAIL(compaction_scn.convert_for_tx(tablet_replica.get_snapshot_version()))) {
+    LOG_WARN("failed to get tablet meta info", K(ret), K(compaction_scn), K(tenant_id), K(tablet_id), K(ls_id), K(src_addr));
+  } else {/*do nothing*/}
   return ret;
 }
 

src/storage/ls/ob_ls_ddl_log_handler.cpp

@@ -75,28 +75,19 @@ int ObLSDDLLogHandler::offline()
     LOG_WARN("failed to build ls tablet iter", K(ret), K(ls_));
   } else {
     while (OB_SUCC(ret)) {
-      ObTabletHandle tablet_handle;
-      if (OB_FAIL(tablet_iter.get_next_tablet(tablet_handle))) {
+      ObDDLKvMgrHandle ddl_kv_mgr_handle;
+      if (OB_FAIL(tablet_iter.get_next_ddl_kv_mgr(ddl_kv_mgr_handle))) {
         if (OB_ITER_END == ret) {
           ret = OB_SUCCESS;
           break;
         } else {
-          LOG_WARN("failed to get tablet", K(ret), K(tablet_handle));
+          LOG_WARN("failed to get ddl kv mgr", K(ret), K(ddl_kv_mgr_handle));
         }
-      } else if (OB_UNLIKELY(!tablet_handle.is_valid())) {
+      } else if (OB_UNLIKELY(!ddl_kv_mgr_handle.is_valid())) {
         ret = OB_ERR_UNEXPECTED;
-        LOG_WARN("invalid tablet handle", K(ret), K(tablet_handle));
-      } else {
-        ObDDLKvMgrHandle ddl_kv_mgr_handle;
-        if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_mgr(ddl_kv_mgr_handle))) {
-          if (OB_ENTRY_NOT_EXIST != ret) {
-            LOG_WARN("get ddl kv mgr failed", K(ret), "ls_meta", ls_->get_ls_meta(), "tablet_meta", tablet_handle.get_obj()->get_tablet_meta());
-          } else {
-            ret = OB_SUCCESS;
-          }
-        } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->cleanup())) {
-          LOG_WARN("ddl kv mgr cleanup failed", K(ret), "ls_meta", ls_->get_ls_meta(), "tablet_meta", tablet_handle.get_obj()->get_tablet_meta());
-        }
+        LOG_WARN("invalid tablet handle", K(ret), K(ddl_kv_mgr_handle));
+      } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->cleanup())) {
+        LOG_WARN("ddl kv mgr cleanup failed", K(ret), "ls_meta", ls_->get_ls_meta(), "tablet_id", ddl_kv_mgr_handle.get_obj()->get_tablet_id());
       }
     }
   }
@@ -227,24 +218,24 @@ int ObLSDDLLogHandler::flush(palf::SCN &rec_scn)
     } else {
       bool has_ddl_kv = false;
       while (OB_SUCC(ret)) {
-        ObTabletHandle tablet_handle;
-        if (OB_FAIL(tablet_iter.get_next_tablet(tablet_handle))) {
+        ObDDLKvMgrHandle ddl_kv_mgr_handle;
+        if (OB_FAIL(tablet_iter.get_next_ddl_kv_mgr(ddl_kv_mgr_handle))) {
           if (OB_ITER_END == ret) {
             ret = OB_SUCCESS;
             break;
           } else {
-            LOG_WARN("failed to get tablet", K(ret), K(tablet_handle));
+            LOG_WARN("failed to get ddl kv mgr", K(ret), K(ddl_kv_mgr_handle));
           }
-        } else if (OB_UNLIKELY(!tablet_handle.is_valid())) {
+        } else if (OB_UNLIKELY(!ddl_kv_mgr_handle.is_valid())) {
           ret = OB_ERR_UNEXPECTED;
-          LOG_WARN("invalid tablet handle", K(ret), K(tablet_handle));
-        } else if (OB_FAIL(tablet_handle.get_obj()->check_has_effective_ddl_kv(has_ddl_kv))) {
+          LOG_WARN("invalid ddl kv mgr handle", K(ret), K(ddl_kv_mgr_handle));
+        } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->check_has_effective_ddl_kv(has_ddl_kv))) {
           LOG_WARN("failed to check ddl kv", K(ret));
         } else if (has_ddl_kv) {
           DEBUG_SYNC(BEFORE_DDL_CHECKPOINT);
           ObDDLTableMergeDagParam param;
           param.ls_id_ = ls_->get_ls_id();
-          param.tablet_id_ = tablet_handle.get_obj()->get_tablet_meta().tablet_id_;
+          param.tablet_id_ = ddl_kv_mgr_handle.get_obj()->get_tablet_id();
           param.rec_scn_ = rec_scn;
           if (OB_FAIL(compaction::ObScheduleDagFunc::schedule_ddl_table_merge_dag(param))) {
             if (OB_EAGAIN != ret && OB_SIZE_OVERFLOW != ret) {
@@ -268,22 +259,22 @@ palf::SCN ObLSDDLLogHandler::get_rec_scn()
     LOG_WARN("failed to build ls tablet iter", K(ret), K(ls_));
   } else {
     while (OB_SUCC(ret)) {
-      ObTabletHandle tablet_handle;
+      ObDDLKvMgrHandle ddl_kv_mgr_handle;
       palf::SCN min_scn = palf::SCN::max_scn();
-      if (OB_FAIL(tablet_iter.get_next_tablet(tablet_handle))) {
+      if (OB_FAIL(tablet_iter.get_next_ddl_kv_mgr(ddl_kv_mgr_handle))) {
         if (OB_ITER_END == ret) {
           ret = OB_SUCCESS;
           break;
         } else {
-          LOG_WARN("failed to get tablet", K(ret), K(tablet_handle));
+          LOG_WARN("failed to get ddl kv mgr", K(ret), K(ddl_kv_mgr_handle));
         }
-      } else if (OB_UNLIKELY(!tablet_handle.is_valid())) {
+      } else if (OB_UNLIKELY(!ddl_kv_mgr_handle.is_valid())) {
         ret = OB_ERR_UNEXPECTED;
-        LOG_WARN("invalid tablet handle", K(ret), K(tablet_handle));
-      } else if (OB_FAIL(tablet_handle.get_obj()->check_has_effective_ddl_kv(has_ddl_kv))) {
+        LOG_WARN("invalid ddl kv mgr handle", K(ret), K(ddl_kv_mgr_handle));
+      } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->check_has_effective_ddl_kv(has_ddl_kv))) {
         LOG_WARN("failed to check ddl kv", K(ret));
       } else if (has_ddl_kv) {
-        if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_min_scn(min_scn))) {
+        if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->get_ddl_kv_min_scn(min_scn))) {
           LOG_WARN("fail to get ddl kv min log ts", K(ret));
         } else {
           rec_scn = palf::SCN::min(rec_scn, min_scn);

src/storage/memtable/ob_memtable.cpp

@@ -171,7 +171,11 @@ int ObMemtable::init(const ObITable::TableKey &table_key,
   } else {
     ls_ = ls;
     ObMemtableStat::get_instance().register_memtable(this);
-    mode_ = MTL(lib::Worker::CompatMode);
+    if (table_key.get_tablet_id().is_sys_tablet()) {
+      mode_ = lib::Worker::CompatMode::MYSQL;
+    } else {
+      mode_ = MTL(lib::Worker::CompatMode);
+    }
     state_ = ObMemtableState::ACTIVE;
     freeze_state_ = ObMemtableFreezeState::NOT_READY_FOR_FLUSH;
     timestamp_ = ObTimeUtility::current_time();

src/storage/meta_mem/ob_tenant_meta_mem_mgr.cpp

@@ -1032,6 +1032,36 @@ int ObTenantMetaMemMgr::set_tablet_pointer_tx_data(
   return ret;
 }
 
+int ObTenantMetaMemMgr::get_tablet_ddl_kv_mgr(
+    const ObTabletMapKey &key,
+    ObDDLKvMgrHandle &ddl_kv_mgr_handle)
+{
+  int ret = OB_SUCCESS;
+  ObTabletPointerHandle ptr_handle(tablet_map_);
+  if (OB_UNLIKELY(!is_inited_)) {
+    ret = OB_NOT_INIT;
+    LOG_WARN("ObTenantMetaMemMgr hasn't been initialized", K(ret));
+  } else if (OB_UNLIKELY(!key.is_valid())) {
+    ret = OB_INVALID_ARGUMENT;
+    LOG_WARN("invalid argument", K(ret), K(key));
+  } else if (OB_FAIL(tablet_map_.get(key, ptr_handle))) {
+    LOG_WARN("failed to get ptr handle", K(ret), K(key));
+  } else {
+    ObTabletPointer *tablet_ptr = static_cast<ObTabletPointer*>(ptr_handle.get_resource_ptr());
+    if (OB_ISNULL(tablet_ptr)) {
+      ret = OB_ERR_UNEXPECTED;
+      LOG_WARN("tablet ptr is NULL", K(ret), K(ptr_handle));
+    } else {
+      tablet_ptr->get_ddl_kv_mgr(ddl_kv_mgr_handle);
+      if (!ddl_kv_mgr_handle.is_valid()) {
+        ret = OB_ENTRY_NOT_EXIST;
+        LOG_DEBUG("ddl kv mgr not exist", K(ret), K(ddl_kv_mgr_handle));
+      }
+    }
+  }
+  return ret;
+}
+
 int ObTenantMetaMemMgr::get_meta_mem_status(common::ObIArray<ObTenantMetaMemStatus> &info) const
 {
   int ret = OB_SUCCESS;

src/storage/meta_mem/ob_tenant_meta_mem_mgr.h

@@ -190,6 +190,7 @@ public:
   int set_tablet_pointer_tx_data(const ObTabletMapKey &key, const ObTabletTxMultiSourceDataUnit &tx_data);
   int insert_pinned_tablet(const ObTabletMapKey &key);
   int erase_pinned_tablet(const ObTabletMapKey &key);
+  int get_tablet_ddl_kv_mgr(const ObTabletMapKey &key, ObDDLKvMgrHandle &ddl_kv_mgr_handle);
 
   // TIPS:
   //  - only for allocating variable meta object in storage meta.

src/storage/ob_partition_range_spliter.cpp

@@ -1603,13 +1603,13 @@ int ObPartitionIncrementalRangeSpliter::ObIncrementalIterator::prepare_store_ctx
   int ret = OB_SUCCESS;
   auto ls_id = merge_ctx_.param_.ls_id_;
   auto &snapshot = merge_ctx_.sstable_version_range_.snapshot_version_;
-  palf::SCN tmp_scn;
-  if (OB_FAIL(tmp_scn.convert_for_lsn_allocator(snapshot))) {
-    STORAGE_LOG(WARN, "convert for fail", K(ret), K(ls_id), K(snapshot));
+  palf::SCN scn;
+  if (OB_FAIL(scn.convert_for_tx(snapshot))) {
+    STORAGE_LOG(WARN, "convert for tx fail", K(ret), K(ls_id), K(snapshot));
   } else if (OB_FAIL(store_ctx_.init_for_read(ls_id,
                                               INT64_MAX,
                                               -1,
-                                              tmp_scn))) {
+                                              scn))) {
     STORAGE_LOG(WARN, "init store ctx fail", K(ret), K(ls_id), K(snapshot));
   }
   return ret;

src/storage/ob_storage_struct.h

@@ -22,6 +22,7 @@
 #include "storage/ob_i_table.h"
 #include "storage/ob_storage_schema.h"
 #include "storage/tablet/ob_tablet_table_store_flag.h"
+#include "logservice/palf/scn.h"
 
 namespace oceanbase
 {
@@ -38,15 +39,15 @@ class ObMigrationTabletParam;
 typedef common::ObSEArray<common::ObStoreRowkey, common::OB_DEFAULT_MULTI_GET_ROWKEY_NUM> GetRowkeyArray;
 typedef common::ObSEArray<common::ObStoreRange, common::OB_DEFAULT_MULTI_GET_ROWKEY_NUM> ScanRangeArray;
 
-static const int64_t EXIST_READ_SNAPSHOT_VERSION = INT64_MAX - 1;
-static const int64_t MERGE_READ_SNAPSHOT_VERSION = INT64_MAX - 2;
-static const int64_t MV_LEFT_MERGE_READ_SNAPSHOT_VERSION = INT64_MAX - 3;
-static const int64_t MV_RIGHT_MERGE_READ_SNAPSHOT_VERSION = INT64_MAX - 4;
-static const int64_t MV_MERGE_READ_SNAPSHOT_VERSION = INT64_MAX - 5;
-static const int64_t BUILD_INDEX_READ_SNAPSHOT_VERSION = INT64_MAX - 6;
-static const int64_t WARM_UP_READ_SNAPSHOT_VERSION = INT64_MAX - 7;
-static const int64_t GET_BATCH_ROWS_READ_SNAPSHOT_VERSION = INT64_MAX - 8;
-static const int64_t GET_SCAN_COST_READ_SNAPSHOT_VERSION = INT64_MAX - 9;
+static const int64_t EXIST_READ_SNAPSHOT_VERSION = palf::OB_MAX_SCN_TS_NS - 1;
+static const int64_t MERGE_READ_SNAPSHOT_VERSION = palf::OB_MAX_SCN_TS_NS - 2;
+// static const int64_t MV_LEFT_MERGE_READ_SNAPSHOT_VERSION = INT64_MAX - 3;
+// static const int64_t MV_RIGHT_MERGE_READ_SNAPSHOT_VERSION = INT64_MAX - 4;
+// static const int64_t MV_MERGE_READ_SNAPSHOT_VERSION = INT64_MAX - 5;
+// static const int64_t BUILD_INDEX_READ_SNAPSHOT_VERSION = INT64_MAX - 6;
+// static const int64_t WARM_UP_READ_SNAPSHOT_VERSION = INT64_MAX - 7;
+static const int64_t GET_BATCH_ROWS_READ_SNAPSHOT_VERSION = palf::OB_MAX_SCN_TS_NS - 8;
+// static const int64_t GET_SCAN_COST_READ_SNAPSHOT_VERSION = INT64_MAX - 9;
 
 
 enum ObMigrateStatus

src/storage/tablelock/ob_lock_table.cpp

@@ -60,7 +60,7 @@ int ObLockTable::restore_lock_table_(ObITable &sstable)
   common::ObVersionRange trans_version_range;
   trans_version_range.base_version_ = 0;
   trans_version_range.multi_version_start_ = 0;
-  trans_version_range.snapshot_version_ = common::ObVersionRange::MAX_VERSION - 2;
+  trans_version_range.snapshot_version_ = MERGE_READ_SNAPSHOT_VERSION;
 
 
   common::ObSEArray<share::schema::ObColDesc, 2> columns;