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

[TD-188] adjust format and remove some unnecessary code

This commit is contained in:
Tao Liu 2020-06-09 04:16:09 +00:00
parent dd70c178b6
commit 18c92c1cf4
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/inc/tdataformat.h
View File

@ -69,8 +69,8 @@ typedef struct {
int version; // version int version; // version
int numOfCols; // Number of columns appended int numOfCols; // Number of columns appended
int tlen; // maximum length of a SDataRow without the header part 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 flen; // First part length in a SDataRow after the header part
int16_t vlen; // pure value part length, excluded the overhead int16_t vlen; // pure value part length, excluded the overhead
STColumn columns[]; STColumn columns[];
} STSchema; } STSchema;

4
src/common/src/tdataformat.c
View File

@ -37,7 +37,6 @@ void *tdEncodeSchema(void *dst, STSchema *pSchema) {
T_APPEND_MEMBER(dst, pSchema, STSchema, version); T_APPEND_MEMBER(dst, pSchema, STSchema, version);
T_APPEND_MEMBER(dst, pSchema, STSchema, numOfCols); T_APPEND_MEMBER(dst, pSchema, STSchema, numOfCols);
T_APPEND_MEMBER(dst, pSchema, STSchema, vlen);
for (int i = 0; i < schemaNCols(pSchema); i++) { for (int i = 0; i < schemaNCols(pSchema); i++) {
STColumn *pCol = schemaColAt(pSchema, i); STColumn *pCol = schemaColAt(pSchema, i);
T_APPEND_MEMBER(dst, pCol, STColumn, type); T_APPEND_MEMBER(dst, pCol, STColumn, type);
@ -54,12 +53,10 @@ void *tdEncodeSchema(void *dst, STSchema *pSchema) {
STSchema *tdDecodeSchema(void **psrc) { STSchema *tdDecodeSchema(void **psrc) {
int totalCols = 0; int totalCols = 0;
int version = 0; int version = 0;
int16_t vlen = 0;
STSchemaBuilder schemaBuilder = {0}; STSchemaBuilder schemaBuilder = {0};
T_READ_MEMBER(*psrc, int, version); T_READ_MEMBER(*psrc, int, version);
T_READ_MEMBER(*psrc, int, totalCols); T_READ_MEMBER(*psrc, int, totalCols);
T_READ_MEMBER(*psrc, int16_t, vlen);
if (tdInitTSchemaBuilder(&schemaBuilder, version) < 0) return NULL; if (tdInitTSchemaBuilder(&schemaBuilder, version) < 0) return NULL;
@ -78,7 +75,6 @@ STSchema *tdDecodeSchema(void **psrc) {
} }
STSchema *pSchema = tdGetSchemaFromBuilder(&schemaBuilder); STSchema *pSchema = tdGetSchemaFromBuilder(&schemaBuilder);
pSchema->vlen = vlen;
tdDestroyTSchemaBuilder(&schemaBuilder); tdDestroyTSchemaBuilder(&schemaBuilder);
return pSchema; return pSchema;
} }

8
src/inc/tsdb.h
View File

@ -67,10 +67,10 @@ typedef struct {
// --------- TSDB REPOSITORY USAGE STATISTICS // --------- TSDB REPOSITORY USAGE STATISTICS
typedef struct { typedef struct {
int64_t totalStorage; //total bytes occupie int64_t totalStorage; // total bytes occupie
int64_t compStorage; int64_t compStorage;
int64_t pointsWritten; //total data points written int64_t pointsWritten; // total data points written
}STsdbStat; } STsdbStat;
typedef void TsdbRepoT; // use void to hide implementation details from outside typedef void TsdbRepoT; // use void to hide implementation details from outside