From f630fc38f805e178ef1c3e0b27b68a16036f2d80 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Mon, 23 Oct 2023 15:46:32 +0800
Subject: [PATCH] tsdb/commit: skip last tier ts data committing

---
 source/dnode/vnode/src/tsdb/tsdbCommit2.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
index d4cb63fb7b..5bb486de4a 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@@ -128,8 +128,16 @@ static int32_t tsdbCommitTSData(SCommitter2 *committer) {
       }
     }
 
+    extern int8_t tsS3Enabled;
+
+    int32_t nlevel = tfsGetLevel(committer->tsdb->pVnode->pTfs);
+    bool    skipRow = false;
+    if (tsS3Enabled && nlevel > 1 && committer->ctx->did.level == nlevel - 1) {
+      skipRow = true;
+    }
+
     int64_t ts = TSDBROW_TS(&row->row);
-    if (ts > committer->ctx->maxKey) {
+    if (ts > committer->ctx->maxKey || skipRow) {
       committer->ctx->nextKey = TMIN(committer->ctx->nextKey, ts);
       code = tsdbIterMergerSkipTableData(committer->dataIterMerger, committer->ctx->tbid);
       TSDB_CHECK_CODE(code, lino, _exit);