From 5cfec0f2efb7f90e51901df93e19d814b48f7ea5 Mon Sep 17 00:00:00 2001 From: Venkatesh Raghavan Date: Wed, 15 Feb 2017 12:23:18 -0800 Subject: [PATCH] Remove duplicated DPE tests Issue: #1759 --- src/test/regress/expected/dpe.out | 2 +- src/test/regress/expected/dpe_optimizer.out | 2 +- src/test/regress/expected/qp_dpe.out | 50 +------------------ .../regress/expected/qp_dpe_optimizer.out | 50 +------------------ src/test/regress/sql/dpe.sql | 2 +- src/test/regress/sql/qp_dpe.sql | 32 +----------- 6 files changed, 6 insertions(+), 132 deletions(-) diff --git a/src/test/regress/expected/dpe.out b/src/test/regress/expected/dpe.out index f1bd09d190..7fff65f19f 100644 --- a/src/test/regress/expected/dpe.out +++ b/src/test/regress/expected/dpe.out @@ -2287,7 +2287,7 @@ select * from dim inner join malp on (dim.i = malp.i and dim.j = malp.j); -- onl (3 rows) -- --- bugs +-- DPE: assertion failed with window function -- drop schema if exists dpe_bugs cascade; NOTICE: schema "dpe_bugs" does not exist, skipping diff --git a/src/test/regress/expected/dpe_optimizer.out b/src/test/regress/expected/dpe_optimizer.out index f8f7e31fdb..21573d8c60 100644 --- a/src/test/regress/expected/dpe_optimizer.out +++ b/src/test/regress/expected/dpe_optimizer.out @@ -1703,7 +1703,7 @@ select * from dim inner join malp on (dim.i = malp.i and dim.j = malp.j); -- onl (3 rows) -- --- bugs +-- DPE: assertion failed with window function -- drop schema if exists dpe_bugs cascade; NOTICE: schema "dpe_bugs" does not exist, skipping diff --git a/src/test/regress/expected/qp_dpe.out b/src/test/regress/expected/qp_dpe.out index c6d8906b7f..ebfc16a760 100644 --- a/src/test/regress/expected/qp_dpe.out +++ b/src/test/regress/expected/qp_dpe.out @@ -299,52 +299,4 @@ select count(*) from foo1,foo2 where foo1.j =foo2.j and foo2.i <= ALL(select 1 U 20 (1 row) -RESET ALL; --- ---------------------------------------------------------------------- --- Test: DPE: assertion failed with window function --- ---------------------------------------------------------------------- --- start_ignore -drop table if exists pat; -NOTICE: table "pat" does not exist, skipping -drop table if exists jpat; -NOTICE: table "jpat" does not exist, skipping -create table pat(a int, b date) partition by range (b) (start ('2010-01-01') end ('2010-01-05') every (1), default partition other); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' 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 "pat_1_prt_other" for table "pat" -NOTICE: CREATE TABLE will create partition "pat_1_prt_2" for table "pat" -NOTICE: CREATE TABLE will create partition "pat_1_prt_3" for table "pat" -NOTICE: CREATE TABLE will create partition "pat_1_prt_4" for table "pat" -NOTICE: CREATE TABLE will create partition "pat_1_prt_5" for table "pat" -insert into pat select i,date '2010-01-01' + i from generate_series(1, 10)i; -create table jpat(a int, b date); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' 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 jpat values(1, '2010-01-02'); --- end_ignore -select count_operator('explain select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b);', 'Append') > 0; - ?column? ----------- - t -(1 row) - -select count_operator('explain select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b);', 'Dynamic Table Scan') > 0; - ?column? ----------- - f -(1 row) - -select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b); - b | count | a | a -------------+-------+---+--- - 01-02-2010 | 1 | 1 | 1 -(1 row) - -RESET ALL; --- ---------------------------------------------------------------------- --- Test: teardown.sql --- ---------------------------------------------------------------------- --- start_ignore -drop schema qp_dpe cascade; --- end_ignore -RESET ALL; +RESET ALL; \ No newline at end of file diff --git a/src/test/regress/expected/qp_dpe_optimizer.out b/src/test/regress/expected/qp_dpe_optimizer.out index 9e80e14b01..be833aa6a2 100644 --- a/src/test/regress/expected/qp_dpe_optimizer.out +++ b/src/test/regress/expected/qp_dpe_optimizer.out @@ -299,52 +299,4 @@ select count(*) from foo1,foo2 where foo1.j =foo2.j and foo2.i <= ALL(select 1 U 20 (1 row) -RESET ALL; --- ---------------------------------------------------------------------- --- Test: DPE: assertion failed with window function --- ---------------------------------------------------------------------- --- start_ignore -drop table if exists pat; -NOTICE: table "pat" does not exist, skipping -drop table if exists jpat; -NOTICE: table "jpat" does not exist, skipping -create table pat(a int, b date) partition by range (b) (start ('2010-01-01') end ('2010-01-05') every (1), default partition other); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' 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 "pat_1_prt_other" for table "pat" -NOTICE: CREATE TABLE will create partition "pat_1_prt_2" for table "pat" -NOTICE: CREATE TABLE will create partition "pat_1_prt_3" for table "pat" -NOTICE: CREATE TABLE will create partition "pat_1_prt_4" for table "pat" -NOTICE: CREATE TABLE will create partition "pat_1_prt_5" for table "pat" -insert into pat select i,date '2010-01-01' + i from generate_series(1, 10)i; -create table jpat(a int, b date); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' 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 jpat values(1, '2010-01-02'); --- end_ignore -select count_operator('explain select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b);', 'Append') > 0; - ?column? ----------- - f -(1 row) - -select count_operator('explain select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b);', 'Dynamic Table Scan') > 0; - ?column? ----------- - t -(1 row) - -select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b); - b | count | a | a -------------+-------+---+--- - 01-02-2010 | 1 | 1 | 1 -(1 row) - -RESET ALL; --- ---------------------------------------------------------------------- --- Test: teardown.sql --- ---------------------------------------------------------------------- --- start_ignore -drop schema qp_dpe cascade; --- end_ignore -RESET ALL; +RESET ALL; \ No newline at end of file diff --git a/src/test/regress/sql/dpe.sql b/src/test/regress/sql/dpe.sql index 85e845cc8c..5d39c11a5d 100644 --- a/src/test/regress/sql/dpe.sql +++ b/src/test/regress/sql/dpe.sql @@ -342,7 +342,7 @@ set gp_dynamic_partition_pruning = on; select * from dim inner join malp on (dim.i = malp.i and dim.j = malp.j); -- only one partition should be chosen -- --- bugs +-- DPE: assertion failed with window function -- drop schema if exists dpe_bugs cascade; diff --git a/src/test/regress/sql/qp_dpe.sql b/src/test/regress/sql/qp_dpe.sql index ab6c4b15d9..ac8d38a3bf 100644 --- a/src/test/regress/sql/qp_dpe.sql +++ b/src/test/regress/sql/qp_dpe.sql @@ -195,34 +195,4 @@ select count_operator('explain select count(*) from foo1,foo2 where foo1.j =foo2 select count_operator('explain select count(*) from foo1,foo2 where foo1.j =foo2.j and foo2.i <= ALL(select 1 UNION select 2);', 'Dynamic Table Scan') > 0; select count(*) from foo1,foo2 where foo1.j =foo2.j and foo2.i <= ALL(select 1 UNION select 2); -RESET ALL; - --- ---------------------------------------------------------------------- --- Test: DPE: assertion failed with window function --- ---------------------------------------------------------------------- - --- start_ignore -drop table if exists pat; -drop table if exists jpat; - -create table pat(a int, b date) partition by range (b) (start ('2010-01-01') end ('2010-01-05') every (1), default partition other); -insert into pat select i,date '2010-01-01' + i from generate_series(1, 10)i; -create table jpat(a int, b date); -insert into jpat values(1, '2010-01-02'); - --- end_ignore - -select count_operator('explain select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b);', 'Append') > 0; -select count_operator('explain select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b);', 'Dynamic Table Scan') > 0; - -select * from (select count(*) over (order by a rows between 1 preceding and 1 following), a, b from jpat)jpat inner join pat using(b); -RESET ALL; - --- ---------------------------------------------------------------------- --- Test: teardown.sql --- ---------------------------------------------------------------------- - --- start_ignore -drop schema qp_dpe cascade; --- end_ignore -RESET ALL; +RESET ALL; \ No newline at end of file -- GitLab