From e61f6a417010ef0d4a1a97e1246f06dba02493e2 Mon Sep 17 00:00:00 2001 From: csch Date: Fri, 10 Feb 2023 11:30:15 +0800 Subject: [PATCH] fix some typo error --- src/sql/engine/ob_bit_vector.h | 2 +- src/sql/engine/ob_exec_context.cpp | 4 ++-- src/sql/engine/ob_physical_plan.cpp | 4 ++-- src/sql/engine/ob_physical_plan.h | 6 +++--- src/sql/engine/ob_physical_plan_ctx.h | 4 ++-- src/sql/engine/ob_tenant_sql_memory_manager.cpp | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/sql/engine/ob_bit_vector.h b/src/sql/engine/ob_bit_vector.h index 6b56d7c8d1..33a04fee87 100644 --- a/src/sql/engine/ob_bit_vector.h +++ b/src/sql/engine/ob_bit_vector.h @@ -112,7 +112,7 @@ public: const T *reinterpret_data() const { return reinterpret_cast(data_); } /** - * access all valid fliped bit, flip a bit meaning change its value from 0 to 1 or from 1 to 0 + * access all valid flipped bit, flip a bit meaning change its value from 0 to 1 or from 1 to 0 * and it access all 0 bit */ template diff --git a/src/sql/engine/ob_exec_context.cpp b/src/sql/engine/ob_exec_context.cpp index ba89dea689..6e91f78bf2 100644 --- a/src/sql/engine/ob_exec_context.cpp +++ b/src/sql/engine/ob_exec_context.cpp @@ -682,7 +682,7 @@ int ObExecContext::add_temp_table_interm_result_ids(uint64_t temp_table_id, ObTempTableResultInfo info; info.addr_ = sqc_addr; if (OB_FAIL(info.interm_result_ids_.assign(ids))) { - LOG_WARN("failed to assign to interm resuld ids.", K(ret)); + LOG_WARN("failed to assign to interm result ids.", K(ret)); } else if (OB_FAIL(ctx.interm_result_infos_.push_back(info))) { LOG_WARN("failed to push back result info", K(ret)); } else { @@ -697,7 +697,7 @@ int ObExecContext::add_temp_table_interm_result_ids(uint64_t temp_table_id, ObTempTableResultInfo info; info.addr_ = sqc_addr; if (OB_FAIL(info.interm_result_ids_.assign(ids))) { - LOG_WARN("failed to assign to interm resuld ids.", K(ret)); + LOG_WARN("failed to assign to interm result ids.", K(ret)); } else if (OB_FAIL(ctx.interm_result_infos_.push_back(info))) { LOG_WARN("failed to push back result info", K(ret)); } else if (OB_FAIL(temp_ctx.push_back(ctx))) { diff --git a/src/sql/engine/ob_physical_plan.cpp b/src/sql/engine/ob_physical_plan.cpp index 72e99694aa..c4fbf6b864 100644 --- a/src/sql/engine/ob_physical_plan.cpp +++ b/src/sql/engine/ob_physical_plan.cpp @@ -1172,7 +1172,7 @@ int ObPhysicalPlan::update_cache_obj_stat(ObILibCacheCtx &ctx) if (OB_FAIL(ob_write_string(get_allocator(), trunc_stmt.string(), stat_.stmt_))) { - SQL_PC_LOG(WARN, "fail to set turncate string", K(ret)); + SQL_PC_LOG(WARN, "fail to set truncate string", K(ret)); } stat_.ps_stmt_id_ = pc_ctx.fp_result_.pc_key_.key_id_; } else { @@ -1180,7 +1180,7 @@ int ObPhysicalPlan::update_cache_obj_stat(ObILibCacheCtx &ctx) if (OB_FAIL(ob_write_string(get_allocator(), trunc_stmt.string(), stat_.stmt_))) { - SQL_PC_LOG(WARN, "fail to set turncate string", K(ret)); + SQL_PC_LOG(WARN, "fail to set truncate string", K(ret)); } } stat_.large_querys_= 0; diff --git a/src/sql/engine/ob_physical_plan.h b/src/sql/engine/ob_physical_plan.h index a7dc08c3c2..4280ccb137 100644 --- a/src/sql/engine/ob_physical_plan.h +++ b/src/sql/engine/ob_physical_plan.h @@ -508,9 +508,9 @@ private: * is not saved: * 1. resolve the statement to get the partition columns * 2. extract the range of the partition columns using query range and given predicates - * 3. get the ObRawExpr of the partition expr and convert it to a postfix expresssion + * 3. get the ObRawExpr of the partition expr and convert it to a postfix expression * 4. calculate the partition ids using the postfix expression - * 5. inquire the location cache servince to get a list of partition locations given + * 5. inquire the location cache service to get a list of partition locations given * the partition ids * * However, with the pre table location saved, we can readily skip steps 1, 2(partially), @@ -657,7 +657,7 @@ public: bool enable_append_; // for APPEND hint uint64_t append_table_id_; ObLogicalPlanRawData logical_plan_; - // for detecor manager + // for detector manager bool is_enable_px_fast_reclaim_; }; diff --git a/src/sql/engine/ob_physical_plan_ctx.h b/src/sql/engine/ob_physical_plan_ctx.h index c05600a0b9..92618c9486 100644 --- a/src/sql/engine/ob_physical_plan_ctx.h +++ b/src/sql/engine/ob_physical_plan_ctx.h @@ -471,7 +471,7 @@ private: static const int64_t ESTIMATE_PS_RESERVE_TIME = 100 * 1000; static const int64_t ESTIMATE_TRANS_RESERVE_TIME = 70 * 1000; //oracle calc time during running, not before running. - //oracle datetime func has two categoris: sysdate/systimestamp, current_date/current_timestamp/localtimestamp + //oracle datetime func has two categories: sysdate/systimestamp, current_date/current_timestamp/localtimestamp //so we use `cur_time_` for first used-category, `cur_time_ + DELTA_TARDY_TIME_US` for second used-category. static const int64_t DELTA_TARDY_TIME_US = 5; common::ObIAllocator &allocator_; @@ -588,7 +588,7 @@ private: ObRemoteSqlInfo remote_sql_info_; //used for expr output pack, do encode according to its field const common::ObIArray *field_array_; - //used for expr output pack, do bianry encode or text encode + //used for expr output pack, do binary encode or text encode bool is_ps_protocol_; //used for monitor operator information int64_t plan_start_time_; diff --git a/src/sql/engine/ob_tenant_sql_memory_manager.cpp b/src/sql/engine/ob_tenant_sql_memory_manager.cpp index 5a082f261f..fd4d0e6fa4 100644 --- a/src/sql/engine/ob_tenant_sql_memory_manager.cpp +++ b/src/sql/engine/ob_tenant_sql_memory_manager.cpp @@ -194,7 +194,7 @@ void ObTenantSqlMemoryManager::ObSqlWorkAreaCalcInfo::destroy(ObIAllocator &allo } // delta计算逻辑，前一个interval和后一个interval计算相差公式为 -// suppose calculate the idx interaval, and pre-interval is (idx + 1) +// suppose calculate the idx interval, and pre-interval is (idx + 1) // delta = intervals_[idx+1].total_hash_sise // - intervals_[idx].interval_cache_size // * intervals_[idx+1].total_hash_cnt + no_cache_cnt * interval_size @@ -901,7 +901,7 @@ int ObTenantSqlMemoryManager::get_max_work_area_size( // 1 - x^3函数，表示随着hold内存越多，可用内存越少，同时alloc越多，可用内存越少 // 反之，hold越少，可用内存越多，alloc越少，可用内存又会越多 // 这里采用平方主要是为了内存增长和减少都比较平滑 - // so: fomula + // so: formula // hold_ratio = hold / max_size; // tmp_max_wa = (1 - hold_ratio * hold_ratio * hold_ratio) * (max - hold) + alloc // alloc_ratio = alloc / tmp_max_wa @@ -917,7 +917,7 @@ int ObTenantSqlMemoryManager::get_max_work_area_size( // max_wa_memory_size = (tmp_max_wa_memory_size >> 1); // } else { - // only use fomula (1 - ratio ^ 3) + // only use formula (1 - ratio ^ 3) max_wa_memory_size = tmp_max_wa_memory_size * (1 - alloc_ratio * alloc_ratio * alloc_ratio); } max_workarea_size_ = tenant_work_area_max_size; @@ -1172,7 +1172,7 @@ int ObTenantSqlMemoryManager::calculate_global_bound_size_by_interval_info( global_bound_size_ = calc_info.get_global_bound_size(); mem_target_ = calc_info.get_mem_target(); pre_enable_auto_memory_mgr_ = true; - // last set enable auto memory manager, so others read the vairable to avoiding dirty read + // last set enable auto memory manager, so others read the variable to avoiding dirty read enable_auto_memory_mgr_ = true; } if (auto_calc) { @@ -1233,7 +1233,7 @@ int ObTenantSqlMemoryManager::calculate_global_bound_size(ObIAllocator *allocato global_bound_size_ = min_bound_size_; drift_size_ = 0; pre_enable_auto_memory_mgr_ = true; - // last set enable auto memory manager, so others read the vairable to avoiding dirty read + // last set enable auto memory manager, so others read the variable to avoiding dirty read enable_auto_memory_mgr_ = true; if (auto_calc) { LOG_INFO("work area memory zero", K(tenant_id_), K(global_bound_size_));