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

[FEAT MERGE] Fix the error code loss and overwriting issues on the master branch

Browse Source 
Co-authored-by: jingtaoye35 <1255153887@qq.com>
Co-authored-by: fkuner <784819644@qq.com>
Co-authored-by: lucky-sinx <2549261744@qq.com>
This commit is contained in:
hwx65
2024-06-17 13:46:15 +00:00
committed by ob-robot
parent 020eae1d2b
commit da5aece3e1
266 changed files with 661 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/engine/basic/ob_hash_partitioning_infrastructure_op.h
View File

@ -2813,7 +2813,7 @@ int ObHashPartitionExtendHashTable<Item>::check_and_extend()
K(size_), K(get_bucket_num()), K(sql_mem_processor_->get_mem_bound()));
}
}
if (OB_ISNULL(buckets_)) {
if (OB_SUCC(ret) && OB_ISNULL(buckets_)) {
ret = OB_ERR_UNEXPECTED;
SQL_ENG_LOG(WARN, "null buckets", K(ret));
}

4
src/sql/engine/basic/ob_limit_op.cpp
View File

@ -424,8 +424,8 @@ int ObLimitOp::is_row_order_by_item_value_equal(bool &is_equal)
ObDatum *datum = NULL;
if (OB_FAIL(expr->eval(eval_ctx_, datum))) {
LOG_WARN("expression evaluate failed", K(ret));
} else if (expr->basic_funcs_->null_first_cmp_(
pre_sort_columns_.store_row_->cells()[i], *datum, cmp_ret)) {
} else if (OB_FAIL(expr->basic_funcs_->null_first_cmp_(
pre_sort_columns_.store_row_->cells()[i], *datum, cmp_ret))) {
LOG_WARN("compare failed", K(ret));
} else {
is_equal = 0 == cmp_ret;

7
src/sql/engine/basic/ob_temp_table_insert_op.cpp
View File

@ -100,7 +100,7 @@ int ObTempTableInsertOp::inner_close()
} else if (OB_ISNULL(task_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpect null task", K(ret));
} else if (!task_->interm_result_ids_.empty()) {
} else if (OB_UNLIKELY(!task_->interm_result_ids_.empty())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("result ids should be empty", K(ret));
} else if (OB_FAIL(task_->interm_result_ids_.assign(interm_result_ids_))) {
@ -110,6 +110,7 @@ int ObTempTableInsertOp::inner_close()
}
int temp_ret = ret;
if (OB_FAIL(clear_all_datum_store())) {
// overwrite ret
LOG_WARN("failed to clear datum store", K(ret));
}
ret = temp_ret;
@ -270,12 +271,12 @@ int ObTempTableInsertOp::init_chunk_row_store(ObDTLIntermResultInfo *&chunk_row_
)))) {
LOG_WARN("failed to create row store.", K(ret));
} else if (FALSE_IT(chunk_row_store = result_info_guard.result_info_)) {
} else if (chunk_row_store->datum_store_->init(UINT64_MAX,
} else if (OB_FAIL(chunk_row_store->datum_store_->init(UINT64_MAX,
tenant_id,
ObCtxIds::WORK_AREA,
"SqlTempTableRowSt",
true,
sizeof(uint64_t))) {
sizeof(uint64_t)))) {
LOG_WARN("failed to init the chunk row store.", K(ret));
} else if (OB_FAIL(all_datum_store_.push_back(chunk_row_store))) {
LOG_WARN("failed to push back datum store", K(ret));

5
src/sql/engine/basic/ob_temp_table_insert_vec_op.cpp
View File

@ -110,6 +110,7 @@ int ObTempTableInsertVecOp::inner_close()
}
int temp_ret = ret;
if (OB_FAIL(clear_all_interm_res_info())) {
// overwrite ret, has temp_ret
LOG_WARN("failed to clear row store", K(ret));
}
ret = temp_ret;
@ -210,12 +211,12 @@ int ObTempTableInsertVecOp::create_interm_result_info(ObDTLIntermResultInfo *&in
true))) {
LOG_WARN("failed to create row store.", K(ret));
} else if (FALSE_IT(interm_res_info = result_info_guard.result_info_)) {
} else if (interm_res_info->col_store_->init(MY_SPEC.get_child()->output_,
} else if (OB_FAIL(interm_res_info->col_store_->init(MY_SPEC.get_child()->output_,
MY_SPEC.max_batch_size_,
mem_attr,
0 /*mem_limit*/,
true /*enable_dump*/,
false /*reuse_vector_array*/)) {
false /*reuse_vector_array*/))) {
LOG_WARN("failed to init the chunk row store.", K(ret));
} else if (OB_FAIL(all_interm_res_info_.push_back(interm_res_info))) {
LOG_WARN("failed to push back row store", K(ret));