diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 441af9a21583e757f79aca9650f82d4bd674fbea..e1f17b09a98a53f570f581f5164d684c75a92f47 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -69,8 +69,8 @@ typedef struct { int version; // version int numOfCols; // Number of columns appended int tlen; // maximum length of a SDataRow without the header part - int16_t flen; // First part length in a SDataRow after the header part - int16_t vlen; // pure value part length, excluded the overhead + int16_t flen; // First part length in a SDataRow after the header part + int16_t vlen; // pure value part length, excluded the overhead STColumn columns[]; } STSchema; diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index cb84c376eb3870c0735bad57f4ed2fbea7c0e760..0e4ffda78bf7d9d9e50101fece7d78b2ef5dabdf 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -37,7 +37,6 @@ void *tdEncodeSchema(void *dst, STSchema *pSchema) { T_APPEND_MEMBER(dst, pSchema, STSchema, version); T_APPEND_MEMBER(dst, pSchema, STSchema, numOfCols); - T_APPEND_MEMBER(dst, pSchema, STSchema, vlen); for (int i = 0; i < schemaNCols(pSchema); i++) { STColumn *pCol = schemaColAt(pSchema, i); T_APPEND_MEMBER(dst, pCol, STColumn, type); @@ -54,12 +53,10 @@ void *tdEncodeSchema(void *dst, STSchema *pSchema) { STSchema *tdDecodeSchema(void **psrc) { int totalCols = 0; int version = 0; - int16_t vlen = 0; STSchemaBuilder schemaBuilder = {0}; T_READ_MEMBER(*psrc, int, version); T_READ_MEMBER(*psrc, int, totalCols); - T_READ_MEMBER(*psrc, int16_t, vlen); if (tdInitTSchemaBuilder(&schemaBuilder, version) < 0) return NULL; @@ -78,7 +75,6 @@ STSchema *tdDecodeSchema(void **psrc) { } STSchema *pSchema = tdGetSchemaFromBuilder(&schemaBuilder); - pSchema->vlen = vlen; tdDestroyTSchemaBuilder(&schemaBuilder); return pSchema; } diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index bdb61e6ee13cd33195c3536ea640d9873363d3fe..add85d9438440b9992649bdbd349b378de691405 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -67,10 +67,10 @@ typedef struct { // --------- TSDB REPOSITORY USAGE STATISTICS typedef struct { - int64_t totalStorage; //total bytes occupie - int64_t compStorage; - int64_t pointsWritten; //total data points written -}STsdbStat; + int64_t totalStorage; // total bytes occupie + int64_t compStorage; + int64_t pointsWritten; // total data points written +} STsdbStat; typedef void TsdbRepoT; // use void to hide implementation details from outside