add index case

.gitignore

@@ -130,3 +130,4 @@ tools/COPYING
 tools/BUGS
 tools/taos-tools
 tools/taosws-rs
+tags

source/dnode/mnode/impl/inc/mndIndex.h

@@ -13,7 +13,8 @@ SIdxObj *mndAcquireIdx(SMnode *pMnode, char *Name);
 void     mndReleaseIdx(SMnode *pMnode, SIdxObj *pSma);
 int32_t  mndDropIdxsByStb(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SStbObj *pStb);
 int32_t  mndDropIdxsByDb(SMnode *pMnode, STrans *pTrans, SDbObj *pDb);
-int32_t  mndGetTableIdx(SMnode *pMnode, char *tbFName, STableIndexRsp *rsp, bool *exist);
+// int32_t  mndDropIdxsByTagName(SMnode *pMnode, SStbObj *pStb, char *tagName);
+int32_t mndGetTableIdx(SMnode *pMnode, char *tbFName, STableIndexRsp *rsp, bool *exist);
 
 int32_t mndRetrieveTagIdx(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows);
 int32_t mndProcessDropTagIdxReq(SRpcMsg *pReq);

source/dnode/mnode/impl/src/mndDb.c

@@ -17,6 +17,7 @@
 #include "mndDb.h"
 #include "mndCluster.h"
 #include "mndDnode.h"
+#include "mndIndex.h"
 #include "mndPrivilege.h"
 #include "mndShow.h"
 #include "mndSma.h"
@@ -1053,6 +1054,7 @@ static int32_t mndDropDb(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb) {
   /*if (mndDropTopicByDB(pMnode, pTrans, pDb) != 0) goto _OVER;*/
   if (mndDropStreamByDb(pMnode, pTrans, pDb) != 0) goto _OVER;
   if (mndDropSmasByDb(pMnode, pTrans, pDb) != 0) goto _OVER;
+  if (mndDropIdxsByDb(pMnode, pTrans, pDb) != 0) goto _OVER;
   if (mndSetDropDbRedoActions(pMnode, pTrans, pDb) != 0) goto _OVER;
   if (mndUserRemoveDb(pMnode, pTrans, pDb->name) != 0) goto _OVER;
 

source/dnode/mnode/impl/src/mndIndex.c

@@ -469,16 +469,6 @@ static int32_t mndSetDropIdxCommitLogs(SMnode *pMnode, STrans *pTrans, SIdxObj *
   return 0;
 }
 
-int32_t mndDropIdxsByStb(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SStbObj *pStb) {
-  // stb
-  return 0;
-}
-
-int32_t mndDropIdxsByDb(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
-  // by db name
-  return 0;
-}
-
 static int32_t mndProcessGetTbIdxReq(SRpcMsg *pReq) {
   //
   return 0;
@@ -791,3 +781,72 @@ static int32_t mndProcessGetIdxReq(SRpcMsg *pReq) {
   // do nothing
   return 0;
 }
+
+int32_t mndDropIdxsByStb(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SStbObj *pStb) {
+  SSdb *pSdb = pMnode->pSdb;
+  void *pIter = NULL;
+
+  while (1) {
+    SIdxObj *pIdx = NULL;
+    pIter = sdbFetch(pSdb, SDB_IDX, pIter, (void **)&pIdx);
+    if (pIter == NULL) break;
+
+    if (pIdx->stbUid == pStb->uid) {
+      if (mndSetDropIdxCommitLogs(pMnode, pTrans, pIdx) != 0) {
+        sdbRelease(pSdb, pIdx);
+        sdbCancelFetch(pSdb, pIdx);
+        return -1;
+      }
+    }
+
+    sdbRelease(pSdb, pIdx);
+  }
+
+  return 0;
+}
+
+/*
+int32_t mndDropIdxsByTagName(SMnode *pMnode, SStbObj *pStb, char *tagName) {
+  SSdb *pSdb = pMnode->pSdb;
+  void *pIter = NULL;
+
+  while (1) {
+    SIdxObj *pIdx = NULL;
+    pIter = sdbFetch(pSdb, SDB_IDX, pIter, (void **)&pIdx);
+    if (pIter == NULL) break;
+
+    if (pIdx->stbUid == pStb->uid && strcasecmp(pIdx->colName, tagName) == 0) {
+      if (mndSetDropIdxCommitLogs(pMnode, pTrans, pIdx) != 0) {
+        sdbRelease(pSdb, pIdx);
+        sdbCancelFetch(pSdb, pIdx);
+        return -1;
+      }
+    }
+
+    sdbRelease(pSdb, pIdx);
+  }
+
+  return 0;
+}*/
+int32_t mndDropIdxsByDb(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
+  SSdb *pSdb = pMnode->pSdb;
+  void *pIter = NULL;
+
+  while (1) {
+    SIdxObj *pIdx = NULL;
+    pIter = sdbFetch(pSdb, SDB_IDX, pIter, (void **)&pIdx);
+    if (pIter == NULL) break;
+
+    if (pIdx->dbUid == pDb->uid) {
+      if (mndSetDropIdxCommitLogs(pMnode, pTrans, pIdx) != 0) {
+        sdbRelease(pSdb, pIdx);
+        sdbCancelFetch(pSdb, pIdx);
+        return -1;
+      }
+    }
+
+    sdbRelease(pSdb, pIdx);
+  }
+
+  return 0;
+}
\ No newline at end of file

source/dnode/mnode/impl/src/mndStb.c

@@ -17,6 +17,7 @@
 #include "mndStb.h"
 #include "mndDb.h"
 #include "mndDnode.h"
+#include "mndIndex.h"
 #include "mndInfoSchema.h"
 #include "mndMnode.h"
 #include "mndPerfSchema.h"
@@ -1358,6 +1359,10 @@ static int32_t mndDropSuperTableTag(SMnode *pMnode, const SStbObj *pOld, SStbObj
   pNew->numOfTags--;
 
   pNew->tagVer++;
+
+  // if (mndDropIndexByTag(pMnode, pOld, tagName) != 0) {
+  //   return -1;
+  // }
   mInfo("stb:%s, start to drop tag %s", pNew->name, tagName);
   return 0;
 }
@@ -2120,9 +2125,9 @@ static int32_t mndDropStb(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb, SStbObj *p
   if (mndSetDropStbRedoLogs(pMnode, pTrans, pStb) != 0) goto _OVER;
   if (mndSetDropStbCommitLogs(pMnode, pTrans, pStb) != 0) goto _OVER;
   if (mndSetDropStbRedoActions(pMnode, pTrans, pDb, pStb) != 0) goto _OVER;
+  if (mndDropIdxsByStb(pMnode, pTrans, pDb, pStb) != 0) goto _OVER;
   if (mndDropSmasByStb(pMnode, pTrans, pDb, pStb) != 0) goto _OVER;
   if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
-
   code = 0;
 
 _OVER:

tests/script/tsim/tagindex/sma_and_tag_index.sim

@@ -76,30 +76,33 @@ sql drop index smat2i
 
 $i = 0
 $smaPre = sma3
-while $i < 5000 
+while $i < 5 
   $sma = $smaPre . $i
   $i = $i + 1
   sql create sma index $sma on $mtPrefix function(max(c1)) interval(6m,10s) sliding(6m);
 endw
 
 sql select * from information_schema.ins_indexes
-if $rows != 5001 then 
+if $rows != 6 then 
   return -1
 endi
 
 
 
+sql drop stable $mtPrefix
+sql select * from information_schema.ins_indexes
+if $rows != 0 then 
+  return -1
+endi
 
+sql create table if not exists $mtPrefix (ts timestamp, c1 int) tags (t1 int, t2 int, t3 int, t4 int, t5 int)
+sql create index tagt2i on $mtPrefix (t2)
+sql drop database $dbPrefix
 
-
-print ==== test name conflict
- 
-sql_error create index ti3 on $mtPrefix(t2) 
-
-sql_error create index ti2 on $mtPrefix(t2) 
-sql_error create index ti2 on $mtPrefix(t1) 
-sql_error create index ti2 on $mtPrefix(t3) 
-sql_error create index ti2 on $mtPrefix(txx) 
+sql select * from information_schema.ins_indexes
+if $rows != 0 then 
+  return -1
+endi
 
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file