This is an automated email from the ASF dual-hosted git repository.
englefly pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 3ee0e2baf90 [fix](nereids)update session var for broadcast penalty
(#40199)
3ee0e2baf90 is described below
commit 3ee0e2baf9018f9777b049a2d7e5a3c29ad3c9d3
Author: minghong <engle...@gmail.com>
AuthorDate: Mon Sep 2 14:04:35 2024 +0800
[fix](nereids)update session var for broadcast penalty (#40199)
## Proposed changes
pr25421 pick pr22092 from master to branch-2.0, but forget to update
session variable BROADCAST_RIGHT_TABLE_SCALE_FACTOR
Issue Number: close #xxx
<!--Describe your changes.-->
---
.../java/org/apache/doris/qe/SessionVariable.java | 2 +-
.../data/nereids_ssb_shape_sf100_p0/shape/flat.out | 9 ++++---
.../data/nereids_ssb_shape_sf100_p0/shape/q2.2.out | 13 +++++-----
.../data/nereids_ssb_shape_sf100_p0/shape/q2.3.out | 24 +++++++++----------
.../data/nereids_ssb_shape_sf100_p0/shape/q3.3.out | 24 +++++++++----------
.../data/nereids_ssb_shape_sf100_p0/shape/q3.4.out | 28 ++++++++++------------
.../data/nereids_ssb_shape_sf100_p0/shape/q4.3.out | 13 +++++-----
7 files changed, 52 insertions(+), 61 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index 3c57d6dbe91..8a5c3a85055 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -946,7 +946,7 @@ public class SessionVariable implements Serializable,
Writable {
public boolean enableDpHypTrace = false;
@VariableMgr.VarAttr(name = BROADCAST_RIGHT_TABLE_SCALE_FACTOR)
- private double broadcastRightTableScaleFactor = 10.0;
+ private double broadcastRightTableScaleFactor = 0.0;
@VariableMgr.VarAttr(name = BROADCAST_ROW_COUNT_LIMIT, needForward = true)
private double broadcastRowCountLimit = 30000000;
diff --git a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/flat.out
b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/flat.out
index 5cb66b49bc7..330f9cd23c9 100644
--- a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/flat.out
+++ b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/flat.out
@@ -6,11 +6,10 @@ PhysicalResultSink
------hashJoin[INNER_JOIN](s.s_suppkey = l.lo_suppkey)
--------PhysicalProject
----------hashJoin[INNER_JOIN](c.c_custkey = l.lo_custkey)
-------------PhysicalDistribute
---------------hashJoin[INNER_JOIN](p.p_partkey = l.lo_partkey)
-----------------PhysicalOlapScan[lineorder]
-----------------PhysicalDistribute
-------------------PhysicalOlapScan[part]
+------------hashJoin[INNER_JOIN](p.p_partkey = l.lo_partkey)
+--------------PhysicalOlapScan[lineorder]
+--------------PhysicalDistribute
+----------------PhysicalOlapScan[part]
------------PhysicalDistribute
--------------PhysicalOlapScan[customer]
--------PhysicalDistribute
diff --git a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.2.out
b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.2.out
index 0a148822bf8..8f8c02f1d37 100644
--- a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.2.out
+++ b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.2.out
@@ -12,14 +12,13 @@ PhysicalResultSink
------------------hashJoin[INNER_JOIN](lineorder.lo_orderdate =
dates.d_datekey)
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN](lineorder.lo_partkey =
part.p_partkey)
-------------------------PhysicalDistribute
---------------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
+------------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
+--------------------------PhysicalProject
+----------------------------PhysicalOlapScan[lineorder]
+--------------------------PhysicalDistribute
----------------------------PhysicalProject
-------------------------------PhysicalOlapScan[lineorder]
-----------------------------PhysicalDistribute
-------------------------------PhysicalProject
---------------------------------filter((supplier.s_region = 'ASIA'))
-----------------------------------PhysicalOlapScan[supplier]
+------------------------------filter((supplier.s_region = 'ASIA'))
+--------------------------------PhysicalOlapScan[supplier]
------------------------PhysicalDistribute
--------------------------PhysicalProject
----------------------------filter((part.p_brand >= 'MFGR#2221')(part.p_brand
<= 'MFGR#2228'))
diff --git a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.3.out
b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.3.out
index 17b70822a93..c62f47123f2 100644
--- a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.3.out
+++ b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q2.3.out
@@ -10,21 +10,19 @@ PhysicalResultSink
--------------hashAgg[LOCAL]
----------------PhysicalProject
------------------hashJoin[INNER_JOIN](lineorder.lo_orderdate =
dates.d_datekey)
---------------------PhysicalDistribute
-----------------------PhysicalProject
-------------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
---------------------------PhysicalDistribute
-----------------------------hashJoin[INNER_JOIN](lineorder.lo_partkey =
part.p_partkey)
-------------------------------PhysicalProject
---------------------------------PhysicalOlapScan[lineorder]
-------------------------------PhysicalDistribute
---------------------------------PhysicalProject
-----------------------------------filter((part.p_brand = 'MFGR#2239'))
-------------------------------------PhysicalOlapScan[part]
+--------------------PhysicalProject
+----------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
+------------------------hashJoin[INNER_JOIN](lineorder.lo_partkey =
part.p_partkey)
+--------------------------PhysicalProject
+----------------------------PhysicalOlapScan[lineorder]
--------------------------PhysicalDistribute
----------------------------PhysicalProject
-------------------------------filter((supplier.s_region = 'EUROPE'))
---------------------------------PhysicalOlapScan[supplier]
+------------------------------filter((part.p_brand = 'MFGR#2239'))
+--------------------------------PhysicalOlapScan[part]
+------------------------PhysicalDistribute
+--------------------------PhysicalProject
+----------------------------filter((supplier.s_region = 'EUROPE'))
+------------------------------PhysicalOlapScan[supplier]
--------------------PhysicalDistribute
----------------------PhysicalProject
------------------------PhysicalOlapScan[dates]
diff --git a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.3.out
b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.3.out
index 66d311edb31..f588d0f389a 100644
--- a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.3.out
+++ b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.3.out
@@ -9,21 +9,19 @@ PhysicalResultSink
------------hashAgg[LOCAL]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN](lineorder.lo_orderdate = dates.d_datekey)
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN](lineorder.lo_custkey =
customer.c_custkey)
-------------------------PhysicalDistribute
---------------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
-----------------------------PhysicalProject
-------------------------------PhysicalOlapScan[lineorder]
-----------------------------PhysicalDistribute
-------------------------------PhysicalProject
---------------------------------filter(s_city IN ('UNITED KI1', 'UNITED KI5'))
-----------------------------------PhysicalOlapScan[supplier]
+------------------PhysicalProject
+--------------------hashJoin[INNER_JOIN](lineorder.lo_custkey =
customer.c_custkey)
+----------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
+------------------------PhysicalProject
+--------------------------PhysicalOlapScan[lineorder]
------------------------PhysicalDistribute
--------------------------PhysicalProject
-----------------------------filter(c_city IN ('UNITED KI1', 'UNITED KI5'))
-------------------------------PhysicalOlapScan[customer]
+----------------------------filter(s_city IN ('UNITED KI1', 'UNITED KI5'))
+------------------------------PhysicalOlapScan[supplier]
+----------------------PhysicalDistribute
+------------------------PhysicalProject
+--------------------------filter(c_city IN ('UNITED KI1', 'UNITED KI5'))
+----------------------------PhysicalOlapScan[customer]
------------------PhysicalDistribute
--------------------PhysicalProject
----------------------filter((dates.d_year <= 1997)(dates.d_year >= 1992))
diff --git a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.4.out
b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.4.out
index 8cfeb063775..6e1779e275e 100644
--- a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.4.out
+++ b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q3.4.out
@@ -8,24 +8,22 @@ PhysicalResultSink
----------PhysicalDistribute
------------hashAgg[LOCAL]
--------------PhysicalProject
-----------------hashJoin[INNER_JOIN](lineorder.lo_custkey = customer.c_custkey)
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN](lineorder.lo_orderdate =
dates.d_datekey)
+----------------hashJoin[INNER_JOIN](lineorder.lo_orderdate = dates.d_datekey)
+------------------PhysicalProject
+--------------------hashJoin[INNER_JOIN](lineorder.lo_custkey =
customer.c_custkey)
+----------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
-----------------------------PhysicalProject
-------------------------------PhysicalOlapScan[lineorder]
-----------------------------PhysicalDistribute
-------------------------------PhysicalProject
---------------------------------filter(s_city IN ('UNITED KI1', 'UNITED KI5'))
-----------------------------------PhysicalOlapScan[supplier]
+--------------------------PhysicalOlapScan[lineorder]
------------------------PhysicalDistribute
--------------------------PhysicalProject
-----------------------------filter((dates.d_yearmonth = 'Dec1997'))
-------------------------------PhysicalOlapScan[dates]
+----------------------------filter(s_city IN ('UNITED KI1', 'UNITED KI5'))
+------------------------------PhysicalOlapScan[supplier]
+----------------------PhysicalDistribute
+------------------------PhysicalProject
+--------------------------filter(c_city IN ('UNITED KI1', 'UNITED KI5'))
+----------------------------PhysicalOlapScan[customer]
------------------PhysicalDistribute
--------------------PhysicalProject
-----------------------filter(c_city IN ('UNITED KI1', 'UNITED KI5'))
-------------------------PhysicalOlapScan[customer]
+----------------------filter((dates.d_yearmonth = 'Dec1997'))
+------------------------PhysicalOlapScan[dates]
diff --git a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q4.3.out
b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q4.3.out
index a25a04a7d31..8ba0bb019b6 100644
--- a/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q4.3.out
+++ b/regression-test/data/nereids_ssb_shape_sf100_p0/shape/q4.3.out
@@ -16,14 +16,13 @@ PhysicalResultSink
----------------------hashJoin[INNER_JOIN](lineorder.lo_orderdate =
dates.d_datekey)
------------------------PhysicalProject
--------------------------hashJoin[INNER_JOIN](lineorder.lo_partkey =
part.p_partkey)
-----------------------------PhysicalDistribute
-------------------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
+----------------------------hashJoin[INNER_JOIN](lineorder.lo_suppkey =
supplier.s_suppkey)
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[lineorder]
+------------------------------PhysicalDistribute
--------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[lineorder]
---------------------------------PhysicalDistribute
-----------------------------------PhysicalProject
-------------------------------------filter((supplier.s_nation = 'UNITED
STATES'))
---------------------------------------PhysicalOlapScan[supplier]
+----------------------------------filter((supplier.s_nation = 'UNITED STATES'))
+------------------------------------PhysicalOlapScan[supplier]
----------------------------PhysicalDistribute
------------------------------PhysicalProject
--------------------------------filter((part.p_category = 'MFGR#14'))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
