From fefda54c48d704b9126fd1d1996f0fe633930111 Mon Sep 17 00:00:00 2001 From: 924060929 <924060929@qq.com> Date: Wed, 17 Jul 2024 22:26:56 +0800 Subject: [PATCH] fix --- .../main/java/org/apache/doris/qe/Coordinator.java | 11 +---------- .../tpcds_sf100/noStatsRfPrune/query28.out | 2 +- .../tpcds_sf100/no_stats_shape/query28.out | 2 +- .../new_shapes_p0/tpcds_sf100/rf_prune/query28.out | 2 +- .../data/new_shapes_p0/tpcds_sf100/shape/query28.out | 2 +- .../data/new_shapes_p0/tpcds_sf1000/shape/query51.out | 8 ++++---- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java index 8459cb3b68ec78..48b4736052d409 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java @@ -257,9 +257,6 @@ public class Coordinator implements CoordInterface { private long jobId = -1; // job which this task belongs to private TUniqueId queryId; - // parallel execute - private final TUniqueId nextInstanceId; - // a timestamp represent the absolute timeout // eg, System.currentTimeMillis() + executeTimeoutS * 1000 private long timeoutDeadline; @@ -355,9 +352,6 @@ public Coordinator(ConnectContext context, Analyzer analyzer, Planner planner) { } else { this.queryGlobals.setTimeZone(context.getSessionVariable().getTimeZone()); } - this.nextInstanceId = new TUniqueId(); - nextInstanceId.setHi(queryId.hi); - nextInstanceId.setLo(queryId.lo + 1); this.assignedRuntimeFilters = planner.getRuntimeFilters(); this.topnFilters = planner.getTopnFilters(); this.executionProfile = new ExecutionProfile(queryId, fragments); @@ -380,15 +374,12 @@ public Coordinator(Long jobId, TUniqueId queryId, DescriptorTable descTable, Lis this.queryGlobals.setTimeZone(timezone); this.queryGlobals.setLoadZeroTolerance(loadZeroTolerance); this.queryOptions.setBeExecVersion(Config.be_exec_version); - this.nextInstanceId = new TUniqueId(); - nextInstanceId.setHi(queryId.hi); - nextInstanceId.setLo(queryId.lo + 1); this.executionProfile = new ExecutionProfile(queryId, fragments); } private void setFromUserProperty(ConnectContext connectContext) { String qualifiedUser = connectContext.getQualifiedUser(); - // set cpu resource limit + // set cpu resource limitch int cpuLimit = Env.getCurrentEnv().getAuth().getCpuResourceLimit(qualifiedUser); if (cpuLimit > 0) { // overwrite the cpu resource limit from session variable; diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query28.out b/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query28.out index 1578290f334935..dae7cb1c23a402 100644 --- a/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query28.out +++ b/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query28.out @@ -31,7 +31,7 @@ PhysicalResultSink ------------------------PhysicalDistribute[DistributionSpecGather] --------------------------hashAgg[LOCAL] ----------------------------PhysicalProject -------------------------------filter(((((store_sales.ss_list_price >= 150.00) AND (store_sales.ss_list_price <= 1.6E+2)) OR ((store_sales.ss_coupon_amt >= 6600.00) AND (store_sales.ss_coupon_amt <= 7.6E+3))) OR ((store_sales.ss_wholesale_cost >= 9.00) AND (store_sales.ss_wholesale_cost <= 29.00))) and (store_sales.ss_quantity <= 15) and (store_sales.ss_quantity >= 11)) +------------------------------filter(((((store_sales.ss_list_price >= 150.00) AND (store_sales.ss_list_price <= 160.00)) OR ((store_sales.ss_coupon_amt >= 6600.00) AND (store_sales.ss_coupon_amt <= 7600.00))) OR ((store_sales.ss_wholesale_cost >= 9.00) AND (store_sales.ss_wholesale_cost <= 29.00))) and (store_sales.ss_quantity <= 15) and (store_sales.ss_quantity >= 11)) --------------------------------PhysicalOlapScan[store_sales] ----------------PhysicalLimit[LOCAL] ------------------hashAgg[GLOBAL] diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query28.out b/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query28.out index 1578290f334935..dae7cb1c23a402 100644 --- a/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query28.out +++ b/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query28.out @@ -31,7 +31,7 @@ PhysicalResultSink ------------------------PhysicalDistribute[DistributionSpecGather] --------------------------hashAgg[LOCAL] ----------------------------PhysicalProject -------------------------------filter(((((store_sales.ss_list_price >= 150.00) AND (store_sales.ss_list_price <= 1.6E+2)) OR ((store_sales.ss_coupon_amt >= 6600.00) AND (store_sales.ss_coupon_amt <= 7.6E+3))) OR ((store_sales.ss_wholesale_cost >= 9.00) AND (store_sales.ss_wholesale_cost <= 29.00))) and (store_sales.ss_quantity <= 15) and (store_sales.ss_quantity >= 11)) +------------------------------filter(((((store_sales.ss_list_price >= 150.00) AND (store_sales.ss_list_price <= 160.00)) OR ((store_sales.ss_coupon_amt >= 6600.00) AND (store_sales.ss_coupon_amt <= 7600.00))) OR ((store_sales.ss_wholesale_cost >= 9.00) AND (store_sales.ss_wholesale_cost <= 29.00))) and (store_sales.ss_quantity <= 15) and (store_sales.ss_quantity >= 11)) --------------------------------PhysicalOlapScan[store_sales] ----------------PhysicalLimit[LOCAL] ------------------hashAgg[GLOBAL] diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query28.out b/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query28.out index 1578290f334935..dae7cb1c23a402 100644 --- a/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query28.out +++ b/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query28.out @@ -31,7 +31,7 @@ PhysicalResultSink ------------------------PhysicalDistribute[DistributionSpecGather] --------------------------hashAgg[LOCAL] ----------------------------PhysicalProject -------------------------------filter(((((store_sales.ss_list_price >= 150.00) AND (store_sales.ss_list_price <= 1.6E+2)) OR ((store_sales.ss_coupon_amt >= 6600.00) AND (store_sales.ss_coupon_amt <= 7.6E+3))) OR ((store_sales.ss_wholesale_cost >= 9.00) AND (store_sales.ss_wholesale_cost <= 29.00))) and (store_sales.ss_quantity <= 15) and (store_sales.ss_quantity >= 11)) +------------------------------filter(((((store_sales.ss_list_price >= 150.00) AND (store_sales.ss_list_price <= 160.00)) OR ((store_sales.ss_coupon_amt >= 6600.00) AND (store_sales.ss_coupon_amt <= 7600.00))) OR ((store_sales.ss_wholesale_cost >= 9.00) AND (store_sales.ss_wholesale_cost <= 29.00))) and (store_sales.ss_quantity <= 15) and (store_sales.ss_quantity >= 11)) --------------------------------PhysicalOlapScan[store_sales] ----------------PhysicalLimit[LOCAL] ------------------hashAgg[GLOBAL] diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query28.out b/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query28.out index 1578290f334935..dae7cb1c23a402 100644 --- a/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query28.out +++ b/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query28.out @@ -31,7 +31,7 @@ PhysicalResultSink ------------------------PhysicalDistribute[DistributionSpecGather] --------------------------hashAgg[LOCAL] ----------------------------PhysicalProject -------------------------------filter(((((store_sales.ss_list_price >= 150.00) AND (store_sales.ss_list_price <= 1.6E+2)) OR ((store_sales.ss_coupon_amt >= 6600.00) AND (store_sales.ss_coupon_amt <= 7.6E+3))) OR ((store_sales.ss_wholesale_cost >= 9.00) AND (store_sales.ss_wholesale_cost <= 29.00))) and (store_sales.ss_quantity <= 15) and (store_sales.ss_quantity >= 11)) +------------------------------filter(((((store_sales.ss_list_price >= 150.00) AND (store_sales.ss_list_price <= 160.00)) OR ((store_sales.ss_coupon_amt >= 6600.00) AND (store_sales.ss_coupon_amt <= 7600.00))) OR ((store_sales.ss_wholesale_cost >= 9.00) AND (store_sales.ss_wholesale_cost <= 29.00))) and (store_sales.ss_quantity <= 15) and (store_sales.ss_quantity >= 11)) --------------------------------PhysicalOlapScan[store_sales] ----------------PhysicalLimit[LOCAL] ------------------hashAgg[GLOBAL] diff --git a/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query51.out b/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query51.out index 6c22d2df3086e3..38bec2403ec075 100644 --- a/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query51.out +++ b/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query51.out @@ -19,9 +19,9 @@ PhysicalResultSink --------------------------------PhysicalDistribute[DistributionSpecHash] ----------------------------------hashAgg[LOCAL] ------------------------------------PhysicalProject ---------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((web_sales.ws_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[ws_sold_date_sk] +--------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((store_sales.ss_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF1 d_date_sk->[ss_sold_date_sk] ----------------------------------------PhysicalProject -------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF1 +------------------------------------------PhysicalOlapScan[store_sales] apply RFs: RF1 ----------------------------------------PhysicalProject ------------------------------------------filter((date_dim.d_month_seq <= 1223) and (date_dim.d_month_seq >= 1212)) --------------------------------------------PhysicalOlapScan[date_dim] @@ -34,9 +34,9 @@ PhysicalResultSink --------------------------------PhysicalDistribute[DistributionSpecHash] ----------------------------------hashAgg[LOCAL] ------------------------------------PhysicalProject ---------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((store_sales.ss_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[ss_sold_date_sk] +--------------------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((web_sales.ws_sold_date_sk = date_dim.d_date_sk)) otherCondition=() build RFs:RF0 d_date_sk->[ws_sold_date_sk] ----------------------------------------PhysicalProject -------------------------------------------PhysicalOlapScan[store_sales] apply RFs: RF0 +------------------------------------------PhysicalOlapScan[web_sales] apply RFs: RF0 ----------------------------------------PhysicalProject ------------------------------------------filter((date_dim.d_month_seq <= 1223) and (date_dim.d_month_seq >= 1212)) --------------------------------------------PhysicalOlapScan[date_dim]