Skip to content

Commit 454fa31

Browse files
avamingliavamingli
committed
Fix cases of cherry-pick
1 parent ace5385 commit 454fa31

File tree

4 files changed

+34
-40
lines changed

4 files changed

+34
-40
lines changed

‎src/test/regress/expected/gp_dqa.out‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,11 +2247,11 @@ explain (verbose, costs off) select count(distinct (b)::text) as b, count(distin
22472247
QUERY PLAN
22482248
-----------------------------------------------------------------------------------------------------------
22492249
Finalize Aggregate
2250-
Output: count(DISTINCT ((b)::text)), count(DISTINCT (a)::character varying)
2250+
Output: count(DISTINCT ((b)::text)), count(DISTINCT a)
22512251
-> Gather Motion 3:1 (slice1; segments: 3)
2252-
Output: (PARTIAL count(DISTINCT ((b)::text))), (PARTIAL count(DISTINCT (a)::character varying))
2252+
Output: (PARTIAL count(DISTINCT ((b)::text))), (PARTIAL count(DISTINCT a))
22532253
-> Partial Aggregate
2254-
Output: PARTIAL count(DISTINCT ((b)::text)), PARTIAL count(DISTINCT (a)::character varying)
2254+
Output: PARTIAL count(DISTINCT ((b)::text)), PARTIAL count(DISTINCT a)
22552255
-> Redistribute Motion 3:3 (slice2; segments: 3)
22562256
Output: b, a, ((b)::text), (AggExprId)
22572257
Hash Key: ((b)::text), a, (AggExprId)

‎src/test/regress/expected/gp_dqa_optimizer.out‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,14 +2383,14 @@ DETAIL: Feature not supported: Multiple Distinct Qualified Aggregates are disab
23832383
explain (verbose, costs off) select count(distinct (b)::text) as b, count(distinct (a)::text::varchar) as a from dqa_f3;
23842384
INFO: GPORCA failed to produce a plan, falling back to planner
23852385
DETAIL: Feature not supported: Multiple Distinct Qualified Aggregates are disabled in the optimizer
2386-
QUERY PLAN
2387-
-------------------------------------------------------------------------------------------------------------
2386+
QUERY PLAN
2387+
-----------------------------------------------------------------------------------------------------------
23882388
Finalize Aggregate
2389-
Output: count(DISTINCT ((b)::text)), count(DISTINCT (a)::character varying)
2389+
Output: count(DISTINCT ((b)::text)), count(DISTINCT a)
23902390
-> Gather Motion 3:1 (slice1; segments: 3)
2391-
Output: (PARTIAL count(DISTINCT ((b)::text))), (PARTIAL count(DISTINCT (a)::character varying))
2391+
Output: (PARTIAL count(DISTINCT ((b)::text))), (PARTIAL count(DISTINCT a))
23922392
-> Partial Aggregate
2393-
Output: PARTIAL count(DISTINCT ((b)::text)), PARTIAL count(DISTINCT (a)::character varying)
2393+
Output: PARTIAL count(DISTINCT ((b)::text)), PARTIAL count(DISTINCT a)
23942394
-> Redistribute Motion 3:3 (slice2; segments: 3)
23952395
Output: b, a, ((b)::text), (AggExprId)
23962396
Hash Key: ((b)::text), a, (AggExprId)

‎src/test/regress/expected/psql_gp_commands.out‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,16 @@ ALTER TABLE "d_bogus_heap" OWNER TO test_psql_de_role;
169169
(7 rows)
170170

171171
\d+
172-
List of relations
173-
Schema | Name | Type | Owner | Storage | Size | Description
174-
------------------+-------------------+---------------+-------------------+-----------+---------+-------------
175-
test_psql_schema | dE_external_table | foreign table | test_psql_de_role | | 0 bytes |
176-
test_psql_schema | dE_foreign_table | foreign table | test_psql_de_role | | 0 bytes |
177-
test_psql_schema | d_ao | table | test_psql_de_role | ao_row | 128 kB |
178-
test_psql_schema | d_aocs | table | test_psql_de_role | ao_column | 128 kB |
179-
test_psql_schema | d_bogus_heap | table | test_psql_de_role | bogus | 0 bytes |
180-
test_psql_schema | d_heap | table | test_psql_de_role | heap | 0 bytes |
181-
test_psql_schema | d_view | view | test_psql_de_role | | 0 bytes |
172+
List of relations
173+
Schema | Name | Type | Owner | Storage | Persistence | Size | Description
174+
------------------+-------------------+---------------+-------------------+-----------+-------------+---------+-------------
175+
test_psql_schema | dE_external_table | foreign table | test_psql_de_role | | permanent | 0 bytes |
176+
test_psql_schema | dE_foreign_table | foreign table | test_psql_de_role | | permanent | 0 bytes |
177+
test_psql_schema | d_ao | table | test_psql_de_role | ao_row | permanent | 128 kB |
178+
test_psql_schema | d_aocs | table | test_psql_de_role | ao_column | permanent | 128 kB |
179+
test_psql_schema | d_bogus_heap | table | test_psql_de_role | bogus | permanent | 0 bytes |
180+
test_psql_schema | d_heap | table | test_psql_de_role | heap | permanent | 0 bytes |
181+
test_psql_schema | d_view | view | test_psql_de_role | | permanent | 0 bytes |
182182
(7 rows)
183183

184184
-- The Storage column is not interesting for indexes, so it's omitted with

‎src/test/regress/expected/tidscan_optimizer.out‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -145,21 +145,18 @@ SET enable_hashjoin TO off; -- otherwise hash join might win
145145
EXPLAIN (COSTS OFF)
146146
SELECT t1.ctid, t1.*, t2.ctid, t2.*
147147
FROM tidscan t1 JOIN tidscan t2 ON t1.ctid = t2.ctid WHERE t1.id = 1;
148-
QUERY PLAN
149-
------------------------------------------------------------------
148+
QUERY PLAN
149+
---------------------------------------------------------------
150150
Gather Motion 3:1 (slice1; segments: 3)
151151
-> Hash Join
152152
Hash Cond: (tidscan.ctid = tidscan_1.ctid)
153-
-> Redistribute Motion 3:3 (slice2; segments: 3)
154-
Hash Key: tidscan.ctid
155-
-> Seq Scan on tidscan
156-
Filter: (id = 1)
153+
-> Seq Scan on tidscan
157154
-> Hash
158-
-> Redistribute Motion 3:3 (slice3; segments: 3)
159-
Hash Key: tidscan_1.ctid
155+
-> Broadcast Motion 3:3 (slice2; segments: 3)
160156
-> Seq Scan on tidscan tidscan_1
157+
Filter: (id = 1)
161158
Optimizer: Pivotal Optimizer (GPORCA)
162-
(12 rows)
159+
(9 rows)
163160

164161
SELECT t1.ctid, t1.*, t2.ctid, t2.*
165162
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;
171168
EXPLAIN (COSTS OFF)
172169
SELECT t1.ctid, t1.*, t2.ctid, t2.*
173170
FROM tidscan t1 LEFT JOIN tidscan t2 ON t1.ctid = t2.ctid WHERE t1.id = 1;
174-
QUERY PLAN
175-
------------------------------------------------------------------
176-
Gather Motion 3:1 (slice1; segments: 3)
177-
-> Hash Left Join
178-
Hash Cond: (tidscan.ctid = tidscan_1.ctid)
179-
-> Redistribute Motion 3:3 (slice2; segments: 3)
180-
Hash Key: tidscan.ctid
181-
-> Seq Scan on tidscan
171+
QUERY PLAN
172+
------------------------------------------------------
173+
Hash Right Join
174+
Hash Cond: (tidscan.ctid = tidscan_1.ctid)
175+
-> Gather Motion 3:1 (slice1; segments: 3)
176+
-> Seq Scan on tidscan
177+
-> Hash
178+
-> Gather Motion 3:1 (slice2; segments: 3)
179+
-> Seq Scan on tidscan tidscan_1
182180
Filter: (id = 1)
183-
-> Hash
184-
-> Redistribute Motion 3:3 (slice3; segments: 3)
185-
Hash Key: tidscan_1.ctid
186-
-> Seq Scan on tidscan tidscan_1
187181
Optimizer: Pivotal Optimizer (GPORCA)
188-
(12 rows)
182+
(9 rows)
189183

190184
SELECT t1.ctid, t1.*, t2.ctid, t2.*
191185
FROM tidscan t1 LEFT JOIN tidscan t2 ON t1.ctid = t2.ctid WHERE t1.id = 1;

0 commit comments

Comments
 (0)