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

add inner_same_as for udf func and remove useless GET_MIN_CLUSTER_VERSION

Browse Source
This commit is contained in:
Larry955
2022-11-16 07:35:39 +00:00
committed by wangzelin.wzl
parent 99d34dc07b
commit 8aee7d972f
34 changed files with 279 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sql/resolver/ddl/ob_create_table_resolver.cpp
View File

@ -1162,16 +1162,12 @@ int ObCreateTableResolver::resolve_table_elements(const ParseNode *node,
LOG_USER_ERROR(OB_ERR_TOO_LONG_COLUMN_LENGTH, column.get_column_name(), static_cast<int32_t>(OB_MAX_VARCHAR_LENGTH));
} else if (ob_is_text_tc(column.get_data_type())) {
ObLength max_length = 0;
if ((GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_1470) && !ObSchemaService::g_liboblog_mode_) {
max_length = ObAccuracy::MAX_ACCURACY_OLD[column.get_data_type()].get_length();
} else {
max_length = ObAccuracy::MAX_ACCURACY2[is_oracle_mode][column.get_data_type()].get_length();
}
max_length = ObAccuracy::MAX_ACCURACY2[is_oracle_mode][column.get_data_type()].get_length();
if (length > max_length) {
ret = OB_ERR_TOO_LONG_COLUMN_LENGTH;
LOG_USER_ERROR(OB_ERR_TOO_LONG_COLUMN_LENGTH, column.get_column_name(),
ObAccuracy::MAX_ACCURACY2[is_oracle_mode][column.get_data_type()].get_length());
} else if ((GET_MIN_CLUSTER_VERSION() >= CLUSTER_VERSION_1470) || ObSchemaService::g_liboblog_mode_) {
} else {
length = min(length, OB_MAX_LOB_HANDLE_LENGTH);
}
}
@ -2038,23 +2034,13 @@ int ObCreateTableResolver::set_table_option_to_schema(ObTableSchema &table_schem
if (OB_SUCC(ret)) {
if (0 == progressive_merge_round) {
if (GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_2200) {
progressive_merge_round = 0;
} else {
progressive_merge_round = 1;
}
progressive_merge_round = 1;
}
}
if (OB_SUCC(ret)) {
if (OB_STORAGE_FORMAT_VERSION_INVALID == storage_format_version_) {
if (GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_2200) {
storage_format_version_ = OB_STORAGE_FORMAT_VERSION_V2;
} else if (GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_3000) {
storage_format_version_ = OB_STORAGE_FORMAT_VERSION_V3;
} else {
storage_format_version_ = OB_STORAGE_FORMAT_VERSION_V4;
}
storage_format_version_ = OB_STORAGE_FORMAT_VERSION_V4;
}
}