Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
a7aa9ac4
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看板
提交
a7aa9ac4
编写于
2月 07, 2023
作者:
wmmhello
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix:reset measuretag pointer if it is the same child table
上级
fba34210
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
1 deletion
+9
-1
source/client/src/clientSml.c
source/client/src/clientSml.c
+2
-1
source/client/src/clientSmlJson.c
source/client/src/clientSmlJson.c
+5
-0
source/client/src/clientSmlTelnet.c
source/client/src/clientSmlTelnet.c
+2
-0
未找到文件。
source/client/src/clientSml.c
浏览文件 @
a7aa9ac4
...
...
@@ -1082,7 +1082,8 @@ void smlDestroyInfo(SSmlHandle *info) {
if
(
info
->
parseJsonByLib
)
{
taosMemoryFree
(
info
->
lines
[
i
].
tags
);
}
taosMemoryFree
(
info
->
lines
[
i
].
measureTag
);
if
(
info
->
lines
[
i
].
measureTagsLen
!=
0
)
taosMemoryFree
(
info
->
lines
[
i
].
measureTag
);
}
taosMemoryFree
(
info
->
lines
);
}
...
...
source/client/src/clientSmlJson.c
浏览文件 @
a7aa9ac4
...
...
@@ -812,6 +812,7 @@ static int32_t smlParseTagsFromJSON(SSmlHandle *info, cJSON *tags, SSmlLineInfo
elements
->
measureTag
=
(
char
*
)
taosMemoryMalloc
(
elements
->
measureLen
+
elements
->
tagsLen
);
memcpy
(
elements
->
measureTag
,
elements
->
measure
,
elements
->
measureLen
);
memcpy
(
elements
->
measureTag
+
elements
->
measureLen
,
elements
->
tags
,
elements
->
tagsLen
);
elements
->
measureTagsLen
=
elements
->
measureLen
+
elements
->
tagsLen
;
SSmlTableInfo
**
tmp
=
(
SSmlTableInfo
**
)
taosHashGet
(
info
->
childTables
,
elements
->
measureTag
,
elements
->
measureLen
+
elements
->
tagsLen
);
SSmlTableInfo
*
tinfo
=
NULL
;
...
...
@@ -1018,6 +1019,8 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
elements
->
tags
=
NULL
;
return
ret
;
}
}
else
{
elements
->
measureTag
=
info
->
preLine
.
measureTag
;
}
if
(
needFree
){
...
...
@@ -1196,6 +1199,8 @@ static int32_t smlParseJSONString(SSmlHandle *info, char **start, SSmlLineInfo *
uError
(
"OTD:0x%"
PRIx64
" Unable to parse tags from JSON payload"
,
info
->
id
);
return
ret
;
}
}
else
{
elements
->
measureTag
=
info
->
preLine
.
measureTag
;
}
if
(
unlikely
(
info
->
reRun
)){
...
...
source/client/src/clientSmlTelnet.c
浏览文件 @
a7aa9ac4
...
...
@@ -71,6 +71,7 @@ static void smlParseTelnetElement(char **sql, char *sqlEnd, char **data, int32_t
static
int32_t
smlParseTelnetTags
(
SSmlHandle
*
info
,
char
*
data
,
char
*
sqlEnd
,
SSmlLineInfo
*
elements
,
SSmlMsgBuf
*
msg
)
{
if
(
is_same_child_table_telnet
(
elements
,
&
info
->
preLine
)
==
0
){
elements
->
measureTag
=
info
->
preLine
.
measureTag
;
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -234,6 +235,7 @@ static int32_t smlParseTelnetTags(SSmlHandle *info, char *data, char *sqlEnd, SS
elements
->
measureTag
=
(
char
*
)
taosMemoryMalloc
(
elements
->
measureLen
+
elements
->
tagsLen
);
memcpy
(
elements
->
measureTag
,
elements
->
measure
,
elements
->
measureLen
);
memcpy
(
elements
->
measureTag
+
elements
->
measureLen
,
elements
->
tags
,
elements
->
tagsLen
);
elements
->
measureTagsLen
=
elements
->
measureLen
+
elements
->
tagsLen
;
SSmlTableInfo
**
tmp
=
(
SSmlTableInfo
**
)
taosHashGet
(
info
->
childTables
,
elements
->
measureTag
,
elements
->
measureLen
+
elements
->
tagsLen
);
SSmlTableInfo
*
tinfo
=
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录