[SCN] fix farm failure

This commit is contained in:
obdev
2022-11-28 02:58:33 +00:00
committed by ob-robot
parent 87a9357186
commit 51de5b5911
594 changed files with 9722 additions and 7770 deletions

View File

@ -136,13 +136,9 @@ int ObExprColumnConv::convert_with_null_check(ObObj &result,
if (OB_FAIL(ObExprColumnConv::convert_skip_null_check(result, obj, res_type, is_strict,
cast_ctx, type_infos))) {
LOG_WARN("fail to convert skip null check", K(ret));
} else {
// if (GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_2220) {
if (is_not_null && (result.is_null() || (lib::is_oracle_mode() && result.is_null_oracle()))) {
ret = OB_BAD_NULL_ERROR;
LOG_WARN("Column should not be null", K(ret));
// }
}
} else if (is_not_null && (result.is_null() || (lib::is_oracle_mode() && result.is_null_oracle()))) {
ret = OB_BAD_NULL_ERROR;
LOG_WARN("Column should not be null", K(ret));
}
return ret;
}