Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
adminstrot
TDengine
提交
4a727534
TDengine
项目概览
adminstrot
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4a727534
编写于
9月 06, 2021
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-6443]<feature>: Support OpenTSDB HTTP JSON data import format
上级
7745b6b5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
14 deletion
+14
-14
src/client/src/tscParseOpenTSDB.c
src/client/src/tscParseOpenTSDB.c
+14
-14
未找到文件。
src/client/src/tscParseOpenTSDB.c
浏览文件 @
4a727534
...
...
@@ -13,12 +13,12 @@
#include "tscParseLine.h"
#define MAX_FIELDS_NUM 2
#define JSON_SUB_FIELDS_NUM 2
#define JSON_FIELDS_NUM 4
#define
OTD_
MAX_FIELDS_NUM 2
#define
OTD_
JSON_SUB_FIELDS_NUM 2
#define
OTD_
JSON_FIELDS_NUM 4
#define OT
S
_TIMESTAMP_COLUMN_NAME "ts"
#define OT
S
_METRIC_VALUE_COLUMN_NAME "value"
#define OT
D
_TIMESTAMP_COLUMN_NAME "ts"
#define OT
D
_METRIC_VALUE_COLUMN_NAME "value"
/* telnet style API parser */
static
uint64_t
HandleId
=
0
;
...
...
@@ -81,12 +81,12 @@ static int32_t parseTelnetTimeStamp(TAOS_SML_KV **pTS, int *num_kvs, const char
const
char
*
start
,
*
cur
;
int32_t
ret
=
TSDB_CODE_SUCCESS
;
int
len
=
0
;
char
key
[]
=
OT
S
_TIMESTAMP_COLUMN_NAME
;
char
key
[]
=
OT
D
_TIMESTAMP_COLUMN_NAME
;
char
*
value
=
NULL
;
start
=
cur
=
*
index
;
//allocate fields for timestamp and value
*
pTS
=
tcalloc
(
MAX_FIELDS_NUM
,
sizeof
(
TAOS_SML_KV
));
*
pTS
=
tcalloc
(
OTD_
MAX_FIELDS_NUM
,
sizeof
(
TAOS_SML_KV
));
while
(
*
cur
!=
'\0'
)
{
if
(
*
cur
==
' '
)
{
...
...
@@ -127,7 +127,7 @@ static int32_t parseTelnetMetricValue(TAOS_SML_KV **pKVs, int *num_kvs, const ch
const
char
*
start
,
*
cur
;
int32_t
ret
=
TSDB_CODE_SUCCESS
;
int
len
=
0
;
char
key
[]
=
OT
S
_METRIC_VALUE_COLUMN_NAME
;
char
key
[]
=
OT
D
_METRIC_VALUE_COLUMN_NAME
;
char
*
value
=
NULL
;
start
=
cur
=
*
index
;
...
...
@@ -459,7 +459,7 @@ int32_t parseMetricFromJSON(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInf
int32_t
parseTimestampFromJSONObj
(
cJSON
*
root
,
int64_t
*
tsVal
,
SSmlLinesInfo
*
info
)
{
int32_t
size
=
cJSON_GetArraySize
(
root
);
if
(
size
!=
JSON_SUB_FIELDS_NUM
)
{
if
(
size
!=
OTD_
JSON_SUB_FIELDS_NUM
)
{
return
TSDB_CODE_TSC_INVALID_JSON
;
}
...
...
@@ -510,7 +510,7 @@ int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSm
//Timestamp must be the first KV to parse
assert
(
*
num_kvs
==
0
);
int64_t
tsVal
;
char
key
[]
=
OT
S
_TIMESTAMP_COLUMN_NAME
;
char
key
[]
=
OT
D
_TIMESTAMP_COLUMN_NAME
;
cJSON
*
timestamp
=
cJSON_GetObjectItem
(
root
,
"timestamp"
);
if
(
cJSON_IsNumber
(
timestamp
))
{
...
...
@@ -531,7 +531,7 @@ int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSm
}
//allocate fields for timestamp and value
*
pTS
=
tcalloc
(
MAX_FIELDS_NUM
,
sizeof
(
TAOS_SML_KV
));
*
pTS
=
tcalloc
(
OTD_
MAX_FIELDS_NUM
,
sizeof
(
TAOS_SML_KV
));
(
*
pTS
)
->
key
=
tcalloc
(
sizeof
(
key
),
1
);
...
...
@@ -664,7 +664,7 @@ int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* inf
int32_t
ret
=
TSDB_CODE_SUCCESS
;
int32_t
size
=
cJSON_GetArraySize
(
root
);
if
(
size
!=
JSON_SUB_FIELDS_NUM
)
{
if
(
size
!=
OTD_
JSON_SUB_FIELDS_NUM
)
{
return
TSDB_CODE_TSC_INVALID_JSON
;
}
...
...
@@ -755,7 +755,7 @@ int32_t parseValueFromJSON(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info)
int32_t
parseMetricValueFromJSON
(
cJSON
*
root
,
TAOS_SML_KV
**
pKVs
,
int
*
num_kvs
,
SSmlLinesInfo
*
info
)
{
//skip timestamp
TAOS_SML_KV
*
pVal
=
*
pKVs
+
1
;
char
key
[]
=
OT
S
_METRIC_VALUE_COLUMN_NAME
;
char
key
[]
=
OT
D
_METRIC_VALUE_COLUMN_NAME
;
cJSON
*
metricVal
=
cJSON_GetObjectItem
(
root
,
"value"
);
if
(
metricVal
==
NULL
)
{
...
...
@@ -842,7 +842,7 @@ int32_t tscParseJSONPayload(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInf
int32_t
size
=
cJSON_GetArraySize
(
root
);
//outmost json fields has to be exactly 4
if
(
size
!=
JSON_FIELDS_NUM
)
{
if
(
size
!=
OTD_
JSON_FIELDS_NUM
)
{
tscError
(
"OTD:0x%"
PRIx64
" Invalid number of JSON fields in data point %d"
,
info
->
id
,
size
);
return
TSDB_CODE_TSC_INVALID_JSON
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录