Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
0080c283
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看板
提交
0080c283
编写于
12月 03, 2021
作者:
S
shenglian zhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
skip build schema and modify db schema if meta found and insert success
上级
1efb1647
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
65 addition
and
3 deletion
+65
-3
src/client/src/tscParseLineProtocol.c
src/client/src/tscParseLineProtocol.c
+63
-2
src/client/src/tscParseOpenTSDB.c
src/client/src/tscParseOpenTSDB.c
+2
-1
未找到文件。
src/client/src/tscParseLineProtocol.c
浏览文件 @
0080c283
...
...
@@ -573,7 +573,11 @@ static int32_t getTableMetaFromLocalCache(TAOS* taos, char* tableName, STableMet
}
if
(
tableMeta
!=
NULL
)
{
if
(
outTableMeta
!=
NULL
)
{
*
outTableMeta
=
tableMeta
;
}
else
{
free
(
tableMeta
);
}
return
TSDB_CODE_SUCCESS
;
}
else
{
return
TSDB_CODE_TSC_NO_META_CACHED
;
...
...
@@ -841,11 +845,12 @@ static int32_t applyChildTableDataPointsWithInsertSQL(TAOS* taos, char* cTableNa
free
(
colKVs
);
sql
[
totalLen
]
=
'\0'
;
tsc
Info
(
"SML:0x%"
PRIx64
" insert child table table %s of super table %s sql: %s"
,
info
->
id
,
cTableName
,
sTableName
,
sql
);
tsc
Debug
(
"SML:0x%"
PRIx64
" insert child table table %s of super table %s sql: %s"
,
info
->
id
,
cTableName
,
sTableName
,
sql
);
TAOS_RES
*
res
=
taos_query
(
taos
,
sql
);
free
(
sql
);
code
=
taos_errno
(
res
);
info
->
affectedRows
=
taos_affected_rows
(
res
);
taos_free_result
(
res
);
return
code
;
}
...
...
@@ -1167,6 +1172,62 @@ int tscSmlInsert(TAOS* taos, TAOS_SML_DATA_POINT* points, int numPoint, SSmlLine
info
->
affectedRows
=
0
;
//TODO:
if
(
numPoint
==
1
)
{
TAOS_SML_DATA_POINT
*
point
=
points
;
if
(
!
point
->
childTableName
)
{
int
tableNameLen
=
TSDB_TABLE_NAME_LEN
;
point
->
childTableName
=
calloc
(
1
,
tableNameLen
+
1
);
getSmlMd5ChildTableName
(
point
,
point
->
childTableName
,
&
tableNameLen
,
info
);
point
->
childTableName
[
tableNameLen
]
=
'\0'
;
}
int32_t
ret
=
getTableMetaFromLocalCache
(
taos
,
point
->
childTableName
,
NULL
,
info
);
if
(
ret
==
TSDB_CODE_SUCCESS
)
{
STableMeta
*
tableMeta
;
int32_t
ret2
=
getTableMetaFromLocalCache
(
taos
,
point
->
stableName
,
&
tableMeta
,
info
);
if
(
ret2
!=
TSDB_CODE_SUCCESS
)
{
tscError
(
"SML:0x%"
PRIx64
" meta of super table %s not found but meta of child table %s found "
,
info
->
id
,
point
->
stableName
,
point
->
childTableName
);
}
uint8_t
precision
=
tableMeta
->
tableInfo
.
precision
;
free
(
tableMeta
);
char
*
sql
=
malloc
(
TSDB_MAX_SQL_LEN
+
1
);
int
freeBytes
=
TSDB_MAX_SQL_LEN
;
int
sqlLen
=
0
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"insert into %s("
,
point
->
childTableName
);
for
(
int
col
=
0
;
col
<
point
->
fieldNum
;
++
col
)
{
TAOS_SML_KV
*
kv
=
point
->
fields
+
col
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"%s,"
,
kv
->
key
);
}
--
sqlLen
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
") values ("
);
TAOS_SML_KV
*
tsField
=
point
->
fields
+
0
;
int64_t
ts
=
*
(
int64_t
*
)(
tsField
->
value
);
ts
=
convertTimePrecision
(
ts
,
TSDB_TIME_PRECISION_NANO
,
precision
);
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"%"
PRId64
","
,
ts
);
for
(
int
col
=
1
;
col
<
point
->
fieldNum
;
++
col
)
{
TAOS_SML_KV
*
kv
=
point
->
fields
+
col
;
int32_t
len
=
0
;
converToStr
(
sql
+
sqlLen
,
kv
->
type
,
kv
->
value
,
kv
->
length
,
&
len
);
sqlLen
+=
len
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
","
);
}
--
sqlLen
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
")"
);
sql
[
sqlLen
]
=
0
;
tscDebug
(
"SML:0x%"
PRIx64
" insert child table table %s of super table %s sql: %s"
,
info
->
id
,
point
->
childTableName
,
point
->
stableName
,
sql
);
TAOS_RES
*
res
=
taos_query
(
taos
,
sql
);
free
(
sql
);
code
=
taos_errno
(
res
);
info
->
affectedRows
=
taos_affected_rows
(
res
);
taos_free_result
(
res
);
if
(
code
==
TSDB_CODE_SUCCESS
)
{
return
code
;
}
}
}
tscDebug
(
"SML:0x%"
PRIx64
" build data point schemas"
,
info
->
id
);
SArray
*
stableSchemas
=
taosArrayInit
(
32
,
sizeof
(
SSmlSTableSchema
));
// SArray<STableColumnsSchema>
code
=
buildDataPointSchemas
(
points
,
numPoint
,
stableSchemas
,
info
);
...
...
src/client/src/tscParseOpenTSDB.c
浏览文件 @
0080c283
...
...
@@ -125,8 +125,9 @@ static int32_t parseTelnetTimeStamp(TAOS_SML_KV **pTS, int *num_kvs, const char
}
tfree
(
value
);
(
*
pTS
)
->
key
=
tcalloc
(
sizeof
(
key
),
1
);
(
*
pTS
)
->
key
=
tcalloc
(
sizeof
(
key
)
+
TS_ESCAPE_CHAR_SIZE
,
1
);
memcpy
((
*
pTS
)
->
key
,
key
,
sizeof
(
key
));
addEscapeCharToString
((
*
pTS
)
->
key
,
strlen
(
key
));
*
num_kvs
+=
1
;
*
index
=
cur
+
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录