Skip to content

Commit 2cf6d6a

Browse files
author
Timon Karnezos
committed
Specified explicit column names for result sets to make tests less brittle. Tested under 9.1/9.2, OS X and Centos 6.3.
1 parent 540f9ab commit 2cf6d6a

14 files changed

+56
-56
lines changed

‎regress/cumulative_union_comprehensive.ref

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ SELECT v1.recno,
8585
v1.union_compressed_multiset,
8686
(select hll_union_agg(compressed_multiset)
8787
from test_rhswkjtc
88-
where recno <= v1.recno)
88+
where recno <= v1.recno) as hll_union_agg
8989
FROM test_rhswkjtc v1
9090
WHERE v1.union_compressed_multiset !=
9191
(select hll_union_agg(compressed_multiset)
9292
from test_rhswkjtc
9393
where recno <= v1.recno);
94-
recno | union_compressed_multiset | ?column?
95-
-------+---------------------------+----------
94+
recno | union_compressed_multiset | hll_union_agg
95+
-------+---------------------------+---------------
9696
(0 rows)
9797

9898
-- Test aggregate accumulation with cardinality
@@ -101,14 +101,14 @@ SELECT v1.recno,
101101
ceil(v1.union_cardinality),
102102
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
103103
from test_rhswkjtc
104-
where recno <= v1.recno)
104+
where recno <= v1.recno) as ceiling
105105
FROM test_rhswkjtc v1
106106
WHERE ceil(v1.union_cardinality) !=
107107
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
108108
from test_rhswkjtc
109109
where recno <= v1.recno);
110-
recno | ceil | ?column?
111-
-------+------+----------
110+
recno | ceil | ceiling
111+
-------+------+---------
112112
(0 rows)
113113

114114
-- Window function which calls final functions more then once.

‎regress/cumulative_union_comprehensive.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ SELECT v1.recno,
6565
v1.union_compressed_multiset,
6666
(select hll_union_agg(compressed_multiset)
6767
from test_rhswkjtc
68-
where recno <= v1.recno)
68+
where recno <= v1.recno) as hll_union_agg
6969
FROM test_rhswkjtc v1
7070
WHERE v1.union_compressed_multiset !=
7171
(select hll_union_agg(compressed_multiset)
@@ -78,7 +78,7 @@ SELECT v1.recno,
7878
ceil(v1.union_cardinality),
7979
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
8080
from test_rhswkjtc
81-
where recno <= v1.recno)
81+
where recno <= v1.recno) as ceiling
8282
FROM test_rhswkjtc v1
8383
WHERE ceil(v1.union_cardinality) !=
8484
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))

‎regress/cumulative_union_explicit_explicit.ref

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ SELECT v1.recno,
8585
v1.union_compressed_multiset,
8686
(select hll_union_agg(compressed_multiset)
8787
from test_swlnhisq
88-
where recno <= v1.recno)
88+
where recno <= v1.recno) as hll_union_agg
8989
FROM test_swlnhisq v1
9090
WHERE v1.union_compressed_multiset !=
9191
(select hll_union_agg(compressed_multiset)
9292
from test_swlnhisq
9393
where recno <= v1.recno);
94-
recno | union_compressed_multiset | ?column?
95-
-------+---------------------------+----------
94+
recno | union_compressed_multiset | hll_union_agg
95+
-------+---------------------------+---------------
9696
(0 rows)
9797

9898
-- Test aggregate accumulation with cardinality
@@ -101,14 +101,14 @@ SELECT v1.recno,
101101
ceil(v1.union_cardinality),
102102
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
103103
from test_swlnhisq
104-
where recno <= v1.recno)
104+
where recno <= v1.recno) as ceiling
105105
FROM test_swlnhisq v1
106106
WHERE ceil(v1.union_cardinality) !=
107107
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
108108
from test_swlnhisq
109109
where recno <= v1.recno);
110-
recno | ceil | ?column?
111-
-------+------+----------
110+
recno | ceil | ceiling
111+
-------+------+---------
112112
(0 rows)
113113

114114
DROP TABLE test_swlnhisq;

‎regress/cumulative_union_explicit_explicit.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ SELECT v1.recno,
6565
v1.union_compressed_multiset,
6666
(select hll_union_agg(compressed_multiset)
6767
from test_swlnhisq
68-
where recno <= v1.recno)
68+
where recno <= v1.recno) as hll_union_agg
6969
FROM test_swlnhisq v1
7070
WHERE v1.union_compressed_multiset !=
7171
(select hll_union_agg(compressed_multiset)
@@ -78,7 +78,7 @@ SELECT v1.recno,
7878
ceil(v1.union_cardinality),
7979
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
8080
from test_swlnhisq
81-
where recno <= v1.recno)
81+
where recno <= v1.recno) as ceiling
8282
FROM test_swlnhisq v1
8383
WHERE ceil(v1.union_cardinality) !=
8484
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))

‎regress/cumulative_union_explicit_promotion.ref

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ SELECT v1.recno,
9494
v1.union_compressed_multiset,
9595
(select hll_union_agg(compressed_multiset)
9696
from test_wsdiietv
97-
where recno <= v1.recno)
97+
where recno <= v1.recno) as hll_union_agg
9898
FROM test_wsdiietv v1
9999
WHERE v1.union_compressed_multiset !=
100100
(select hll_union_agg(compressed_multiset)
101101
from test_wsdiietv
102102
where recno <= v1.recno);
103-
recno | union_compressed_multiset | ?column?
104-
-------+---------------------------+----------
103+
recno | union_compressed_multiset | hll_union_agg
104+
-------+---------------------------+---------------
105105
(0 rows)
106106

107107
-- Test aggregate accumulation with cardinality
@@ -110,14 +110,14 @@ SELECT v1.recno,
110110
ceil(v1.union_cardinality),
111111
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
112112
from test_wsdiietv
113-
where recno <= v1.recno)
113+
where recno <= v1.recno) as ceiling
114114
FROM test_wsdiietv v1
115115
WHERE ceil(v1.union_cardinality) !=
116116
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
117117
from test_wsdiietv
118118
where recno <= v1.recno);
119-
recno | ceil | ?column?
120-
-------+------+----------
119+
recno | ceil | ceiling
120+
-------+------+---------
121121
(0 rows)
122122

123123
DROP TABLE test_wsdiietv;

‎regress/cumulative_union_explicit_promotion.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ SELECT v1.recno,
7070
v1.union_compressed_multiset,
7171
(select hll_union_agg(compressed_multiset)
7272
from test_wsdiietv
73-
where recno <= v1.recno)
73+
where recno <= v1.recno) as hll_union_agg
7474
FROM test_wsdiietv v1
7575
WHERE v1.union_compressed_multiset !=
7676
(select hll_union_agg(compressed_multiset)
@@ -83,7 +83,7 @@ SELECT v1.recno,
8383
ceil(v1.union_cardinality),
8484
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
8585
from test_wsdiietv
86-
where recno <= v1.recno)
86+
where recno <= v1.recno) as ceiling
8787
FROM test_wsdiietv v1
8888
WHERE ceil(v1.union_cardinality) !=
8989
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))

‎regress/cumulative_union_probabilistic_probabilistic.ref

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ SELECT v1.recno,
8888
v1.union_compressed_multiset,
8989
(select hll_union_agg(compressed_multiset)
9090
from test_mpuahgwy
91-
where recno <= v1.recno)
91+
where recno <= v1.recno) as hll_union_agg
9292
FROM test_mpuahgwy v1
9393
WHERE v1.union_compressed_multiset !=
9494
(select hll_union_agg(compressed_multiset)
9595
from test_mpuahgwy
9696
where recno <= v1.recno);
97-
recno | union_compressed_multiset | ?column?
98-
-------+---------------------------+----------
97+
recno | union_compressed_multiset | hll_union_agg
98+
-------+---------------------------+---------------
9999
(0 rows)
100100

101101
-- Test aggregate accumulation with cardinality
@@ -104,14 +104,14 @@ SELECT v1.recno,
104104
ceil(v1.union_cardinality),
105105
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
106106
from test_mpuahgwy
107-
where recno <= v1.recno)
107+
where recno <= v1.recno) as ceiling
108108
FROM test_mpuahgwy v1
109109
WHERE ceil(v1.union_cardinality) !=
110110
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
111111
from test_mpuahgwy
112112
where recno <= v1.recno);
113-
recno | ceil | ?column?
114-
-------+------+----------
113+
recno | ceil | ceiling
114+
-------+------+---------
115115
(0 rows)
116116

117117
DROP TABLE test_mpuahgwy;

‎regress/cumulative_union_probabilistic_probabilistic.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ SELECT v1.recno,
6565
v1.union_compressed_multiset,
6666
(select hll_union_agg(compressed_multiset)
6767
from test_mpuahgwy
68-
where recno <= v1.recno)
68+
where recno <= v1.recno) as hll_union_agg
6969
FROM test_mpuahgwy v1
7070
WHERE v1.union_compressed_multiset !=
7171
(select hll_union_agg(compressed_multiset)
@@ -78,7 +78,7 @@ SELECT v1.recno,
7878
ceil(v1.union_cardinality),
7979
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
8080
from test_mpuahgwy
81-
where recno <= v1.recno)
81+
where recno <= v1.recno) as ceiling
8282
FROM test_mpuahgwy v1
8383
WHERE ceil(v1.union_cardinality) !=
8484
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))

‎regress/cumulative_union_sparse_full_representation.ref

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ SELECT v1.recno,
9494
v1.union_compressed_multiset,
9595
(select hll_union_agg(compressed_multiset)
9696
from test_tagumlbl
97-
where recno <= v1.recno)
97+
where recno <= v1.recno) as hll_union_agg
9898
FROM test_tagumlbl v1
9999
WHERE v1.union_compressed_multiset !=
100100
(select hll_union_agg(compressed_multiset)
101101
from test_tagumlbl
102102
where recno <= v1.recno);
103-
recno | union_compressed_multiset | ?column?
104-
-------+---------------------------+----------
103+
recno | union_compressed_multiset | hll_union_agg
104+
-------+---------------------------+---------------
105105
(0 rows)
106106

107107
-- Test aggregate accumulation with cardinality
@@ -110,14 +110,14 @@ SELECT v1.recno,
110110
ceil(v1.union_cardinality),
111111
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
112112
from test_tagumlbl
113-
where recno <= v1.recno)
113+
where recno <= v1.recno) as ceiling
114114
FROM test_tagumlbl v1
115115
WHERE ceil(v1.union_cardinality) !=
116116
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
117117
from test_tagumlbl
118118
where recno <= v1.recno);
119-
recno | ceil | ?column?
120-
-------+------+----------
119+
recno | ceil | ceiling
120+
-------+------+---------
121121
(0 rows)
122122

123123
DROP TABLE test_tagumlbl;

‎regress/cumulative_union_sparse_full_representation.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ SELECT v1.recno,
7070
v1.union_compressed_multiset,
7171
(select hll_union_agg(compressed_multiset)
7272
from test_tagumlbl
73-
where recno <= v1.recno)
73+
where recno <= v1.recno) as hll_union_agg
7474
FROM test_tagumlbl v1
7575
WHERE v1.union_compressed_multiset !=
7676
(select hll_union_agg(compressed_multiset)
@@ -83,7 +83,7 @@ SELECT v1.recno,
8383
ceil(v1.union_cardinality),
8484
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
8585
from test_tagumlbl
86-
where recno <= v1.recno)
86+
where recno <= v1.recno) as ceiling
8787
FROM test_tagumlbl v1
8888
WHERE ceil(v1.union_cardinality) !=
8989
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))

‎regress/cumulative_union_sparse_promotion.ref

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ SELECT v1.recno,
9494
v1.union_compressed_multiset,
9595
(select hll_union_agg(compressed_multiset)
9696
from test_bsnvqefe
97-
where recno <= v1.recno)
97+
where recno <= v1.recno) as hll_union_agg
9898
FROM test_bsnvqefe v1
9999
WHERE v1.union_compressed_multiset !=
100100
(select hll_union_agg(compressed_multiset)
101101
from test_bsnvqefe
102102
where recno <= v1.recno);
103-
recno | union_compressed_multiset | ?column?
104-
-------+---------------------------+----------
103+
recno | union_compressed_multiset | hll_union_agg
104+
-------+---------------------------+---------------
105105
(0 rows)
106106

107107
-- Test aggregate accumulation with cardinality
@@ -110,14 +110,14 @@ SELECT v1.recno,
110110
ceil(v1.union_cardinality),
111111
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
112112
from test_bsnvqefe
113-
where recno <= v1.recno)
113+
where recno <= v1.recno) as ceiling
114114
FROM test_bsnvqefe v1
115115
WHERE ceil(v1.union_cardinality) !=
116116
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
117117
from test_bsnvqefe
118118
where recno <= v1.recno);
119-
recno | ceil | ?column?
120-
-------+------+----------
119+
recno | ceil | ceiling
120+
-------+------+---------
121121
(0 rows)
122122

123123
DROP TABLE test_bsnvqefe;

‎regress/cumulative_union_sparse_promotion.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ SELECT v1.recno,
7070
v1.union_compressed_multiset,
7171
(select hll_union_agg(compressed_multiset)
7272
from test_bsnvqefe
73-
where recno <= v1.recno)
73+
where recno <= v1.recno) as hll_union_agg
7474
FROM test_bsnvqefe v1
7575
WHERE v1.union_compressed_multiset !=
7676
(select hll_union_agg(compressed_multiset)
@@ -83,7 +83,7 @@ SELECT v1.recno,
8383
ceil(v1.union_cardinality),
8484
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
8585
from test_bsnvqefe
86-
where recno <= v1.recno)
86+
where recno <= v1.recno) as ceiling
8787
FROM test_bsnvqefe v1
8888
WHERE ceil(v1.union_cardinality) !=
8989
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))

‎regress/cumulative_union_sparse_sparse.ref

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ SELECT v1.recno,
8585
v1.union_compressed_multiset,
8686
(select hll_union_agg(compressed_multiset)
8787
from test_bmbffonl
88-
where recno <= v1.recno)
88+
where recno <= v1.recno) as hll_union_agg
8989
FROM test_bmbffonl v1
9090
WHERE v1.union_compressed_multiset !=
9191
(select hll_union_agg(compressed_multiset)
9292
from test_bmbffonl
9393
where recno <= v1.recno);
94-
recno | union_compressed_multiset | ?column?
95-
-------+---------------------------+----------
94+
recno | union_compressed_multiset | hll_union_agg
95+
-------+---------------------------+---------------
9696
(0 rows)
9797

9898
-- Test aggregate accumulation with cardinality
@@ -101,14 +101,14 @@ SELECT v1.recno,
101101
ceil(v1.union_cardinality),
102102
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
103103
from test_bmbffonl
104-
where recno <= v1.recno)
104+
where recno <= v1.recno) as ceiling
105105
FROM test_bmbffonl v1
106106
WHERE ceil(v1.union_cardinality) !=
107107
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
108108
from test_bmbffonl
109109
where recno <= v1.recno);
110-
recno | ceil | ?column?
111-
-------+------+----------
110+
recno | ceil | ceiling
111+
-------+------+---------
112112
(0 rows)
113113

114114
DROP TABLE test_bmbffonl;

‎regress/cumulative_union_sparse_sparse.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ SELECT v1.recno,
6565
v1.union_compressed_multiset,
6666
(select hll_union_agg(compressed_multiset)
6767
from test_bmbffonl
68-
where recno <= v1.recno)
68+
where recno <= v1.recno) as hll_union_agg
6969
FROM test_bmbffonl v1
7070
WHERE v1.union_compressed_multiset !=
7171
(select hll_union_agg(compressed_multiset)
@@ -78,7 +78,7 @@ SELECT v1.recno,
7878
ceil(v1.union_cardinality),
7979
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))
8080
from test_bmbffonl
81-
where recno <= v1.recno)
81+
where recno <= v1.recno) as ceiling
8282
FROM test_bmbffonl v1
8383
WHERE ceil(v1.union_cardinality) !=
8484
(select ceiling(hll_cardinality(hll_union_agg(compressed_multiset)))

0 commit comments

Comments
 (0)