From 6e1b94044f90fd9a131e3221bdcb936fce867b19 Mon Sep 17 00:00:00 2001
From: yangqise7en <877793735@qq.com>
Date: Mon, 31 Jul 2023 09:18:28 +0000
Subject: [PATCH] fix errno

---
 src/storage/compaction/ob_medium_compaction_info.cpp | 2 +-
 src/storage/compaction/ob_partition_merger.cpp       | 1 +
 src/storage/tablet/ob_tablet_dumped_medium_info.cpp  | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/storage/compaction/ob_medium_compaction_info.cpp b/src/storage/compaction/ob_medium_compaction_info.cpp
index deeedaf4d5..932e70ba1e 100644
--- a/src/storage/compaction/ob_medium_compaction_info.cpp
+++ b/src/storage/compaction/ob_medium_compaction_info.cpp
@@ -127,7 +127,7 @@ int ObParallelMergeInfo::deserialize(
         for (int i = 0; OB_SUCC(ret) && i < list_size_; ++i) {
           if (OB_FAIL(tmp_datum_rowkey.deserialize(buf, data_len, pos))) {
             LOG_WARN("failed to decode datum rowkey", K(ret), K(i), K(list_size_), K(data_len), K(pos));
-          } else if (tmp_datum_rowkey.deep_copy(parallel_datum_rowkey_list_[i] /*dst*/, allocator)) {
+          } else if (OB_FAIL(tmp_datum_rowkey.deep_copy(parallel_datum_rowkey_list_[i] /*dst*/, allocator))) {
             LOG_WARN("failed to deep copy datum rowkey", KR(ret), K(i), K(tmp_datum_rowkey));
           }
         } // end of for
diff --git a/src/storage/compaction/ob_partition_merger.cpp b/src/storage/compaction/ob_partition_merger.cpp
index c97d985c6d..84e03cc4d3 100644
--- a/src/storage/compaction/ob_partition_merger.cpp
+++ b/src/storage/compaction/ob_partition_merger.cpp
@@ -1739,6 +1739,7 @@ void ObPartitionMergeDumper::print_error_info(const int err_no,
         ret = OB_ERR_UNEXPECTED;
         STORAGE_LOG(WARN, "Unexpected null macro block", K(ret), KPC(macro_desc), KPC(cur_iter));
       } else if (OB_ISNULL(curr_row)) {
+        ret = OB_ERR_UNEXPECTED;
         STORAGE_LOG(WARN, "merge iter content: ", K(midx), K(cur_iter->get_table()->get_key()),
                     KPC(macro_desc));
       } else {
diff --git a/src/storage/tablet/ob_tablet_dumped_medium_info.cpp b/src/storage/tablet/ob_tablet_dumped_medium_info.cpp
index 91e401db45..860016c65d 100644
--- a/src/storage/tablet/ob_tablet_dumped_medium_info.cpp
+++ b/src/storage/tablet/ob_tablet_dumped_medium_info.cpp
@@ -342,9 +342,10 @@ int ObTabletDumpedMediumInfo::deserialize(common::ObIAllocator &allocator, const
     }
 
     if (OB_FAIL(ret)) {
-      for (int64_t i = 0; i < medium_info_list_.count(); ++i) {
+      for (int64_t i = 0; OB_SUCC(ret) && i < medium_info_list_.count(); ++i) {
         compaction::ObMediumCompactionInfo *medium_info = medium_info_list_[i];
         if (OB_ISNULL(medium_info)) {
+          ret = OB_ERR_UNEXPECTED;
           LOG_ERROR("medium info kv is null", KP(medium_info), K(i));
         } else {
           medium_info->reset();