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

Merge branch 'feat/TS-2846' of github.com:taosdata/TDengine into feat/TS-2846

This commit is contained in:
Xiaoyu Wang 2023-03-09 16:04:59 +08:00
parent e5de317f44 8ecfaa5a7c
commit 77cd3e82fb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/tmsg.h
View File

@ -1317,7 +1317,7 @@ typedef struct {
int8_t strict; int8_t strict;
int8_t cacheLast; int8_t cacheLast;
int64_t reserved[8]; int64_t reserved[8];
// 1.0 modification // 1st modification
int16_t sttTrigger; int16_t sttTrigger;
int32_t minRows; int32_t minRows;
} SAlterVnodeConfigReq; } SAlterVnodeConfigReq;

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

@ -4177,7 +4177,7 @@ int32_t tSerializeSAlterVnodeConfigReq(void *buf, int32_t bufLen, SAlterVnodeCon
if (tEncodeI64(&encoder, pReq->reserved[i]) < 0) return -1; if (tEncodeI64(&encoder, pReq->reserved[i]) < 0) return -1;
} }
// 1.0 modification // 1st modification
if (tEncodeI16(&encoder, pReq->sttTrigger) < 0) return -1; if (tEncodeI16(&encoder, pReq->sttTrigger) < 0) return -1;
if (tEncodeI32(&encoder, pReq->minRows) < 0) return -1; if (tEncodeI32(&encoder, pReq->minRows) < 0) return -1;
@ -4210,7 +4210,7 @@ int32_t tDeserializeSAlterVnodeConfigReq(void *buf, int32_t bufLen, SAlterVnodeC
if (tDecodeI64(&decoder, &pReq->reserved[i]) < 0) return -1; if (tDecodeI64(&decoder, &pReq->reserved[i]) < 0) return -1;
} }
// 1.0 modification // 1st modification
if (tDecodeIsEnd(&decoder)) { if (tDecodeIsEnd(&decoder)) {
pReq->sttTrigger = -1; pReq->sttTrigger = -1;
pReq->minRows = -1; pReq->minRows = -1;