From 23765baadbc4aabc7c52c12123d479c635482bd2 Mon Sep 17 00:00:00 2001
From: joseph12138 <17862707376@163.com>
Date: Mon, 24 Jun 2024 09:59:47 +0000
Subject: [PATCH] [master] adjust log level and adjust sort function

---
 src/rootserver/ob_disaster_recovery_worker.cpp            | 2 +-
 src/rootserver/ob_unit_manager.h                          | 2 +-
 .../tenant_snapshot/ob_tenant_snapshot_table_operator.cpp | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/rootserver/ob_disaster_recovery_worker.cpp b/src/rootserver/ob_disaster_recovery_worker.cpp
index 6a5ca0709..b5313b246 100755
--- a/src/rootserver/ob_disaster_recovery_worker.cpp
+++ b/src/rootserver/ob_disaster_recovery_worker.cpp
@@ -1682,7 +1682,7 @@ int ObDRWorker::UnitProvider::allocate_unit(
 
 bool ObDRWorker::LATaskCmp::operator()(const LATask *left, const LATask *right)
 {
-  bool bool_ret = true;
+  bool bool_ret = false;
   if (OB_SUCCESS != ret_) {
     // bypass
   } else if (nullptr == left || nullptr == right) {
diff --git a/src/rootserver/ob_unit_manager.h b/src/rootserver/ob_unit_manager.h
index e83c52bfa..1a647d797 100644
--- a/src/rootserver/ob_unit_manager.h
+++ b/src/rootserver/ob_unit_manager.h
@@ -54,7 +54,7 @@ public:
     bool operator()(const share::ObUnit *left, const share::ObUnit *right) {
       bool bool_ret = true;
       if (nullptr == left && nullptr == right) {
-        bool_ret = true;
+        bool_ret = false;
       } else if (nullptr == left && nullptr != right) {
         bool_ret = true;
       } else if (nullptr != left && nullptr == right) {
diff --git a/src/share/tenant_snapshot/ob_tenant_snapshot_table_operator.cpp b/src/share/tenant_snapshot/ob_tenant_snapshot_table_operator.cpp
index 191e291fa..7e5780e8f 100644
--- a/src/share/tenant_snapshot/ob_tenant_snapshot_table_operator.cpp
+++ b/src/share/tenant_snapshot/ob_tenant_snapshot_table_operator.cpp
@@ -729,7 +729,7 @@ int ObTenantSnapshotTableOperator::update_special_tenant_snap_item(const ObTenan
     LOG_WARN("exec sql failed", KR(ret), K(sql), K(gen_meta_tenant_id(user_tenant_id_)));
   } else if (!is_single_row(affected_rows)) {
     ret = OB_ERR_UNEXPECTED;
-    LOG_ERROR("unexpected affected rows", KR(ret), K(affected_rows));
+    LOG_WARN("unexpected affected rows", KR(ret), K(affected_rows));
   }
   return ret;
 }
@@ -775,7 +775,7 @@ int ObTenantSnapshotTableOperator::update_tenant_snap_item(const ObTenantSnapsho
     LOG_WARN("exec sql failed", KR(ret), K(sql), K(gen_meta_tenant_id(user_tenant_id_)));
   } else if (!is_single_row(affected_rows)) {
     ret = OB_ERR_UNEXPECTED;
-    LOG_ERROR("unexpected affected rows", KR(ret), K(affected_rows), K(sql));
+    LOG_WARN("unexpected affected rows", KR(ret), K(affected_rows), K(sql));
   }
   return ret;
 }
@@ -816,7 +816,7 @@ int ObTenantSnapshotTableOperator::update_tenant_snap_item(const ObTenantSnapsho
     LOG_WARN("exec sql failed", KR(ret), K(sql), K(gen_meta_tenant_id(user_tenant_id_)));
   } else if (!is_single_row(affected_rows)) {
     ret = OB_ERR_UNEXPECTED;
-    LOG_ERROR("unexpected affected rows", KR(ret), K(affected_rows), K(sql));
+    LOG_WARN("unexpected affected rows", KR(ret), K(affected_rows), K(sql));
   }
   return ret;
 }
@@ -853,7 +853,7 @@ int ObTenantSnapshotTableOperator::update_tenant_snap_item(const ObString &snaps
     LOG_WARN("exec sql failed", KR(ret), K(sql), K(gen_meta_tenant_id(user_tenant_id_)));
   } else if (!is_single_row(affected_rows)) {
     ret = OB_ERR_UNEXPECTED;
-    LOG_ERROR("unexpected affected rows", KR(ret), K(affected_rows), K(sql));
+    LOG_WARN("unexpected affected rows", KR(ret), K(affected_rows), K(sql));
   }
   return ret;
 }