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
2023-02-22 16:32:55 +08:00
parent e61f6a4170
commit 60700dde28
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/cmd/ob_ddl_executor_util.cpp
View File

@ -94,7 +94,7 @@ int ObDDLExecutorUtil::wait_ddl_finish(
if (OB_FAIL(ret)) {
} else if (OB_FAIL(handle_session_exception(session))) {
LOG_WARN("session exeception happened", K(ret), K(is_support_cancel));
LOG_WARN("session exception happened", K(ret), K(is_support_cancel));
if (is_support_cancel && OB_TMP_FAIL(cancel_ddl_task(tenant_id, common_rpc_proxy))) {
LOG_WARN("cancel ddl task failed", K(tmp_ret));
ret = OB_SUCCESS;
@ -246,7 +246,7 @@ int ObDDLExecutorUtil::wait_ddl_retry_task_finish(
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(handle_session_exception(session))) {
LOG_WARN("session exeception happened", K(ret));
LOG_WARN("session exception happened", K(ret));
if (OB_TMP_FAIL(cancel_ddl_task(tenant_id, common_rpc_proxy))) {
LOG_WARN("cancel ddl task failed", K(tmp_ret));
ret = OB_SUCCESS;

4
src/sql/engine/cmd/ob_load_data_impl.cpp
View File

@ -1633,7 +1633,7 @@ int ObLoadDataSPImpl::handle_returned_insert_task(ObExecContext &ctx,
ret = found ? box.server_last_available_ts.update(addr, curr_time)
: box.server_last_available_ts.insert(addr, curr_time);
if (OB_FAIL(ret)) {
LOG_WARN("failt to update server_last_available_ts",
LOG_WARN("failed to update server_last_available_ts",
K(ret), K(addr), K(found), K(is_leader_changed));
}
}
@ -2763,7 +2763,7 @@ int ObLoadDataSPImpl::ToolBox::init(ObExecContext &ctx, ObLoadDataStmt &load_stm
LOG_WARN("fail to init generator", K(ret));
} else if (OB_FAIL(generator.set_params(insert_stmt_head_buff, load_args.file_cs_type_,
session->get_sql_mode()))) {
LOG_WARN("fail to set pararms", K(ret));
LOG_WARN("fail to set params", K(ret));
} else if (OB_FAIL(copy_exprs_for_shuffle_task(ctx, load_stmt, insert_infos,
generator.get_field_exprs(),
generator.get_insert_exprs()))) {

8
src/sql/engine/cmd/ob_load_data_rpc.cpp
View File

@ -301,7 +301,7 @@ int ObRpcLoadDataTaskExecuteP::process()
succ_row_count = affected_rows;
}
//2. if failed, try insert seperately
//2. if failed, try insert separately
if (OB_SUCC(ret) && OB_SUCCESS != exec_ret) {
ObSqlString seperate_insert_sql_head;
ObSqlString seperate_insert_sql;
@ -383,7 +383,7 @@ int ObRpcLoadDataTaskExecuteP::process()
if (OB_SUCC(ret) && OB_SUCCESS != memory_check_ret) {
ret = memory_check_ret; //cover ret
}
//sumarize return value
//summarize return value
if (OB_FAIL(ret)) {
ObLoadDataUtils::set_flag(result.task_flags_,
static_cast<int64_t>(ObLoadTaskResultFlag::RPC_REMOTE_PROCESS_ERROR));
@ -485,7 +485,7 @@ int ObRpcLoadDataTaskCallBack::process()
}
MEM_BARRIER();
if (OB_SUCCESS != (second_ret = task_controller_.on_task_finished())) {
//signal main thread failed, fetal error. TODO wjh: handle this error
//signal main thread failed, fatal error. TODO wjh: handle this error
if (OB_SUCCESS == ret) {
ret = second_ret;
}
@ -542,7 +542,7 @@ void ObParallelTaskController::wait_all_task_finish(const char *task_name, int64
}
}
if (is_too_long) {
LOG_WARN_RET(OB_ERR_UNEXPECTED, "LOAD DATA finish waitting long task", K(wait_duration_ms));
LOG_WARN_RET(OB_ERR_UNEXPECTED, "LOAD DATA finish waiting long task", K(wait_duration_ms));
}
}

8
src/sql/engine/cmd/ob_partition_executor_utils.cpp
View File

@ -235,7 +235,7 @@ int check_list_value_duplicate(T **partition_array,
!ObSQLUtils::is_same_type_for_compare(tmp_row.get_cell(z).get_meta(),
row.get_cell(z).get_meta())) {
ret = OB_ERR_PARTITION_VALUE_ERROR;
LOG_WARN("partiton value should have same meta info", K(ret), K(tmp_row), K(row), K(j));
LOG_WARN("partition value should have same meta info", K(ret), K(tmp_row), K(row), K(j));
}
}
if (OB_SUCC(ret) && tmp_row == row) {
@ -477,7 +477,7 @@ int ObPartitionExecutorUtils::set_range_part_high_bound(ObExecContext &ctx,
ObSEArray<ObObj, OB_DEFAULT_ARRAY_SIZE> range_partition_obj;
if (is_subpart && OB_UNLIKELY(!stmt.use_def_sub_part())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("subpart shoud be template", K(ret));
LOG_WARN("subpart should be template", K(ret));
} else if (is_subpart && (OB_ISNULL(subpartition_array))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("subpartition_array is NULL", K(ret));
@ -633,7 +633,7 @@ int ObPartitionExecutorUtils::check_increasing_range_value(T **array,
&& !rowkey_cur->get_obj_ptr()[j].is_max_value()
&& !rowkey_last->get_obj_ptr()[j].is_max_value()) {
ret = OB_ERR_PARTITION_VALUE_ERROR;
LOG_WARN("partiton value should have same meta info", K(ret), K(*rowkey_cur), K(*rowkey_last), K(j));
LOG_WARN("partition value should have same meta info", K(ret), K(*rowkey_cur), K(*rowkey_last), K(j));
}
}
}
@ -1221,7 +1221,7 @@ int ObPartitionExecutorUtils::set_list_part_rows(ObExecContext &ctx,
table_schema.get_def_sub_part_num() : table_schema.get_first_part_num();
if (is_subpart && OB_UNLIKELY(!stmt.use_def_sub_part())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("subpart shoud be template", K(ret));
LOG_WARN("subpart should be template", K(ret));
} else if (is_subpart && (OB_ISNULL(subpartition_array))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get null subpartition_array", K(ret));

2
src/sql/engine/cmd/ob_tenant_executor.cpp
View File

@ -902,7 +902,7 @@ int ObPurgeRecycleBinExecutor::execute(ObExecContext &ctx, ObPurgeRecycleBinStmt
//一个租户只purge 10个回收站的对象，防止卡住RS的ddl线程
//每次返回purge的行数，只有purge数目少于affected_rows
int64_t start_time = ObTimeUtility::current_time();
// replcace timeout from hardcode 9s to 10 * GCONF.rpc_timeout
// replace timeout from hardcode 9s to 10 * GCONF.rpc_timeout
if (OB_FAIL(common_rpc_proxy->timeout(10 * GCONF.rpc_timeout).purge_expire_recycle_objects(purge_recyclebin_arg, affected_rows))) {
LOG_WARN("purge reyclebin objects failed", K(ret), K(affected_rows), K(purge_recyclebin_arg));
//如果失败情况下，不需要继续

6
src/sql/engine/cmd/ob_variable_set_executor.cpp
View File

@ -483,7 +483,7 @@ int ObVariableSetExecutor::set_user_variable(const ObObj &val,
ret = OB_ERR_UNEXPECTED;
LOG_WARN("session is null", K(ret));
} else if (OB_FAIL(switch_to_session_variable(expr_ctx, val, sess_var))) {
LOG_WARN("fail to stiwch to session variablee", K(ret), K(val));
LOG_WARN("fail to switch to session variable", K(ret), K(val));
} else if (OB_FAIL(session->replace_user_variable(*ctx, variable_name, sess_var))) {
LOG_WARN("set variable to session plan failed", K(ret), K(variable_name));
} else {
@ -502,7 +502,7 @@ int ObVariableSetExecutor::set_user_variable(const ObObj &val,
ret = OB_ERR_UNEXPECTED;
LOG_WARN("session is null", K(ret));
} else if (OB_FAIL(switch_to_session_variable(val, sess_var))) {
LOG_WARN("fail to stiwch to session variablee", K(ret), K(val));
LOG_WARN("fail to switch to session variable", K(ret), K(val));
} else if (OB_FAIL(session->replace_user_variable(variable_name, sess_var))) {
LOG_WARN("set variable to session plan failed", K(ret), K(variable_name));
} else {
@ -994,7 +994,7 @@ int ObVariableSetExecutor::process_session_autocommit_hook(ObExecContext &exec_c
} else if (transaction::ObGlobalTxType::DBLINK_TRANS == global_tx_type) {
if (my_session->need_restore_auto_commit()) {
ret = OB_OP_NOT_ALLOW;
LOG_WARN("not allow to set autocomit off", K(ret), K(xid));
LOG_WARN("not allow to set autocommit off", K(ret), K(xid));
} else {
LOG_INFO("set autocommit off in dblink trans", K(ret), K(xid));
}

8
src/sql/engine/ob_operator.cpp
View File

@ -484,7 +484,7 @@ int ObOpSpec::accept(ObOpSpecVisitor &visitor) const
LOG_WARN("failed to pre visit", K(ret));
}
if (OB_FAIL(ret)) {
// do nothingn
// do nothing
} else if (OB_ISNULL(children_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected null children", K(ret));
@ -791,7 +791,7 @@ int ObOperator::init_skip_vector()
// copy from ob_phy_operator.cpp
int ObOperator::rescan()
{
//rescan must reset the oeprator context to the state after call operator open()
//rescan must reset the operator context to the state after call operator open()
//for the general non-terminal operator, function rescan() is to call children rescan()
//if you want to do more, you must rewrite this function
//for the general terminal operator, function rescan() does nothing
@ -1052,7 +1052,7 @@ int ObOperator::get_next_row()
begin_cpu_time_counting();
begin_ash_line_id_reg();
if (OB_FAIL(check_stack_once())) {
LOG_WARN("too deep recusive", K(ret));
LOG_WARN("too deep recursive", K(ret));
} else {
if (ctx_.get_my_session()->is_user_session() || spec_.plan_->get_phy_plan_hint().monitor_) {
IGNORE_RETURN try_register_rt_monitor_node(1);
@ -1153,7 +1153,7 @@ int ObOperator::get_next_batch(const int64_t max_row_cnt, const ObBatchRows *&ba
begin_ash_line_id_reg();
if (OB_FAIL(check_stack_once())) {
LOG_WARN("too deep recusive", K(ret));
LOG_WARN("too deep recursive", K(ret));
} else {
if (OB_UNLIKELY(spec_.need_check_output_datum_ && brs_checker_)) {
if (OB_FAIL(brs_checker_->check_datum_modified())) {

2
src/sql/engine/ob_sql_mem_mgr_processor.cpp
View File

@ -236,7 +236,7 @@ int ObSqlMemMgrProcessor::extend_max_memory_size(
int ret = OB_SUCCESS;
need_dump = true;
if (OB_FAIL(try_upgrade_auto_mgr(allocator, mem_used))) {
LOG_WARN("failed to try udgrade auto manager", K(ret));
LOG_WARN("failed to try upgrade auto manager", K(ret));
} else if (OB_UNLIKELY(!is_auto_mgr())) {
/* do nothing */
} else if (OB_NOT_NULL(sql_mem_mgr_)) {

2
src/sql/engine/ob_tenant_sql_memory_manager.h
View File

@ -314,7 +314,7 @@ public:
int64_t est_cache_size_; // 估计的全内存大小
int64_t est_one_pass_size_; // 估计的one pass大小
int64_t last_memory_used_; // 上次执行内存使用大小
int64_t last_execution_; // 上次执行的状态，是optimal、onepass还是multimpass
int64_t last_execution_; // 上次执行的状态，是optimal、onepass还是multipass
int64_t last_degree_; // 上次执行dop
int64_t total_executions_; // 每个worker算执行一次
int64_t optimal_executions_; // 全内存执行次数