Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
f4af74b9
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看板
未验证
提交
f4af74b9
编写于
1月 18, 2022
作者:
S
shenglian-zhou
提交者:
GitHub
1月 18, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9855 from taosdata/fix/TD-13000
[TD-13000]<fix>: typo in error msg
上级
4351c4c8
698ce470
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
10 deletion
+10
-10
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+10
-10
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
f4af74b9
...
...
@@ -6682,7 +6682,7 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
}
if
(
tscIsProjectionQuery
(
pQueryInfo
))
{
bool
found
=
false
;
bool
found
=
false
;
for
(
int32_t
i
=
0
;
i
<
tscNumOfExprs
(
pQueryInfo
);
++
i
)
{
SExprInfo
*
pExpr
=
tscExprGet
(
pQueryInfo
,
i
);
if
(
pExpr
->
base
.
functionId
==
TSDB_FUNC_PRJ
&&
pExpr
->
base
.
colInfo
.
colId
==
pSchema
[
index
.
columnIndex
].
colId
)
{
...
...
@@ -6694,10 +6694,10 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
if
(
!
found
)
{
int32_t
numOfCols
=
(
int32_t
)
tscNumOfFields
(
pQueryInfo
);
tscAddFuncInSelectClause
(
pQueryInfo
,
numOfCols
,
TSDB_FUNC_PRJ
,
&
index
,
pSchema
,
TSDB_COL_NORMAL
,
getNewResColId
(
pCmd
));
SInternalField
*
pSupInfo
=
tscFieldInfoGetInternalField
(
&
pQueryInfo
->
fieldsInfo
,
numOfCols
);
pSupInfo
->
visible
=
false
;
pQueryInfo
->
type
|=
TSDB_QUERY_TYPE_PROJECTION_QUERY
;
}
}
...
...
@@ -6718,17 +6718,17 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
const
char
*
msg4
=
"set tag value only available for table"
;
const
char
*
msg5
=
"only support add one tag"
;
const
char
*
msg6
=
"column can only be modified by super table"
;
const
char
*
msg7
=
"no tags can be dropped"
;
const
char
*
msg8
=
"only support one tag"
;
const
char
*
msg9
=
"tag name too long"
;
const
char
*
msg10
=
"invalid tag name"
;
const
char
*
msg11
=
"primary tag cannot be dropped"
;
const
char
*
msg12
=
"update normal column not supported"
;
const
char
*
msg13
=
"invalid tag value"
;
const
char
*
msg14
=
"tag value too long"
;
const
char
*
msg15
=
"no columns can be dropped"
;
const
char
*
msg16
=
"only support one column"
;
const
char
*
msg17
=
"invalid column name"
;
...
...
@@ -6736,7 +6736,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
const
char
*
msg19
=
"invalid new tag name"
;
const
char
*
msg20
=
"table is not super table"
;
const
char
*
msg21
=
"only binary/nchar column length could be modified"
;
const
char
*
msg23
=
"only column length c
oul
be be modified"
;
const
char
*
msg23
=
"only column length c
an
be be modified"
;
const
char
*
msg24
=
"invalid binary/nchar column length"
;
const
char
*
msg25
=
"json type error, should be string"
;
...
...
@@ -6799,7 +6799,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
if
(
ret
!=
TSDB_CODE_SUCCESS
)
{
return
ret
;
}
tscFieldInfoAppend
(
&
pQueryInfo
->
fieldsInfo
,
p
);
}
else
if
(
pAlterSQL
->
type
==
TSDB_ALTER_TABLE_DROP_TAG_COLUMN
)
{
if
(
tscGetNumOfTags
(
pTableMeta
)
==
1
)
{
...
...
@@ -6832,7 +6832,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
char
name1
[
128
]
=
{
0
};
strncpy
(
name1
,
pItem
->
pVar
.
pz
,
pItem
->
pVar
.
nLen
);
TAOS_FIELD
f
=
tscCreateField
(
TSDB_DATA_TYPE_INT
,
name1
,
tDataTypes
[
TSDB_DATA_TYPE_INT
].
bytes
);
tscFieldInfoAppend
(
&
pQueryInfo
->
fieldsInfo
,
&
f
);
}
else
if
(
pAlterSQL
->
type
==
TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN
)
{
...
...
@@ -6882,7 +6882,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
// Note: update can only be applied to table not super table.
// the following is used to handle tags value for table created according to super table
pCmd
->
command
=
TSDB_SQL_UPDATE_TAGS_VAL
;
SArray
*
pVarList
=
pAlterSQL
->
varList
;
tVariantListItem
*
item
=
taosArrayGet
(
pVarList
,
0
);
int16_t
numOfTags
=
tscGetNumOfTags
(
pTableMeta
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录