Remove duplicated test.

The case in 'bfv_index' is identical to the one in 'bfv_joins', except
that the case in 'bfv_index' contained a few more queries. Remove the
redundant case from 'bfv_joins'.

src/test/regress/expected/bfv_index.out

@@ -57,6 +57,7 @@ NOTICE:  table "bfv_tab2_dimdate" does not exist, skipping
 DROP TABLE IF EXISTS bfv_tab2_dimtabl1;
 NOTICE:  table "bfv_tab2_dimtabl1" does not exist, skipping
 --end_ignore
+-- Bug-fix verification for MPP-25537: PANIC when bitmap index used in ORCA select
 CREATE TABLE bfv_tab2_facttable1 (
 col1 integer,
 wk_id smallint,

src/test/regress/expected/bfv_index_optimizer.out

@@ -60,6 +60,7 @@ NOTICE:  table "bfv_tab2_dimdate" does not exist, skipping
 DROP TABLE IF EXISTS bfv_tab2_dimtabl1;
 NOTICE:  table "bfv_tab2_dimtabl1" does not exist, skipping
 --end_ignore
+-- Bug-fix verification for MPP-25537: PANIC when bitmap index used in ORCA select
 CREATE TABLE bfv_tab2_facttable1 (
 col1 integer,
 wk_id smallint,

src/test/regress/expected/bfv_joins.out

@@ -2940,88 +2940,6 @@ select * from x_part join x_non_part on (my_equality(a,e));
   4 | 12 | 4 | 1 | 10 | 10
 (90 rows)
 
--- Bug-fix verification for MPP-25537: PANIC when bitmap index used in ORCA select
-CREATE TABLE mpp25537_facttable1 (
-  col1 integer,
-  wk_id smallint,
-  id integer
-)
-with (appendonly=true, orientation=column, compresstype=zlib, compresslevel=5)
-partition by range (wk_id) (
-  start (1::smallint) END (20::smallint) inclusive every (1),
-  default partition dflt
-);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'col1' as the Greenplum Database 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.
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_dflt" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_2" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_3" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_4" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_5" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_6" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_7" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_8" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_9" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_10" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_11" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_12" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_13" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_14" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_15" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_16" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_17" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_18" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_19" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_20" for table "mpp25537_facttable1"
-insert into mpp25537_facttable1 select col1, col1, col1 from (select generate_series(1,20) col1) a;
-CREATE TABLE mpp25537_dimdate (
-  wk_id smallint,
-  col2 date
-);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'wk_id' as the Greenplum Database 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 mpp25537_dimdate select col1, current_date - col1 from (select generate_series(1,20,2) col1) a;
-CREATE TABLE mpp25537_dimtabl1 (
-  id integer,
-  col2 integer
-);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Greenplum Database 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 mpp25537_dimtabl1 select col1, col1 from (select generate_series(1,20,3) col1) a;
-CREATE INDEX idx_mpp25537_facttable1 on mpp25537_facttable1 (id);
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_dflt"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_2"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_3"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_4"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_5"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_6"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_7"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_8"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_9"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_10"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_11"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_12"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_13"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_14"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_15"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_16"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_17"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_18"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_19"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_20"
-set optimizer_analyze_root_partition to on;
-ANALYZE mpp25537_facttable1;
-ANALYZE mpp25537_dimdate;
-ANALYZE mpp25537_dimtabl1;
-SELECT count(*)
-FROM mpp25537_facttable1 ft, mpp25537_dimdate dt, mpp25537_dimtabl1 dt1
-WHERE ft.wk_id = dt.wk_id
-AND ft.id = dt1.id;
- count 
--------
-     4
-(1 row)
-
 --
 -- This threw an error at one point:
 -- ERROR: FULL JOIN is only supported with merge-joinable join conditions

src/test/regress/expected/bfv_joins_optimizer.out

@@ -2938,88 +2938,6 @@ select * from x_part join x_non_part on (my_equality(a,e));
  10 | 30 | 4 | 1 | 10 | 10
 (90 rows)
 
--- Bug-fix verification for MPP-25537: PANIC when bitmap index used in ORCA select
-CREATE TABLE mpp25537_facttable1 (
-  col1 integer,
-  wk_id smallint,
-  id integer
-)
-with (appendonly=true, orientation=column, compresstype=zlib, compresslevel=5)
-partition by range (wk_id) (
-  start (1::smallint) END (20::smallint) inclusive every (1),
-  default partition dflt
-);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'col1' as the Greenplum Database 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.
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_dflt" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_2" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_3" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_4" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_5" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_6" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_7" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_8" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_9" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_10" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_11" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_12" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_13" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_14" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_15" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_16" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_17" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_18" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_19" for table "mpp25537_facttable1"
-NOTICE:  CREATE TABLE will create partition "mpp25537_facttable1_1_prt_20" for table "mpp25537_facttable1"
-insert into mpp25537_facttable1 select col1, col1, col1 from (select generate_series(1,20) col1) a;
-CREATE TABLE mpp25537_dimdate (
-  wk_id smallint,
-  col2 date
-);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'wk_id' as the Greenplum Database 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 mpp25537_dimdate select col1, current_date - col1 from (select generate_series(1,20,2) col1) a;
-CREATE TABLE mpp25537_dimtabl1 (
-  id integer,
-  col2 integer
-);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Greenplum Database 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 mpp25537_dimtabl1 select col1, col1 from (select generate_series(1,20,3) col1) a;
-CREATE INDEX idx_mpp25537_facttable1 on mpp25537_facttable1 (id);
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_dflt"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_2"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_3"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_4"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_5"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_6"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_7"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_8"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_9"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_10"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_11"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_12"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_13"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_14"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_15"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_16"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_17"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_18"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_19"
-NOTICE:  building index for child partition "mpp25537_facttable1_1_prt_20"
-set optimizer_analyze_root_partition to on;
-ANALYZE mpp25537_facttable1;
-ANALYZE mpp25537_dimdate;
-ANALYZE mpp25537_dimtabl1;
-SELECT count(*)
-FROM mpp25537_facttable1 ft, mpp25537_dimdate dt, mpp25537_dimtabl1 dt1
-WHERE ft.wk_id = dt.wk_id
-AND ft.id = dt1.id;
- count 
--------
-     4
-(1 row)
-
 --
 -- This threw an error at one point:
 -- ERROR: FULL JOIN is only supported with merge-joinable join conditions

src/test/regress/sql/bfv_index.sql

@@ -38,6 +38,7 @@ DROP TABLE IF EXISTS bfv_tab2_dimdate;
 DROP TABLE IF EXISTS bfv_tab2_dimtabl1;
 --end_ignore
 
+-- Bug-fix verification for MPP-25537: PANIC when bitmap index used in ORCA select
 CREATE TABLE bfv_tab2_facttable1 (
 col1 integer,
 wk_id smallint,

src/test/regress/sql/bfv_joins.sql

@@ -114,49 +114,6 @@ select * from x_part left join x_non_part on (a > e);
 select * from x_part right join x_non_part on (a > e);
 select * from x_part join x_non_part on (my_equality(a,e));
 
-
--- Bug-fix verification for MPP-25537: PANIC when bitmap index used in ORCA select
-CREATE TABLE mpp25537_facttable1 (
-  col1 integer,
-  wk_id smallint,
-  id integer
-)
-with (appendonly=true, orientation=column, compresstype=zlib, compresslevel=5)
-partition by range (wk_id) (
-  start (1::smallint) END (20::smallint) inclusive every (1),
-  default partition dflt
-);
-
-insert into mpp25537_facttable1 select col1, col1, col1 from (select generate_series(1,20) col1) a;
-
-CREATE TABLE mpp25537_dimdate (
-  wk_id smallint,
-  col2 date
-);
-
-insert into mpp25537_dimdate select col1, current_date - col1 from (select generate_series(1,20,2) col1) a;
-
-CREATE TABLE mpp25537_dimtabl1 (
-  id integer,
-  col2 integer
-);
-
-insert into mpp25537_dimtabl1 select col1, col1 from (select generate_series(1,20,3) col1) a;
-
-CREATE INDEX idx_mpp25537_facttable1 on mpp25537_facttable1 (id);
-
-set optimizer_analyze_root_partition to on;
-
-ANALYZE mpp25537_facttable1;
-ANALYZE mpp25537_dimdate;
-ANALYZE mpp25537_dimtabl1;
-
-SELECT count(*)
-FROM mpp25537_facttable1 ft, mpp25537_dimdate dt, mpp25537_dimtabl1 dt1
-WHERE ft.wk_id = dt.wk_id
-AND ft.id = dt1.id;
-
-
 --
 -- This threw an error at one point:
 -- ERROR: FULL JOIN is only supported with merge-joinable join conditions