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

merge develop into master 20240312

Browse Source
This commit is contained in:
hnwyllmm
2024-03-14 09:56:28 +00:00
committed by ob-robot
parent 668b1289ad
commit 68a433ea37
12 changed files with 1045 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/logservice/libobcdc/src/ob_log_config.h
View File

@ -111,7 +111,7 @@ public:
DEF_INT(storager_queue_length, OB_CLUSTER_PARAMETER, "0", "[0,]", "storager queue length");
DEF_INT(reader_thread_num, OB_CLUSTER_PARAMETER, "10", "[1,]", "reader thread number");
DEF_INT(reader_queue_length, OB_CLUSTER_PARAMETER, "0", "[0,]", "reader queue length");
DEF_INT(br_queue_length, OB_CLUSTER_PARAMETER, "0", "[0, ]", "user_binlog_record queue length");
DEF_INT(br_queue_length, OB_CLUSTER_PARAMETER, "0", "[0,]", "user_binlog_record queue length");
DEF_INT(cached_schema_version_count, OB_CLUSTER_PARAMETER, "32", "[1,]", "cached schema version count");
DEF_INT(history_schema_version_count, OB_CLUSTER_PARAMETER, "16", "[1,]", "history schema version count");
DEF_INT(resource_collector_thread_num, OB_CLUSTER_PARAMETER, "11", "[1,]", "resource collector thread number");

5
src/sql/code_generator/ob_static_engine_cg.cpp
View File

@ -8157,11 +8157,6 @@ int ObStaticEngineCG::get_phy_op_type(ObLogicalOperator &log_op,
type = PHY_PX_DIST_TRANSMIT;
} else if (op.get_plan()->get_optimizer_context().is_online_ddl() && ObPQDistributeMethod::PARTITION_RANGE == op.get_dist_method()) {
type = PHY_PX_REPART_TRANSMIT;
} else if (OB_REPARTITION_NO_REPARTITION != op.get_repartition_type()
&& !op.is_slave_mapping()) {
type = PHY_PX_REPART_TRANSMIT;
} else if (ObPQDistributeMethod::LOCAL != op.get_dist_method()) {
type = PHY_PX_DIST_TRANSMIT;
} else {
// NOTE: 优化器需要和执行器保持一致，既没有分区、又没有HASH、或其它重分区方式时，就使用All To One
type = PHY_PX_REDUCE_TRANSMIT;