From d1a4e2d232c35264621503b9905be1f19ebd7469 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 25 May 2022 08:03:05 +0000
Subject: [PATCH] feat: drop stable

---
 source/dnode/vnode/src/meta/metaTable.c | 144 +++++++-----------------
 1 file changed, 43 insertions(+), 101 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index 208d6f9fca..462d461a8a 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -23,6 +23,7 @@ static int metaUpdateTtlIdx(SMeta *pMeta, const SMetaEntry *pME);
 static int metaSaveToSkmDb(SMeta *pMeta, const SMetaEntry *pME);
 static int metaUpdateCtbIdx(SMeta *pMeta, const SMetaEntry *pME);
 static int metaUpdateTagIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry);
+static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type);
 
 int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
   SMetaEntry  me = {0};
@@ -116,7 +117,7 @@ int metaDropSTable(SMeta *pMeta, int64_t verison, SVDropStbReq *pReq) {
 
   for (int32_t iChild = 0; iChild < taosArrayGetSize(pArray); iChild++) {
     tb_uid_t uid = *(tb_uid_t *)taosArrayGet(pArray, iChild);
-    metaDropTableByUid(pMeta, uid);
+    metaDropTableByUid(pMeta, uid, NULL);
   }
 
   taosArrayDestroy(pArray);
@@ -263,122 +264,63 @@ _err:
 }
 
 int metaDropTable(SMeta *pMeta, int64_t version, SVDropTbReq *pReq, SArray *tbUids) {
-  TBC        *pTbDbc = NULL;
-  TBC        *pUidIdxc = NULL;
-  TBC        *pNameIdxc = NULL;
-  const void *pData;
-  int         nData;
-  tb_uid_t    uid;
-  int64_t     tver;
-  SMetaEntry  me = {0};
-  SDecoder    coder = {0};
-  int8_t      type;
-  int64_t     ctime;
-  tb_uid_t    suid;
-  int         c = 0, ret;
-
-  // search & delete the name idx
-  tdbTbcOpen(pMeta->pNameIdx, &pNameIdxc, &pMeta->txn);
-  ret = tdbTbcMoveTo(pNameIdxc, pReq->name, strlen(pReq->name) + 1, &c);
-  if (ret < 0 || !tdbTbcIsValid(pNameIdxc) || c) {
-    tdbTbcClose(pNameIdxc);
-    terrno = TSDB_CODE_VND_TABLE_NOT_EXIST;
-    return -1;
-  }
+  void    *pData = NULL;
+  int      nData = 0;
+  int      rc = 0;
+  tb_uid_t uid;
+  int      type;
 
-  ret = tdbTbcGet(pNameIdxc, NULL, NULL, &pData, &nData);
-  if (ret < 0) {
-    ASSERT(0);
+  rc = tdbTbGet(pMeta->pNameIdx, pReq->name, strlen(pReq->name) + 1, &pData, &nData);
+  if (rc < 0) {
+    terrno = TSDB_CODE_VND_TABLE_NOT_EXIST;
     return -1;
   }
-
   uid = *(tb_uid_t *)pData;
 
-  tdbTbcDelete(pNameIdxc);
-  tdbTbcClose(pNameIdxc);
-
-  // search & delete uid idx
-  tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, &pMeta->txn);
-  ret = tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
-  if (ret < 0 || c != 0) {
-    ASSERT(0);
-    return -1;
-  }
-
-  ret = tdbTbcGet(pUidIdxc, NULL, NULL, &pData, &nData);
-  if (ret < 0) {
-    ASSERT(0);
-    return -1;
-  }
-
-  tver = *(int64_t *)pData;
-  tdbTbcDelete(pUidIdxc);
-  tdbTbcClose(pUidIdxc);
-
-  // search and get meta entry
-  tdbTbcOpen(pMeta->pTbDb, &pTbDbc, &pMeta->txn);
-  ret = tdbTbcMoveTo(pTbDbc, &(STbDbKey){.uid = uid, .version = tver}, sizeof(STbDbKey), &c);
-  if (ret < 0 || c != 0) {
-    ASSERT(0);
-    return -1;
-  }
+  metaWLock(pMeta);
+  metaDropTableByUid(pMeta, uid, &type);
+  metaULock(pMeta);
 
-  ret = tdbTbcGet(pTbDbc, NULL, NULL, &pData, &nData);
-  if (ret < 0) {
-    ASSERT(0);
-    return -1;
+  if (type == TSDB_CHILD_TABLE && tbUids) {
+    taosArrayPush(tbUids, &uid);
   }
 
-  // decode entry
-  void *pDataCopy = taosMemoryMalloc(nData);  // remove the copy (todo)
-  memcpy(pDataCopy, pData, nData);
-  tDecoderInit(&coder, pDataCopy, nData);
-  ret = metaDecodeEntry(&coder, &me);
-  if (ret < 0) {
-    ASSERT(0);
-    return -1;
-  }
+  tdbFree(pData);
+  return 0;
+}
 
-  type = me.type;
-  if (type == TSDB_CHILD_TABLE) {
-    ctime = me.ctbEntry.ctime;
-    suid = me.ctbEntry.suid;
-    taosArrayPush(tbUids, &me.uid);
-  } else if (type == TSDB_NORMAL_TABLE) {
-    ctime = me.ntbEntry.ctime;
-    suid = 0;
-  } else {
-    ASSERT(0);
-  }
+static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type) {
+  void      *pData = NULL;
+  int        nData = 0;
+  int        rc = 0;
+  int64_t    version;
+  SMetaEntry e = {0};
+  SDecoder   dc = {0};
 
-  taosMemoryFree(pDataCopy);
-  tDecoderClear(&coder);
-  tdbTbcClose(pTbDbc);
+  rc = tdbTbGet(pMeta->pUidIdx, &uid, sizeof(uid), &pData, &nData);
+  version = *(int64_t *)pData;
 
-  if (type == TSDB_CHILD_TABLE) {
-    // remove the pCtbIdx
-    TBC *pCtbIdxc = NULL;
-    tdbTbcOpen(pMeta->pCtbIdx, &pCtbIdxc, &pMeta->txn);
+  tdbTbGet(pMeta->pTbDb, &(STbDbKey){.version = version, .uid = uid}, sizeof(STbDbKey), &pData, &nData);
 
-    ret = tdbTbcMoveTo(pCtbIdxc, &(SCtbIdxKey){.suid = suid, .uid = uid}, sizeof(SCtbIdxKey), &c);
-    if (ret < 0 || c != 0) {
-      ASSERT(0);
-      return -1;
-    }
+  tDecoderInit(&dc, pData, nData);
+  metaDecodeEntry(&dc, &e);
 
-    tdbTbcDelete(pCtbIdxc);
-    tdbTbcClose(pCtbIdxc);
+  if (type) *type = e.type;
 
-    // remove tags from pTagIdx (todo)
-  } else if (type == TSDB_NORMAL_TABLE) {
-    // remove from pSkmDb
-  } else {
-    ASSERT(0);
+  tdbTbDelete(pMeta->pTbDb, &(STbDbKey){.version = version, .uid = uid}, sizeof(STbDbKey), &pMeta->txn);
+  tdbTbDelete(pMeta->pNameIdx, e.name, strlen(e.name) + 1, &pMeta->txn);
+  tdbTbDelete(pMeta->pUidIdx, &uid, sizeof(uid), &pMeta->txn);
+  if (e.type == TSDB_CHILD_TABLE) {
+    tdbTbDelete(pMeta->pCtbIdx, &(SCtbIdxKey){.suid = e.ctbEntry.suid, .uid = uid}, sizeof(SCtbIdxKey), &pMeta->txn);
+  } else if (e.type == TSDB_NORMAL_TABLE) {
+    // drop schema.db (todo)
+    // drop ttl.idx (todo)
+  } else if (e.type == TSDB_SUPER_TABLE) {
+    // drop schema.db (todo)
   }
 
-  // remove from ttl (todo)
-  if (ctime > 0) {
-  }
+  tDecoderClear(&dc);
+  tdbFree(pData);
 
   return 0;
 }
-- 
GitLab