From 151df3bf8fe59a9d379f5a669bb93a02d0a4dbdf Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 1 Feb 2023 21:02:52 +0800
Subject: [PATCH] opt tag filter

---
 source/client/src/clientTmq.c          |  2 +-
 source/dnode/mnode/impl/src/mndStb.c   | 12 ++----------
 source/dnode/mnode/impl/src/mndTrans.c |  6 ++++++
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c
index 01c99c6e9e..bb68ce65c2 100644
--- a/source/client/src/clientTmq.c
+++ b/source/client/src/clientTmq.c
@@ -418,7 +418,7 @@ int32_t tmqCommitDone(SMqCommitCbParamSet* pParamSet) {
 
 static void tmqCommitRspCountDown(SMqCommitCbParamSet* pParamSet) {
   int32_t waitingRspNum = atomic_sub_fetch_32(&pParamSet->waitingRspNum, 1);
-  if(ASSERT(waitingRspNum >= 0)){
+  if (ASSERT(waitingRspNum >= 0)) {
     tscError("tmqCommitRspCountDown error:%d", waitingRspNum);
     return;
   }
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 706dfb9724..e660b78def 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -3130,7 +3130,7 @@ static int32_t mndCheckIndexReq(SCreateTagIndexReq *pReq) {
 int32_t mndAddIndexImpl(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb, SStbObj *pStb, bool needRsp, void *sql,
                         int32_t len) {
   // impl later
-  int32_t code = -1;
+  int32_t code = 0;
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_DB_INSIDE, pReq, "create-stb-index");
   if (pTrans == NULL) goto _OVER;
 
@@ -3138,11 +3138,6 @@ int32_t mndAddIndexImpl(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb, SStbObj *pSt
   mndTransSetDbName(pTrans, pDb->name, pStb->name);
   if (mndTrancCheckConflict(pMnode, pTrans) != 0) goto _OVER;
 
-  if (needRsp) {
-    void   *pCont = NULL;
-    int32_t contLen = 0;
-    mndTransSetRpcRsp(pTrans, pCont, contLen);
-  }
   if (mndSetAlterStbRedoLogs(pMnode, pTrans, pDb, pStb) != 0) goto _OVER;
   if (mndSetAlterStbCommitLogs(pMnode, pTrans, pDb, pStb) != 0) goto _OVER;
   if (mndSetAlterStbRedoActions2(pMnode, pTrans, pDb, pStb, sql, len) != 0) goto _OVER;
@@ -3234,11 +3229,8 @@ static int32_t mndProcessCreateIndexReq(SRpcMsg *pReq) {
   if (terrno == TSDB_CODE_MND_TAG_INDEX_ALREADY_EXIST || terrno == TSDB_CODE_MND_TAG_NOT_EXIST) {
     return terrno;
   } else {
-    if (code != 0) code = TSDB_CODE_ACTION_IN_PROGRESS;
+    if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS;
   }
-
-  return TSDB_CODE_SUCCESS;
-
 _OVER:
   if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {
     mError("stb:%s, failed to create index since %s", tagIdxReq.stbName, terrstr());
diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c
index dfcd55bcba..4e19152ca4 100644
--- a/source/dnode/mnode/impl/src/mndTrans.c
+++ b/source/dnode/mnode/impl/src/mndTrans.c
@@ -994,6 +994,12 @@ static void mndTransSendRpcRsp(SMnode *pMnode, STrans *pTrans) {
         if (0 == mndBuildSMCreateStbRsp(pMnode, pTrans->dbname, pTrans->stbname, &pCont, &contLen) != 0) {
           mndTransSetRpcRsp(pTrans, pCont, contLen);
         }
+      } else if (pTrans->originRpcType == TDMT_MND_CREATE_INDEX) {
+        void   *pCont = NULL;
+        int32_t contLen = 0;
+        if (0 == mndBuildSMCreateStbRsp(pMnode, pTrans->dbname, pTrans->stbname, &pCont, &contLen) != 0) {
+          mndTransSetRpcRsp(pTrans, pCont, contLen);
+        }
       }
 
       if (pTrans->rpcRspLen != 0) {
-- 
GitLab