Skip to content

Commit f574a17

Browse files
committed
Fix some answer files for parallel schedule in pax
1 parent c2a2a28 commit f574a17

21 files changed

Lines changed: 467 additions & 444 deletions

contrib/pax_storage/src/test/regress/expected/alter_table.out

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ DROP TABLE attmp;
124124
-- fails with incorrect object type
125125
CREATE VIEW at_v1 AS SELECT 1 as a;
126126
ALTER TABLE at_v1 ALTER COLUMN a SET STATISTICS 0;
127-
ERROR: "at_v1" is not a table, materialized view, index, partitioned index, or foreign table
127+
ERROR: ALTER action ALTER COLUMN ... SET STATISTICS cannot be performed on relation "at_v1"
128+
DETAIL: This operation is not supported for views.
128129
DROP VIEW at_v1;
129130
--
130131
-- rename - check on both non-temp and temp tables

contrib/pax_storage/src/test/regress/expected/bitmapops.out

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@ SELECT count(*) FROM bmscantest_ao WHERE a = 1 AND b = 1 AND c = 1;
149149
EXPLAIN SELECT count(*) FROM bmscantest_ao WHERE a = 1 AND (b = 1 OR c = 1) AND d = 1;
150150
QUERY PLAN
151151
-------------------------------------------------------------------------------------------------------------
152-
Finalize Aggregate (cost=74.60..74.61 rows=1 width=8)
153-
-> Gather Motion 3:1 (slice1; segments: 3) (cost=74.54..74.59 rows=3 width=8)
154-
-> Partial Aggregate (cost=74.54..74.55 rows=1 width=8)
155-
-> Bitmap Heap Scan on bmscantest_ao (cost=70.47..74.49 rows=18 width=0)
156-
Recheck Cond: ((d = 1) AND (a = 1) AND ((b = 1) OR (c = 1)))
157-
-> BitmapAnd (cost=70.47..70.47 rows=1 width=0)
152+
Finalize Aggregate (cost=47.80..47.81 rows=1 width=8)
153+
-> Gather Motion 3:1 (slice1; segments: 3) (cost=47.74..47.79 rows=3 width=8)
154+
-> Partial Aggregate (cost=47.74..47.75 rows=1 width=8)
155+
-> Bitmap Heap Scan on bmscantest_ao (cost=43.68..47.70 rows=18 width=0)
156+
Recheck Cond: ((a = 1) AND (d = 1) AND ((b = 1) OR (c = 1)))
157+
-> BitmapAnd (cost=43.68..43.68 rows=1 width=0)
158+
-> Bitmap Index Scan on i_bmtest_ao_a (cost=0.00..4.01 rows=440 width=0)
159+
Index Cond: (a = 1)
158160
-> Bitmap Index Scan on i_bmtest_ao_d (cost=0.00..17.07 rows=396 width=0)
159161
Index Cond: (d = 1)
160-
-> Bitmap Index Scan on i_bmtest_ao_a (cost=0.00..17.91 rows=440 width=0)
161-
Index Cond: (a = 1)
162-
-> BitmapOr (cost=34.99..34.99 rows=836 width=0)
163-
-> Bitmap Index Scan on i_bmtest_ao_b (cost=0.00..16.90 rows=396 width=0)
162+
-> BitmapOr (cost=22.09..22.09 rows=836 width=0)
163+
-> Bitmap Index Scan on i_bmtest_ao_b (cost=0.00..4.01 rows=396 width=0)
164164
Index Cond: (b = 1)
165165
-> Bitmap Index Scan on i_bmtest_ao_c (cost=0.00..18.07 rows=440 width=0)
166166
Index Cond: (c = 1)
@@ -263,18 +263,18 @@ SELECT count(*) FROM bmscantest_aocs WHERE a = 1 AND b = 1 AND c = 1;
263263
EXPLAIN SELECT count(*) FROM bmscantest_aocs WHERE a = 1 AND (b = 1 OR c = 1) AND d = 1;
264264
QUERY PLAN
265265
---------------------------------------------------------------------------------------------------------------
266-
Finalize Aggregate (cost=74.60..74.61 rows=1 width=8)
267-
-> Gather Motion 3:1 (slice1; segments: 3) (cost=74.54..74.59 rows=3 width=8)
268-
-> Partial Aggregate (cost=74.54..74.55 rows=1 width=8)
269-
-> Bitmap Heap Scan on bmscantest_aocs (cost=70.47..74.49 rows=18 width=0)
270-
Recheck Cond: ((d = 1) AND (a = 1) AND ((b = 1) OR (c = 1)))
271-
-> BitmapAnd (cost=70.47..70.47 rows=1 width=0)
266+
Finalize Aggregate (cost=47.80..47.81 rows=1 width=8)
267+
-> Gather Motion 3:1 (slice1; segments: 3) (cost=47.74..47.79 rows=3 width=8)
268+
-> Partial Aggregate (cost=47.74..47.75 rows=1 width=8)
269+
-> Bitmap Heap Scan on bmscantest_aocs (cost=43.68..47.70 rows=18 width=0)
270+
Recheck Cond: ((a = 1) AND (d = 1) AND ((b = 1) OR (c = 1)))
271+
-> BitmapAnd (cost=43.68..43.68 rows=1 width=0)
272+
-> Bitmap Index Scan on i_bmtest_aocs_a (cost=0.00..4.01 rows=440 width=0)
273+
Index Cond: (a = 1)
272274
-> Bitmap Index Scan on i_bmtest_aocs_d (cost=0.00..17.07 rows=396 width=0)
273275
Index Cond: (d = 1)
274-
-> Bitmap Index Scan on i_bmtest_aocs_a (cost=0.00..17.91 rows=440 width=0)
275-
Index Cond: (a = 1)
276-
-> BitmapOr (cost=34.99..34.99 rows=836 width=0)
277-
-> Bitmap Index Scan on i_bmtest_aocs_b (cost=0.00..16.90 rows=396 width=0)
276+
-> BitmapOr (cost=22.09..22.09 rows=836 width=0)
277+
-> Bitmap Index Scan on i_bmtest_aocs_b (cost=0.00..4.01 rows=396 width=0)
278278
Index Cond: (b = 1)
279279
-> Bitmap Index Scan on i_bmtest_aocs_c (cost=0.00..18.07 rows=440 width=0)
280280
Index Cond: (c = 1)

contrib/pax_storage/src/test/regress/expected/copy2.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ LINE 1: COPY x from stdin (force_not_null (a), force_not_null (b));
7777
^
7878
COPY x from stdin (force_null (a), force_null (b));
7979
ERROR: conflicting or redundant options
80+
LINE 1: COPY x from stdin (force_null (a), force_null (b));
81+
^
8082
COPY x from stdin (convert_selectively (a), convert_selectively (b));
8183
ERROR: conflicting or redundant options
8284
LINE 1: COPY x from stdin (convert_selectively (a), convert_selectiv...

contrib/pax_storage/src/test/regress/expected/dependency.out

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,16 @@ SET SESSION AUTHORIZATION regress_dep_user0;
4949
-- permission denied
5050
DROP OWNED BY regress_dep_user1;
5151
ERROR: permission denied to drop objects
52+
DETAIL: Only roles with privileges of role "regress_dep_user1" may drop objects owned by it.
5253
DROP OWNED BY regress_dep_user0, regress_dep_user2;
5354
ERROR: permission denied to drop objects
55+
DETAIL: Only roles with privileges of role "regress_dep_user2" may drop objects owned by it.
5456
REASSIGN OWNED BY regress_dep_user0 TO regress_dep_user1;
5557
ERROR: permission denied to reassign objects
58+
DETAIL: Only roles with privileges of role "regress_dep_user1" may reassign objects to it.
5659
REASSIGN OWNED BY regress_dep_user1 TO regress_dep_user0;
5760
ERROR: permission denied to reassign objects
61+
DETAIL: Only roles with privileges of role "regress_dep_user1" may reassign objects owned by it.
5862
-- this one is allowed
5963
DROP OWNED BY regress_dep_user0;
6064
CREATE TABLE deptest1 (f1 int unique) DISTRIBUTED BY (f1);

contrib/pax_storage/src/test/regress/expected/domain.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ explain (verbose, costs off)
426426
Update on public.dcomptable
427427
-> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
428428
Output: (((d1[1].r := (d1[1].r - '1'::double precision))[1].i := (d1[1].i + '1'::double precision))::dcomptypea), ctid, gp_segment_id, dcomptable.*, (DMLAction)
429-
-> Split
429+
-> Split Update
430430
Output: (((d1[1].r := (d1[1].r - '1'::double precision))[1].i := (d1[1].i + '1'::double precision))::dcomptypea), ctid, gp_segment_id, dcomptable.*, DMLAction
431431
-> Seq Scan on public.dcomptable
432432
Output: (d1[1].r := (d1[1].r - '1'::double precision))[1].i := (d1[1].i + '1'::double precision), ctid, gp_segment_id, dcomptable.*

contrib/pax_storage/src/test/regress/expected/explain.out

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -596,13 +596,6 @@ select jsonb_pretty(
596596
"Sort Key": [ +
597597
"tenk1.tenthous" +
598598
], +
599-
"work_mem": { +
600-
"Used": 0, +
601-
"Segments": 0, +
602-
"Max Memory": 0, +
603-
"Workfile Spilling": 0, +
604-
"Max Memory Segment": 0 +
605-
}, +
606599
"Gang Type": "primary reader", +
607600
"Node Type": "Sort", +
608601
"Plan Rows": 0, +
@@ -716,8 +709,7 @@ select jsonb_pretty(
716709
"Workers": 0, +
717710
"Subworkers": 0, +
718711
"Maximum Memory Used": 0 +
719-
}, +
720-
"Work Maximum Memory": 0 +
712+
} +
721713
} +
722714
], +
723715
"Statement statistics": { +

contrib/pax_storage/src/test/regress/expected/json.out

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,8 +2087,7 @@ SELECT json_build_object('a', 'b', 'c'); -- error
20872087
ERROR: argument list must have even number of elements
20882088
HINT: The arguments of json_build_object() must consist of alternating keys and values.
20892089
SELECT json_build_object(NULL, 'a'); -- error, key cannot be NULL
2090-
ERROR: argument 1 cannot be null
2091-
HINT: Object keys should be text.
2090+
ERROR: null value not allowed for object key
20922091
SELECT json_build_object('a', NULL); -- ok
20932092
json_build_object
20942093
-------------------
@@ -2117,8 +2116,7 @@ SELECT json_build_object(VARIADIC ARRAY['a', NULL]::text[]); -- ok
21172116
(1 row)
21182117

21192118
SELECT json_build_object(VARIADIC ARRAY[NULL, 'a']::text[]); -- error, key cannot be NULL
2120-
ERROR: argument 1 cannot be null
2121-
HINT: Object keys should be text.
2119+
ERROR: null value not allowed for object key
21222120
SELECT json_build_object(VARIADIC '{1,2,3,4}'::text[]); -- ok
21232121
json_build_object
21242122
------------------------
@@ -2159,8 +2157,7 @@ SELECT json_build_object(1,2);
21592157

21602158
-- keys must be scalar and not null
21612159
SELECT json_build_object(null,2);
2162-
ERROR: argument 1 cannot be null
2163-
HINT: Object keys should be text.
2160+
ERROR: null value not allowed for object key
21642161
SELECT json_build_object(r,2) FROM (SELECT 1 AS a, 2 AS b) r;
21652162
ERROR: key value must be scalar, not array, composite, or json
21662163
SELECT json_build_object(json '{"a":1,"b":2}', 3);
@@ -2186,7 +2183,7 @@ SELECT json_object_agg(name, type order by type, name) FROM foo;
21862183

21872184
INSERT INTO foo VALUES (999999, NULL, 'bar');
21882185
SELECT json_object_agg(name, type) FROM foo;
2189-
ERROR: field name must not be null
2186+
ERROR: null value not allowed for object key
21902187
-- json_object
21912188
-- empty object, one dimension
21922189
SELECT json_object('{}');

contrib/pax_storage/src/test/regress/expected/limit.out

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -627,10 +627,10 @@ CREATE VIEW limit_thousand_v_1 AS SELECT thousand FROM onek WHERE thousand < 995
627627
----------+---------+-----------+----------+---------+---------+-------------
628628
thousand | integer | | | | plain |
629629
View definition:
630-
SELECT onek.thousand
630+
SELECT thousand
631631
FROM onek
632-
WHERE onek.thousand < 995
633-
ORDER BY onek.thousand
632+
WHERE thousand < 995
633+
ORDER BY thousand
634634
OFFSET 10
635635
FETCH FIRST 5 ROWS WITH TIES;
636636

@@ -642,10 +642,10 @@ CREATE VIEW limit_thousand_v_2 AS SELECT thousand FROM onek WHERE thousand < 995
642642
----------+---------+-----------+----------+---------+---------+-------------
643643
thousand | integer | | | | plain |
644644
View definition:
645-
SELECT onek.thousand
645+
SELECT thousand
646646
FROM onek
647-
WHERE onek.thousand < 995
648-
ORDER BY onek.thousand
647+
WHERE thousand < 995
648+
ORDER BY thousand
649649
OFFSET 10
650650
LIMIT 5;
651651

@@ -660,10 +660,10 @@ CREATE VIEW limit_thousand_v_3 AS SELECT thousand FROM onek WHERE thousand < 995
660660
----------+---------+-----------+----------+---------+---------+-------------
661661
thousand | integer | | | | plain |
662662
View definition:
663-
SELECT onek.thousand
663+
SELECT thousand
664664
FROM onek
665-
WHERE onek.thousand < 995
666-
ORDER BY onek.thousand
665+
WHERE thousand < 995
666+
ORDER BY thousand
667667
FETCH FIRST (NULL::integer + 1) ROWS WITH TIES;
668668

669669
CREATE VIEW limit_thousand_v_4 AS SELECT thousand FROM onek WHERE thousand < 995
@@ -674,10 +674,10 @@ CREATE VIEW limit_thousand_v_4 AS SELECT thousand FROM onek WHERE thousand < 995
674674
----------+---------+-----------+----------+---------+---------+-------------
675675
thousand | integer | | | | plain |
676676
View definition:
677-
SELECT onek.thousand
677+
SELECT thousand
678678
FROM onek
679-
WHERE onek.thousand < 995
680-
ORDER BY onek.thousand
679+
WHERE thousand < 995
680+
ORDER BY thousand
681681
LIMIT ALL;
682682

683683
-- leave these views

contrib/pax_storage/src/test/regress/expected/oidjoins.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ NOTICE: checking pg_transform {trftosql} => pg_proc {oid}
275275
NOTICE: checking pg_sequence {seqrelid} => pg_class {oid}
276276
NOTICE: checking pg_sequence {seqtypid} => pg_type {oid}
277277
NOTICE: checking pg_publication {pubowner} => pg_authid {oid}
278+
NOTICE: checking pg_publication_namespace {pnpubid} => pg_publication {oid}
279+
NOTICE: checking pg_publication_namespace {pnnspid} => pg_namespace {oid}
278280
NOTICE: checking pg_publication_rel {prpubid} => pg_publication {oid}
279281
NOTICE: checking pg_publication_rel {prrelid} => pg_class {oid}
280282
NOTICE: checking pg_subscription {subdbid} => pg_database {oid}

contrib/pax_storage/src/test/regress/expected/partition_aggregate.out

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ SELECT c, sum(a) FROM pagg_tab WHERE c = 'x' GROUP BY c;
192192
QUERY PLAN
193193
--------------------------------
194194
GroupAggregate
195-
Group Key: c
196195
-> Result
197196
One-Time Filter: false
198197
(4 rows)
@@ -436,21 +435,21 @@ SELECT c, sum(b order by a) FROM pagg_tab GROUP BY c ORDER BY 1, 2;
436435
-> GroupAggregate
437436
Group Key: pagg_tab.c
438437
-> Sort
439-
Sort Key: pagg_tab.c
438+
Sort Key: pagg_tab.c, pagg_tab.a
440439
-> Redistribute Motion 3:3 (slice2; segments: 3)
441440
Hash Key: pagg_tab.c
442441
-> Seq Scan on pagg_tab_p1 pagg_tab
443442
-> GroupAggregate
444443
Group Key: pagg_tab_1.c
445444
-> Sort
446-
Sort Key: pagg_tab_1.c
445+
Sort Key: pagg_tab_1.c, pagg_tab_1.a
447446
-> Redistribute Motion 3:3 (slice3; segments: 3)
448447
Hash Key: pagg_tab_1.c
449448
-> Seq Scan on pagg_tab_p2 pagg_tab_1
450449
-> GroupAggregate
451450
Group Key: pagg_tab_2.c
452451
-> Sort
453-
Sort Key: pagg_tab_2.c
452+
Sort Key: pagg_tab_2.c, pagg_tab_2.a
454453
-> Redistribute Motion 3:3 (slice4; segments: 3)
455454
Hash Key: pagg_tab_2.c
456455
-> Seq Scan on pagg_tab_p3 pagg_tab_2
@@ -962,10 +961,10 @@ SELECT a.x, b.y, count(*) FROM (SELECT * FROM pagg_tab1 WHERE x < 20) a FULL JOI
962961
-- Empty join relation because of empty outer side, no partitionwise agg plan
963962
EXPLAIN (COSTS OFF)
964963
SELECT a.x, a.y, count(*) FROM (SELECT * FROM pagg_tab1 WHERE x = 1 AND x = 2) a LEFT JOIN pagg_tab2 b ON a.x = b.y GROUP BY a.x, a.y ORDER BY 1, 2;
965-
QUERY PLAN
966-
---------------------------------------
964+
QUERY PLAN
965+
--------------------------------------
967966
GroupAggregate
968-
Group Key: pagg_tab1.x, pagg_tab1.y
967+
Group Key: pagg_tab1.y
969968
-> Sort
970969
Sort Key: pagg_tab1.y
971970
-> Result
@@ -1127,21 +1126,21 @@ SELECT a, sum(b), array_agg(distinct c), count(*) FROM pagg_tab_ml GROUP BY a HA
11271126
Group Key: pagg_tab_ml.a
11281127
Filter: (avg(pagg_tab_ml.b) < '3'::numeric)
11291128
-> Sort
1130-
Sort Key: pagg_tab_ml.a
1129+
Sort Key: pagg_tab_ml.a, pagg_tab_ml.c
11311130
-> Seq Scan on pagg_tab_ml_p1 pagg_tab_ml
11321131
-> GroupAggregate
11331132
Group Key: pagg_tab_ml_2.a
11341133
Filter: (avg(pagg_tab_ml_2.b) < '3'::numeric)
11351134
-> Sort
1136-
Sort Key: pagg_tab_ml_2.a
1135+
Sort Key: pagg_tab_ml_2.a, pagg_tab_ml_2.c
11371136
-> Append
11381137
-> Seq Scan on pagg_tab_ml_p2_s1 pagg_tab_ml_2
11391138
-> Seq Scan on pagg_tab_ml_p2_s2 pagg_tab_ml_3
11401139
-> GroupAggregate
11411140
Group Key: pagg_tab_ml_5.a
11421141
Filter: (avg(pagg_tab_ml_5.b) < '3'::numeric)
11431142
-> Sort
1144-
Sort Key: pagg_tab_ml_5.a
1143+
Sort Key: pagg_tab_ml_5.a, pagg_tab_ml_5.c
11451144
-> Append
11461145
-> Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_5
11471146
-> Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_6
@@ -1173,21 +1172,21 @@ SELECT a, sum(b), array_agg(distinct c), count(*) FROM pagg_tab_ml GROUP BY a HA
11731172
Group Key: pagg_tab_ml.a
11741173
Filter: (avg(pagg_tab_ml.b) < '3'::numeric)
11751174
-> Sort
1176-
Sort Key: pagg_tab_ml.a
1175+
Sort Key: pagg_tab_ml.a, pagg_tab_ml.c
11771176
-> Seq Scan on pagg_tab_ml_p1 pagg_tab_ml
11781177
-> GroupAggregate
11791178
Group Key: pagg_tab_ml_2.a
11801179
Filter: (avg(pagg_tab_ml_2.b) < '3'::numeric)
11811180
-> Sort
1182-
Sort Key: pagg_tab_ml_2.a
1181+
Sort Key: pagg_tab_ml_2.a, pagg_tab_ml_2.c
11831182
-> Append
11841183
-> Seq Scan on pagg_tab_ml_p2_s1 pagg_tab_ml_2
11851184
-> Seq Scan on pagg_tab_ml_p2_s2 pagg_tab_ml_3
11861185
-> GroupAggregate
11871186
Group Key: pagg_tab_ml_5.a
11881187
Filter: (avg(pagg_tab_ml_5.b) < '3'::numeric)
11891188
-> Sort
1190-
Sort Key: pagg_tab_ml_5.a
1189+
Sort Key: pagg_tab_ml_5.a, pagg_tab_ml_5.c
11911190
-> Append
11921191
-> Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_5
11931192
-> Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_6

0 commit comments

Comments
 (0)