hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix view col alias name bugs

Browse Source
This commit is contained in:
obdev 2021-07-09 17:15:13 +08:00 committed by wangzelin.wzl
parent 701367dbff
commit a26b60e7a4
3 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/observer/virtual_table/ob_information_columns_table.cpp
View File

@ -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()));
}
}

44
src/sql/resolver/ddl/ob_create_view_resolver.cpp
View File

@ -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));

12
src/sql/resolver/ddl/ob_create_view_resolver.h
View File

@ -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);
/**