Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
5cd433f7
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,发现更多精彩内容 >>
提交
5cd433f7
编写于
1月 03, 2023
作者:
wmmhello
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix:add log for json parse
上级
99b2e71b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
43 addition
and
22 deletion
+43
-22
source/client/src/clientSmlJson.c
source/client/src/clientSmlJson.c
+1
-1
source/client/src/clientSmlTelnet.c
source/client/src/clientSmlTelnet.c
+2
-2
tests/system-test/2-query/sml.py
tests/system-test/2-query/sml.py
+7
-7
utils/test/c/sml_test.c
utils/test/c/sml_test.c
+33
-12
未找到文件。
source/client/src/clientSmlJson.c
浏览文件 @
5cd433f7
...
...
@@ -409,7 +409,7 @@ int smlJsonParseObj(char **start, SSmlLineInfo *element, int8_t *offset){
(
*
start
)
++
;
}
if
(
unlikely
(
index
!=
OTD_JSON_FIELDS_NUM
))
{
if
(
unlikely
(
index
!=
0
&&
index
!=
OTD_JSON_FIELDS_NUM
))
{
uError
(
"elements != %d"
,
OTD_JSON_FIELDS_NUM
)
return
-
1
;
}
...
...
source/client/src/clientSmlTelnet.c
浏览文件 @
5cd433f7
...
...
@@ -23,8 +23,8 @@
int32_t
is_same_child_table_telnet
(
const
void
*
a
,
const
void
*
b
){
SSmlLineInfo
*
t1
=
(
SSmlLineInfo
*
)
a
;
SSmlLineInfo
*
t2
=
(
SSmlLineInfo
*
)
b
;
uError
(
"is_same_child_table_telnet len:%d,%d %s,%s @@@ len:%d,%d %s,%s"
,
t1
->
measureLen
,
t2
->
measureLen
,
t1
->
measure
,
t2
->
measure
,
t1
->
tagsLen
,
t2
->
tagsLen
,
t1
->
tags
,
t2
->
tags
);
//
uError("is_same_child_table_telnet len:%d,%d %s,%s @@@ len:%d,%d %s,%s", t1->measureLen, t2->measureLen,
//
t1->measure, t2->measure, t1->tagsLen, t2->tagsLen, t1->tags, t2->tags);
if
(
t1
==
NULL
||
t2
==
NULL
||
t1
->
measure
==
NULL
||
t2
->
measure
==
NULL
||
t1
->
tags
==
NULL
||
t2
->
tags
==
NULL
)
return
1
;
...
...
tests/system-test/2-query/sml.py
浏览文件 @
5cd433f7
...
...
@@ -71,18 +71,18 @@ class TDTestCase:
tdSql
.
checkData
(
0
,
2
,
"web01"
)
tdSql
.
query
(
f
"select distinct tbname from
{
dbname
}
.`sys.cpu.nice`"
)
tdSql
.
checkRows
(
2
)
tdSql
.
checkRows
(
3
)
tdSql
.
query
(
f
"select * from
{
dbname
}
.`sys.cpu.nice` order by _ts"
)
tdSql
.
checkRows
(
2
)
tdSql
.
checkData
(
0
,
1
,
9
.000000000
)
tdSql
.
checkData
(
0
,
2
,
"web0
2
"
)
tdSql
.
checkRows
(
4
)
tdSql
.
checkData
(
0
,
1
,
13
.000000000
)
tdSql
.
checkData
(
0
,
2
,
"web0
1
"
)
tdSql
.
checkData
(
0
,
3
,
None
)
tdSql
.
checkData
(
0
,
4
,
"lga"
)
tdSql
.
checkData
(
1
,
1
,
18
.000000000
)
tdSql
.
checkData
(
1
,
2
,
"web0
1
"
)
tdSql
.
checkData
(
1
,
3
,
"t1"
)
tdSql
.
checkData
(
1
,
1
,
9
.000000000
)
tdSql
.
checkData
(
1
,
2
,
"web0
2
"
)
tdSql
.
checkData
(
3
,
3
,
"t1"
)
tdSql
.
checkData
(
0
,
4
,
"lga"
)
tdSql
.
query
(
f
"select * from
{
dbname
}
.macylr"
)
...
...
utils/test/c/sml_test.c
浏览文件 @
5cd433f7
...
...
@@ -114,7 +114,7 @@ int smlProcess_json1_Test() {
taos_free_result
(
pRes
);
const
char
*
sql
[]
=
{
"[{
\"
metric
\"
:
\"
sys.cpu.nice
\"
,
\"
timestamp
\"
:0,
\"
value
\"
:18,
\"
tags
\"
:{
\"
host
\"
:
\"
web01
\"
,
\"
id
\"
:
\"
t1
\"
,
\"
dc
\"
:
\"
lga
\"
}},{
\"
metric
\"
:
\"
sys.cpu.nice
\"
,
\"
timestamp
\"
:166234404
2
,
\"
value
\"
:9,
\"
tags
\"
:{
\"
host
\"
:
\"
web02
\"
,
\"
dc
\"
:
\"
lga
\"
}}]"
"[{
\"
metric
\"
:
\"
sys.cpu.nice
\"
,
\"
timestamp
\"
:0,
\"
value
\"
:18,
\"
tags
\"
:{
\"
host
\"
:
\"
web01
\"
,
\"
id
\"
:
\"
t1
\"
,
\"
dc
\"
:
\"
lga
\"
}},{
\"
metric
\"
:
\"
sys.cpu.nice
\"
,
\"
timestamp
\"
:166234404
5
,
\"
value
\"
:9,
\"
tags
\"
:{
\"
host
\"
:
\"
web02
\"
,
\"
dc
\"
:
\"
lga
\"
}}]"
};
char
*
sql1
[
1
]
=
{
0
};
...
...
@@ -132,6 +132,27 @@ int smlProcess_json1_Test() {
for
(
int
i
=
0
;
i
<
1
;
i
++
){
taosMemoryFree
(
sql1
[
i
]);
}
const
char
*
sql2
[]
=
{
"[{
\"
metric
\"
:
\"
sys.cpu.nice
\"
,
\"
timestamp
\"
:1662344041,
\"
value
\"
:13,
\"
tags
\"
:{
\"
host
\"
:
\"
web01
\"
,
\"
dc
\"
:
\"
lga
\"
}},{
\"
metric
\"
:
\"
sys.cpu.nice
\"
,
\"
timestamp
\"
:1662344042,
\"
value
\"
:9,
\"
tags
\"
:{
\"
host
\"
:
\"
web02
\"
,
\"
dc
\"
:
\"
lga
\"
}}]"
,
};
char
*
sql3
[
1
]
=
{
0
};
for
(
int
i
=
0
;
i
<
1
;
i
++
){
sql3
[
i
]
=
taosMemoryCalloc
(
1
,
1024
);
strncpy
(
sql3
[
i
],
sql2
[
i
],
1023
);
}
pRes
=
taos_schemaless_insert
(
taos
,
(
char
**
)
sql3
,
sizeof
(
sql3
)
/
sizeof
(
sql3
[
0
]),
TSDB_SML_JSON_PROTOCOL
,
TSDB_SML_TIMESTAMP_NANO_SECONDS
);
printf
(
"%s result:%s
\n
"
,
__FUNCTION__
,
taos_errstr
(
pRes
));
code
=
taos_errno
(
pRes
);
taos_free_result
(
pRes
);
for
(
int
i
=
0
;
i
<
1
;
i
++
){
taosMemoryFree
(
sql3
[
i
]);
}
taos_close
(
taos
);
return
code
;
...
...
@@ -178,7 +199,7 @@ int smlProcess_json3_Test() {
taos_free_result
(
pRes
);
const
char
*
sql
[]
=
{
"[{
\"
metric
\"
:
\"
sys.cpu.nice
\"
,
\"
timestamp
\"
:0,
\"
value
\"
:
\"
18
\"
,
\"
tags
\"
:{
\"
host
\"
:
\"
web01
\"
,
\"
id
\"
:
\"
t1
\"
,
\"
dc
\"
:
\"
lga
\"
}}]"
"[{
\"
metric
\"
:
\"
sys.cpu.nice
3
\"
,
\"
timestamp
\"
:0,
\"
value
\"
:
\"
18
\"
,
\"
tags
\"
:{
\"
host
\"
:
\"
web01
\"
,
\"
id
\"
:
\"
t1
\"
,
\"
dc
\"
:
\"
lga
\"
}}]"
};
char
*
sql1
[
1
]
=
{
0
};
for
(
int
i
=
0
;
i
<
1
;
i
++
){
...
...
@@ -956,20 +977,20 @@ int main(int argc, char *argv[]) {
// printf("str:%s \t %d\n", str[i], smlCalTypeSum(str[i], strlen(str[i])));
// }
int
ret
=
0
;
//
ret = sml_ttl_Test();
//
ASSERT(!ret);
//
ret = sml_ts2164_Test();
//
ASSERT(!ret);
//
ret = smlProcess_influx_Test();
//
ASSERT(!ret);
//
ret = smlProcess_telnet_Test();
//
ASSERT(!ret);
ret
=
sml_ttl_Test
();
ASSERT
(
!
ret
);
ret
=
sml_ts2164_Test
();
ASSERT
(
!
ret
);
ret
=
smlProcess_influx_Test
();
ASSERT
(
!
ret
);
ret
=
smlProcess_telnet_Test
();
ASSERT
(
!
ret
);
ret
=
smlProcess_json1_Test
();
ASSERT
(
!
ret
);
ret
=
smlProcess_json2_Test
();
ASSERT
(
ret
);
ASSERT
(
!
ret
);
ret
=
smlProcess_json3_Test
();
ASSERT
(
ret
);
ASSERT
(
!
ret
);
ret
=
sml_TD15662_Test
();
ASSERT
(
!
ret
);
ret
=
sml_TD15742_Test
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录