From 68d4eb2c18e3d62c7dbc48d41566dd14a835f3ce Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 6 Feb 2020 17:23:12 +0800 Subject: [PATCH] more --- src/vnode/common/catalog/inc/schema.h | 18 ++++++++++++++++ src/vnode/common/catalog/inc/type.h | 30 +++++++++++++++++++++++++++ src/vnode/common/data/inc/data.h | 18 ++++++++++++++++ src/vnode/tsdb/src/tsdb.c | 1 + 4 files changed, 67 insertions(+) create mode 100644 src/vnode/common/catalog/inc/schema.h create mode 100644 src/vnode/common/catalog/inc/type.h create mode 100644 src/vnode/common/data/inc/data.h diff --git a/src/vnode/common/catalog/inc/schema.h b/src/vnode/common/catalog/inc/schema.h new file mode 100644 index 0000000000..89a048574c --- /dev/null +++ b/src/vnode/common/catalog/inc/schema.h @@ -0,0 +1,18 @@ +#if !defined(_TD_SCHEMA_H_) +#define _TD_SCHEMA_H_ + +#include + +#include "type.h" + +typedef struct _scolumn { + td_datatype_t type; + int32_t bytes; +} SColumn; + +typedef struct SSchema { + int32_t numOfCols; + SColumn *columns; +} SSchema; + +#endif // _TD_SCHEMA_H_ diff --git a/src/vnode/common/catalog/inc/type.h b/src/vnode/common/catalog/inc/type.h new file mode 100644 index 0000000000..ed8d84a227 --- /dev/null +++ b/src/vnode/common/catalog/inc/type.h @@ -0,0 +1,30 @@ +#if !defined(_TD_TYPE_H_) +#define _TD_TYPE_H_ + +typedef enum { + TD_DATATYPE_INVLD = 0, + TD_DATATYPE_BOOL, + TD_DATATYPE_TINYINT, + TD_DATATYPE_SMALLINT, + TD_DATATYPE_INT, + TD_DATATYPE_BIGINT, + TD_DATATYPE_FLOAT, + TD_DATATYPE_DOUBLE, + TD_DATATYPE_VARCHAR, + TD_DATATYPE_NCHAR, + TD_DATATYPE_BINARY +} td_datatype_t; + +// TODO: finish below +#define TD_DATATYPE_BOOL_NULL +#define TD_DATATYPE_TINYINT_NULL +#define TD_DATATYPE_SMALLINT_NULL +#define TD_DATATYPE_INT_NULL +#define TD_DATATYPE_BIGINT_NULL +#define TD_DATATYPE_FLOAT_NULL +#define TD_DATATYPE_DOUBLE_NULL +#define TD_DATATYPE_VARCHAR_NULL +#define TD_DATATYPE_NCHAR_NULL +#define TD_DATATYPE_BINARY_NULL + +#endif // _TD_TYPE_H_ diff --git a/src/vnode/common/data/inc/data.h b/src/vnode/common/data/inc/data.h new file mode 100644 index 0000000000..de9502e709 --- /dev/null +++ b/src/vnode/common/data/inc/data.h @@ -0,0 +1,18 @@ +#if !defined(_TD_DATA_H_) +#define _TD_DATA_H_ + +#include + +// ---- Row data interface +typedef struct { + int32_t numOfRows; + char * data; +} SRData; + +// ---- Column data interface +typedef struct { + int32_t numOfPoints; + char *data; +} SCData; + +#endif // _TD_DATA_H_ diff --git a/src/vnode/tsdb/src/tsdb.c b/src/vnode/tsdb/src/tsdb.c index 9d9fd64b06..50a46717f6 100644 --- a/src/vnode/tsdb/src/tsdb.c +++ b/src/vnode/tsdb/src/tsdb.c @@ -31,6 +31,7 @@ typedef struct STSDBRepo void *pTableDict; /* Map from super tableName->table + * TODO: may use dict */ void *pSTableDict;