From 74de64b0bb883c66dee7f4c6f3aaf28d387f87d0 Mon Sep 17 00:00:00 2001 From: liu0x54 Date: Mon, 11 May 2020 10:39:37 +0000 Subject: [PATCH] [TD-198] fix bugs --- src/client/src/tscSchemaUtil.c | 3 ++- src/inc/tsdb.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/client/src/tscSchemaUtil.c b/src/client/src/tscSchemaUtil.c index 648c25657c..2b32af383c 100644 --- a/src/client/src/tscSchemaUtil.c +++ b/src/client/src/tscSchemaUtil.c @@ -156,7 +156,8 @@ static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) { */ void extractTableName(char* meterId, char* name) { char* r = skipSegments(meterId, TS_PATH_DELIMITER[0], 2); - copy(name, r, TS_PATH_DELIMITER[0]); + size_t len = copy(name, r, TS_PATH_DELIMITER[0]); + name[len] = 0; } SSQLToken extractDBName(char* meterId, char* name) { diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index e783368ec4..ee873d8a1d 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -97,7 +97,7 @@ extern "C" { #define TSDB_METER_NAME_LEN 64 #define TSDB_DB_NAME_LEN 32 -#define TSDB_COL_NAME_LEN 64 +#define TSDB_COL_NAME_LEN 128 #define TSDB_MAX_SAVED_SQL_LEN TSDB_MAX_COLUMNS * 16 #define TSDB_MAX_SQL_LEN TSDB_PAYLOAD_SIZE #define TSDB_MAX_ALLOWED_SQL_LEN (8*1024*1024U) // sql length should be less than 6mb @@ -230,7 +230,7 @@ extern "C" { #define TSDB_QUERY_TYPE_INSERT 0x100U // insert type #define TSDB_QUERY_TYPE_IMPORT 0x200U // import data -#define TSDB_QUERY_TYPE_TS_NO_MATCH_JOIN_QUERY 0x400u // join query without ts match +#define TSDB_QUERY_TYPE_TS_NO_MATCH_JOIN_QUERY 0x400u // join query without ts match #define TSDB_QUERY_HAS_TYPE(x, _type) (((x) & (_type)) != 0) #define TSDB_QUERY_SET_TYPE(x, _type) ((x) |= (_type)) -- GitLab