Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
572d2fbe
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
572d2fbe
编写于
10月 24, 2021
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-10700]<enhance>: The escape char backstick can be used for both tag name and column name
上级
9ef8aaea
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
24 deletion
+18
-24
src/client/inc/tscParseLine.h
src/client/inc/tscParseLine.h
+1
-0
src/client/src/tscParseLineProtocol.c
src/client/src/tscParseLineProtocol.c
+17
-24
未找到文件。
src/client/inc/tscParseLine.h
浏览文件 @
572d2fbe
...
...
@@ -24,6 +24,7 @@ extern "C" {
#define SML_TIMESTAMP_MILLI_SECOND_DIGITS 13
typedef
TSDB_SML_PROTOCOL_TYPE
SMLProtocolType
;
#define SML_ESCAPE_CHAR_SIZE 2
typedef
struct
{
char
*
key
;
...
...
src/client/src/tscParseLineProtocol.c
浏览文件 @
572d2fbe
...
...
@@ -1175,6 +1175,15 @@ static void escapeSpecialCharacter(uint8_t field, const char **pos) {
*
pos
=
cur
;
}
void
addEscapeChartoString
(
char
*
str
,
int32_t
len
)
{
if
(
str
==
NULL
)
{
return
;
}
memmove
(
str
+
1
,
str
,
len
);
str
[
0
]
=
str
[
len
]
=
TS_ESCAPE_CHAR
;
str
[
len
+
1
]
=
'\0'
;
}
bool
isValidInteger
(
char
*
str
)
{
char
*
c
=
str
;
if
(
*
c
!=
'+'
&&
*
c
!=
'-'
&&
!
isdigit
(
*
c
))
{
...
...
@@ -1886,13 +1895,8 @@ static int32_t parseSmlKey(TAOS_SML_KV *pKV, const char **index, SHashObj *pHash
char
key
[
TSDB_COL_NAME_LEN
+
1
];
// +1 to avoid key[len] over write
uint16_t
len
=
0
;
//key field cannot start with digit
if
(
isdigit
(
*
cur
))
{
tscError
(
"SML:0x%"
PRIx64
" Tag key cannot start with digit"
,
info
->
id
);
return
TSDB_CODE_TSC_LINE_SYNTAX_ERROR
;
}
while
(
*
cur
!=
'\0'
)
{
if
(
len
>
=
TSDB_COL_NAME_LEN
-
1
)
{
if
(
len
>
TSDB_COL_NAME_LEN
-
1
)
{
tscError
(
"SML:0x%"
PRIx64
" Key field cannot exceeds %d characters"
,
info
->
id
,
TSDB_COL_NAME_LEN
-
1
);
return
TSDB_CODE_TSC_INVALID_COLUMN_LENGTH
;
}
...
...
@@ -1919,8 +1923,9 @@ static int32_t parseSmlKey(TAOS_SML_KV *pKV, const char **index, SHashObj *pHash
return
TSDB_CODE_TSC_LINE_SYNTAX_ERROR
;
}
pKV
->
key
=
calloc
(
len
+
1
,
1
);
pKV
->
key
=
calloc
(
len
+
TS_ESCAPE_CHAR
+
1
,
1
);
memcpy
(
pKV
->
key
,
key
,
len
+
1
);
addEscapeChartoString
(
pKV
->
key
,
len
);
//tscDebug("SML:0x%"PRIx64" Key:%s|len:%d", info->id, pKV->key, len);
*
index
=
cur
+
1
;
return
TSDB_CODE_SUCCESS
;
...
...
@@ -2015,19 +2020,13 @@ static int32_t parseSmlMeasurement(TAOS_SML_DATA_POINT *pSml, const char **index
const
char
*
cur
=
*
index
;
uint16_t
len
=
0
;
pSml
->
stableName
=
calloc
(
TSDB_TABLE_NAME_LEN
+
1
,
1
);
// +1 to avoid 1772 line over write
pSml
->
stableName
=
calloc
(
TSDB_TABLE_NAME_LEN
+
SML_ESCAPE_CHAR_SIZE
,
1
);
if
(
pSml
->
stableName
==
NULL
){
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
if
(
isdigit
(
*
cur
))
{
tscError
(
"SML:0x%"
PRIx64
" Measurement field cannnot start with digit"
,
info
->
id
);
free
(
pSml
->
stableName
);
pSml
->
stableName
=
NULL
;
return
TSDB_CODE_TSC_LINE_SYNTAX_ERROR
;
}
while
(
*
cur
!=
'\0'
)
{
if
(
len
>
=
TSDB_TABLE_NAME_LEN
-
1
)
{
if
(
len
>
TSDB_TABLE_NAME_LEN
-
1
)
{
tscError
(
"SML:0x%"
PRIx64
" Measurement field cannot exceeds %d characters"
,
info
->
id
,
TSDB_TABLE_NAME_LEN
-
1
);
free
(
pSml
->
stableName
);
pSml
->
stableName
=
NULL
;
...
...
@@ -2061,7 +2060,7 @@ static int32_t parseSmlMeasurement(TAOS_SML_DATA_POINT *pSml, const char **index
pSml
->
stableName
=
NULL
;
return
TSDB_CODE_TSC_LINE_SYNTAX_ERROR
;
}
pSml
->
stableName
[
len
]
=
'\0'
;
addEscapeChartoString
(
pSml
->
stableName
,
len
)
;
*
index
=
cur
+
1
;
tscDebug
(
"SML:0x%"
PRIx64
" Stable name in measurement:%s|len:%d"
,
info
->
id
,
pSml
->
stableName
,
len
);
...
...
@@ -2118,16 +2117,10 @@ static int32_t parseSmlKvPairs(TAOS_SML_KV **pKVs, int *num_kvs,
goto
error
;
}
if
(
!
isField
&&
(
strcasecmp
(
pkv
->
key
,
"ID"
)
==
0
))
{
ret
=
isValidChildTableName
(
pkv
->
value
,
pkv
->
length
,
info
);
if
(
ret
)
{
free
(
pkv
->
key
);
free
(
pkv
->
value
);
goto
error
;
}
smlData
->
childTableName
=
malloc
(
pkv
->
length
+
1
);
smlData
->
childTableName
=
malloc
(
pkv
->
length
+
SML_ESCAPE_CHAR_SIZE
+
1
);
memcpy
(
smlData
->
childTableName
,
pkv
->
value
,
pkv
->
length
);
strntolower_s
(
smlData
->
childTableName
,
smlData
->
childTableName
,
(
int32_t
)
pkv
->
length
);
smlData
->
childTableName
[
pkv
->
length
]
=
'\0'
;
addEscapeChartoString
(
smlData
->
childTableName
,
(
int32_t
)
pkv
->
length
)
;
free
(
pkv
->
key
);
free
(
pkv
->
value
);
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录