Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
fba34210
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
Star
22018
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看板
提交
fba34210
编写于
2月 07, 2023
作者:
wmmhello
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix:rm compare function for json and telnet in schemaless
上级
bec6cdf7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
7 deletion
+5
-7
source/client/inc/clientSml.h
source/client/inc/clientSml.h
+1
-1
source/client/src/clientSml.c
source/client/src/clientSml.c
+0
-2
source/client/src/clientSmlJson.c
source/client/src/clientSmlJson.c
+2
-2
source/client/src/clientSmlTelnet.c
source/client/src/clientSmlTelnet.c
+2
-2
未找到文件。
source/client/inc/clientSml.h
浏览文件 @
fba34210
...
@@ -229,7 +229,7 @@ SSmlTableInfo* smlBuildTableInfo(int numRows, const char* measure, int32_t me
...
@@ -229,7 +229,7 @@ SSmlTableInfo* smlBuildTableInfo(int numRows, const char* measure, int32_t me
SSmlSTableMeta
*
smlBuildSTableMeta
(
bool
isDataFormat
);
SSmlSTableMeta
*
smlBuildSTableMeta
(
bool
isDataFormat
);
int32_t
smlSetCTableName
(
SSmlTableInfo
*
oneTable
);
int32_t
smlSetCTableName
(
SSmlTableInfo
*
oneTable
);
STableMeta
*
smlGetMeta
(
SSmlHandle
*
info
,
const
void
*
measure
,
int32_t
measureLen
);
STableMeta
*
smlGetMeta
(
SSmlHandle
*
info
,
const
void
*
measure
,
int32_t
measureLen
);
int32_t
is_same_child_table_telnet
(
const
void
*
a
,
const
void
*
b
,
size_t
len
);
int32_t
is_same_child_table_telnet
(
const
void
*
a
,
const
void
*
b
);
int64_t
smlParseOpenTsdbTime
(
SSmlHandle
*
info
,
const
char
*
data
,
int32_t
len
);
int64_t
smlParseOpenTsdbTime
(
SSmlHandle
*
info
,
const
char
*
data
,
int32_t
len
);
int32_t
smlClearForRerun
(
SSmlHandle
*
info
);
int32_t
smlClearForRerun
(
SSmlHandle
*
info
);
int32_t
smlParseValue
(
SSmlKv
*
pVal
,
SSmlMsgBuf
*
msg
);
int32_t
smlParseValue
(
SSmlKv
*
pVal
,
SSmlMsgBuf
*
msg
);
...
...
source/client/src/clientSml.c
浏览文件 @
fba34210
...
@@ -1323,7 +1323,6 @@ int32_t smlClearForRerun(SSmlHandle *info) {
...
@@ -1323,7 +1323,6 @@ int32_t smlClearForRerun(SSmlHandle *info) {
static
int32_t
smlParseLine
(
SSmlHandle
*
info
,
char
*
lines
[],
char
*
rawLine
,
char
*
rawLineEnd
,
int
numLines
)
{
static
int32_t
smlParseLine
(
SSmlHandle
*
info
,
char
*
lines
[],
char
*
rawLine
,
char
*
rawLineEnd
,
int
numLines
)
{
int32_t
code
=
TSDB_CODE_SUCCESS
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
if
(
info
->
protocol
==
TSDB_SML_JSON_PROTOCOL
)
{
if
(
info
->
protocol
==
TSDB_SML_JSON_PROTOCOL
)
{
taosHashSetEqualFp
(
info
->
childTables
,
is_same_child_table_telnet
);
if
(
lines
)
{
if
(
lines
)
{
code
=
smlParseJSON
(
info
,
*
lines
);
code
=
smlParseJSON
(
info
,
*
lines
);
}
else
if
(
rawLine
)
{
}
else
if
(
rawLine
)
{
...
@@ -1368,7 +1367,6 @@ static int32_t smlParseLine(SSmlHandle *info, char *lines[], char *rawLine, char
...
@@ -1368,7 +1367,6 @@ static int32_t smlParseLine(SSmlHandle *info, char *lines[], char *rawLine, char
code
=
smlParseInfluxString
(
info
,
tmp
,
tmp
+
len
,
info
->
lines
+
i
);
code
=
smlParseInfluxString
(
info
,
tmp
,
tmp
+
len
,
info
->
lines
+
i
);
}
}
}
else
if
(
info
->
protocol
==
TSDB_SML_TELNET_PROTOCOL
)
{
}
else
if
(
info
->
protocol
==
TSDB_SML_TELNET_PROTOCOL
)
{
taosHashSetEqualFp
(
info
->
childTables
,
is_same_child_table_telnet
);
if
(
info
->
dataFormat
)
{
if
(
info
->
dataFormat
)
{
SSmlLineInfo
element
=
{
0
};
SSmlLineInfo
element
=
{
0
};
code
=
smlParseTelnetString
(
info
,
(
char
*
)
tmp
,
(
char
*
)
tmp
+
len
,
&
element
);
code
=
smlParseTelnetString
(
info
,
(
char
*
)
tmp
,
(
char
*
)
tmp
+
len
,
&
element
);
...
...
source/client/src/clientSmlJson.c
浏览文件 @
fba34210
...
@@ -1010,7 +1010,7 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
...
@@ -1010,7 +1010,7 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
bool
needFree
=
info
->
dataFormat
;
bool
needFree
=
info
->
dataFormat
;
elements
->
tags
=
cJSON_PrintUnformatted
(
tagsJson
);
elements
->
tags
=
cJSON_PrintUnformatted
(
tagsJson
);
elements
->
tagsLen
=
strlen
(
elements
->
tags
);
elements
->
tagsLen
=
strlen
(
elements
->
tags
);
if
(
is_same_child_table_telnet
(
elements
,
&
info
->
preLine
,
0
)
!=
0
)
{
if
(
is_same_child_table_telnet
(
elements
,
&
info
->
preLine
)
!=
0
)
{
ret
=
smlParseTagsFromJSON
(
info
,
tagsJson
,
elements
);
ret
=
smlParseTagsFromJSON
(
info
,
tagsJson
,
elements
);
if
(
unlikely
(
ret
))
{
if
(
unlikely
(
ret
))
{
uError
(
"OTD:0x%"
PRIx64
" Unable to parse tags from JSON payload"
,
info
->
id
);
uError
(
"OTD:0x%"
PRIx64
" Unable to parse tags from JSON payload"
,
info
->
id
);
...
@@ -1180,7 +1180,7 @@ static int32_t smlParseJSONString(SSmlHandle *info, char **start, SSmlLineInfo *
...
@@ -1180,7 +1180,7 @@ static int32_t smlParseJSONString(SSmlHandle *info, char **start, SSmlLineInfo *
}
}
// Parse tags
// Parse tags
if
(
is_same_child_table_telnet
(
elements
,
&
info
->
preLine
,
0
)
!=
0
){
if
(
is_same_child_table_telnet
(
elements
,
&
info
->
preLine
)
!=
0
){
char
tmp
=
*
(
elements
->
tags
+
elements
->
tagsLen
);
char
tmp
=
*
(
elements
->
tags
+
elements
->
tagsLen
);
*
(
elements
->
tags
+
elements
->
tagsLen
)
=
0
;
*
(
elements
->
tags
+
elements
->
tagsLen
)
=
0
;
cJSON
*
tagsJson
=
cJSON_Parse
(
elements
->
tags
);
cJSON
*
tagsJson
=
cJSON_Parse
(
elements
->
tags
);
...
...
source/client/src/clientSmlTelnet.c
浏览文件 @
fba34210
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
#include "clientSml.h"
#include "clientSml.h"
int32_t
is_same_child_table_telnet
(
const
void
*
a
,
const
void
*
b
,
size_t
len
){
int32_t
is_same_child_table_telnet
(
const
void
*
a
,
const
void
*
b
){
SSmlLineInfo
*
t1
=
(
SSmlLineInfo
*
)
a
;
SSmlLineInfo
*
t1
=
(
SSmlLineInfo
*
)
a
;
SSmlLineInfo
*
t2
=
(
SSmlLineInfo
*
)
b
;
SSmlLineInfo
*
t2
=
(
SSmlLineInfo
*
)
b
;
// uError("is_same_child_table_telnet len:%d,%d %s,%s @@@ len:%d,%d %s,%s", t1->measureLen, t2->measureLen,
// uError("is_same_child_table_telnet len:%d,%d %s,%s @@@ len:%d,%d %s,%s", t1->measureLen, t2->measureLen,
...
@@ -70,7 +70,7 @@ static void smlParseTelnetElement(char **sql, char *sqlEnd, char **data, int32_t
...
@@ -70,7 +70,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
)
{
static
int32_t
smlParseTelnetTags
(
SSmlHandle
*
info
,
char
*
data
,
char
*
sqlEnd
,
SSmlLineInfo
*
elements
,
SSmlMsgBuf
*
msg
)
{
if
(
is_same_child_table_telnet
(
elements
,
&
info
->
preLine
,
0
)
==
0
){
if
(
is_same_child_table_telnet
(
elements
,
&
info
->
preLine
)
==
0
){
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录