From 4d46a039b2916aa699e5354a64a04ce6bb16af95 Mon Sep 17 00:00:00 2001 From: jackwener Date: Fri, 15 Mar 2024 17:26:40 +0800 Subject: [PATCH 1/2] [fix](Nereids): just pull up project above join --- .../data/nereids_tpcds_shape_sf1000_p0/shape/query90.out | 6 +++--- .../nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out | 6 +++--- .../nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out | 6 +++--- .../data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out | 6 +++--- .../data/nereids_tpcds_shape_sf100_p0/shape/query90.out | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query90.out b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query90.out index 3313e04f0d4f5b..ebd2b668f4fc4a 100644 --- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalTopN[MERGE_SORT] -----PhysicalTopN[LOCAL_SORT] -------PhysicalProject +--PhysicalProject +----PhysicalTopN[MERGE_SORT] +------PhysicalTopN[LOCAL_SORT] --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out index 0628931542ad77..c1da1df73f9fa1 100644 --- a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalTopN[MERGE_SORT] -----PhysicalTopN[LOCAL_SORT] -------PhysicalProject +--PhysicalProject +----PhysicalTopN[MERGE_SORT] +------PhysicalTopN[LOCAL_SORT] --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out index 0628931542ad77..c1da1df73f9fa1 100644 --- a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalTopN[MERGE_SORT] -----PhysicalTopN[LOCAL_SORT] -------PhysicalProject +--PhysicalProject +----PhysicalTopN[MERGE_SORT] +------PhysicalTopN[LOCAL_SORT] --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out index b74a4990382a07..6f947e6ca9370c 100644 --- a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalTopN[MERGE_SORT] -----PhysicalTopN[LOCAL_SORT] -------PhysicalProject +--PhysicalProject +----PhysicalTopN[MERGE_SORT] +------PhysicalTopN[LOCAL_SORT] --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query90.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query90.out index b74a4990382a07..6f947e6ca9370c 100644 --- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalTopN[MERGE_SORT] -----PhysicalTopN[LOCAL_SORT] -------PhysicalProject +--PhysicalProject +----PhysicalTopN[MERGE_SORT] +------PhysicalTopN[LOCAL_SORT] --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] From 7b79400b13e459b1bcd12ac7436404e401d342b6 Mon Sep 17 00:00:00 2001 From: jackwener Date: Fri, 22 Mar 2024 00:05:38 +0800 Subject: [PATCH 2/2] regression test --- .../data/nereids_tpcds_shape_sf1000_p0/shape/query90.out | 6 +++--- .../nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out | 6 +++--- .../nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out | 6 +++--- .../data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out | 6 +++--- .../data/nereids_tpcds_shape_sf100_p0/shape/query90.out | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query90.out b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query90.out index ebd2b668f4fc4a..3313e04f0d4f5b 100644 --- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalProject -----PhysicalTopN[MERGE_SORT] -------PhysicalTopN[LOCAL_SORT] +--PhysicalTopN[MERGE_SORT] +----PhysicalTopN[LOCAL_SORT] +------PhysicalProject --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out index c1da1df73f9fa1..0628931542ad77 100644 --- a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalProject -----PhysicalTopN[MERGE_SORT] -------PhysicalTopN[LOCAL_SORT] +--PhysicalTopN[MERGE_SORT] +----PhysicalTopN[LOCAL_SORT] +------PhysicalProject --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out index c1da1df73f9fa1..0628931542ad77 100644 --- a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalProject -----PhysicalTopN[MERGE_SORT] -------PhysicalTopN[LOCAL_SORT] +--PhysicalTopN[MERGE_SORT] +----PhysicalTopN[LOCAL_SORT] +------PhysicalProject --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out index 6f947e6ca9370c..b74a4990382a07 100644 --- a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalProject -----PhysicalTopN[MERGE_SORT] -------PhysicalTopN[LOCAL_SORT] +--PhysicalTopN[MERGE_SORT] +----PhysicalTopN[LOCAL_SORT] +------PhysicalProject --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather] diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query90.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query90.out index 6f947e6ca9370c..b74a4990382a07 100644 --- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query90.out +++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query90.out @@ -1,9 +1,9 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !ds_shape_90 -- PhysicalResultSink ---PhysicalProject -----PhysicalTopN[MERGE_SORT] -------PhysicalTopN[LOCAL_SORT] +--PhysicalTopN[MERGE_SORT] +----PhysicalTopN[LOCAL_SORT] +------PhysicalProject --------NestedLoopJoin[CROSS_JOIN] ----------hashAgg[GLOBAL] ------------PhysicalDistribute[DistributionSpecGather]