You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by av...@apache.org on 2024/12/27 11:17:52 UTC
(cloudberry) 13/13: Fix cases of cherry-pick
This is an automated email from the ASF dual-hosted git repository.
avamingli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 454fa31bf18c7a601283523aff888fba249267c6
Author: Zhang Mingli <av...@gmail.com>
AuthorDate: Thu Dec 26 15:47:22 2024 +0800
Fix cases of cherry-pick
---
src/test/regress/expected/gp_dqa.out | 6 ++--
src/test/regress/expected/gp_dqa_optimizer.out | 10 +++----
src/test/regress/expected/psql_gp_commands.out | 20 ++++++-------
src/test/regress/expected/tidscan_optimizer.out | 38 +++++++++++--------------
4 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/src/test/regress/expected/gp_dqa.out b/src/test/regress/expected/gp_dqa.out
index 91b38ae965..9090a1547a 100644
--- a/src/test/regress/expected/gp_dqa.out
+++ b/src/test/regress/expected/gp_dqa.out
@@ -2247,11 +2247,11 @@ explain (verbose, costs off) select count(distinct (b)::text) as b, count(distin
QUERY PLAN
-----------------------------------------------------------------------------------------------------------
Finalize Aggregate
- Output: count(DISTINCT ((b)::text)), count(DISTINCT (a)::character varying)
+ Output: count(DISTINCT ((b)::text)), count(DISTINCT a)
-> Gather Motion 3:1 (slice1; segments: 3)
- Output: (PARTIAL count(DISTINCT ((b)::text))), (PARTIAL count(DISTINCT (a)::character varying))
+ Output: (PARTIAL count(DISTINCT ((b)::text))), (PARTIAL count(DISTINCT a))
-> Partial Aggregate
- Output: PARTIAL count(DISTINCT ((b)::text)), PARTIAL count(DISTINCT (a)::character varying)
+ Output: PARTIAL count(DISTINCT ((b)::text)), PARTIAL count(DISTINCT a)
-> Redistribute Motion 3:3 (slice2; segments: 3)
Output: b, a, ((b)::text), (AggExprId)
Hash Key: ((b)::text), a, (AggExprId)
diff --git a/src/test/regress/expected/gp_dqa_optimizer.out b/src/test/regress/expected/gp_dqa_optimizer.out
index 73f7dfb1b8..3f1c7f540e 100644
--- a/src/test/regress/expected/gp_dqa_optimizer.out
+++ b/src/test/regress/expected/gp_dqa_optimizer.out
@@ -2383,14 +2383,14 @@ DETAIL: Feature not supported: Multiple Distinct Qualified Aggregates are disab
explain (verbose, costs off) select count(distinct (b)::text) as b, count(distinct (a)::text::varchar) as a from dqa_f3;
INFO: GPORCA failed to produce a plan, falling back to planner
DETAIL: Feature not supported: Multiple Distinct Qualified Aggregates are disabled in the optimizer
- QUERY PLAN
--------------------------------------------------------------------------------------------------------------
+ QUERY PLAN
+-----------------------------------------------------------------------------------------------------------
Finalize Aggregate
- Output: count(DISTINCT ((b)::text)), count(DISTINCT (a)::character varying)
+ Output: count(DISTINCT ((b)::text)), count(DISTINCT a)
-> Gather Motion 3:1 (slice1; segments: 3)
- Output: (PARTIAL count(DISTINCT ((b)::text))), (PARTIAL count(DISTINCT (a)::character varying))
+ Output: (PARTIAL count(DISTINCT ((b)::text))), (PARTIAL count(DISTINCT a))
-> Partial Aggregate
- Output: PARTIAL count(DISTINCT ((b)::text)), PARTIAL count(DISTINCT (a)::character varying)
+ Output: PARTIAL count(DISTINCT ((b)::text)), PARTIAL count(DISTINCT a)
-> Redistribute Motion 3:3 (slice2; segments: 3)
Output: b, a, ((b)::text), (AggExprId)
Hash Key: ((b)::text), a, (AggExprId)
diff --git a/src/test/regress/expected/psql_gp_commands.out b/src/test/regress/expected/psql_gp_commands.out
index f0724bd562..10755c56fc 100644
--- a/src/test/regress/expected/psql_gp_commands.out
+++ b/src/test/regress/expected/psql_gp_commands.out
@@ -169,16 +169,16 @@ ALTER TABLE "d_bogus_heap" OWNER TO test_psql_de_role;
(7 rows)
\d+
- List of relations
- Schema | Name | Type | Owner | Storage | Size | Description
-------------------+-------------------+---------------+-------------------+-----------+---------+-------------
- test_psql_schema | dE_external_table | foreign table | test_psql_de_role | | 0 bytes |
- test_psql_schema | dE_foreign_table | foreign table | test_psql_de_role | | 0 bytes |
- test_psql_schema | d_ao | table | test_psql_de_role | ao_row | 128 kB |
- test_psql_schema | d_aocs | table | test_psql_de_role | ao_column | 128 kB |
- test_psql_schema | d_bogus_heap | table | test_psql_de_role | bogus | 0 bytes |
- test_psql_schema | d_heap | table | test_psql_de_role | heap | 0 bytes |
- test_psql_schema | d_view | view | test_psql_de_role | | 0 bytes |
+ List of relations
+ Schema | Name | Type | Owner | Storage | Persistence | Size | Description
+------------------+-------------------+---------------+-------------------+-----------+-------------+---------+-------------
+ test_psql_schema | dE_external_table | foreign table | test_psql_de_role | | permanent | 0 bytes |
+ test_psql_schema | dE_foreign_table | foreign table | test_psql_de_role | | permanent | 0 bytes |
+ test_psql_schema | d_ao | table | test_psql_de_role | ao_row | permanent | 128 kB |
+ test_psql_schema | d_aocs | table | test_psql_de_role | ao_column | permanent | 128 kB |
+ test_psql_schema | d_bogus_heap | table | test_psql_de_role | bogus | permanent | 0 bytes |
+ test_psql_schema | d_heap | table | test_psql_de_role | heap | permanent | 0 bytes |
+ test_psql_schema | d_view | view | test_psql_de_role | | permanent | 0 bytes |
(7 rows)
-- The Storage column is not interesting for indexes, so it's omitted with
diff --git a/src/test/regress/expected/tidscan_optimizer.out b/src/test/regress/expected/tidscan_optimizer.out
index ed4ae3e528..79b4abdb56 100644
--- a/src/test/regress/expected/tidscan_optimizer.out
+++ b/src/test/regress/expected/tidscan_optimizer.out
@@ -145,21 +145,18 @@ SET enable_hashjoin TO off; -- otherwise hash join might win
EXPLAIN (COSTS OFF)
SELECT t1.ctid, t1.*, t2.ctid, t2.*
FROM tidscan t1 JOIN tidscan t2 ON t1.ctid = t2.ctid WHERE t1.id = 1;
- QUERY PLAN
-------------------------------------------------------------------
+ QUERY PLAN
+---------------------------------------------------------------
Gather Motion 3:1 (slice1; segments: 3)
-> Hash Join
Hash Cond: (tidscan.ctid = tidscan_1.ctid)
- -> Redistribute Motion 3:3 (slice2; segments: 3)
- Hash Key: tidscan.ctid
- -> Seq Scan on tidscan
- Filter: (id = 1)
+ -> Seq Scan on tidscan
-> Hash
- -> Redistribute Motion 3:3 (slice3; segments: 3)
- Hash Key: tidscan_1.ctid
+ -> Broadcast Motion 3:3 (slice2; segments: 3)
-> Seq Scan on tidscan tidscan_1
+ Filter: (id = 1)
Optimizer: Pivotal Optimizer (GPORCA)
-(12 rows)
+(9 rows)
SELECT t1.ctid, t1.*, t2.ctid, t2.*
FROM tidscan t1 JOIN tidscan t2 ON t1.ctid = t2.ctid WHERE t1.id = 1;
@@ -171,21 +168,18 @@ FROM tidscan t1 JOIN tidscan t2 ON t1.ctid = t2.ctid WHERE t1.id = 1;
EXPLAIN (COSTS OFF)
SELECT t1.ctid, t1.*, t2.ctid, t2.*
FROM tidscan t1 LEFT JOIN tidscan t2 ON t1.ctid = t2.ctid WHERE t1.id = 1;
- QUERY PLAN
-------------------------------------------------------------------
- Gather Motion 3:1 (slice1; segments: 3)
- -> Hash Left Join
- Hash Cond: (tidscan.ctid = tidscan_1.ctid)
- -> Redistribute Motion 3:3 (slice2; segments: 3)
- Hash Key: tidscan.ctid
- -> Seq Scan on tidscan
+ QUERY PLAN
+------------------------------------------------------
+ Hash Right Join
+ Hash Cond: (tidscan.ctid = tidscan_1.ctid)
+ -> Gather Motion 3:1 (slice1; segments: 3)
+ -> Seq Scan on tidscan
+ -> Hash
+ -> Gather Motion 3:1 (slice2; segments: 3)
+ -> Seq Scan on tidscan tidscan_1
Filter: (id = 1)
- -> Hash
- -> Redistribute Motion 3:3 (slice3; segments: 3)
- Hash Key: tidscan_1.ctid
- -> Seq Scan on tidscan tidscan_1
Optimizer: Pivotal Optimizer (GPORCA)
-(12 rows)
+(9 rows)
SELECT t1.ctid, t1.*, t2.ctid, t2.*
FROM tidscan t1 LEFT JOIN tidscan t2 ON t1.ctid = t2.ctid WHERE t1.id = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org