Merge pull request #22661 from taosdata/enh/reserve

stream change ver

include/libs/stream/tstream.h

@@ -31,7 +31,7 @@ extern "C" {
 
 typedef struct SStreamTask SStreamTask;
 
-#define SSTREAM_TASK_VER 1
+#define SSTREAM_TASK_VER 2
 enum {
   STREAM_STATUS__NORMAL = 0,
   STREAM_STATUS__STOP,
@@ -371,6 +371,7 @@ struct SStreamTask {
   int32_t             transferStateAlignCnt;
   struct SStreamMeta* pMeta;
   SSHashObj*          pNameMap;
+  char                reserve[256];
 };
 
 typedef struct SMetaHbInfo {

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

@@ -709,6 +709,8 @@ typedef struct {
 
   // 3.0.5.
   int64_t checkpointId;
+  char    reserve[256];
+
 } SStreamObj;
 
 int32_t tEncodeSStreamObj(SEncoder* pEncoder, const SStreamObj* pObj);

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

@@ -84,6 +84,8 @@ int32_t tEncodeSStreamObj(SEncoder *pEncoder, const SStreamObj *pObj) {
   // 3.0.50 ver = 3
   if (tEncodeI64(pEncoder, pObj->checkpointId) < 0) return -1;
 
+  if (tEncodeCStrWithLen(pEncoder, pObj->reserve, sizeof(pObj->reserve) - 1) < 0) return -1;
+
   tEndEncode(pEncoder);
   return pEncoder->pos;
 }
@@ -157,6 +159,8 @@ int32_t tDecodeSStreamObj(SDecoder *pDecoder, SStreamObj *pObj, int32_t sver) {
   if (sver >= 3) {
     if (tDecodeI64(pDecoder, &pObj->checkpointId) < 0) return -1;
   }
+  if (tDecodeCStrTo(pDecoder, pObj->reserve) < 0) return -1;
+
   tEndDecode(pDecoder);
   return 0;
 }

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

@@ -14,6 +14,7 @@
  */
 
 #include "mndStream.h"
+#include "audit.h"
 #include "mndDb.h"
 #include "mndDnode.h"
 #include "mndMnode.h"
@@ -28,9 +29,8 @@
 #include "parser.h"
 #include "tmisce.h"
 #include "tname.h"
-#include "audit.h"
 
-#define MND_STREAM_VER_NUMBER      3
+#define MND_STREAM_VER_NUMBER      4
 #define MND_STREAM_RESERVE_SIZE    64
 #define MND_STREAM_MAX_NUM         60
 #define MND_STREAM_CHECKPOINT_NAME "stream-checkpoint"
@@ -874,15 +874,18 @@ static int32_t mndProcessCreateStreamReq(SRpcMsg *pReq) {
   code = TSDB_CODE_ACTION_IN_PROGRESS;
 
   char detail[2000] = {0};
-  sprintf(detail, "checkpointFreq:%" PRId64 ", createStb:%d, deleteMark:%" PRId64 ", "
+  sprintf(detail,
+          "checkpointFreq:%" PRId64 ", createStb:%d, deleteMark:%" PRId64
+          ", "
           "fillHistory:%d, igExists:%d, "
-          "igExpired:%d, igUpdate:%d, lastTs:%" PRId64 ", "
+          "igExpired:%d, igUpdate:%d, lastTs:%" PRId64
-          "maxDelay:%" PRId64 ", numOfTags:%d, sourceDB:%s, "
+          ", "
+          "maxDelay:%" PRId64
+          ", numOfTags:%d, sourceDB:%s, "
           "targetStbFullName:%s, triggerType:%d, watermark:%" PRId64,
           createStreamReq.checkpointFreq, createStreamReq.createStb, createStreamReq.deleteMark,
-          createStreamReq.fillHistory, createStreamReq.igExists, 
+          createStreamReq.fillHistory, createStreamReq.igExists, createStreamReq.igExpired, createStreamReq.igUpdate,
-          createStreamReq.igExpired, createStreamReq.igUpdate, createStreamReq.lastTs,
+          createStreamReq.lastTs, createStreamReq.maxDelay, createStreamReq.numOfTags, createStreamReq.sourceDB,
-          createStreamReq.maxDelay, createStreamReq.numOfTags, createStreamReq.sourceDB, 
           createStreamReq.targetStbFullName, createStreamReq.triggerType, createStreamReq.watermark);
 
   auditRecord(pReq, pMnode->clusterId, "createStream", createStreamReq.name, "", detail);

source/libs/stream/src/streamTask.c

@@ -134,46 +134,12 @@ int32_t tEncodeStreamTask(SEncoder* pEncoder, const SStreamTask* pTask) {
     if (tEncodeCStr(pEncoder, pTask->shuffleDispatcher.stbFullName) < 0) return -1;
   }
   if (tEncodeI64(pEncoder, pTask->triggerParam) < 0) return -1;
+  if (tEncodeCStrWithLen(pEncoder, pTask->reserve, sizeof(pTask->reserve) - 1) < 0) return -1;
 
   tEndEncode(pEncoder);
   return pEncoder->pos;
 }
 
-int32_t tDecodeStreamTaskChkInfo(SDecoder* pDecoder, SCheckpointInfo* pChkpInfo) {
-  int64_t ver;
-  int64_t skip64;
-  int8_t  skip8;
-  int32_t skip32;
-  int16_t skip16;
-  SEpSet  epSet;
-
-  if (tStartDecode(pDecoder) < 0) return -1;
-  if (tDecodeI64(pDecoder, &ver) < 0) return -1;
-
-  if (ver != SSTREAM_TASK_VER) return -1;
-
-  if (tDecodeI64(pDecoder, &skip64) < 0) return -1;
-  if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
-  if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
-  if (tDecodeI8(pDecoder, &skip8) < 0) return -1;
-  if (tDecodeI8(pDecoder, &skip8) < 0) return -1;
-  if (tDecodeI16(pDecoder, &skip16) < 0) return -1;
-
-  if (tDecodeI8(pDecoder, &skip8) < 0) return -1;
-  if (tDecodeI8(pDecoder, &skip8) < 0) return -1;
-
-  if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
-  if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
-  if (tDecodeSEpSet(pDecoder, &epSet) < 0) return -1;
-  if (tDecodeSEpSet(pDecoder, &epSet) < 0) return -1;
-
-  if (tDecodeI64(pDecoder, &pChkpInfo->checkpointId) < 0) return -1;
-  if (tDecodeI64(pDecoder, &pChkpInfo->checkpointVer) < 0) return -1;
-
-  tEndDecode(pDecoder);
-  return 0;
-}
-
 int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
   if (tStartDecode(pDecoder) < 0) return -1;
   if (tDecodeI64(pDecoder, &pTask->ver) < 0) return -1;
@@ -245,6 +211,42 @@ int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
     if (tDecodeCStrTo(pDecoder, pTask->shuffleDispatcher.stbFullName) < 0) return -1;
   }
   if (tDecodeI64(pDecoder, &pTask->triggerParam) < 0) return -1;
+  if (tDecodeCStrTo(pDecoder, pTask->reserve) < 0) return -1;
+
+  tEndDecode(pDecoder);
+  return 0;
+}
+
+int32_t tDecodeStreamTaskChkInfo(SDecoder* pDecoder, SCheckpointInfo* pChkpInfo) {
+  int64_t ver;
+  int64_t skip64;
+  int8_t  skip8;
+  int32_t skip32;
+  int16_t skip16;
+  SEpSet  epSet;
+
+  if (tStartDecode(pDecoder) < 0) return -1;
+  if (tDecodeI64(pDecoder, &ver) < 0) return -1;
+
+  if (ver != SSTREAM_TASK_VER) return -1;
+
+  if (tDecodeI64(pDecoder, &skip64) < 0) return -1;
+  if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
+  if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
+  if (tDecodeI8(pDecoder, &skip8) < 0) return -1;
+  if (tDecodeI8(pDecoder, &skip8) < 0) return -1;
+  if (tDecodeI16(pDecoder, &skip16) < 0) return -1;
+
+  if (tDecodeI8(pDecoder, &skip8) < 0) return -1;
+  if (tDecodeI8(pDecoder, &skip8) < 0) return -1;
+
+  if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
+  if (tDecodeI32(pDecoder, &skip32) < 0) return -1;
+  if (tDecodeSEpSet(pDecoder, &epSet) < 0) return -1;
+  if (tDecodeSEpSet(pDecoder, &epSet) < 0) return -1;
+
+  if (tDecodeI64(pDecoder, &pChkpInfo->checkpointId) < 0) return -1;
+  if (tDecodeI64(pDecoder, &pChkpInfo->checkpointVer) < 0) return -1;
 
   tEndDecode(pDecoder);
   return 0;