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

[scn] fix failure of mittest after refresh feature scn

Browse Source
This commit is contained in:
obdev
2022-11-28 01:46:42 +00:00
committed by ob-robot
parent 49a02f3304
commit 54b64a7263
1898 changed files with 255804 additions and 280809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/engine/basic/ob_chunk_datum_store.cpp
View File

@ -75,7 +75,7 @@ int ObChunkDatumStore::StoredRow::to_expr_skip_const(const ObIArray<ObExpr*> &ex
} else {
for (uint32_t i = 0; i < cnt_; ++i) {
const ObExpr *expr = exprs.at(i);
if (expr->is_const_expr()) { // T_QUESTIONMARK is included in dynamic_const
if (expr->is_dynamic_const_ || expr->is_static_const_) { // T_QUESTIONMARK is included in dynamic_const
continue;
} else {
expr->locate_expr_datum(ctx) = cells()[i];

4
src/sql/engine/basic/ob_chunk_datum_store.h
View File

@ -1203,7 +1203,7 @@ int ObChunkDatumStore::Iterator::get_next_row_skip_const(ObEvalCtx &ctx,
// logical operator, we can not add expr in CG.
for (int64_t i = 0; i < sr->cnt_; i++) {
const ObExpr *expr = exprs.at(i);
if (expr->is_const_expr()) { // T_QUESTIONMARK is included in is_dynamic_const
if (expr->is_dynamic_const_) { // T_QUESTIONMARK is included in is_dynamic_const
continue;
} else {
const ObDatum &src = sr->cells()[i];
@ -1270,7 +1270,7 @@ void ObChunkDatumStore::Iterator::attach_rows(
if (NULL != srows) {
for (int64_t col_idx = 0; col_idx < exprs.count(); col_idx++) {
ObExpr *e = exprs.at(col_idx);
if (skip_const && e->is_const_expr()) {
if (skip_const && e->is_dynamic_const_) {
continue;
}
if (OB_LIKELY(!fill_invariable_res_buf || e->is_variable_res_buf())) {

1
src/sql/engine/basic/ob_expr_values_op.cpp
View File

@ -309,7 +309,6 @@ int ObExprValuesOp::get_real_batch_obj_type(ObDatumMeta &src_meta,
{
int ret = OB_SUCCESS;
if (MY_SPEC.ins_values_batch_opt_
&& T_QUESTIONMARK == src_expr->type_
&& (src_expr->frame_idx_
< spec_.plan_->get_expr_frame_info().const_frame_.count()
+ spec_.plan_->get_expr_frame_info().param_frame_.count())) {

2
src/sql/engine/basic/ob_ra_datum_store.cpp
View File

@ -131,7 +131,7 @@ int ObRADatumStore::StoredRow::to_expr(const common::ObIArray<ObExpr*> &exprs,
LOG_WARN("datum count mismatch", K(ret), K(cnt_), K(exprs.count()));
} else {
for (uint32_t i = 0; i < cnt_; ++i) {
if (exprs.at(i)->is_const_expr()) {
if (exprs.at(i)->is_static_const_) {
continue;
} else {
exprs.at(i)->locate_expr_datum(ctx) = cells()[i];

11
src/sql/engine/basic/ob_select_into_op.cpp
View File

@ -72,14 +72,9 @@ int ObSelectIntoOp::inner_open()
ObString path = file_name_.get_varchar().trim();
if (path.prefix_match_ci(OB_OSS_PREFIX)) {
file_location_ = IntoFileLocation::REMOTE_OSS;
ObString temp_url = path.split_on('?');
temp_url.trim();
ObString storage_info;
if (OB_FAIL(ob_write_string(ctx_.get_allocator(), temp_url, url_, true))) {
LOG_WARN("fail to append string", K(ret));
} else if (OB_FAIL(ob_write_string(ctx_.get_allocator(), path, storage_info, true))) {
LOG_WARN("fail to append string", K(ret));
} else if (OB_FAIL(access_info_.set(url_.ptr(), storage_info.ptr()))) {
url_ = path.split_on('?');
url_.trim();
if (OB_FAIL(access_info_.set(url_.ptr(), path.ptr()))) {
LOG_WARN("fail to set access info", K(ret), K(path));
}