From e4a6af92073790d6ed441ea941eda7a2cd933a35 Mon Sep 17 00:00:00 2001
From: IHEII <602280108@qq.com>
Date: Fri, 20 Oct 2023 02:43:10 +0000
Subject: [PATCH] [CP] [Fix] ttl delete

---
 src/observer/table/ttl/ob_table_ttl_task.cpp | 90 +++++++++++---------
 1 file changed, 49 insertions(+), 41 deletions(-)

diff --git a/src/observer/table/ttl/ob_table_ttl_task.cpp b/src/observer/table/ttl/ob_table_ttl_task.cpp
index 43290628cb..233520b7aa 100644
--- a/src/observer/table/ttl/ob_table_ttl_task.cpp
+++ b/src/observer/table/ttl/ob_table_ttl_task.cpp
@@ -512,49 +512,56 @@ int ObTableTTLDeleteRowIterator::get_next_row(ObNewRow*& row)
     LOG_DEBUG("finish get next row", KR(ret), K(cur_del_rows_), K(limit_del_rows_));
   } else {
     bool is_expired = false;
-    while(OB_SUCC(ret) && !is_expired && OB_SUCC(ObTableApiScanRowIterator::get_next_row(row, false/*need_deep_copy*/))) {
-      last_row_ = row;
-      // NOTE: For hbase table, the row expired if and only if
-      // 1. The row's version exceed maxversion
-      // 2. The row's expired time(cell_ts + ttl) exceed current time
-      if (is_hbase_table_) {
-        scan_cnt_++;
-        ObHTableCellEntity cell(row);
-        ObString cell_rowkey = cell.get_rowkey();
-        ObString cell_qualifier = cell.get_qualifier();
-        int64_t cell_ts = -cell.get_timestamp(); // obhtable timestamp is nagative in ms
-        if ((cell_rowkey != cur_rowkey_) || (cell_qualifier != cur_qualifier_)) {
-          cur_version_ = 1;
-          allocator_.reuse();
-          if (OB_FAIL(ob_write_string(allocator_, cell_rowkey, cur_rowkey_))) {
-            LOG_WARN("fail to copy cell rowkey", KR(ret), K(cell_rowkey));
-          } else if (OB_FAIL(ob_write_string(allocator_, cell_qualifier, cur_qualifier_))) {
-            LOG_WARN("fail to copy cell qualifier", KR(ret), K(cell_qualifier));
+    while(OB_SUCC(ret) && !is_expired) {
+      if (OB_FAIL(ObTableApiScanRowIterator::get_next_row(row, false/*need_deep_copy*/))) {
+        if (OB_ITER_END != ret) {
+          LOG_WARN("fail to get next row", K(ret));
+        }
+        last_row_ = nullptr;
+      } else {
+        last_row_ = row;
+        // NOTE: For hbase table, the row expired if and only if
+        // 1. The row's version exceed maxversion
+        // 2. The row's expired time(cell_ts + ttl) exceed current time
+        if (is_hbase_table_) {
+          scan_cnt_++;
+          ObHTableCellEntity cell(row);
+          ObString cell_rowkey = cell.get_rowkey();
+          ObString cell_qualifier = cell.get_qualifier();
+          int64_t cell_ts = -cell.get_timestamp(); // obhtable timestamp is nagative in ms
+          if ((cell_rowkey != cur_rowkey_) || (cell_qualifier != cur_qualifier_)) {
+            cur_version_ = 1;
+            allocator_.reuse();
+            if (OB_FAIL(ob_write_string(allocator_, cell_rowkey, cur_rowkey_))) {
+              LOG_WARN("fail to copy cell rowkey", KR(ret), K(cell_rowkey));
+            } else if (OB_FAIL(ob_write_string(allocator_, cell_qualifier, cur_qualifier_))) {
+              LOG_WARN("fail to copy cell qualifier", KR(ret), K(cell_qualifier));
+            }
+          } else {
+            cur_version_++;
+          }
+          if (max_version_ > 0 && cur_version_ > max_version_) {
+            max_version_cnt_++;
+            cur_del_rows_++;
+            is_last_row_ttl_ = false;
+            is_expired = true;
+          } else if (time_to_live_ms_ > 0 && (cell_ts + time_to_live_ms_ < ObHTableUtils::current_time_millis())) {
+            ttl_cnt_++;
+            cur_del_rows_++;
+            is_last_row_ttl_ = true;
+            is_expired = true;
           }
         } else {
-          cur_version_++;
-        }
-        if (max_version_ > 0 && cur_version_ > max_version_) {
-          max_version_cnt_++;
-          cur_del_rows_++;
-          is_last_row_ttl_ = false;
-          is_expired = true;
-        } else if (time_to_live_ms_ > 0 && (cell_ts + time_to_live_ms_ < ObHTableUtils::current_time_millis())) {
-          ttl_cnt_++;
-          cur_del_rows_++;
-          is_last_row_ttl_ = true;
-          is_expired = true;
-        }
-      } else {
-        // NOTE: For relation table, the row expired if and only if
-        // 1. The row's expired time (the result of ttl definition) exceed current time
-        scan_cnt_++;
-        if (OB_FAIL(ttl_checker_.check_row_expired(*row, is_expired))) {
-          LOG_WARN("fail to check row expired", KR(ret));
-        } else if (is_expired) {
-          ttl_cnt_++;
-          cur_del_rows_++;
-          is_last_row_ttl_ = true;
+          // NOTE: For relation table, the row expired if and only if
+          // 1. The row's expired time (the result of ttl definition) exceed current time
+          scan_cnt_++;
+          if (OB_FAIL(ttl_checker_.check_row_expired(*row, is_expired))) {
+            LOG_WARN("fail to check row expired", KR(ret));
+          } else if (is_expired) {
+            ttl_cnt_++;
+            cur_del_rows_++;
+            is_last_row_ttl_ = true;
+          }
         }
       }
     }
@@ -658,6 +665,7 @@ int ObTableTTLDeleteTask::execute_ttl_delete(ObTableTTLDeleteRowIterator &ttl_ro
     }
 
     if (OB_SUCC(ret) && rowkey_.is_valid()) {
+      // if ITER_END in ttl_row_iter, rowkey_ will not be assigned by last_row_ in this round
       uint64_t buf_len = rowkey_.get_serialize_size();
       char *buf = static_cast<char *>(allocator_.alloc(buf_len));
       int64_t pos = 0;