Skip to content

Commit 8c71af0

Browse files
liushengsongoppenheimer01
authored andcommitted
Fix: fix pax test with orca when upgrade to PG16
1 parent d78aa86 commit 8c71af0

127 files changed

Lines changed: 39910 additions & 4515 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

contrib/pax_storage/expected/cbdb_parallel.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- CBDB PARALLEL
33
-- Test CBDB style parallel plan.
44
-- GUCs shoule be set with local, do not disturb other parallel plans.
5-
-- Should not use force_parallel_mode as it will ignore plan and check results only.
5+
-- Should not use debug_parallel_query as it will ignore plan and check results only.
66
-- We want to check plan in this file!
77
-- If there is need to do that, set it local inside a transaction.
88
-- Set optimizer off in this file, ORCA parallel is not supported.
@@ -31,7 +31,7 @@
3131
-- 12 CdbLocusType_HashedWorkers
3232
--
3333
--
34-
set force_parallel_mode = 0;
34+
set debug_parallel_query = 0;
3535
set optimizer = off;
3636
create schema test_parallel;
3737
set search_path to test_parallel;
@@ -327,7 +327,7 @@ set local enable_parallel = on;
327327
create index on t1(c2);
328328
insert into t1 select i, i from generate_series(1, 1000000) i;
329329
analyze t1;
330-
set local force_parallel_mode = 1;
330+
set local debug_parallel_query = 1;
331331
set local enable_seqscan = off;
332332
explain(locus, costs off) select c2 from t1;
333333
QUERY PLAN
@@ -2178,7 +2178,7 @@ abort;
21782178
begin;
21792179
set local optimizer=off;
21802180
set local enable_parallel=on;
2181-
set local force_parallel_mode =1 ;
2181+
set local debug_parallel_query =1 ;
21822182
set local min_parallel_table_scan_size = 0;
21832183
create table semi_t1 (c1 integer) with(parallel_workers=2) distributed randomly;
21842184
create table semi_t2 (c2 integer) with(parallel_workers=2) distributed randomly;
@@ -2434,5 +2434,5 @@ abort;
24342434
drop schema test_parallel cascade;
24352435
-- end_ignore
24362436
reset gp_appendonly_insert_files;
2437-
reset force_parallel_mode;
2437+
reset debug_parallel_query;
24382438
reset optimizer;

contrib/pax_storage/expected/types.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ CREATE TABLE pax_test.all_typbyval_pg_types (
2121
timestamptz_col timestamptz,
2222
pg_lsn_col pg_lsn
2323
) USING pax distributed by (id);
24-
insert into pax_test.all_typbyval_pg_types values(1, true,'c',2,'cid',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0'),
25-
(1, true,'c',2,'cid',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0'),
26-
(1, true,'c',2,'cid',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0');
24+
insert into pax_test.all_typbyval_pg_types values(1, true,'c',2,'0',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0'),
25+
(1, true,'c',2,'0',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0'),
26+
(1, true,'c',2,'0',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0');
2727
select * from pax_test.all_typbyval_pg_types;
2828
id | bool_col | char_col | int2_col | cid_col | float4_col | int4_col | date_col | oid_col | time_stamp_col | int8_col | float8_col | money_col | time_col | timestamptz_col | pg_lsn_col
2929
----+----------+----------+----------+---------+------------+----------+------------+---------+--------------------------+----------+------------+-----------+----------+------------------------------+------------

contrib/pax_storage/expected/update.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ UPDATE update_test t
179179
Update on public.update_test t
180180
-> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
181181
Output: ($1), ($2), t.c, ((SubPlan 1 (returns $1,$2))), t.ctid, t.gp_segment_id, t.*, (DMLAction)
182-
-> Split
182+
-> Split Update
183183
Output: ($1), ($2), t.c, ((SubPlan 1 (returns $1,$2))), t.ctid, t.gp_segment_id, t.*, DMLAction
184184
-> Seq Scan on public.update_test t
185185
Output: $1, $2, t.c, (SubPlan 1 (returns $1,$2)), t.ctid, t.gp_segment_id, t.*

contrib/pax_storage/sql/cbdb_parallel.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- CBDB PARALLEL
33
-- Test CBDB style parallel plan.
44
-- GUCs shoule be set with local, do not disturb other parallel plans.
5-
-- Should not use force_parallel_mode as it will ignore plan and check results only.
5+
-- Should not use debug_parallel_query as it will ignore plan and check results only.
66
-- We want to check plan in this file!
77
-- If there is need to do that, set it local inside a transaction.
88
-- Set optimizer off in this file, ORCA parallel is not supported.
@@ -31,7 +31,7 @@
3131
-- 12 CdbLocusType_HashedWorkers
3232
--
3333
--
34-
set force_parallel_mode = 0;
34+
set debug_parallel_query = 0;
3535
set optimizer = off;
3636

3737
create schema test_parallel;
@@ -134,7 +134,7 @@ set local enable_parallel = on;
134134
create index on t1(c2);
135135
insert into t1 select i, i from generate_series(1, 1000000) i;
136136
analyze t1;
137-
set local force_parallel_mode = 1;
137+
set local debug_parallel_query = 1;
138138
set local enable_seqscan = off;
139139
explain(locus, costs off) select c2 from t1;
140140
-- results check
@@ -691,7 +691,7 @@ abort;
691691
begin;
692692
set local optimizer=off;
693693
set local enable_parallel=on;
694-
set local force_parallel_mode =1 ;
694+
set local debug_parallel_query =1 ;
695695
set local min_parallel_table_scan_size = 0;
696696
create table semi_t1 (c1 integer) with(parallel_workers=2) distributed randomly;
697697
create table semi_t2 (c2 integer) with(parallel_workers=2) distributed randomly;
@@ -765,5 +765,5 @@ drop schema test_parallel cascade;
765765
-- end_ignore
766766

767767
reset gp_appendonly_insert_files;
768-
reset force_parallel_mode;
768+
reset debug_parallel_query;
769769
reset optimizer;

contrib/pax_storage/sql/types.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ CREATE TABLE pax_test.all_typbyval_pg_types (
2222
pg_lsn_col pg_lsn
2323
) USING pax distributed by (id);
2424

25-
insert into pax_test.all_typbyval_pg_types values(1, true,'c',2,'cid',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0'),
26-
(1, true,'c',2,'cid',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0'),
27-
(1, true,'c',2,'cid',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0');
25+
insert into pax_test.all_typbyval_pg_types values(1, true,'c',2,'0',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0'),
26+
(1, true,'c',2,'0',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0'),
27+
(1, true,'c',2,'0',4.2,5,'2023-05-17 17:56:49',7,'2023-05-17 17:56:49',10,11.1111,12,'2023-05-17 17:56:49','2023-05-17 17:56:49', '16/0');
2828
select * from pax_test.all_typbyval_pg_types;
2929

3030
create table pax_test.all_typlen_lt_0_pg_type (

contrib/pax_storage/src/test/isolation2/expected/modify_table_data_corrupt_optimizer.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ explain (costs off) update tab1 set b = b + 1;
189189
-> Result
190190
-> Redistribute Motion 3:3 (slice1; segments: 3)
191191
Hash Key: b
192-
-> Split
192+
-> Split Update
193193
-> Seq Scan on tab1
194194
Optimizer: GPORCA
195195
(9 rows)

contrib/pax_storage/src/test/isolation2/sql/setup_startup_memory_accounting.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
! gpconfig -c gp_vmem_limit_per_query -v '20MB' --skipvalidation
33
! gpconfig -c gp_vmem_protect_limit -v '60'
44
! gpconfig -c runaway_detector_activation_percent -v 0
5-
! gpstop -rai;
5+
! gpstop -raf;
66
-- end_ignore

0 commit comments

Comments
 (0)