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

Fix mysql tests

Browse Source
This commit is contained in:
hezuojiao
2023-01-04 10:38:12 +00:00
committed by ob-robot
parent e8d80ceea0
commit 8ee98a51af
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/observer/virtual_table/ob_information_kvcache_table.h
View File

@ -80,4 +80,3 @@ private:
} }
} }
#endif /* OCEANBASE_OBSERVER_VIRTUAL_TABLE_OB_INFORMATION_KVCACHE_TABLE */ #endif /* OCEANBASE_OBSERVER_VIRTUAL_TABLE_OB_INFORMATION_KVCACHE_TABLE */

6
src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp
View File

@ -382,9 +382,15 @@ int ObRawExprDeduceType::calc_result_type(ObNonTerminalRawExpr &expr,
for (int64_t i = 0; i < types.count(); ++i) { for (int64_t i = 0; i < types.count(); ++i) {
types.at(i).set_calc_meta(types.at(i)); types.at(i).set_calc_meta(types.at(i));
if (lib::is_mysql_mode() && types.at(i).is_double()) { if (lib::is_mysql_mode() && types.at(i).is_double()) {
const ObPrecision p = types.at(i).get_precision();
const ObScale s = types.at(i).get_scale();
// check whether the precision and scale is valid
if ((PRECISION_UNKNOWN_YET == p && s == SCALE_UNKNOWN_YET) ||
(s >= 0 && s <= OB_MAX_DOUBLE_FLOAT_SCALE && p >= s)) {
types.at(i).set_calc_accuracy(types.at(i).get_accuracy()); types.at(i).set_calc_accuracy(types.at(i).get_accuracy());
} }
} }
}
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
} else if (ObExprOperator::NOT_ROW_DIMENSION != row_dimension) { } else if (ObExprOperator::NOT_ROW_DIMENSION != row_dimension) {
ret = op->calc_result_typeN(result_type, GET_TYPE_ARRAY(types), types.count(), type_ctx); ret = op->calc_result_typeN(result_type, GET_TYPE_ARRAY(types), types.count(), type_ctx);