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

cherry-pick bugfix from 3.1 to open source branch

Browse Source
This commit is contained in:
obdev
2021-07-14 17:48:15 +08:00
committed by wangzelin.wzl
parent 131c2cf658
commit a997b23808
19 changed files with 14233 additions and 14190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sql/resolver/ddl/ob_alter_table_resolver.cpp
View File

@ -3421,6 +3421,16 @@ int ObAlterTableResolver::resolve_change_column(const ParseNode& node)
K(ret),
K(alter_column_schema.get_accuracy()),
KPC(origin_col_schema));
} else if ((ObTimestampType == origin_col_schema->get_data_type()
|| ObDateTimeType == origin_col_schema->get_data_type()
|| ObTimeType == origin_col_schema->get_data_type())
&& origin_col_schema->get_data_type() == alter_column_schema.get_data_type()
&& origin_col_schema->get_accuracy().get_precision() >
alter_column_schema.get_accuracy().get_precision()) {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "Decrease scale of timestamp type");
LOG_WARN("Decrease scale of timestamp type not supported", K(ret),
K(origin_col_schema->get_accuracy()), K(alter_column_schema.get_accuracy()));
}
}
if (OB_SUCC(ret)) {
@ -3531,6 +3541,17 @@ int ObAlterTableResolver::resolve_modify_column(
K(ret),
K(alter_column_schema.get_accuracy()),
KPC(origin_col_schema));
} else if ((ObTimestampNanoType == origin_col_schema->get_data_type()
|| ObTimestampType == origin_col_schema->get_data_type()
|| ObDateTimeType == origin_col_schema->get_data_type()
|| ObTimeType == origin_col_schema->get_data_type())
&& origin_col_schema->get_data_type() == alter_column_schema.get_data_type()
&& origin_col_schema->get_accuracy().get_precision() >
alter_column_schema.get_accuracy().get_precision()) {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "Decrease scale of timestamp type");
LOG_WARN("Decrease scale of timestamp type not supported", K(ret),
K(origin_col_schema->get_accuracy()), K(alter_column_schema.get_accuracy()));
} else if (share::is_oracle_mode() &&
((origin_col_schema->get_data_type() != alter_column_schema.get_data_type()) ||
(origin_col_schema->get_data_length() != alter_column_schema.get_data_length()))) {

4
src/sql/resolver/expr/ob_raw_expr_printer.cpp
View File

@ -411,6 +411,10 @@ int ObRawExprPrinter::print(ObOpRawExpr* expr)
case T_OP_GT:
case T_OP_SQ_GT:
SET_SYMBOL_IF_EMPTY(">");
case T_OP_BIT_LEFT_SHIFT:
SET_SYMBOL_IF_EMPTY("<<");
case T_OP_BIT_RIGHT_SHIFT:
SET_SYMBOL_IF_EMPTY(">>");
case T_OP_NE:
case T_OP_SQ_NE:
SET_SYMBOL_IF_EMPTY("<>");