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

fix some typo error

Browse Source
This commit is contained in:
csch
2022-12-30 16:42:20 +08:00
parent 287987fb8a
commit 24a9d2d004
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/sql/optimizer/ob_dynamic_sampling.cpp
View File

@ -57,7 +57,7 @@ int ObDynamicSampling::estimate_table_rowcount(const ObDSTableParam &param,
LOG_WARN("failed to get ds stat items");
} else if (get_ds_item_size() == 0) {
//all ds item can get from cache.
LOG_TRACE("suceed to get ds item from cache", K(param));
LOG_TRACE("succeed to get ds item from cache", K(param));
} else if (OB_FAIL(do_estimate_table_rowcount(param, throw_ds_error))) {
LOG_WARN("failed to do estimate table rowcount", K(ret));
} else if (OB_FAIL(add_ds_result_cache(ds_result_items))) {
@ -97,7 +97,7 @@ int ObDynamicSampling::add_ds_result_cache(ObIArray<ObDSResultItem> &ds_result_i
ds_result_items.at(i).stat_handle_))) {
LOG_WARN("failed to add ds stat cache", K(ret));
} else {
ds_result_items.at(i).stat_ = NULL;//reset and the memory will free togather after ds.
ds_result_items.at(i).stat_ = NULL;//reset and the memory will free togther after ds.
if (ds_result_items.at(i).type_ == ObDSResultItemType::OB_DS_BASIC_STAT) {
logical_idx = i;
}
@ -326,7 +326,7 @@ int ObDynamicSampling::add_ds_col_stat_item(const ObDSTableParam &param,
}
if (!found_it) {
if (!ObColumnStatParam::is_valid_opt_col_type(col_expr->get_data_type())) {
//do nothing, only ds fullfill with column stats type.
//do nothing, only ds fulfill with column stats type.
} else if (OB_FAIL(add_ds_stat_item(ObDSStatItem(&result_item,
tmp_str,
col_expr,
@ -507,7 +507,7 @@ int ObDynamicSampling::estimte_rowcount(int64_t max_ds_timeout,
LOG_WARN("failed to pack dynamic sampling", K(ret));
} else if (OB_FAIL(prepare_and_store_session(session_info, session_value,
nested_count, is_no_backslash_escapes, tx_desc))) {
throw_ds_error = true;//here we must throw error, because the seesion may be unavailable.
throw_ds_error = true;//here we must throw error, because the session may be unavailable.
LOG_WARN("failed to prepare and store session", K(ret));
} else {
need_restore_session = true;
@ -525,7 +525,7 @@ int ObDynamicSampling::estimte_rowcount(int64_t max_ds_timeout,
int tmp_ret = OB_SUCCESS;
if (OB_SUCCESS != (tmp_ret = restore_session(session_info, session_value,
nested_count, is_no_backslash_escapes, tx_desc))) {
throw_ds_error = true;//here we must throw error, because the seesion may be unavailable.
throw_ds_error = true;//here we must throw error, because the session may be unavailable.
ret = COVER_SUCC(tmp_ret);
LOG_WARN("failed to restore session", K(tmp_ret));
}
@ -806,7 +806,7 @@ int ObDynamicSampling::calc_table_sample_block_ratio(const ObDSTableParam &param
sample_block_ratio_ = sample_block_ratio_ * param.degree_;
sample_block_ratio_ = sample_block_ratio_ < 100.0 ? sample_block_ratio_ : 100.0;
}
//4.adjsut the seed.
//4.adjust the seed.
seed_ = (param.degree_ > 1 || param.partition_infos_.count() > 1) ? 0 : 1;
}
LOG_TRACE("succeed to calc table sample block ratio", K(param), K(seed_), K(sample_micro_cnt),
@ -1332,7 +1332,7 @@ int ObDynamicSamplingUtils::check_ds_can_use_filters(const ObIArray<ObRawExpr*>
for (int64_t i = 0; OB_SUCC(ret) && !no_use && i < filters.count(); ++i) {
if (OB_ISNULL(filters.at(i))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpcted null", K(ret), K(filters.at(i)));
LOG_WARN("get unexpected null", K(ret), K(filters.at(i)));
} else if (OB_FAIL(check_ds_can_use_filter(filters.at(i), no_use, total_expr_cnt))) {
LOG_WARN("failed to check ds can use filter", K(ret));
}
@ -1347,7 +1347,7 @@ int ObDynamicSamplingUtils::check_ds_can_use_filter(const ObRawExpr *filter,
int ret = OB_SUCCESS;
if (OB_ISNULL(filter)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpcted null", K(ret), K(filter));
LOG_WARN("get unexpected null", K(ret), K(filter));
} else if (filter->has_flag(CNT_DYNAMIC_PARAM) ||
filter->has_flag(CNT_SUB_QUERY) ||
filter->has_flag(CNT_RAND_FUNC) ||
@ -1581,7 +1581,7 @@ bool ObDynamicSamplingUtils::is_ds_virtual_table(const int64_t table_id)
table_id == share::OB_TENANT_VIRTUAL_COLLATION_ORA_TID);
}
//fowllowing function used to dynamic sampling join in the future.
//following function used to dynamic sampling join in the future.
// int ObDynamicSampling::estimate_join_rowcount(const ObOptDSJoinParam &param,
// uint64_t &join_output_cnt)

12
src/sql/optimizer/ob_insert_log_plan.cpp
View File

@ -370,7 +370,7 @@ int ObInsertLogPlan::allocate_insert_values_as_top(ObLogicalOperator *&top)
} else if (insert_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) {
ret = values_op->add_child(top);
@ -687,7 +687,7 @@ int ObInsertLogPlan::check_insert_stmt_need_multi_partition_dml(bool &is_multi_p
} else if (OB_FAIL(insert_stmt->part_key_has_subquery(has_subquery_part_key))) {
LOG_WARN("failed to check part key has subquery", K(ret));
} else if (OB_FAIL(insert_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*/ }
@ -1027,7 +1027,7 @@ int ObInsertLogPlan::copy_index_dml_infos_for_insert_up(const ObInsertTableInfo&
LOG_WARN("init index assignment info failed", K(ret));
} else if (!table_info.is_link_table_ &&
OB_FAIL(check_update_part_key(index_schema, index_dml_info))) {
LOG_WARN("faield to check update part key", K(ret));
LOG_WARN("failed to check update part key", K(ret));
} else if (0 == i) {
if (OB_FAIL(index_dml_info->ck_cst_exprs_.assign(update_cst_exprs))) {
LOG_WARN("failed to assign update check exprs", K(ret));
@ -1295,7 +1295,7 @@ int ObInsertLogPlan::get_all_rowkey_columns_for_ddl(const ObInsertTableInfo& tab
ObSQLSessionInfo* session_info = optimizer_context_.get_session_info();
if (OB_ISNULL(stmt) || OB_ISNULL(ddl_table_schema) || OB_ISNULL(session_info)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexptected null", K(ret), K(stmt), K(ddl_table_schema));
LOG_WARN("get unexpected null", K(ret), K(stmt), K(ddl_table_schema));
} else {
const ObRowkeyInfo &rowkey_info = ddl_table_schema->get_rowkey_info();
uint64_t rowkey_column_id = 0;
@ -1357,7 +1357,7 @@ int ObInsertLogPlan::get_all_columns_for_ddl(const ObInsertTableInfo& table_info
const ObInsertStmt* stmt = get_stmt();
if (OB_ISNULL(stmt) || OB_ISNULL(ddl_table_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexptected null", K(ret), K(stmt), K(ddl_table_schema));
LOG_WARN("get unexpected null", K(ret), K(stmt), K(ddl_table_schema));
} else {
ObTableSchema::const_column_iterator iter = ddl_table_schema->column_begin();
ObTableSchema::const_column_iterator end = ddl_table_schema->column_end();
@ -1392,7 +1392,7 @@ int ObInsertLogPlan::get_all_part_columns_for_ddl(const ObInsertTableInfo& table
const ObInsertStmt* stmt = get_stmt();
if (OB_ISNULL(stmt) || OB_ISNULL(data_table_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexptected null", K(ret), K(stmt), K(data_table_schema));
LOG_WARN("get unexpected null", K(ret), K(stmt), K(data_table_schema));
} else {
ObTableSchema::const_column_iterator iter = data_table_schema->column_begin();
ObTableSchema::const_column_iterator end = data_table_schema->column_end();

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

@ -924,7 +924,7 @@ int ObLogDelUpd::get_rowid_version(int64_t &rowid_version)
} else if (OB_ISNULL(schema_guard = get_plan()->get_optimizer_context().get_schema_guard()) ||
OB_ISNULL(session_info = get_plan()->get_optimizer_context().get_session_info())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to get schama guart", K(ret), K(schema_guard), K(session_info));
LOG_WARN("failed to get schema guard", K(ret), K(schema_guard), K(session_info));
} else if (OB_FAIL(schema_guard->get_table_schema(
session_info->get_effective_tenant_id(),
get_index_tid(), table_schema))) {
@ -1324,7 +1324,7 @@ int ObLogDelUpd::generate_fk_lookup_part_id_expr(IndexDMLInfo &index_dml_info)
} else if (OB_ISNULL(schema_guard = get_plan()->get_optimizer_context().get_schema_guard()) ||
OB_ISNULL(session_info = get_plan()->get_optimizer_context().get_session_info())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to get schama guart", K(ret), K(schema_guard), K(session_info));
LOG_WARN("failed to get schema guard", K(ret), K(schema_guard), K(session_info));
} else if (OB_FAIL(schema_guard->get_table_schema(session_info->get_effective_tenant_id(),
index_dml_info.ref_table_id_,
table_schema))) {

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

@ -685,10 +685,10 @@ int ObStrictPwjComparer::is_sub_partition_logically_equal(const PwjTable &l_tabl
LOG_WARN("get unexpected null", K(ret));
} else if (OB_FAIL(get_subpartition_indexes_by_part_index(l_table, l_part_index,
l_used_partition_indexes))) {
LOG_WARN("faield to get subpartition indexes by part index", K(ret));
LOG_WARN("failed to get subpartition indexes by part index", K(ret));
} else if (OB_FAIL(get_subpartition_indexes_by_part_index(r_table, r_part_index,
r_used_partition_indexes))) {
LOG_WARN("faield to get subpartition indexes by part index", K(ret));
LOG_WARN("failed to get subpartition indexes by part index", K(ret));
} else if (l_used_partition_indexes.count() != r_used_partition_indexes.count()) {
is_equal = false;
} else if (is_hash_like_part(l_table.subpart_type_)) {
@ -821,7 +821,7 @@ int ObStrictPwjComparer::check_hash_subpartition_equal(ObSubPartition **l_subpar
OB_ISNULL(l_subpartition_array[l_indexes.at(i)]) ||
OB_ISNULL(r_subpartition_array[r_indexes.at(i)])) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpeted error", K(ret), K(l_subpartition_array), K(r_subpartition_array));
LOG_WARN("get unexpected error", K(ret), K(l_subpartition_array), K(r_subpartition_array));
} else {
subpart_tablet_id_pair.first = l_subpartition_array[l_indexes.at(i)]->get_tablet_id().id();
subpart_tablet_id_pair.second = r_subpartition_array[r_indexes.at(i)]->get_tablet_id().id();
@ -1062,7 +1062,7 @@ int ObStrictPwjComparer::get_sub_part_tablet_id(const PwjTable &table,
}
if (OB_SUCC(ret) && !find) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to find part_index in all_partition_idnexes", K(ret),
LOG_WARN("failed to find part_index in all_partition_indexes", K(ret),
K(part_index), K(table.all_partition_indexes_));
}
}

8
src/sql/optimizer/ob_pwj_comparer.h
View File

@ -114,14 +114,14 @@ public:
virtual int add_table(PwjTable &table, bool &is_match_pwj);
/**
* 从phy_table_locaton_info中提取以下分区相关的信息
* 从phy_table_location_info中提取以下分区相关的信息
* @param all_partition_ids:
* phy_table_locaton_info中所有的partition_id(物理分区id)
* phy_table_location_info中所有的partition_id(物理分区id)
* @param all_partition_indexes:
* phy_table_locaton_info中每一个partition_id(物理分区id)的
* phy_table_location_info中每一个partition_id(物理分区id)的
* part_id(一级逻辑分区id)在part_array中的偏移
* @param all_subpartition_indexes:
* phy_table_locaton_info中每一个partition_id(物理分区id)的
* phy_table_location_info中每一个partition_id(物理分区id)的
* subpart_id(二级逻辑分区id)在subpart_array中的偏移
* @param is_partition_single:
* 二级分区表的phy_table_location_info_中，是否只涉及到一个一级分区