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

type compatibitily

This commit is contained in:
Liu Jicong 2022-02-23 16:27:04 +08:00
parent ae6cb518e6
commit 906b8d75f8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common/tmsg.h
View File

@ -804,8 +804,8 @@ typedef struct {
int8_t update; int8_t update;
int32_t sversion; int32_t sversion;
int32_t tversion; int32_t tversion;
int64_t suid; uint64_t suid;
int64_t tuid; uint64_t tuid;
int32_t vgId; int32_t vgId;
SSchema* pSchemas; SSchema* pSchemas;
} STableMetaRsp; } STableMetaRsp;

1
include/common/tmsgdef.h
View File

@ -194,4 +194,3 @@ enum {
TDMT_MAX TDMT_MAX
#endif #endif
}; };
// clang-format on

1
include/util/tdef.h
View File

@ -14,6 +14,7 @@
*/ */
// clang-format off // clang-format off
#ifndef _TD_UTIL_DEF_H #ifndef _TD_UTIL_DEF_H
#define _TD_UTIL_DEF_H #define _TD_UTIL_DEF_H

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

@ -1669,8 +1669,8 @@ static int32_t tEncodeSTableMetaRsp(SCoder *pEncoder, STableMetaRsp *pRsp) {
if (tEncodeI8(pEncoder, pRsp->update) < 0) return -1; if (tEncodeI8(pEncoder, pRsp->update) < 0) return -1;
if (tEncodeI32(pEncoder, pRsp->sversion) < 0) return -1; if (tEncodeI32(pEncoder, pRsp->sversion) < 0) return -1;
if (tEncodeI32(pEncoder, pRsp->tversion) < 0) return -1; if (tEncodeI32(pEncoder, pRsp->tversion) < 0) return -1;
if (tEncodeI64(pEncoder, pRsp->suid) < 0) return -1; if (tEncodeU64(pEncoder, pRsp->suid) < 0) return -1;
if (tEncodeI64(pEncoder, pRsp->tuid) < 0) return -1; if (tEncodeU64(pEncoder, pRsp->tuid) < 0) return -1;
if (tEncodeI32(pEncoder, pRsp->vgId) < 0) return -1; if (tEncodeI32(pEncoder, pRsp->vgId) < 0) return -1;
for (int32_t i = 0; i < pRsp->numOfColumns + pRsp->numOfTags; ++i) { for (int32_t i = 0; i < pRsp->numOfColumns + pRsp->numOfTags; ++i) {
SSchema *pSchema = &pRsp->pSchemas[i]; SSchema *pSchema = &pRsp->pSchemas[i];
@ -1692,8 +1692,8 @@ static int32_t tDecodeSTableMetaRsp(SCoder *pDecoder, STableMetaRsp *pRsp) {
if (tDecodeI8(pDecoder, &pRsp->update) < 0) return -1; if (tDecodeI8(pDecoder, &pRsp->update) < 0) return -1;
if (tDecodeI32(pDecoder, &pRsp->sversion) < 0) return -1; if (tDecodeI32(pDecoder, &pRsp->sversion) < 0) return -1;
if (tDecodeI32(pDecoder, &pRsp->tversion) < 0) return -1; if (tDecodeI32(pDecoder, &pRsp->tversion) < 0) return -1;
if (tDecodeI64(pDecoder, &pRsp->suid) < 0) return -1; if (tDecodeU64(pDecoder, &pRsp->suid) < 0) return -1;
if (tDecodeI64(pDecoder, &pRsp->tuid) < 0) return -1; if (tDecodeU64(pDecoder, &pRsp->tuid) < 0) return -1;
if (tDecodeI32(pDecoder, &pRsp->vgId) < 0) return -1; if (tDecodeI32(pDecoder, &pRsp->vgId) < 0) return -1;
int32_t totalCols = pRsp->numOfTags + pRsp->numOfColumns; int32_t totalCols = pRsp->numOfTags + pRsp->numOfColumns;