From 55840709ed2da07daf2bf0f0906fce8b8d1b7eb5 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 30 Jun 2023 13:54:49 +0800
Subject: [PATCH] skip dropped table tomb data commit

---
 source/dnode/vnode/src/tsdb/tsdbCommit2.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
index 7f5139caa5..170700aeb8 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@@ -112,6 +112,8 @@ static int32_t tsdbCommitTSData(SCommitter2 *committer) {
 
   committer->ctx->hasTSData = false;
 
+  committer->ctx->tbid->suid = 0;
+  committer->ctx->tbid->uid = 0;
   for (SRowInfo *row; (row = tsdbIterMergerGetData(committer->dataIterMerger)) != NULL;) {
     if (row->uid != committer->ctx->tbid->uid) {
       committer->ctx->tbid->suid = row->suid;
@@ -149,14 +151,28 @@ _exit:
 }
 
 static int32_t tsdbCommitTombData(SCommitter2 *committer) {
-  int32_t code = 0;
-  int32_t lino = 0;
+  int32_t   code = 0;
+  int32_t   lino = 0;
+  SMetaInfo info;
 
   if (committer->ctx->fset == NULL && !committer->ctx->hasTSData) {
     return 0;
   }
 
+  committer->ctx->tbid->suid = 0;
+  committer->ctx->tbid->uid = 0;
   for (STombRecord *record; (record = tsdbIterMergerGetTombRecord(committer->tombIterMerger));) {
+    if (record->uid != committer->ctx->tbid->uid) {
+      committer->ctx->tbid->suid = record->suid;
+      committer->ctx->tbid->uid = record->uid;
+
+      if (metaGetInfo(committer->tsdb->pVnode->pMeta, record->uid, &info, NULL) != 0) {
+        code = tsdbIterMergerSkipTableData(committer->dataIterMerger, committer->ctx->tbid);
+        TSDB_CHECK_CODE(code, lino, _exit);
+        continue;
+      }
+    }
+
     if (record->ekey < committer->ctx->minKey) {
       goto _next;
     } else if (record->skey > committer->ctx->maxKey) {
-- 
GitLab