Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
978f6398
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
978f6398
编写于
6月 16, 2023
作者:
wmmhello
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix:[TD-24807] double quote & space escape error
上级
02324202
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
3 deletion
+12
-3
source/client/src/clientSmlLine.c
source/client/src/clientSmlLine.c
+10
-3
source/client/test/smlTest.cpp
source/client/test/smlTest.cpp
+2
-0
未找到文件。
source/client/src/clientSmlLine.c
浏览文件 @
978f6398
...
@@ -202,7 +202,7 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
...
@@ -202,7 +202,7 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
bool
keyEscaped
=
false
;
bool
keyEscaped
=
false
;
size_t
keyLenEscaped
=
0
;
size_t
keyLenEscaped
=
0
;
while
(
*
sql
<
sqlEnd
)
{
while
(
*
sql
<
sqlEnd
)
{
if
(
unlikely
(
IS_COMMA
(
*
sql
)))
{
if
(
unlikely
(
IS_
SPACE
(
*
sql
)
||
IS_
COMMA
(
*
sql
)))
{
smlBuildInvalidDataMsg
(
&
info
->
msgBuf
,
"invalid data"
,
*
sql
);
smlBuildInvalidDataMsg
(
&
info
->
msgBuf
,
"invalid data"
,
*
sql
);
return
TSDB_CODE_SML_INVALID_DATA
;
return
TSDB_CODE_SML_INVALID_DATA
;
}
}
...
@@ -410,7 +410,7 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
...
@@ -410,7 +410,7 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
bool
keyEscaped
=
false
;
bool
keyEscaped
=
false
;
size_t
keyLenEscaped
=
0
;
size_t
keyLenEscaped
=
0
;
while
(
*
sql
<
sqlEnd
)
{
while
(
*
sql
<
sqlEnd
)
{
if
(
unlikely
(
IS_COMMA
(
*
sql
)))
{
if
(
unlikely
(
IS_
SPACE
(
*
sql
)
||
IS_
COMMA
(
*
sql
)))
{
smlBuildInvalidDataMsg
(
&
info
->
msgBuf
,
"invalid data"
,
*
sql
);
smlBuildInvalidDataMsg
(
&
info
->
msgBuf
,
"invalid data"
,
*
sql
);
return
TSDB_CODE_SML_INVALID_DATA
;
return
TSDB_CODE_SML_INVALID_DATA
;
}
}
...
@@ -443,7 +443,14 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
...
@@ -443,7 +443,14 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
if
(
unlikely
(
*
(
*
sql
)
==
QUOTE
&&
(
*
(
*
sql
-
1
)
!=
SLASH
||
(
*
sql
-
1
)
==
escapeChar
)))
{
if
(
unlikely
(
*
(
*
sql
)
==
QUOTE
&&
(
*
(
*
sql
-
1
)
!=
SLASH
||
(
*
sql
-
1
)
==
escapeChar
)))
{
isInQuote
=
!
isInQuote
;
isInQuote
=
!
isInQuote
;
(
*
sql
)
++
;
(
*
sql
)
++
;
if
(
!
isInQuote
)
break
;
if
(
!
isInQuote
)
{
if
(
unlikely
(
IS_SPACE
(
*
sql
)
||
IS_COMMA
(
*
sql
)))
{
break
;
}
else
{
smlBuildInvalidDataMsg
(
&
info
->
msgBuf
,
"invalid data"
,
*
sql
);
return
TSDB_CODE_SML_INVALID_DATA
;
}
}
continue
;
continue
;
}
}
if
(
!
isInQuote
)
{
if
(
!
isInQuote
)
{
...
...
source/client/test/smlTest.cpp
浏览文件 @
978f6398
...
@@ -224,6 +224,8 @@ TEST(testCase, smlParseCols_Error_Test) {
...
@@ -224,6 +224,8 @@ TEST(testCase, smlParseCols_Error_Test) {
"st,tt=aa c 1=2 1626006833639000000,"
,
"st,tt=aa c 1=2 1626006833639000000,"
,
//field value double quote,slash
//field value double quote,slash
"st,tt=aa c=
\"
a
\"
a
\"
1626006833639000000,"
,
"st,tt=aa c=
\"
a
\"
a
\"
1626006833639000000,"
,
"escape_test,tag1=
\"
tag1_value
\"
,tag2=
\"
tag2_value
\"
co l0=
\"
col0_value
\"
,col1=
\"
col1_value
\"
1680918783010000000"
,
"escape_test,tag1=
\"
tag1_value
\"
,tag2=
\"
tag2_value
\"
col0=
\"
co
\"
l
\"
0_value
\"
,col1=
\"
col1_value
\"
1680918783010000000"
};
};
SSmlHandle
*
info
=
smlBuildSmlInfo
(
NULL
);
SSmlHandle
*
info
=
smlBuildSmlInfo
(
NULL
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录