Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
9d9efd12
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看板
提交
9d9efd12
编写于
12月 04, 2021
作者:
S
shenglian zhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix convertToString float precsion and getSuperTableMeta for schemaless
上级
0080c283
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
69 addition
and
65 deletion
+69
-65
src/client/src/tscParseLineProtocol.c
src/client/src/tscParseLineProtocol.c
+67
-63
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+2
-2
未找到文件。
src/client/src/tscParseLineProtocol.c
浏览文件 @
9d9efd12
...
...
@@ -529,10 +529,10 @@ static int32_t fillDbSchema(STableMeta* tableMeta, char* tableName, SSmlSTableSc
return
TSDB_CODE_SUCCESS
;
}
static
int32_t
getTableMetaFromLocalCache
(
TAOS
*
taos
,
char
*
tableName
,
STableMeta
**
outTableMeta
,
SSmlLinesInfo
*
info
)
{
static
int32_t
get
Super
TableMetaFromLocalCache
(
TAOS
*
taos
,
char
*
tableName
,
STableMeta
**
outTableMeta
,
SSmlLinesInfo
*
info
)
{
int32_t
code
=
0
;
STableMeta
*
tableMeta
=
NULL
;
{
SSqlObj
*
pSql
=
calloc
(
1
,
sizeof
(
SSqlObj
));
if
(
pSql
==
NULL
)
{
tscError
(
"SML:0x%"
PRIx64
" failed to allocate memory, reason:%s"
,
info
->
id
,
strerror
(
errno
));
...
...
@@ -570,13 +570,22 @@ static int32_t getTableMetaFromLocalCache(TAOS* taos, char* tableName, STableMet
size_t
size
=
0
;
taosHashGetCloneExt
(
UTIL_GET_TABLEMETA
(
pSql
),
fullTableName
,
strlen
(
fullTableName
),
NULL
,
(
void
**
)
&
tableMeta
,
&
size
);
taosReleaseRef
(
tscObjRef
,
pSql
->
self
);
STableMeta
*
stableMeta
=
tableMeta
;
if
(
tableMeta
!=
NULL
&&
tableMeta
->
tableType
==
TSDB_CHILD_TABLE
)
{
taosHashGetCloneExt
(
UTIL_GET_TABLEMETA
(
pSql
),
tableMeta
->
sTableName
,
strlen
(
tableMeta
->
sTableName
),
NULL
,
(
void
**
)
stableMeta
,
&
size
);
}
if
(
tableMeta
!=
NULL
)
{
if
(
stableMeta
!=
tableMeta
)
{
free
(
tableMeta
);
}
if
(
stableMeta
!=
NULL
)
{
if
(
outTableMeta
!=
NULL
)
{
*
outTableMeta
=
tableMeta
;
*
outTableMeta
=
s
tableMeta
;
}
else
{
free
(
tableMeta
);
free
(
s
tableMeta
);
}
return
TSDB_CODE_SUCCESS
;
}
else
{
...
...
@@ -596,7 +605,7 @@ static int32_t retrieveTableMeta(TAOS* taos, char* tableName, STableMeta** pTabl
}
tscDebug
(
"SML:0x%"
PRIx64
" retrieve table meta. super table name: %s"
,
info
->
id
,
tableName
);
code
=
getTableMetaFromLocalCache
(
taos
,
tableName
,
&
tableMeta
,
info
);
code
=
get
Super
TableMetaFromLocalCache
(
taos
,
tableName
,
&
tableMeta
,
info
);
if
(
code
==
TSDB_CODE_SUCCESS
)
{
tscDebug
(
"SML:0x%"
PRIx64
" successfully retrieved table meta. super table name: %s"
,
info
->
id
,
tableName
);
break
;
...
...
@@ -1172,51 +1181,46 @@ 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
;
TAOS_SML_DATA_POINT
*
point
=
points
+
0
;
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
);
}
int32_t
ret
=
getSuperTableMetaFromLocalCache
(
taos
,
point
->
stableName
,
&
tableMeta
,
info
);
if
(
ret
==
TSDB_CODE_SUCCESS
)
{
uint8_t
precision
=
tableMeta
->
tableInfo
.
precision
;
free
(
tableMeta
);
char
*
sql
=
malloc
(
TSDB_MAX_SQL_LEN
+
1
);
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
);
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
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"%s,"
,
kv
->
key
);
}
--
sqlLen
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
") values ("
);
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
);
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
);
converToStr
(
sql
+
sqlLen
,
kv
->
type
,
kv
->
value
,
kv
->
length
,
&
len
);
sqlLen
+=
len
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
","
);
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
","
);
}
--
sqlLen
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
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
);
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
);
...
...
src/client/src/tscUtil.c
浏览文件 @
9d9efd12
...
...
@@ -81,11 +81,11 @@ int32_t converToStr(char *str, int type, void *buf, int32_t bufSize, int32_t *le
break
;
case
TSDB_DATA_TYPE_FLOAT
:
n
=
sprintf
(
str
,
"%
e"
,
GET_FLOAT_VAL
(
buf
));
n
=
sprintf
(
str
,
"%
.*e"
,
DECIMAL_DIG
,
GET_FLOAT_VAL
(
buf
));
break
;
case
TSDB_DATA_TYPE_DOUBLE
:
n
=
sprintf
(
str
,
"%
e"
,
GET_DOUBLE_VAL
(
buf
));
n
=
sprintf
(
str
,
"%
.*e"
,
DECIMAL_DIG
,
GET_DOUBLE_VAL
(
buf
));
break
;
case
TSDB_DATA_TYPE_BINARY
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录