From f5f3fd0173a6b5cc512286baba01f0a3f93f32c7 Mon Sep 17 00:00:00 2001 From: hnwyllmm Date: Tue, 19 Dec 2023 08:46:14 +0000 Subject: [PATCH] merge devleop into master 20231212 --- .github/workflows/farm.yml | 1 - src/sql/engine/cmd/ob_partition_executor_utils.cpp | 4 ++-- src/sql/engine/table/ob_table_scan_with_index_back_op.cpp | 2 +- src/sql/executor/ob_shuffle_service.cpp | 6 +++--- src/sql/executor/ob_shuffle_service.h | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/farm.yml b/.github/workflows/farm.yml index 9cac3f7d8..9eb9d2c96 100644 --- a/.github/workflows/farm.yml +++ b/.github/workflows/farm.yml @@ -9,7 +9,6 @@ on: - 'README.md' - 'README_CN.md' - 'CONTRIBUTING.md' - schedule: - cron: '30 9 * * *' diff --git a/src/sql/engine/cmd/ob_partition_executor_utils.cpp b/src/sql/engine/cmd/ob_partition_executor_utils.cpp index ec40b9bc7..5b5c5b543 100644 --- a/src/sql/engine/cmd/ob_partition_executor_utils.cpp +++ b/src/sql/engine/cmd/ob_partition_executor_utils.cpp @@ -248,7 +248,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("partition value should have same meta info", K(ret), K(tmp_row), K(row), K(j)); + LOG_WARN("partiton value should have same meta info", K(ret), K(tmp_row), K(row), K(j)); } } if (OB_SUCC(ret) && tmp_row == row) { @@ -647,7 +647,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("partition value should have same meta info", K(ret), K(*rowkey_cur), K(*rowkey_last), K(j)); + LOG_WARN("partiton value should have same meta info", K(ret), K(*rowkey_cur), K(*rowkey_last), K(j)); } else if (rowkey_cur->get_obj_ptr()[j].is_max_value() && rowkey_last->get_obj_ptr()[j].is_max_value()) { need_check_maxvalue = true; diff --git a/src/sql/engine/table/ob_table_scan_with_index_back_op.cpp b/src/sql/engine/table/ob_table_scan_with_index_back_op.cpp index 861846aa0..543998447 100644 --- a/src/sql/engine/table/ob_table_scan_with_index_back_op.cpp +++ b/src/sql/engine/table/ob_table_scan_with_index_back_op.cpp @@ -40,7 +40,7 @@ int ObTableScanWithIndexBackOp::inner_open() if (OB_ISNULL(op_kit = ctx_.get_operator_kit(MY_SPEC.get_index_scan_tree_id())) || OB_ISNULL(op_kit->op_)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("get ObOperator from exec ctx failed", K(MY_SPEC.get_index_scan_tree_id())); + LOG_WARN("get ObOperater from exec ctx failed", K(MY_SPEC.get_index_scan_tree_id())); } else if (FALSE_IT(index_scan_tree_ = op_kit->op_)) { } else if (OB_FAIL(prepare_scan_param())) { if (OB_ITER_END != ret) { diff --git a/src/sql/executor/ob_shuffle_service.cpp b/src/sql/executor/ob_shuffle_service.cpp index b1a55698e..8450f1a2d 100644 --- a/src/sql/executor/ob_shuffle_service.cpp +++ b/src/sql/executor/ob_shuffle_service.cpp @@ -52,7 +52,7 @@ int ObShuffleService::get_partition_ids(ObExecContext &exec_ctx, const ObIArray &repart_sub_columns, int64_t &part_id, int64_t &subpart_id, - bool &no_match_partition) + bool &no_match_partiton) { int ret = OB_SUCCESS; if (OB_FAIL(init_expr_ctx(exec_ctx))) { @@ -69,10 +69,10 @@ int ObShuffleService::get_partition_ids(ObExecContext &exec_ctx, } if (OB_SUCC(ret)) { if (part_id == NO_MATCH_PARTITION || subpart_id == NO_MATCH_PARTITION) { - no_match_partition = true; + no_match_partiton = true; } } - LOG_DEBUG("get part id and subpart id", K(part_id), K(subpart_id), K(no_match_partition)); + LOG_DEBUG("get part id and subpart id", K(part_id), K(subpart_id), K(no_match_partiton)); return ret; } diff --git a/src/sql/executor/ob_shuffle_service.h b/src/sql/executor/ob_shuffle_service.h index 461a1530e..b97a8497e 100644 --- a/src/sql/executor/ob_shuffle_service.h +++ b/src/sql/executor/ob_shuffle_service.h @@ -63,7 +63,7 @@ public: const ObIArray &repart_sub_columns, int64_t &part_idx, int64_t &subpart_idx, - bool &no_match_partition); + bool &no_match_partiton); // 这个接口仅在px框架下使用, 非px请使用上面接口. int get_partition_ids(ObExecContext &exec_ctx, @@ -76,7 +76,7 @@ public: const ObPxPartChMap &ch_map, int64_t &part_id, int64_t &subpart_id, - bool &no_match_partition, + bool &no_match_partiton, ObRepartitionType part_type); private: int init_expr_ctx(ObExecContext &exec_ctx);