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

[CP] fix information_schema.columns resolve column default failed

Browse Source
This commit is contained in:
obdev
2022-12-30 03:38:17 +00:00
committed by ob-robot
parent 0d2a35c3d4
commit f946117747
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -934,7 +934,10 @@ int ObInfoSchemaColumnsTable::fill_row_cells(const common::ObString &database_na
}
} else {
ObArray<common::ObString> extended_type_info;
if (OB_FAIL(column_item.default_value_.print_plain_str_literal(extended_type_info, buf, buf_len, pos))) {
const ObLengthSemantics default_length_semantics = session_->get_local_nls_length_semantics();
if (OB_FAIL(extended_type_info.assign(select_item.expr_->get_enum_set_values()))) {
SERVER_LOG(WARN, "failed to assign enum values", K(ret));
} else if (OB_FAIL(column_item.default_value_.print_plain_str_literal(extended_type_info, buf, buf_len, pos))) {
SERVER_LOG(WARN, "fail to print plain str literal", K(buf), K(buf_len), K(pos), K(ret));
} else {
cells[cell_idx].set_varchar(ObString(static_cast<int32_t>(pos), buf));
@ -1067,21 +1070,9 @@ int ObInfoSchemaColumnsTable::fill_row_cells(const common::ObString &database_na
break;
}
case COLUMN_TYPE: {
int64_t pos = 0;
const ObLengthSemantics default_length_semantics = session_->get_local_nls_length_semantics();
ObArray<common::ObString> extended_type_info;
if (OB_FAIL(get_type_str(column_attributes.result_type_.get_obj_meta(),
column_attributes.result_type_.get_accuracy(),
extended_type_info,
default_length_semantics,
pos))) {
SERVER_LOG(WARN,"fail to get column type str",K(ret), K(column_attributes.result_type_));
}
if (OB_SUCC(ret)) {
ObString type_val(column_type_str_len_, static_cast<int32_t>(strlen(column_type_str_)),column_type_str_);
cells[cell_idx].set_varchar(type_val);
cells[cell_idx].set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
}
ObString type_val(column_type_str_len_, static_cast<int32_t>(strlen(column_type_str_)),column_type_str_);
cells[cell_idx].set_varchar(type_val);
cells[cell_idx].set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
break;
}
case COLUMN_KEY: {