Skip to content

Commit

Permalink
Fix cases of cherry-pick
Browse files Browse the repository at this point in the history
  • Loading branch information
@avamingli
avamingli committed Dec 26, 2024
1 parent 6d07ccb commit 195454d
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 40 deletions.
6 changes: 3 additions & 3 deletions src/test/regress/expected/gp_dqa.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions src/test/regress/expected/gp_dqa_optimizer.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions src/test/regress/expected/psql_gp_commands.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 16 additions & 22 deletions src/test/regress/expected/tidscan_optimizer.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 195454d

Please sign in to comment.