PAX: fix icw_test in github CI

Removed some useless file and change fix the pax icw_test in github CI

Also changed the `Cloudberry Database` to `Apache Cloudberry`

Author: jiaqizho

contrib/pax_storage/Makefile

@@ -4,7 +4,7 @@ MODULE_big = pax
 OBJS = \
 	$(WIN32RES) 
 PG_CPPFLAGS = -I/usr/local/include
-PG_CXXFLAGS = -std=c++14
+PG_CXXFLAGS = -std=c++17
 
 PGFILEDESC = "pax - PAX table access method"
 SHLIB_LINK += -luuid
@@ -94,6 +94,9 @@ regress_test:
 	make -C $(PAX_REGRESS_DIR) icw_test
 
 isolation2_test:
+	@echo "Begin running pax isolation2 tests"
+	make -C $(PAX_REGRESS_DIR) regress_link
+	@echo "Current PGOPTIONS=$(PGOPTIONS)"
 	make -C $(PAX_ISOLATION2_DIR) installcheck
 
 .PHONY: uninstall-data

contrib/pax_storage/expected/alter_distributed.out

@@ -1,29 +1,29 @@
 set default_table_access_method = pax;
 CREATE TABLE list_parted (a numeric, b int, c int8) PARTITION BY list (a);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 CREATE TABLE sub_parted PARTITION OF list_parted for VALUES in (1) PARTITION BY list (b);
 NOTICE:  table has parent, setting distribution columns to match parent table
 CREATE TABLE sub_part1(b int, c int8, a numeric);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 alter table sub_part1 set distributed by (a);
 ALTER TABLE sub_parted ATTACH PARTITION sub_part1 for VALUES in (1);
 CREATE TABLE sub_part2(b int, c int8, a numeric);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 alter table sub_part2 set distributed by (a);
 ALTER TABLE sub_parted ATTACH PARTITION sub_part2 for VALUES in (2);
 CREATE TABLE list_part1(a numeric, b int, c int8);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 ALTER TABLE list_parted ATTACH PARTITION list_part1 for VALUES in (2,3);
 INSERT into list_parted VALUES (2,5,50);
 INSERT into list_parted VALUES (3,6,60);
 INSERT into sub_parted VALUES (1,1,60);
 INSERT into sub_parted VALUES (1,2,10);
 CREATE TABLE non_parted (id int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 INSERT into non_parted VALUES (1), (1), (1), (2), (2), (2), (3), (3), (3);
 select gp_segment_id,seq from gp_dist_random('pg_ext_aux.pg_pax_fastsequence') where 
@@ -61,22 +61,22 @@ UPDATE list_parted t1 set a = 2 FROM non_parted t2 WHERE t1.a = t2.id and a = 1;
 drop table list_parted;
 drop table non_parted;
 CREATE TABLE list_parted (a numeric, b int, c int8) PARTITION BY list (a);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 CREATE TABLE sub_parted PARTITION OF list_parted for VALUES in (1) PARTITION BY list (b);
 NOTICE:  table has parent, setting distribution columns to match parent table
 CREATE TABLE sub_part1(b int, c int8, a numeric);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 alter table sub_part1 set distributed by (a);
 ALTER TABLE sub_parted ATTACH PARTITION sub_part1 for VALUES in (1);
 CREATE TABLE sub_part2(b int, c int8, a numeric);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 alter table sub_part2 set distributed by (a);
 ALTER TABLE sub_parted ATTACH PARTITION sub_part2 for VALUES in (2);
 CREATE TABLE list_part1(a numeric, b int, c int8);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 ALTER TABLE list_parted ATTACH PARTITION list_part1 for VALUES in (2,3);
 -- make fastseq bigger than 1
@@ -95,7 +95,7 @@ INSERT into list_parted VALUES (3,6,60);
 INSERT into sub_parted VALUES (1,1,60);
 INSERT into sub_parted VALUES (1,2,10);
 CREATE TABLE non_parted (id int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 INSERT into non_parted VALUES (1), (1), (1), (2), (2), (2), (3), (3), (3);
 select gp_segment_id,seq from gp_dist_random('pg_ext_aux.pg_pax_fastsequence') where 
@@ -133,22 +133,22 @@ UPDATE list_parted t1 set a = 2 FROM non_parted t2 WHERE t1.a = t2.id and a = 1;
 drop table list_parted;
 drop table non_parted;
 CREATE TABLE list_parted (a numeric, b int, c int8) PARTITION BY list (a);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 CREATE TABLE sub_parted PARTITION OF list_parted for VALUES in (1) PARTITION BY list (b);
 NOTICE:  table has parent, setting distribution columns to match parent table
 CREATE TABLE sub_part1(b int, c int8, a numeric);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 alter table sub_part1 set distributed by (a);
 ALTER TABLE sub_parted ATTACH PARTITION sub_part1 for VALUES in (1);
 CREATE TABLE sub_part2(b int, c int8, a numeric);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 alter table sub_part2 set distributed by (a);
 ALTER TABLE sub_parted ATTACH PARTITION sub_part2 for VALUES in (2);
 CREATE TABLE list_part1(a numeric, b int, c int8);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 ALTER TABLE list_parted ATTACH PARTITION list_part1 for VALUES in (2,3);
 INSERT into list_parted VALUES (2,5,50);

contrib/pax_storage/expected/cluster.out

@@ -114,7 +114,7 @@ select ptblockname,ptstatistics,ptisclustered from get_pax_aux_table('t_zorder_c
 drop table t_zorder_cluster;
 -- test cluster reloption without order
 create table t_zorder_cluster(c1 int, c2 int) with (minmax_columns='c1,c2', cluster_columns='c2,c1');
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into t_zorder_cluster select i,i from generate_series(1,100000) i;
 insert into t_zorder_cluster select i,i from generate_series(1,100000) i;

contrib/pax_storage/expected/ddl.out

@@ -27,7 +27,7 @@ create table pax_test.t2(
     created_at timestamp with time zone not null,
     updated_at timestamp with time zone not null
 );
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 \d+ pax_test.t2
                                                Table "pax_test.t2"

contrib/pax_storage/expected/detoast.out

@@ -1,6 +1,6 @@
 set default_table_access_method = pax;
 CREATE TABLE toasttest_external(f1 text);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 -- The storage `EXTERNAL` allows out-of-line storage but not compression.
 alter table toasttest_external alter column f1 set storage external;
@@ -19,7 +19,7 @@ SELECT reltoastrelid = 0 AS is_empty
 (1 row)
 
 create table toasttest_external_pax(f1 text) using pax;
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into toasttest_external_pax select * from toasttest_external;
 drop table toasttest_external;
@@ -36,7 +36,7 @@ select length(f1) from toasttest_external_pax;
 
 drop table toasttest_external_pax;
 CREATE TABLE toasttest_compress(f1 text);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 -- The storage `MAIN` allows compression but not out-of-line storage. 
 alter table toasttest_compress alter column f1 set storage main;
@@ -50,7 +50,7 @@ SELECT reltoastrelid = 0 AS is_empty FROM pg_class where relname = 'toasttest_co
 (1 row)
 
 create table toasttest_compress_pax(f1 text) using pax;
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into toasttest_compress_pax select * from toasttest_compress;
 drop table toasttest_compress;
@@ -62,7 +62,7 @@ select length(f1) from toasttest_compress_pax;
 
 drop table toasttest_compress_pax;
 CREATE TABLE toasttest_extended(f1 text);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 -- The storage `EXTENDED` allows both compression and out-of-line storage. 
 alter table toasttest_extended alter column f1 set storage EXTENDED;
@@ -77,7 +77,7 @@ SELECT reltoastrelid = 0 AS is_empty FROM pg_class where relname = 'toasttest_ex
 (1 row)
 
 create table toasttest_extended_pax(f1 text) using pax;
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into toasttest_extended_pax select * from toasttest_extended;
 drop table toasttest_extended;

contrib/pax_storage/expected/filter_tree.out

@@ -16,13 +16,13 @@ create  or replace function falserc(iint int)
  begin return false; end;
  $$ language plpgsql;
 create table t1(same int, v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 create table t2(same int, v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 create table t_allnull(v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 -- two file with minmax(1,400) and minmax(401,800)
 insert into t1 values(1, generate_series(1, 100), generate_series(101, 200), generate_series(201, 300), generate_series(301, 400));

contrib/pax_storage/expected/filter_tree_1.out

@@ -16,13 +16,13 @@ create  or replace function falserc(iint int)
  begin return false; end;
  $$ language plpgsql;
 create table t1(same int, v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 create table t2(same int, v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 create table t_allnull(v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 -- two file with minmax(1,400) and minmax(401,800)
 insert into t1 values(1, generate_series(1, 100), generate_series(101, 200), generate_series(201, 300), generate_series(301, 400));