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

Merge branch 'pr_1548'

Browse Source
This commit is contained in:
ob-robot
2023-09-13 05:08:05 +00:00
parent 868fdeb109 644dd6efe7
commit b83f56b740
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/das/ob_das_group_scan_op.cpp
View File

@ -52,7 +52,7 @@ int ObDASGroupScanOp::rescan()
group_iter = static_cast<ObGroupScanIter *>(group_lookup_op_->get_lookup_iter());
if (NULL == group_iter) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguement", K(group_iter), K(*group_lookup_op_), K(ret));
LOG_WARN("invalid argument", K(group_iter), K(*group_lookup_op_), K(ret));
} else {
group_iter->init_group_range(iter_.get_cur_group_idx(), iter_.get_group_size());
}
@ -328,7 +328,7 @@ int ObGroupLookupOp::switch_lookup_scan_group()
group_iter = static_cast<ObGroupScanIter *>(get_lookup_iter());
if (NULL == group_iter) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguement", K(group_iter), K(ret));
LOG_WARN("invalid argument", K(group_iter), K(ret));
} else {
ret = group_iter->switch_scan_group();
++lookup_group_cnt_;
@ -345,7 +345,7 @@ int ObGroupLookupOp::set_lookup_scan_group(int64_t group_id)
group_iter = static_cast<ObGroupScanIter *>(get_lookup_iter());
if (NULL == group_iter) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguement", K(group_iter), K(ret));
LOG_WARN("invalid argument", K(group_iter), K(ret));
} else {
ret = group_iter->set_scan_group(group_id);
if(-1 == group_id) {

2
src/sql/das/ob_das_scan_op.cpp
View File

@ -202,7 +202,7 @@ int ObDASScanOp::swizzling_remote_task(ObDASRemoteInfo *remote_info)
lookup_rtdef->stmt_allocator_.set_alloc(&CURRENT_CONTEXT->get_arena_allocator());
lookup_rtdef->scan_allocator_.set_alloc(&CURRENT_CONTEXT->get_arena_allocator());
if (OB_FAIL(lookup_rtdef->init_pd_op(*remote_info->exec_ctx_, *lookup_ctdef))) {
LOG_WARN("init lookup pushdown opeartor failed", K(ret));
LOG_WARN("init lookup pushdown operator failed", K(ret));
} else {
lookup_rtdef->p_pd_expr_op_->get_eval_ctx()
.set_max_batch_size(lookup_ctdef->pd_expr_spec_.max_batch_size_);

10
src/sql/monitor/ob_monitor_info_manager.cpp
View File

@ -74,7 +74,7 @@ int ObMonitorInfoManager::get_by_request_id(int64_t request_id,
index = -1;
if (OB_UNLIKELY(request_id <= 0)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid agument", K(ret), K(request_id));
LOG_WARN("invalid argument", K(ret), K(request_id));
} else {
int64_t start_idx = slow_query_queue_.get_pop_idx();
int64_t end_idx = slow_query_queue_.get_push_idx();
@ -105,7 +105,7 @@ int ObMonitorInfoManager::get_by_index(int64_t index,
plan_info = NULL;
if (OB_UNLIKELY(index < 0)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguemnt", K(ret), K(index));
LOG_WARN("invalid argument", K(ret), K(index));
} else if (index >= get_start_index() + get_size()) {
ret = OB_ITER_END;
} else if (NULL == (plan_info = static_cast<ObPhyPlanMonitorInfo*>(slow_query_queue_.get(index, ref)))) {
@ -144,7 +144,7 @@ int ObMonitorInfoManager::add_monitor_info(ObPhyPlanMonitorInfo *info)
int ret = OB_SUCCESS;
if (OB_ISNULL(info)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid agument", K(ret), K(info));
LOG_WARN("invalid argument", K(ret), K(info));
} else {
int64_t retry_times = 3;
while (retry_times > 0) {
@ -186,7 +186,7 @@ int ObMonitorInfoManager::alloc(int64_t request_id,
void *ptr = NULL;
if (OB_UNLIKELY(request_id < 0)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid agument", K(ret), K(request_id));
LOG_WARN("invalid argument", K(ret), K(request_id));
} else if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObPhyPlanMonitorInfo)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("fail to alloc memory", K(ret), K(request_id), K(allocator_.allocated()), K_(memory_limit));
@ -232,7 +232,7 @@ int ObMonitorInfoManager::gc()
}
}
if (OB_FAIL(reclain_map())) {
LOG_WARN("fail to reclain map", K(ret));
LOG_WARN("fail to reclaim map", K(ret));
}
return ret;
}

2
src/sql/ob_dml_stmt_printer.cpp
View File

@ -448,7 +448,7 @@ int ObDMLStmtPrinter::print_json_return_type(int64_t value, ObDataType data_type
break;
}
case T_DATETIME: {
//oracle mode treate date as datetime
//oracle mode treats date as datetime
DATA_PRINTF("date");
break;
}

4
src/sql/ob_sql_context.h
View File

@ -100,7 +100,7 @@ struct LocationConstraint
bool operator==(const LocationConstraint &other) const;
bool operator!=(const LocationConstraint &other) const;
// calculate the inclusion relationship between ObLocationConstaints
// calculate the inclusion relationship between ObLocationConstraints
static int calc_constraints_inclusion(const ObLocationConstraint *left,
const ObLocationConstraint *right,
InclusionType &inclusion_result);
@ -598,7 +598,7 @@ public:
// all_plan_const_param_constraints_ 表示该sql中存在的全部常量约束
// 比如：create table t (a bigint, b bigint as (a + 1 + 2), c bigint as (a + 2 + 3), index idx_b(b), index idx_c(c));
// 对于：select * from t where a + 1 + 2 > 0;
// 有：all_plan_const_param_constaints_ = {[1, 2]}, all_possible_const_param_constraints_ = {[1, 2], [2, 3]}
// 有：all_plan_const_param_constraints_ = {[1, 2]}, all_possible_const_param_constraints_ = {[1, 2], [2, 3]}
// 对于：select * from t where a + 3 + 4 > 0;
// 有：all_plan_const_param_constraints_ = {}, all_possible_const_param_constraints_ = {[1, 2], [2, 3]}
common::ObIArray<ObPCConstParamInfo> *all_plan_const_param_constraints_;

8
src/sql/ob_sql_define.h
View File

@ -265,11 +265,11 @@ enum ObTableLocationType
enum ObRepartitionType
{
OB_REPARTITION_NO_REPARTITION = 0,//不重分区
OB_REPARTITION_ONE_SIDE_ONE_LEVEL,//只有一边按照一级分区做repartiton,不repartition的一边是一级分区
OB_REPARTITION_ONE_SIDE_TWO_LEVEL,//只有一边按照二级分区做repartiton, 不repartition的一边是二级分区
OB_REPARTITION_ONE_SIDE_ONE_LEVEL,//只有一边按照一级分区做repartition,不repartition的一边是一级分区
OB_REPARTITION_ONE_SIDE_TWO_LEVEL,//只有一边按照二级分区做repartition, 不repartition的一边是二级分区
OB_REPARTITION_BOTH_SIDE_ONE_LEVEL,//两边都按照一级分区方式做repartition, 分区键是连接键
OB_REPARTITION_ONE_SIDE_ONE_LEVEL_FIRST,//只有一边按照另外一边(二级分区表)的一级分区做repartiton
OB_REPARTITION_ONE_SIDE_ONE_LEVEL_SUB,//只有一边按照另外一边(二级分区)的二级分区做repartiton
OB_REPARTITION_ONE_SIDE_ONE_LEVEL_FIRST,//只有一边按照另外一边(二级分区表)的一级分区做repartition
OB_REPARTITION_ONE_SIDE_ONE_LEVEL_SUB,//只有一边按照另外一边(二级分区)的二级分区做repartition
};
enum ObRepartitionScope

2
src/sql/plan_cache/ob_cache_object_factory.h
View File

@ -138,7 +138,7 @@ public:
other.ref_handle_ = tmp.ref_handle_;
// If not reset tmp in this line, the reference count of current cache_obj_
// will be mistakely decrease.
// will be mistakenly decrease.
tmp.reset();
}
TO_STRING_KV(K_(cache_obj));

2
src/sql/plan_cache/ob_prepare_stmt_struct.cpp
View File

@ -524,7 +524,7 @@ int ObPsStmtInfo::get_convert_size(int64_t &cv_size) const
ret = OB_ERR_UNEXPECTED;
LOG_WARN("is null", K(ret));
} else if (OB_FAIL(get_deep_copy_size(param->node_, &raw_params_size))) {
LOG_WARN("failed to get deepy copy size", K(ret));
LOG_WARN("failed to get deeps copy size", K(ret));
} else {
raw_params_size += sizeof(ObPCParam);
}

2
src/sql/spm/ob_spm_define.h
View File

@ -289,7 +289,7 @@ struct ObSpmCacheCtx : public ObILibCacheCtx
STAT_ADD_EVOLUTION_PLAN, // add evolution plan to plan cache evolution layer
STAT_ADD_BASELINE_PLAN, // add baseline plan to plan cache evolution layer
STAT_ACCEPT_EVOLUTION_PLAN, // accept evolution plan as baseline and move it from evolution layer to plan layer
STAT_ACCEPT_BASELINE_PLAN, // move baeline plan from evolution layer to plan layer
STAT_ACCEPT_BASELINE_PLAN, // move baseline plan from evolution layer to plan layer
STAT_FIRST_EXECUTE_PLAN,
STAT_FALLBACK_EXECUTE_PLAN,
STAT_MAX