From 1558e5a2ebc09d23a230e63bc892db6cef1ff630 Mon Sep 17 00:00:00 2001 From: hzcheng Date: Thu, 23 Apr 2020 13:13:17 +0800 Subject: [PATCH] Move data type definition out --- src/inc/taos.h | 13 +++++++++++++ src/inc/taosdef.h | 14 +------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/inc/taos.h b/src/inc/taos.h index 419685bd07..d4f1b8f48c 100644 --- a/src/inc/taos.h +++ b/src/inc/taos.h @@ -29,6 +29,19 @@ typedef void TAOS_SUB; typedef void TAOS_STREAM; typedef void TAOS_STMT; +// Data type definition +#define TSDB_DATA_TYPE_NULL 0 // 1 bytes +#define TSDB_DATA_TYPE_BOOL 1 // 1 bytes +#define TSDB_DATA_TYPE_TINYINT 2 // 1 byte +#define TSDB_DATA_TYPE_SMALLINT 3 // 2 bytes +#define TSDB_DATA_TYPE_INT 4 // 4 bytes +#define TSDB_DATA_TYPE_BIGINT 5 // 8 bytes +#define TSDB_DATA_TYPE_FLOAT 6 // 4 bytes +#define TSDB_DATA_TYPE_DOUBLE 7 // 8 bytes +#define TSDB_DATA_TYPE_BINARY 8 // string +#define TSDB_DATA_TYPE_TIMESTAMP 9 // 8 bytes +#define TSDB_DATA_TYPE_NCHAR 10 // unicode string + typedef enum { TSDB_OPTION_LOCALE, TSDB_OPTION_CHARSET, diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index b46986d750..1f64a0d5c1 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -22,6 +22,7 @@ extern "C" { #include #include +#include "taos.h" #define TSDB__packed @@ -31,19 +32,6 @@ extern "C" { #define TSKEY int64_t #endif -// Data type definition -#define TSDB_DATA_TYPE_NULL 0 // 1 bytes -#define TSDB_DATA_TYPE_BOOL 1 // 1 bytes -#define TSDB_DATA_TYPE_TINYINT 2 // 1 byte -#define TSDB_DATA_TYPE_SMALLINT 3 // 2 bytes -#define TSDB_DATA_TYPE_INT 4 // 4 bytes -#define TSDB_DATA_TYPE_BIGINT 5 // 8 bytes -#define TSDB_DATA_TYPE_FLOAT 6 // 4 bytes -#define TSDB_DATA_TYPE_DOUBLE 7 // 8 bytes -#define TSDB_DATA_TYPE_BINARY 8 // string -#define TSDB_DATA_TYPE_TIMESTAMP 9 // 8 bytes -#define TSDB_DATA_TYPE_NCHAR 10 // unicode string - // Bytes for each type. extern const int32_t TYPE_BYTES[11]; // TODO: replace and remove code below -- GitLab