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

fix some bugs

Browse Source
This commit is contained in:
wangt1xiuyi
2023-04-22 14:20:35 +00:00
committed by ob-robot
parent 73ba439d2e
commit 27783b2352
11 changed files with 95 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/sql/resolver/dml/ob_column_namespace_checker.cpp
View File

@ -564,25 +564,12 @@ int ObColumnNamespaceChecker::check_rowid_table_column_namespace(const ObQualifi
&& (cur_table = table_item_iter.get_next_table_item()) != nullptr) {
if (!q_name.tbl_name_.empty()) {
if (cur_table->is_joined_table()) {
const JoinedTable *joined_table = reinterpret_cast<const JoinedTable*>(cur_table);
if (OB_ISNULL(joined_table->left_table_) || OB_ISNULL(joined_table->right_table_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("left or right table of joined table is NULL", K(ret),
KP(joined_table->left_table_), KP(joined_table->right_table_));
} else if (OB_FAIL(ObResolverUtils::name_case_cmp(params_.session_info_, q_name.tbl_name_,
joined_table->left_table_->get_object_name(),
OB_TABLE_NAME_CLASS, is_match))) {
LOG_WARN("table name case compare failed", K(ret),
K(q_name.tbl_name_), K(joined_table->left_table_->get_object_name()));
} else if (is_match) {
table_item = joined_table->left_table_;
} else if (OB_FAIL(ObResolverUtils::name_case_cmp(params_.session_info_, q_name.tbl_name_,
joined_table->right_table_->get_object_name(),
OB_TABLE_NAME_CLASS, is_match))) {
LOG_WARN("table name case compare failed", K(ret),
K(q_name.tbl_name_), K(joined_table->right_table_->get_object_name()));
} else if (is_match) {
table_item = joined_table->right_table_;
if (OB_FAIL(check_rowid_existence_in_joined_table(params_.session_info_,
q_name.tbl_name_,
reinterpret_cast<const JoinedTable*>(cur_table),
is_match,
table_item))) {
LOG_WARN("failed to check rowid existence in joined table", K(ret));
}
} else if (OB_FAIL(ObResolverUtils::name_case_cmp(params_.session_info_,
q_name.tbl_name_,
@ -605,5 +592,63 @@ int ObColumnNamespaceChecker::check_rowid_table_column_namespace(const ObQualifi
return ret;
}
int ObColumnNamespaceChecker::check_rowid_existence_in_joined_table(const ObSQLSessionInfo *session_info,
const ObString &tbl_name,
const JoinedTable *joined_table,
bool &found_it,
const TableItem *&table_item)
{
int ret = OB_SUCCESS;
if (found_it) {
//do nothing
} else if (OB_ISNULL(joined_table)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected null", K(ret), K(joined_table));
} else if (OB_ISNULL(joined_table->left_table_) || OB_ISNULL(joined_table->right_table_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("left or right table of joined table is NULL", K(ret), KP(joined_table->left_table_),
KP(joined_table->right_table_));
} else if (!joined_table->left_table_->is_joined_table() &&
OB_FAIL(ObResolverUtils::name_case_cmp(session_info,
tbl_name,
joined_table->left_table_->get_object_name(),
OB_TABLE_NAME_CLASS,
found_it))) {
LOG_WARN("table name case compare failed", K(ret), K(tbl_name),
K(joined_table->left_table_->get_object_name()));
} else if (found_it) {
table_item = joined_table->left_table_;
} else if (joined_table->left_table_->is_joined_table() &&
OB_FAIL(SMART_CALL(check_rowid_existence_in_joined_table(session_info,
tbl_name,
reinterpret_cast<const JoinedTable*>(joined_table->left_table_),
found_it,
table_item)))) {
LOG_WARN("failed to check rowid existence in joined table", K(ret));
} else if (found_it) {
//do nothing
} else if (!joined_table->right_table_->is_joined_table() &&
OB_FAIL(ObResolverUtils::name_case_cmp(session_info,
tbl_name,
joined_table->right_table_->get_object_name(),
OB_TABLE_NAME_CLASS,
found_it))) {
LOG_WARN("table name case compare failed", K(ret), K(tbl_name),
K(joined_table->right_table_->get_object_name()));
} else if (found_it) {
table_item = joined_table->right_table_;
} else if (joined_table->right_table_->is_joined_table() &&
OB_FAIL(SMART_CALL(check_rowid_existence_in_joined_table(session_info,
tbl_name,
reinterpret_cast<const JoinedTable*>(joined_table->right_table_),
found_it,
table_item)))) {
LOG_WARN("failed to check rowid existence in joined table", K(ret));
} else if (found_it) {
//do nothing
}
return ret;
}
} // namespace sql
} // namespace oceanbase

5
src/sql/resolver/dml/ob_column_namespace_checker.h
View File

@ -118,6 +118,11 @@ private:
const common::ObString &column_name,
const TableItem &table_item,
bool &exist);
int check_rowid_existence_in_joined_table(const ObSQLSessionInfo *session_info,
const ObString &tbl_name,
const JoinedTable *joined_table,
bool &found_it,
const TableItem *&table_item);
private:
ObResolverParams &params_;
//record the table root reference by query