message compitible

source/common/src/tmsg.c

@@ -4213,11 +4213,13 @@ int32_t tDeserializeSCreateVnodeReq(void *buf, int32_t bufLen, SCreateVnodeReq *
   for (int32_t i = 0; i < 8; ++i) {
     if (tDecodeI64(&decoder, &pReq->reserved[i]) < 0) return -1;
   }
-  if (tDecodeI8(&decoder, &pReq->learnerReplica) < 0) return -1;
-  if (tDecodeI8(&decoder, &pReq->learnerSelfIndex) < 0) return -1;
-  for (int32_t i = 0; i < TSDB_MAX_LEARNER_REPLICA; ++i) {
-    SReplica *pReplica = &pReq->learnerReplicas[i];
-    if (tDecodeSReplica(&decoder, pReplica) < 0) return -1;
+  if (tDecodeIsEnd(&decoder)) {
+    if (tDecodeI8(&decoder, &pReq->learnerReplica) < 0) return -1;
+    if (tDecodeI8(&decoder, &pReq->learnerSelfIndex) < 0) return -1;
+    for (int32_t i = 0; i < TSDB_MAX_LEARNER_REPLICA; ++i) {
+      SReplica *pReplica = &pReq->learnerReplicas[i];
+      if (tDecodeSReplica(&decoder, pReplica) < 0) return -1;
+    }
   }
 
   tEndDecode(&decoder);
@@ -4474,13 +4476,15 @@ int32_t tDeserializeSAlterVnodeReplicaReq(void *buf, int32_t bufLen, SAlterVnode
   for (int32_t i = 0; i < 8; ++i) {
     if (tDecodeI64(&decoder, &pReq->reserved[i]) < 0) return -1;
   }
-  if (tDecodeI8(&decoder, &pReq->learnerSelfIndex) < 0) return -1;
-  if (tDecodeI8(&decoder, &pReq->learnerReplica) < 0) return -1;
-  for (int32_t i = 0; i < TSDB_MAX_LEARNER_REPLICA; ++i) {
-    SReplica *pReplica = &pReq->learnerReplicas[i];
-    if (tDecodeSReplica(&decoder, pReplica) < 0) return -1;
+  if (tDecodeIsEnd(&decoder)) {
+    if (tDecodeI8(&decoder, &pReq->learnerSelfIndex) < 0) return -1;
+    if (tDecodeI8(&decoder, &pReq->learnerReplica) < 0) return -1;
+    for (int32_t i = 0; i < TSDB_MAX_LEARNER_REPLICA; ++i) {
+      SReplica *pReplica = &pReq->learnerReplicas[i];
+      if (tDecodeSReplica(&decoder, pReplica) < 0) return -1;
+    }
   }
-
+  
   tEndDecode(&decoder);
   tDecoderClear(&decoder);
   return 0;
@@ -4814,12 +4818,14 @@ int32_t tDeserializeSDCreateMnodeReq(void *buf, int32_t bufLen, SDCreateMnodeReq
     SReplica *pReplica = &pReq->replicas[i];
     if (tDecodeSReplica(&decoder, pReplica) < 0) return -1;
   }
-  if (tDecodeI8(&decoder, &pReq->learnerReplica) < 0) return -1;
-  for (int32_t i = 0; i < TSDB_MAX_LEARNER_REPLICA; ++i) {
-    SReplica *pReplica = &pReq->learnerReplicas[i];
-    if (tDecodeSReplica(&decoder, pReplica) < 0) return -1;
+  if (tDecodeIsEnd(&decoder)) {
+    if (tDecodeI8(&decoder, &pReq->learnerReplica) < 0) return -1;
+    for (int32_t i = 0; i < TSDB_MAX_LEARNER_REPLICA; ++i) {
+      SReplica *pReplica = &pReq->learnerReplicas[i];
+      if (tDecodeSReplica(&decoder, pReplica) < 0) return -1;
+    }
+    if (tDecodeI64(&decoder, &pReq->lastIndex) < 0) return -1;
   }
-  if (tDecodeI64(&decoder, &pReq->lastIndex) < 0) return -1;
   tEndDecode(&decoder);
 
   tDecoderClear(&decoder);