Merge pull request #16423 from taosdata/fix/TD-18306-D

fix: release SStreamObj/SSmaObj when dropping sma index

include/common/tmsg.h

@@ -2677,15 +2677,6 @@ typedef struct {
 int32_t tSerializeSMDropSmaReq(void* buf, int32_t bufLen, SMDropSmaReq* pReq);
 int32_t tDeserializeSMDropSmaReq(void* buf, int32_t bufLen, SMDropSmaReq* pReq);
 
-typedef struct {
-  int32_t vgId;
-  SEpSet  epSet;
-} SVgEpSet;
-
-typedef struct {
-  int32_t padding;
-} SRSmaExecMsg;
-
 typedef struct {
   int8_t         version;       // for compatibility(default 0)
   int8_t         intervalUnit;  // MACRO: TIME_UNIT_XXX

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

@@ -38,7 +38,6 @@ static SSdbRow *mndSmaActionDecode(SSdbRaw *pRaw);
 static int32_t  mndSmaActionInsert(SSdb *pSdb, SSmaObj *pSma);
 static int32_t  mndSmaActionDelete(SSdb *pSdb, SSmaObj *pSpSmatb);
 static int32_t  mndSmaActionUpdate(SSdb *pSdb, SSmaObj *pOld, SSmaObj *pNew);
-static int32_t  mndSmaGetVgEpSet(SMnode *pMnode, SDbObj *pDb, SVgEpSet **ppVgEpSet, int32_t *numOfVgroups);
 static int32_t  mndProcessCreateSmaReq(SRpcMsg *pReq);
 static int32_t  mndProcessDropSmaReq(SRpcMsg *pReq);
 static int32_t  mndProcessGetSmaReq(SRpcMsg *pReq);
@@ -841,6 +840,7 @@ static int32_t mndDropSma(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb, SSmaObj *p
 
 _OVER:
   mndTransDrop(pTrans);
+  mndReleaseStream(pMnode, pStream);
   mndReleaseVgroup(pMnode, pVgroup);
   mndReleaseStb(pMnode, pStb);
   return code;
@@ -961,6 +961,7 @@ _OVER:
     mError("sma:%s, failed to drop since %s", dropReq.name, terrstr());
   }
 
+  mndReleaseSma(pMnode, pSma);
   mndReleaseDb(pMnode, pDb);
   return code;
 }