Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1193
Star 22018
Fork 4786
T
TDengine
提交 d5107092 编写于 作者: C cadem
浏览文件
操作

message compitible

上级 66bacdb1
隐藏空白更改
内联 并排
Showing with 22 addition and 16 deletion
source/common/src/tmsg.c
浏览文件 @ d5107092
...@@ -4213,11 +4213,13 @@ int32_t tDeserializeSCreateVnodeReq(void *buf, int32_t bufLen, SCreateVnodeReq * ...@@ -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 ...@@ -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 ...@@ -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);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或