xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

message compitible

This commit is contained in:
cadem 2023-04-20 09:45:32 +08:00
parent 66bacdb165
commit d51070922b
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/common/src/tmsg.c
View File

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