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

Merge branch 'pr_1546'

Browse Source
This commit is contained in:
ob-robot
2023-09-08 15:51:13 +08:00
parent 46cc984ade 55cfa99aef
commit 19a59fc849
37 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/optimizer/ob_insert_all_log_plan.cpp
View File

@ -127,7 +127,7 @@ int ObInsertAllLogPlan::allocate_insert_values_as_top(ObLogicalOperator *&top)
} else if (insert_all_stmt->is_error_logging() && OB_FAIL(values_op->extract_err_log_info())) {
LOG_WARN("failed to extract error log exprs", K(ret));
} else if (OB_FAIL(values_op->compute_property())) {
LOG_WARN("failed to compute propery", K(ret));
LOG_WARN("failed to compute property", K(ret));
} else {
if (NULL != top) {
values_op->add_child(top);

2
src/sql/optimizer/ob_log_expr_values.cpp
View File

@ -145,7 +145,7 @@ int ObLogExprValues::compute_fd_item_set()
if (OB_FAIL(ret)) {
/*do nothing*/
} else if (OB_FAIL(deduce_const_exprs_and_ft_item_set(*fd_item_set))) {
LOG_WARN("falied to deduce fd item set", K(ret));
LOG_WARN("failed to deduce fd item set", K(ret));
} else {
set_fd_item_set(fd_item_set);
}

2
src/sql/optimizer/ob_log_join.cpp
View File

@ -957,7 +957,7 @@ int ObLogJoin::allocate_granule_post(AllocGIContext &ctx)
// 并且 nlj 向左支 request 一个 part id
// 通知 GI 在迭代 partition granule 时进入 partition pruning 模式
if (OB_FAIL(build_gi_partition_pruning())) {
LOG_WARN("fail deterimine right child partition id", K(ret));
LOG_WARN("fail determine right child partition id", K(ret));
}
}
return ret;

8
src/sql/optimizer/ob_log_table_scan.cpp
View File

@ -152,7 +152,7 @@ int ObLogTableScan::get_op_exprs(ObIArray<ObRawExpr*> &all_exprs)
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected null", K(ret));
} else if (OB_FAIL(generate_access_exprs())) {
LOG_WARN("failed to generate acess exprs", K(ret));
LOG_WARN("failed to generate access exprs", K(ret));
} else if (NULL != limit_count_expr_ &&
OB_FAIL(all_exprs.push_back(limit_count_expr_))) {
LOG_WARN("failed to push back expr", K(ret));
@ -317,7 +317,7 @@ int ObLogTableScan::copy_filter_before_index_back()
} else {
bool is_contain_vir_gen_column = false;
// ObArray<ObRawExpr *> column_exprs;
// scan_pushdown before index back conculde virtual generated column
// scan_pushdown before index back conclude virtual generated column
// need copy for avoiding shared expression.
if (OB_FAIL(ObRawExprUtils::contain_virtual_generated_column(filters.at(i), is_contain_vir_gen_column))) {
LOG_WARN("fail to contain virtual gen column", K(ret));
@ -1836,7 +1836,7 @@ int ObLogTableScan::print_used_hint(PlanText &plan_text)
} else if (!is_skip_scan() && T_INDEX_SS_HINT == hint->get_hint_type()) {
/* is not index skip scan but exist index_ss hint */
} else if (OB_FAIL(hint->print_hint(plan_text))) {
LOG_WARN("failed to print indedx hint", K(ret), K(*hint));
LOG_WARN("failed to print index hint", K(ret), K(*hint));
}
}
} else {// print all no index
@ -1847,7 +1847,7 @@ int ObLogTableScan::print_used_hint(PlanText &plan_text)
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected NULL", K(ret), K(hint));
} else if (OB_FAIL(hint->print_hint(plan_text))) {
LOG_WARN("failed to print indedx hint", K(ret), K(*hint));
LOG_WARN("failed to print index hint", K(ret), K(*hint));
}
}
}

2
src/sql/optimizer/ob_log_topk.cpp
View File

@ -105,7 +105,7 @@ int ObLogTopk::est_cost()
if (OB_ISNULL(child = get_child(first_child)) || OB_ISNULL(get_stmt()) ||
OB_ISNULL(get_plan())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpeced null", K(child), K(get_stmt()), K(get_plan()),K(ret));
LOG_WARN("get unexpected null", K(child), K(get_stmt()), K(get_plan()),K(ret));
} else if (OB_UNLIKELY((parallel = get_parallel()) < 1)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected parallel degree", K(ret));

8
src/sql/optimizer/ob_merge_log_plan.cpp
View File

@ -524,7 +524,7 @@ bool ObMergeLogPlan::match_same_partition(const ObShardingInfo &l_sharding_info,
}
// When insert_sharding and update_sharding match same partition,
// need add euqal constraints for const params in sharding conditions which equal to part key.
// need add equal constraints for const params in sharding conditions which equal to part key.
int ObMergeLogPlan::generate_equal_constraint(ObLogicalOperator &top,
ObShardingInfo &insert_sharding,
bool &can_gen_cons,
@ -552,7 +552,7 @@ int ObMergeLogPlan::generate_equal_constraint(ObLogicalOperator &top,
LOG_WARN("get unexpected null", K(ret), K(target_table_scan));
} else if (OB_FAIL(append(right_conds, target_table_scan->get_range_conditions()))
||OB_FAIL(append(right_conds, target_table_scan->get_filter_exprs()))) {
LOG_WARN("failed to append epxrs", K(ret));
LOG_WARN("failed to append exprs", K(ret));
} else if (OB_FAIL(insert_sharding.get_all_partition_keys(left_part_keys))) {
LOG_WARN("failed to get partition keys", K(ret));
} else if (OB_FAIL(target_table_scan->get_sharding()->get_all_partition_keys(right_part_keys))) {
@ -864,7 +864,7 @@ int ObMergeLogPlan::prepare_table_dml_info_update(const ObMergeTableInfo& merge_
LOG_WARN("failed to get table schema", K(merge_info), K(ret));
} else if (!merge_info.is_link_table_ &&
OB_FAIL(check_update_part_key(index_schema, table_dml_info))) {
LOG_WARN("faield to check update part key", K(ret));
LOG_WARN("failed to check update part key", K(ret));
} else {
for (int64_t i = 0; OB_SUCC(ret) && i < table_dml_info->ck_cst_exprs_.count(); ++i) {
if (OB_FAIL(ObDMLResolver::copy_schema_expr(optimizer_context_.get_expr_factory(),
@ -1027,7 +1027,7 @@ int ObMergeLogPlan::check_merge_stmt_need_multi_partition_dml(bool &is_multi_par
} else if (OB_FAIL(merge_stmt->part_key_has_subquery(has_subquery_part_key))) {
LOG_WARN("failed to check part key has subquery", K(ret));
} else if (OB_FAIL(merge_stmt->part_key_has_auto_inc(has_auto_inc_part_key))) {
LOG_WARN("check to check whether part key containts auto inc column", K(ret));
LOG_WARN("check to check whether part key contains auto inc column", K(ret));
} else if (has_rand_part_key || has_subquery_part_key || has_auto_inc_part_key) {
is_multi_part_dml = true;
} else { /*do nothing*/ }

4
src/sql/optimizer/ob_opt_est_cost_model.cpp
View File

@ -86,7 +86,7 @@ double ObTableMetaInfo::get_micro_block_numbers() const
{
double ret = 0.0;
if (micro_block_count_ <= 0) {
// calculate micore block count use storage statistics
// calculate micro block count use storage statistics
ret = 0;
} else {
// get micro block count from optimizer statistics
@ -1399,7 +1399,7 @@ int ObOptEstCostModel::cost_table_get_one_batch(const ObCostTableScanInfo &est_c
OB_FAIL(cost_table_lookup_rpc(index_back_row_count,
est_cost_info,
network_cost))) {
LOG_WARN("failed to get newwork transform cost for global index", K(ret));
LOG_WARN("failed to get network transform cost for global index", K(ret));
} else {
get_cost = base_cost + ib_cost + network_cost;
get_index_back_cost = ib_cost + network_cost;

2
src/sql/optimizer/ob_opt_est_utils.h
View File

@ -155,7 +155,7 @@ private:
uint64_t &convertable_map,
int64_t pos);
// 1, find common prefix length of strings
// 2, find dynamix base and offset of strings
// 2, find dynamic base and offset of strings
// 3, use dynamic base and offset to convert strings to scalars
static int convert_strings_to_scalar(const common::ObIArray<common::ObString> &origin_strs,
common::ObIArray<double> &scalars);

2
src/sql/optimizer/ob_optimizer.h
View File

@ -56,7 +56,7 @@ namespace sql
*/
PROJECT_PRUNING,
/**
* Exchange allocation is also known as parallel optimzation. Though there
* Exchange allocation is also known as parallel optimization. Though there
* are multiple possible optimization that can happen in this step, at the
* moment we just perform simple check on table location and insert pairs of
* exchange nodes at places where data exchange needs to happen(local