Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
caoersss
oceanbase
提交
a26b60e7
O
oceanbase
项目概览
caoersss
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a26b60e7
编写于
7月 09, 2021
作者:
O
obdev
提交者:
wangzelin.wzl
7月 09, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix view col alias name bugs
上级
701367db
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
40 addition
and
18 deletion
+40
-18
src/observer/virtual_table/ob_information_columns_table.cpp
src/observer/virtual_table/ob_information_columns_table.cpp
+1
-1
src/sql/resolver/ddl/ob_create_view_resolver.cpp
src/sql/resolver/ddl/ob_create_view_resolver.cpp
+30
-14
src/sql/resolver/ddl/ob_create_view_resolver.h
src/sql/resolver/ddl/ob_create_view_resolver.h
+9
-3
未找到文件。
src/observer/virtual_table/ob_information_columns_table.cpp
浏览文件 @
a26b60e7
...
...
@@ -325,7 +325,7 @@ int ObInfoSchemaColumnsTable::check_database_table_filter()
}
// At this time, only db_name is specified, and the db push_back is directly entered into
// filter_database_schema_array
}
else
if
(
OB_FAIL
(
database_schema_array_
.
push_back
(
filter_database_schema
)))
{
}
else
if
(
OB_FAIL
(
add_var_to_array_no_dup
(
database_schema_array_
,
filter_database_schema
)))
{
SERVER_LOG
(
WARN
,
"push_back failed"
,
K
(
filter_database_schema
->
get_database_name
()));
}
}
...
...
src/sql/resolver/ddl/ob_create_view_resolver.cpp
浏览文件 @
a26b60e7
...
...
@@ -236,12 +236,8 @@ int ObCreateViewResolver::resolve(const ParseNode& parse_tree)
LOG_WARN
(
"failed to init hashset"
,
K
(
ret
),
K
(
select_item_size
));
}
for
(
int64_t
i
=
0
;
OB_SUCC
(
ret
)
&&
i
<
select_item_size
;
++
i
)
{
if
(
OB_FAIL
(
check_select_stmt_col_name
(
select_stmt
->
get_select_item
(
i
),
index_array
,
i
,
view_col_names
)))
{
SQL_RESV_LOG
(
WARN
,
"check select stmt col name failed"
,
K
(
ret
),
K
(
select_stmt
->
get_select_item
(
i
).
alias_name_
));
if
(
OB_FAIL
(
check_select_stmt_col_name
(
select_stmt
->
get_select_item
(
i
),
index_array
,
i
,
view_col_names
,
is_expr_or_col_dup
,
dup_col_name
))){
SQL_RESV_LOG
(
WARN
,
"check select stmt col name failed"
,
K
(
ret
),
K
(
select_stmt
->
get_select_item
(
i
).
alias_name_
));
}
}
if
(
OB_SUCC
(
ret
))
{
...
...
@@ -262,7 +258,7 @@ int ObCreateViewResolver::resolve(const ParseNode& parse_tree)
if
(
OB_UNLIKELY
(
select_item_size
!=
view_children_num
))
{
ret
=
OB_ERR_VIEW_WRONG_LIST
;
LOG_WARN
(
"view columns is not equal with select columns"
,
K
(
select_item_size
),
K
(
view_children_num
));
}
else
if
(
share
::
is_oracle_mode
())
{
// need check if any dup. names in oracle mode
}
else
{
// need check if any dup. names in oracle mode
is_expr_or_col_dup
=
false
;
specify_view_col
=
true
;
dup_col_name
.
reset
();
...
...
@@ -283,8 +279,6 @@ int ObCreateViewResolver::resolve(const ParseNode& parse_tree)
// do nothing
}
}
}
else
{
// do nothing
}
}
}
...
...
@@ -311,6 +305,18 @@ int ObCreateViewResolver::resolve(const ParseNode& parse_tree)
}
}
// 检查 mysql 模式下列名定义
if
(
share
::
is_mysql_mode
()
&&
!
(
is_sync_ddl_user
&&
session_info_
->
is_inner
()))
{
if
(
OB_FAIL
(
ret
))
{
// do nothing
}
else
if
(
is_expr_or_col_dup
||
is_view_col_dup
)
{
ret
=
OB_ERR_COLUMN_DUPLICATE
;
LOG_USER_ERROR
(
OB_ERR_COLUMN_DUPLICATE
,
dup_col_name
.
length
(),
dup_col_name
.
ptr
());
}
else
{
// do nothing
}
}
// specify view related flags
if
(
OB_SUCC
(
ret
))
{
if
(
table_schema
.
is_sys_table
())
{
...
...
@@ -538,8 +544,13 @@ int ObCreateViewResolver::stmt_print(
}
// check if alias too long or duplicate
int
ObCreateViewResolver
::
check_select_stmt_col_name
(
SelectItem
&
select_item
,
ObArray
<
int64_t
>&
index_array
,
int64_t
pos
,
common
::
hash
::
ObHashSet
<
ObString
>&
view_col_names
)
int
ObCreateViewResolver
::
check_select_stmt_col_name
(
SelectItem
&
select_item
,
ObArray
<
int64_t
>
&
index_array
,
int64_t
pos
,
common
::
hash
::
ObHashSet
<
ObString
>
&
view_col_names
,
bool
&
is_expr_or_col_dup
,
ObString
&
dup_col_name
)
{
int
ret
=
OB_SUCCESS
;
int
hash_ret
=
OB_HASH_NOT_EXIST
;
...
...
@@ -566,8 +577,13 @@ int ObCreateViewResolver::check_select_stmt_col_name(SelectItem& select_item, Ob
if
(
OB_SUCC
(
ret
)
&&
len_is_legal
)
{
// check if dup
if
(
OB_HASH_EXIST
==
(
hash_ret
=
view_col_names
.
exist_refactored
(
col_name
)))
{
ret
=
OB_ERR_COLUMN_DUPLICATE
;
LOG_USER_ERROR
(
OB_ERR_COLUMN_DUPLICATE
,
col_name
.
length
(),
col_name
.
ptr
());
is_expr_or_col_dup
=
true
;
if
(
dup_col_name
.
empty
())
{
dup_col_name
=
col_name
;
}
ret
=
OB_SUCCESS
;
// ret = OB_ERR_COLUMN_DUPLICATE;
// LOG_USER_ERROR(OB_ERR_COLUMN_DUPLICATE, col_name.length(), col_name.ptr());
}
else
{
if
(
OB_FAIL
(
view_col_names
.
set_refactored
(
col_name
,
0
)))
{
SQL_RESV_LOG
(
WARN
,
"set column name to hash set failed"
,
K
(
ret
),
K
(
col_name
));
...
...
@@ -589,8 +605,8 @@ int ObCreateViewResolver::create_alias_names_auto(
int
hash_ret
=
OB_HASH_EXIST
;
for
(
int64_t
j
=
0
;
OB_SUCC
(
ret
)
&&
j
<
long_col_name_num
;
++
j
)
{
hash_ret
=
OB_HASH_EXIST
;
char
temp_str_buf
[
number
::
ObNumber
::
MAX_PRINTABLE_SIZE
];
while
(
OB_SUCC
(
ret
)
&&
OB_HASH_EXIST
==
hash_ret
)
{
char
temp_str_buf
[
number
::
ObNumber
::
MAX_PRINTABLE_SIZE
];
if
(
snprintf
(
temp_str_buf
,
sizeof
(
temp_str_buf
),
"Name_exp_%ld"
,
auto_name_id
)
<
0
)
{
ret
=
OB_SIZE_OVERFLOW
;
SQL_RESV_LOG
(
WARN
,
"failed to generate buffer for temp_str_buf"
,
K
(
ret
));
...
...
src/sql/resolver/ddl/ob_create_view_resolver.h
浏览文件 @
a26b60e7
...
...
@@ -42,9 +42,15 @@ public:
virtual
int
resolve
(
const
ParseNode
&
parse_tree
);
private:
int
resolve_column_list
(
ParseNode
*
view_columns_node
,
common
::
ObIArray
<
common
::
ObString
>&
column_list
);
int
check_select_stmt_col_name
(
SelectItem
&
select_item
,
ObArray
<
int64_t
>&
index_array
,
int64_t
pos
,
common
::
hash
::
ObHashSet
<
ObString
>&
view_col_names
);
int
resolve_column_list
(
ParseNode
*
view_columns_node
,
common
::
ObIArray
<
common
::
ObString
>
&
column_list
);
int
check_select_stmt_col_name
(
SelectItem
&
select_item
,
ObArray
<
int64_t
>
&
index_array
,
int64_t
pos
,
common
::
hash
::
ObHashSet
<
ObString
>
&
view_col_names
,
bool
&
is_expr_or_col_dup
,
ObString
&
dup_col_name
);
int
create_alias_names_auto
(
ObArray
<
int64_t
>&
index_array
,
ObSelectStmt
*
select_stmt
,
common
::
hash
::
ObHashSet
<
ObString
>&
view_col_names
);
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录