Merge pull request #13466 from taosdata/feature/TD-14481-3.0

feat: add msg of exp wnd and del

include/common/tmsg.h

@@ -2397,16 +2397,26 @@ static int32_t tDecodeTSmaWrapper(SDecoder* pDecoder, STSmaWrapper* pReq) {
 }
 
 typedef struct {
-  int64_t tsmaIndexUid;
+  int64_t indexUid;
   STimeWindow queryWindow;
 } SVGetTsmaExpWndsReq;
 
+#define SMA_WNDS_EXPIRE_FLAG      (0x1)
+#define SMA_WNDS_IS_EXPIRE(flag)  (((flag)&SMA_WNDS_EXPIRE_FLAG) != 0)
+#define SMA_WNDS_SET_EXPIRE(flag) ((flag) |= SMA_WNDS_EXPIRE_FLAG)
+
 typedef struct {
-  int64_t tsmaIndexUid;
+  int64_t indexUid;
+  int8_t  flags;  // 0x1 all window expired
   int32_t numExpWnds;
-  TSKEY*  expWndsStartTs;
+  TSKEY   wndSKeys[];
 } SVGetTsmaExpWndsRsp;
 
+int32_t tEncodeSVGetTSmaExpWndsReq(SEncoder* pCoder, const SVGetTsmaExpWndsReq* pReq);
+int32_t tDecodeSVGetTsmaExpWndsReq(SDecoder* pCoder, SVGetTsmaExpWndsReq* pReq);
+int32_t tEncodeSVGetTSmaExpWndsRsp(SEncoder* pCoder, const SVGetTsmaExpWndsRsp* pReq);
+int32_t tDecodeSVGetTsmaExpWndsRsp(SDecoder* pCoder, SVGetTsmaExpWndsRsp* pReq);
+
 typedef struct {
   int idx;
 } SMCreateFullTextReq;
@@ -2670,23 +2680,27 @@ typedef struct {
 int32_t tEncodeSVSubmitReq(SEncoder* pCoder, const SVSubmitReq* pReq);
 int32_t tDecodeSVSubmitReq(SDecoder* pCoder, SVSubmitReq* pReq);
 
-// TDMT_VND_DELETE
 typedef struct {
-  TSKEY sKey;
-  TSKEY eKey;
-
-  // super table
-  char* stbName;
-
-  // child/normal
-  char* tbName;
+  int64_t     delUid;
+  int64_t     tbUid;  // super/child/normal table
+  int8_t      type;   // table type
+  int16_t     nWnds;
+  char*       tbFullName;
+  char*       subPlan;
+  STimeWindow wnds[];
 } SVDeleteReq;
 
+int32_t tEncodeSVDeleteReq(SEncoder* pCoder, const SVDeleteReq* pReq);
+int32_t tDecodeSVDeleteReq(SDecoder* pCoder, SVDeleteReq* pReq);
+
 typedef struct {
   int32_t code;
-  // TODO
+  int64_t affectedRows;
 } SVDeleteRsp;
 
+int32_t tEncodeSVDeleteRsp(SEncoder* pCoder, const SVDeleteRsp* pReq);
+int32_t tDecodeSVDeleteRsp(SDecoder* pCoder, SVDeleteRsp* pReq);
+
 #pragma pack(pop)
 
 #ifdef __cplusplus

source/common/src/tmsg.c

@@ -3742,6 +3742,111 @@ int32_t tDecodeSVDropTSmaReq(SDecoder *pCoder, SVDropTSmaReq *pReq) {
   return 0;
 }
 
+int32_t tEncodeSVGetTSmaExpWndsReq(SEncoder* pCoder, const SVGetTsmaExpWndsReq* pReq) {
+  if (tStartEncode(pCoder) < 0) return -1;
+
+  if (tEncodeI64(pCoder, pReq->indexUid) < 0) return -1;
+  if (tEncodeI64(pCoder, pReq->queryWindow.skey) < 0) return -1;
+  if (tEncodeI64(pCoder, pReq->queryWindow.ekey) < 0) return -1;
+
+  tEndEncode(pCoder);
+  return 0;  
+}
+
+int32_t tDecodeSVGetTsmaExpWndsReq(SDecoder* pCoder, SVGetTsmaExpWndsReq* pReq) {
+  if (tStartDecode(pCoder) < 0) return -1;
+
+  if (tDecodeI64(pCoder, &pReq->indexUid) < 0) return -1;
+  if (tDecodeI64(pCoder, &pReq->queryWindow.skey) < 0) return -1;
+  if (tDecodeI64(pCoder, &pReq->queryWindow.ekey) < 0) return -1;
+
+  tEndDecode(pCoder);
+  return 0;
+}
+
+int32_t tEncodeSVGetTSmaExpWndsRsp(SEncoder* pCoder, const SVGetTsmaExpWndsRsp* pReq) {
+  if (tStartEncode(pCoder) < 0) return -1;
+
+  if (tEncodeI64(pCoder, pReq->indexUid) < 0) return -1;
+  if (tEncodeI8(pCoder, pReq->flags) < 0) return -1;
+  if (tEncodeI32(pCoder, pReq->numExpWnds) < 0) return -1;
+  for (int32_t i = 0; i < pReq->numExpWnds; ++i) {
+    if (tEncodeI64(pCoder, pReq->wndSKeys[i]) < 0) return -1;
+  }
+  tEndEncode(pCoder);
+  return 0;
+}
+
+int32_t tDecodeSVGetTsmaExpWndsRsp(SDecoder *pCoder, SVGetTsmaExpWndsRsp *pReq) {
+  if (tStartDecode(pCoder) < 0) return -1;
+
+  if (tDecodeI64(pCoder, &pReq->indexUid) < 0) return -1;
+  if (tDecodeI8(pCoder, &pReq->flags) < 0) return -1;
+  if (tDecodeI32(pCoder, &pReq->numExpWnds) < 0) return -1;
+  for (int32_t i = 0; i < pReq->numExpWnds; ++i) {
+    if (tDecodeI64(pCoder, &pReq->wndSKeys[i]) < 0) return -1;
+  }
+
+  tEndDecode(pCoder);
+  return 0;
+}
+
+int32_t tEncodeSVDeleteReq(SEncoder* pCoder, const SVDeleteReq* pReq) {
+  if (tStartEncode(pCoder) < 0) return -1;
+
+  if (tEncodeI64(pCoder, pReq->delUid) < 0) return -1;
+  if (tEncodeI64(pCoder, pReq->tbUid) < 0) return -1;
+  if (tEncodeI8(pCoder, pReq->type) < 0) return -1;
+  if (tEncodeI16v(pCoder, pReq->nWnds) < 0) return -1;
+  if (tEncodeCStr(pCoder, pReq->tbFullName) < 0) return -1;
+  if (tEncodeCStr(pCoder, pReq->subPlan) < 0) return -1;
+  for (int16_t i = 0; i < pReq->nWnds; ++i) {
+    if (tEncodeI64(pCoder, pReq->wnds[i].skey) < 0) return -1;
+    if (tEncodeI64(pCoder, pReq->wnds[i].ekey) < 0) return -1;
+  }
+
+  tEndEncode(pCoder);
+  return 0;
+}
+
+int32_t tDecodeSVDeleteReq(SDecoder* pCoder, SVDeleteReq* pReq) {
+  if (tStartDecode(pCoder) < 0) return -1;
+
+  if (tDecodeI64(pCoder, &pReq->delUid) < 0) return -1;
+  if (tDecodeI64(pCoder, &pReq->tbUid) < 0) return -1;
+  if (tDecodeI8(pCoder, &pReq->type) < 0) return -1;
+  if (tDecodeI16v(pCoder, &pReq->nWnds) < 0) return -1;
+  if (tDecodeCStr(pCoder, &pReq->tbFullName) < 0) return -1;
+  if (tDecodeCStr(pCoder, &pReq->subPlan) < 0) return -1;
+  for (int16_t i = 0; i < pReq->nWnds; ++i) {
+    if (tDecodeI64(pCoder, &pReq->wnds[i].skey) < 0) return -1;
+    if (tDecodeI64(pCoder, &pReq->wnds[i].ekey) < 0) return -1;
+  }
+
+  tEndDecode(pCoder);
+  return 0;
+}
+
+int32_t tEncodeSVDeleteRsp(SEncoder* pCoder, const SVDeleteRsp* pReq) {
+  if (tStartEncode(pCoder) < 0) return -1;
+
+  if (tEncodeI32(pCoder, pReq->code) < 0) return -1;
+  if (tEncodeI64(pCoder, pReq->affectedRows) < 0) return -1;
+
+  tEndEncode(pCoder);
+  return 0;
+}
+
+int32_t tDecodeSVDeleteRsp(SDecoder* pCoder, SVDeleteRsp* pReq) {
+  if (tStartDecode(pCoder) < 0) return -1;
+
+  if (tDecodeI32(pCoder, &pReq->code) < 0) return -1;
+  if (tDecodeI64(pCoder, &pReq->affectedRows) < 0) return -1;
+
+  tEndDecode(pCoder);
+  return 0;
+}
+
 int32_t tSerializeSCMCreateStreamReq(void *buf, int32_t bufLen, const SCMCreateStreamReq *pReq) {
   int32_t sqlLen = 0;
   int32_t astLen = 0;