Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
99347790
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看板
提交
99347790
编写于
10月 27, 2021
作者:
wmmhello
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove the limit of json encode length
上级
fc3e783e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
2 addition
and
26 deletion
+2
-26
src/client/src/tscParseInsert.c
src/client/src/tscParseInsert.c
+1
-12
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+0
-13
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-1
未找到文件。
src/client/src/tscParseInsert.c
浏览文件 @
99347790
...
@@ -1098,30 +1098,19 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
...
@@ -1098,30 +1098,19 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
if
(
TK_STRING
==
sToken
.
type
)
free
(
sToken
.
z
);
if
(
TK_STRING
==
sToken
.
type
)
free
(
sToken
.
z
);
}
}
}
}
tscDestroyBoundColumnInfo
(
&
spd
);
SKVRow
row
=
tdGetKVRowFromBuilder
(
&
kvRowBuilder
);
SKVRow
row
=
tdGetKVRowFromBuilder
(
&
kvRowBuilder
);
tdDestroyKVRowBuilder
(
&
kvRowBuilder
);
tdDestroyKVRowBuilder
(
&
kvRowBuilder
);
if
(
row
==
NULL
)
{
if
(
row
==
NULL
)
{
tscDestroyBoundColumnInfo
(
&
spd
);
return
tscSQLSyntaxErrMsg
(
pInsertParam
->
msg
,
"tag value expected"
,
NULL
);
return
tscSQLSyntaxErrMsg
(
pInsertParam
->
msg
,
"tag value expected"
,
NULL
);
}
}
tdSortKVRowByColIdx
(
row
);
tdSortKVRowByColIdx
(
row
);
pInsertParam
->
tagData
.
dataLen
=
kvRowLen
(
row
);
pInsertParam
->
tagData
.
dataLen
=
kvRowLen
(
row
);
if
(
pInsertParam
->
tagData
.
dataLen
<=
0
){
if
(
pInsertParam
->
tagData
.
dataLen
<=
0
){
tscDestroyBoundColumnInfo
(
&
spd
);
return
tscSQLSyntaxErrMsg
(
pInsertParam
->
msg
,
"tag value expected"
,
NULL
);
return
tscSQLSyntaxErrMsg
(
pInsertParam
->
msg
,
"tag value expected"
,
NULL
);
}
}
// encode json tag string
if
(
spd
.
numOfBound
==
1
&&
pTagSchema
[
spd
.
boundedColumns
[
0
]].
type
==
TSDB_DATA_TYPE_JSON
){
if
(
kvRowLen
(
row
)
>=
pTagSchema
[
spd
.
boundedColumns
[
0
]].
bytes
){
// reserve 1 byte for select
char
tmp
[
128
]
=
{
0
};
sprintf
(
tmp
,
"tag value is too small, can not contain encoded json tag:%d|%d"
,
kvRowLen
(
row
),
pTagSchema
[
spd
.
boundedColumns
[
0
]].
bytes
);
tscDestroyBoundColumnInfo
(
&
spd
);
return
tscInvalidOperationMsg
(
pInsertParam
->
msg
,
tmp
,
NULL
);
}
}
tscDestroyBoundColumnInfo
(
&
spd
);
char
*
pTag
=
realloc
(
pInsertParam
->
tagData
.
data
,
pInsertParam
->
tagData
.
dataLen
);
char
*
pTag
=
realloc
(
pInsertParam
->
tagData
.
data
,
pInsertParam
->
tagData
.
dataLen
);
if
(
pTag
==
NULL
)
{
if
(
pTag
==
NULL
)
{
...
...
src/client/src/tscSQLParser.c
浏览文件 @
99347790
...
@@ -7745,11 +7745,6 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
...
@@ -7745,11 +7745,6 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
}
else
if
(
pItem
->
pVar
.
nType
==
TSDB_DATA_TYPE_TIMESTAMP
)
{
}
else
if
(
pItem
->
pVar
.
nType
==
TSDB_DATA_TYPE_TIMESTAMP
)
{
pItem
->
pVar
.
i64
=
convertTimePrecision
(
pItem
->
pVar
.
i64
,
TSDB_TIME_PRECISION_NANO
,
tinfo
.
precision
);
pItem
->
pVar
.
i64
=
convertTimePrecision
(
pItem
->
pVar
.
i64
,
TSDB_TIME_PRECISION_NANO
,
tinfo
.
precision
);
}
}
}
else
if
(
pSchema
->
type
==
TSDB_DATA_TYPE_JSON
)
{
if
(
pItem
->
pVar
.
nLen
>
pSchema
->
bytes
)
{
tdDestroyKVRowBuilder
(
&
kvRowBuilder
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg3
);
}
}
}
ret
=
tVariantDump
(
&
(
pItem
->
pVar
),
tagVal
,
pSchema
->
type
,
true
);
ret
=
tVariantDump
(
&
(
pItem
->
pVar
),
tagVal
,
pSchema
->
type
,
true
);
...
@@ -7802,14 +7797,6 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
...
@@ -7802,14 +7797,6 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
}
}
tdSortKVRowByColIdx
(
row
);
tdSortKVRowByColIdx
(
row
);
pTag
->
dataLen
=
kvRowLen
(
row
);
pTag
->
dataLen
=
kvRowLen
(
row
);
if
(
schemaSize
==
1
&&
pTagSchema
[
0
].
type
==
TSDB_DATA_TYPE_JSON
){
if
(
kvRowLen
(
row
)
>=
pTagSchema
[
0
].
bytes
){
// reserve 1 byte for select
char
tmp
[
128
]
=
{
0
};
sprintf
(
tmp
,
"tag value is too small, can not contain encoded json tag:%d|%d"
,
kvRowLen
(
row
),
pTagSchema
[
0
].
bytes
);
free
(
row
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
tmp
);
}
}
if
(
pTag
->
data
==
NULL
)
{
if
(
pTag
->
data
==
NULL
)
{
pTag
->
data
=
malloc
(
pTag
->
dataLen
);
pTag
->
data
=
malloc
(
pTag
->
dataLen
);
...
...
src/client/src/tscUtil.c
浏览文件 @
99347790
...
@@ -5191,10 +5191,10 @@ void getJsonTagValueAll(void* data, void* dst, int16_t bytes) {
...
@@ -5191,10 +5191,10 @@ void getJsonTagValueAll(void* data, void* dst, int16_t bytes) {
return
;
return
;
}
}
assert
(
strlen
(
json
)
<=
bytes
);
int32_t
length
=
0
;
int32_t
length
=
0
;
taosMbsToUcs4
(
json
,
strlen
(
json
),
varDataVal
(
dst
),
bytes
-
VARSTR_HEADER_SIZE
,
&
length
);
taosMbsToUcs4
(
json
,
strlen
(
json
),
varDataVal
(
dst
),
bytes
-
VARSTR_HEADER_SIZE
,
&
length
);
varDataSetLen
(
dst
,
length
);
varDataSetLen
(
dst
,
length
);
assert
(
length
<=
bytes
);
tfree
(
json
);
tfree
(
json
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录