Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lzh_me
TDengine
提交
4f01ef99
TDengine
项目概览
lzh_me
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
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,发现更多精彩内容 >>
提交
4f01ef99
编写于
8月 27, 2021
作者:
S
shenglian zhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix crash gen
上级
cef9aa76
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
8 deletion
+15
-8
src/client/src/tscParseLineProtocol.c
src/client/src/tscParseLineProtocol.c
+9
-3
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+4
-3
src/mnode/src/mnodeTable.c
src/mnode/src/mnodeTable.c
+2
-2
未找到文件。
src/client/src/tscParseLineProtocol.c
浏览文件 @
4f01ef99
...
@@ -371,12 +371,15 @@ static int32_t applySchemaAction(TAOS* taos, SSchemaAction* action, SSmlLinesInf
...
@@ -371,12 +371,15 @@ static int32_t applySchemaAction(TAOS* taos, SSchemaAction* action, SSmlLinesInf
buildColumnDescription
(
action
->
alterSTable
.
field
,
result
+
n
,
capacity
-
n
,
&
outBytes
);
buildColumnDescription
(
action
->
alterSTable
.
field
,
result
+
n
,
capacity
-
n
,
&
outBytes
);
TAOS_RES
*
res
=
taos_query
(
taos
,
result
);
//TODO async doAsyncQuery
TAOS_RES
*
res
=
taos_query
(
taos
,
result
);
//TODO async doAsyncQuery
code
=
taos_errno
(
res
);
code
=
taos_errno
(
res
);
char
*
errStr
=
taos_errstr
(
res
);
char
*
begin
=
strstr
(
errStr
,
"duplicated column names"
);
bool
tscDupColNames
=
(
begin
!=
NULL
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
tscError
(
"SML:0x%"
PRIx64
" apply schema action. error: %s"
,
info
->
id
,
taos_errstr
(
res
)
);
tscError
(
"SML:0x%"
PRIx64
" apply schema action. error: %s"
,
info
->
id
,
errStr
);
}
}
taos_free_result
(
res
);
taos_free_result
(
res
);
if
(
code
==
TSDB_CODE_MND_FIELD_ALREAY_EXIST
||
code
==
TSDB_CODE_
TSC_DUP_COL_NAMES
)
{
if
(
code
==
TSDB_CODE_MND_FIELD_ALREAY_EXIST
||
code
==
TSDB_CODE_
MND_TAG_ALREAY_EXIST
||
tscDupColNames
)
{
TAOS_RES
*
res2
=
taos_query
(
taos
,
"RESET QUERY CACHE"
);
TAOS_RES
*
res2
=
taos_query
(
taos
,
"RESET QUERY CACHE"
);
code
=
taos_errno
(
res2
);
code
=
taos_errno
(
res2
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
...
@@ -392,12 +395,15 @@ static int32_t applySchemaAction(TAOS* taos, SSchemaAction* action, SSmlLinesInf
...
@@ -392,12 +395,15 @@ static int32_t applySchemaAction(TAOS* taos, SSchemaAction* action, SSmlLinesInf
result
+
n
,
capacity
-
n
,
&
outBytes
);
result
+
n
,
capacity
-
n
,
&
outBytes
);
TAOS_RES
*
res
=
taos_query
(
taos
,
result
);
//TODO async doAsyncQuery
TAOS_RES
*
res
=
taos_query
(
taos
,
result
);
//TODO async doAsyncQuery
code
=
taos_errno
(
res
);
code
=
taos_errno
(
res
);
char
*
errStr
=
taos_errstr
(
res
);
char
*
begin
=
strstr
(
errStr
,
"duplicated column names"
);
bool
tscDupColNames
=
(
begin
!=
NULL
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
tscError
(
"SML:0x%"
PRIx64
" apply schema action. error : %s"
,
info
->
id
,
taos_errstr
(
res
));
tscError
(
"SML:0x%"
PRIx64
" apply schema action. error : %s"
,
info
->
id
,
taos_errstr
(
res
));
}
}
taos_free_result
(
res
);
taos_free_result
(
res
);
if
(
code
==
TSDB_CODE_MND_TAG_ALREAY_EXIST
||
code
==
TSDB_CODE_
TSC_DUP_COL_NAMES
)
{
if
(
code
==
TSDB_CODE_MND_TAG_ALREAY_EXIST
||
code
==
TSDB_CODE_
MND_FIELD_ALREAY_EXIST
||
tscDupColNames
)
{
TAOS_RES
*
res2
=
taos_query
(
taos
,
"RESET QUERY CACHE"
);
TAOS_RES
*
res2
=
taos_query
(
taos
,
"RESET QUERY CACHE"
);
code
=
taos_errno
(
res2
);
code
=
taos_errno
(
res2
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
...
...
src/client/src/tscSQLParser.c
浏览文件 @
4f01ef99
...
@@ -1601,8 +1601,8 @@ int32_t validateOneTag(SSqlCmd* pCmd, TAOS_FIELD* pTagField) {
...
@@ -1601,8 +1601,8 @@ int32_t validateOneTag(SSqlCmd* pCmd, TAOS_FIELD* pTagField) {
for
(
int32_t
i
=
0
;
i
<
numOfTags
+
numOfCols
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
numOfTags
+
numOfCols
;
++
i
)
{
if
(
strncasecmp
(
pTagField
->
name
,
pSchema
[
i
].
name
,
sizeof
(
pTagField
->
name
)
-
1
)
==
0
)
{
if
(
strncasecmp
(
pTagField
->
name
,
pSchema
[
i
].
name
,
sizeof
(
pTagField
->
name
)
-
1
)
==
0
)
{
return
tscErrorMsgWithCode
(
TSDB_CODE_TSC_DUP_COL_NAMES
,
tscGetErrorMsgPayload
(
pCmd
),
pTagField
->
name
,
NULL
);
//
return tscErrorMsgWithCode(TSDB_CODE_TSC_DUP_COL_NAMES, tscGetErrorMsgPayload(pCmd), pTagField->name, NULL);
// return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "duplicated column name
");
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
"duplicated column names
"
);
}
}
}
}
...
@@ -1655,7 +1655,8 @@ int32_t validateOneColumn(SSqlCmd* pCmd, TAOS_FIELD* pColField) {
...
@@ -1655,7 +1655,8 @@ int32_t validateOneColumn(SSqlCmd* pCmd, TAOS_FIELD* pColField) {
// field name must be unique
// field name must be unique
for
(
int32_t
i
=
0
;
i
<
numOfTags
+
numOfCols
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
numOfTags
+
numOfCols
;
++
i
)
{
if
(
strncasecmp
(
pColField
->
name
,
pSchema
[
i
].
name
,
sizeof
(
pColField
->
name
)
-
1
)
==
0
)
{
if
(
strncasecmp
(
pColField
->
name
,
pSchema
[
i
].
name
,
sizeof
(
pColField
->
name
)
-
1
)
==
0
)
{
return
tscErrorMsgWithCode
(
TSDB_CODE_TSC_DUP_COL_NAMES
,
tscGetErrorMsgPayload
(
pCmd
),
pColField
->
name
,
NULL
);
//return tscErrorMsgWithCode(TSDB_CODE_TSC_DUP_COL_NAMES, tscGetErrorMsgPayload(pCmd), pColField->name, NULL);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
"duplicated column names"
);
}
}
}
}
...
...
src/mnode/src/mnodeTable.c
浏览文件 @
4f01ef99
...
@@ -1246,13 +1246,13 @@ static int32_t mnodeAddSuperTableTag(SMnodeMsg *pMsg, SSchema schema[], int32_t
...
@@ -1246,13 +1246,13 @@ static int32_t mnodeAddSuperTableTag(SMnodeMsg *pMsg, SSchema schema[], int32_t
if
(
mnodeFindSuperTableColumnIndex
(
pStable
,
schema
[
i
].
name
)
>
0
)
{
if
(
mnodeFindSuperTableColumnIndex
(
pStable
,
schema
[
i
].
name
)
>
0
)
{
mError
(
"msg:%p, app:%p stable:%s, add tag, column:%s already exist"
,
pMsg
,
pMsg
->
rpcMsg
.
ahandle
,
mError
(
"msg:%p, app:%p stable:%s, add tag, column:%s already exist"
,
pMsg
,
pMsg
->
rpcMsg
.
ahandle
,
pStable
->
info
.
tableId
,
schema
[
i
].
name
);
pStable
->
info
.
tableId
,
schema
[
i
].
name
);
return
TSDB_CODE_MND_
FIELD
_ALREAY_EXIST
;
return
TSDB_CODE_MND_
TAG
_ALREAY_EXIST
;
}
}
if
(
mnodeFindSuperTableTagIndex
(
pStable
,
schema
[
i
].
name
)
>
0
)
{
if
(
mnodeFindSuperTableTagIndex
(
pStable
,
schema
[
i
].
name
)
>
0
)
{
mError
(
"msg:%p, app:%p stable:%s, add tag, tag:%s already exist"
,
pMsg
,
pMsg
->
rpcMsg
.
ahandle
,
mError
(
"msg:%p, app:%p stable:%s, add tag, tag:%s already exist"
,
pMsg
,
pMsg
->
rpcMsg
.
ahandle
,
pStable
->
info
.
tableId
,
schema
[
i
].
name
);
pStable
->
info
.
tableId
,
schema
[
i
].
name
);
return
TSDB_CODE_MND_
TAG
_ALREAY_EXIST
;
return
TSDB_CODE_MND_
FIELD
_ALREAY_EXIST
;
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录