Skip to content

Commit 1709fd5

Browse files
vitcppvitcpp
authored
Merge pull request #39 from cybertec-postgresql/pg16
Fix compatibility with PG16
2 parents 6cbd413 + ec4bd87 commit 1709fd5

12 files changed

+681
-7
lines changed

Diff for: ‎.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ env:
88
- PG_SUPPORTED_VERSIONS=13
99
- PG_SUPPORTED_VERSIONS=14
1010
- PG_SUPPORTED_VERSIONS=15
11+
- PG_SUPPORTED_VERSIONS=16
1112

1213
language: C
13-
dist: bionic
14+
dist: focal
1415

1516
before_install:
1617
# extra apt.pg.o.sh options added in version 204, travis currently has 199 (2019-11-27)

Diff for: ‎expected/moc100.out

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
\set ECHO none
2+
outputfile_for_majorversion
3+
-----------------------------
4+
10, 11, 12
5+
(1 row)
6+
7+
outputfile_for_arch_bits
8+
--------------------------
9+
64-bit
10+
(1 row)
11+
112
CREATE TABLE moc100 (
213
ivoid text,
314
coverage smoc,

Diff for: ‎expected/moc100_1.out

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
\set ECHO none
2+
outputfile_for_majorversion
3+
-----------------------------
4+
10, 11, 12
5+
(1 row)
6+
7+
outputfile_for_arch_bits
8+
--------------------------
9+
32-bit
10+
(1 row)
11+
112
CREATE TABLE moc100 (
213
ivoid text,
314
coverage smoc,

Diff for: ‎expected/moc100_2.out

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
\set ECHO none
2+
outputfile_for_majorversion
3+
-----------------------------
4+
13, 14, 15
5+
(1 row)
6+
7+
outputfile_for_arch_bits
8+
--------------------------
9+
64-bit
10+
(1 row)
11+
112
CREATE TABLE moc100 (
213
ivoid text,
314
coverage smoc,

Diff for: ‎expected/moc100_3.out

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
\set ECHO none
2+
outputfile_for_majorversion
3+
-----------------------------
4+
13, 14, 15
5+
(1 row)
6+
7+
outputfile_for_arch_bits
8+
--------------------------
9+
32-bit
10+
(1 row)
11+
112
CREATE TABLE moc100 (
213
ivoid text,
314
coverage smoc,

Diff for: ‎expected/moc100_4.out

+309
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,309 @@
1+
\set ECHO none
2+
outputfile_for_majorversion
3+
-----------------------------
4+
16+
5+
(1 row)
6+
7+
outputfile_for_arch_bits
8+
--------------------------
9+
64-bit
10+
(1 row)
11+
12+
CREATE TABLE moc100 (
13+
ivoid text,
14+
coverage smoc,
15+
ref_system_name text
16+
);
17+
COPY moc100 FROM STDIN;
18+
CREATE INDEX ON moc100 USING GIN (coverage);
19+
SELECT ivoid FROM moc100 WHERE coverage && '4/0' ORDER BY ivoid;
20+
ivoid
21+
------------------------------------------
22+
ivo://byu.arvo/dfbsspec/q/getssa
23+
ivo://cadc.nrc.ca/archive/cfht
24+
ivo://cadc.nrc.ca/archive/hst
25+
ivo://cds.vizier/b/assocdata
26+
ivo://cds.vizier/b/swift
27+
ivo://cds.vizier/i/241
28+
ivo://cds.vizier/iv/12
29+
ivo://cds.vizier/ix/13
30+
ivo://cds.vizier/j/a+a/316/147
31+
ivo://cds.vizier/j/a+as/105/311
32+
ivo://cds.vizier/j/a+as/122/235
33+
ivo://chivo/gaia/q/dr1
34+
ivo://chivo/openngc/q/data
35+
ivo://cxc.harvard.edu/csc
36+
ivo://irsa.ipac/2mass/catalog/psc
37+
ivo://irsa.ipac/2mass/catalog/xsc
38+
ivo://irsa.ipac/2mass/images/asky-ql
39+
ivo://irsa.ipac/cosmos/images
40+
ivo://irsa.ipac/iras/images/issa
41+
ivo://irsa.ipac/mast/scrapbook
42+
ivo://irsa.ipac/spitzer/images/swire
43+
ivo://mssl.ucl.ac.uk/xmmsuss_dsa/xmmsuss
44+
ivo://ned.ipac/sia
45+
ivo://ned.ipac/tap
46+
ivo://svo.cab/cat/gbs
47+
ivo://svo.cab/cat/uves
48+
ivo://svo.cab/cat/xshooter
49+
ivo://vopdc.iap/fss
50+
ivo://vopdc.obspm/imcce/m4ast
51+
ivo://vopdc.obspm/imcce/miriade
52+
ivo://vopdc.obspm/imcce/skybot
53+
ivo://vopdc.obspm/lesia/bestars/besc
54+
ivo://vopdc.obspm/lesia/bestars/bess
55+
ivo://vopdc.obspm/luth/exoplanet
56+
ivo://vopdc.obspm/luth/hess
57+
(35 rows)
58+
59+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
60+
SELECT * FROM moc100 WHERE coverage && '0/';
61+
QUERY PLAN
62+
----------------------------------------------------------------------------------------------------------
63+
Bitmap Heap Scan on moc100 (cost=0.00..4.01 rows=1 width=96) (actual rows=0 loops=1)
64+
Recheck Cond: (coverage && '0/'::smoc)
65+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..0.00 rows=1 width=0) (actual rows=0 loops=1)
66+
Index Cond: (coverage && '0/'::smoc)
67+
Planning:
68+
Buffers: shared hit=5
69+
(6 rows)
70+
71+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
72+
SELECT * FROM moc100 WHERE coverage && '4/0';
73+
QUERY PLAN
74+
--------------------------------------------------------------------------------
75+
Seq Scan on moc100 (cost=0.00..6.26 rows=1 width=96) (actual rows=35 loops=1)
76+
Filter: (coverage && '4/0'::smoc)
77+
Rows Removed by Filter: 66
78+
Buffers: shared hit=114
79+
Planning:
80+
Buffers: shared hit=1
81+
(6 rows)
82+
83+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
84+
SELECT * FROM moc100 WHERE coverage = '0/0-11';
85+
QUERY PLAN
86+
--------------------------------------------------------------------------------
87+
Seq Scan on moc100 (cost=0.00..6.26 rows=1 width=96) (actual rows=23 loops=1)
88+
Filter: (coverage = '0/0-11'::smoc)
89+
Rows Removed by Filter: 78
90+
Buffers: shared hit=59
91+
Planning:
92+
Buffers: shared hit=4
93+
(6 rows)
94+
95+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
96+
SELECT * FROM moc100 WHERE coverage = '6/43225,43227';
97+
QUERY PLAN
98+
-------------------------------------------------------------------------------
99+
Seq Scan on moc100 (cost=0.00..6.26 rows=1 width=96) (actual rows=1 loops=1)
100+
Filter: (coverage = '6/43225 43227'::smoc)
101+
Rows Removed by Filter: 100
102+
Buffers: shared hit=59
103+
Planning:
104+
Buffers: shared hit=1
105+
(6 rows)
106+
107+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
108+
SELECT * FROM moc100 WHERE coverage = '0/';
109+
QUERY PLAN
110+
-------------------------------------------------------------------------------
111+
Seq Scan on moc100 (cost=0.00..6.26 rows=1 width=96) (actual rows=1 loops=1)
112+
Filter: (coverage = '0/'::smoc)
113+
Rows Removed by Filter: 100
114+
Buffers: shared hit=59
115+
Planning:
116+
Buffers: shared hit=1
117+
(6 rows)
118+
119+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
120+
SELECT * FROM moc100 WHERE coverage <> '0/0-11';
121+
QUERY PLAN
122+
----------------------------------------------------------------------------------
123+
Seq Scan on moc100 (cost=0.00..6.26 rows=100 width=96) (actual rows=78 loops=1)
124+
Filter: (coverage <> '0/0-11'::smoc)
125+
Rows Removed by Filter: 23
126+
Buffers: shared hit=59
127+
Planning:
128+
Buffers: shared hit=4
129+
(6 rows)
130+
131+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
132+
SELECT * FROM moc100 WHERE coverage <> '6/43225,43227';
133+
QUERY PLAN
134+
-----------------------------------------------------------------------------------
135+
Seq Scan on moc100 (cost=0.00..6.26 rows=100 width=96) (actual rows=100 loops=1)
136+
Filter: (coverage <> '6/43225 43227'::smoc)
137+
Rows Removed by Filter: 1
138+
Buffers: shared hit=59
139+
Planning:
140+
Buffers: shared hit=1
141+
(6 rows)
142+
143+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
144+
SELECT * FROM moc100 WHERE coverage <> '0/';
145+
QUERY PLAN
146+
-----------------------------------------------------------------------------------
147+
Seq Scan on moc100 (cost=0.00..6.26 rows=100 width=96) (actual rows=100 loops=1)
148+
Filter: (coverage <> '0/'::smoc)
149+
Rows Removed by Filter: 1
150+
Buffers: shared hit=59
151+
Planning:
152+
Buffers: shared hit=1
153+
(6 rows)
154+
155+
SET enable_seqscan = off;
156+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
157+
SELECT * FROM moc100 WHERE coverage && '4/0';
158+
QUERY PLAN
159+
------------------------------------------------------------------------------------------------------------
160+
Bitmap Heap Scan on moc100 (cost=38.92..42.93 rows=1 width=96) (actual rows=35 loops=1)
161+
Recheck Cond: (coverage && '4/0'::smoc)
162+
Heap Blocks: exact=5
163+
Buffers: shared hit=85
164+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..38.92 rows=1 width=0) (actual rows=35 loops=1)
165+
Index Cond: (coverage && '4/0'::smoc)
166+
Buffers: shared hit=9
167+
Planning:
168+
Buffers: shared hit=1
169+
(9 rows)
170+
171+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
172+
SELECT * FROM moc100 WHERE coverage <@ '4/0';
173+
QUERY PLAN
174+
------------------------------------------------------------------------------------------------------------
175+
Bitmap Heap Scan on moc100 (cost=47.61..51.63 rows=1 width=96) (actual rows=1 loops=1)
176+
Recheck Cond: (coverage <@ '4/0'::smoc)
177+
Rows Removed by Index Recheck: 35
178+
Heap Blocks: exact=5
179+
Buffers: shared hit=33
180+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..47.61 rows=1 width=0) (actual rows=36 loops=1)
181+
Index Cond: (coverage <@ '4/0'::smoc)
182+
Buffers: shared hit=12
183+
Planning:
184+
Buffers: shared hit=4
185+
(10 rows)
186+
187+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
188+
SELECT * FROM moc100 WHERE coverage @> '4/0';
189+
QUERY PLAN
190+
------------------------------------------------------------------------------------------------------------
191+
Bitmap Heap Scan on moc100 (cost=38.92..42.93 rows=1 width=96) (actual rows=28 loops=1)
192+
Recheck Cond: (coverage @> '4/0'::smoc)
193+
Rows Removed by Index Recheck: 1
194+
Heap Blocks: exact=4
195+
Buffers: shared hit=36
196+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..38.92 rows=1 width=0) (actual rows=29 loops=1)
197+
Index Cond: (coverage @> '4/0'::smoc)
198+
Buffers: shared hit=9
199+
Planning:
200+
Buffers: shared hit=4
201+
(10 rows)
202+
203+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
204+
SELECT * FROM moc100 WHERE coverage = '0/0-11';
205+
QUERY PLAN
206+
----------------------------------------------------------------------------------------------------------------
207+
Bitmap Heap Scan on moc100 (cost=106879.01..106883.02 rows=1 width=96) (actual rows=23 loops=1)
208+
Recheck Cond: (coverage = '0/0-11'::smoc)
209+
Rows Removed by Index Recheck: 1
210+
Heap Blocks: exact=2
211+
Buffers: shared hit=24581
212+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..106879.01 rows=1 width=0) (actual rows=24 loops=1)
213+
Index Cond: (coverage = '0/0-11'::smoc)
214+
Buffers: shared hit=24577
215+
Planning:
216+
Buffers: shared hit=1
217+
JIT:
218+
Functions: 2
219+
Options: Inlining false, Optimization false, Expressions true, Deforming true
220+
(13 rows)
221+
222+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
223+
SELECT * FROM moc100 WHERE coverage = '6/43225,43227';
224+
QUERY PLAN
225+
------------------------------------------------------------------------------------------------------------
226+
Bitmap Heap Scan on moc100 (cost=12.83..16.84 rows=1 width=96) (actual rows=1 loops=1)
227+
Recheck Cond: (coverage = '6/43225 43227'::smoc)
228+
Rows Removed by Index Recheck: 28
229+
Heap Blocks: exact=3
230+
Buffers: shared hit=12
231+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..12.83 rows=1 width=0) (actual rows=29 loops=1)
232+
Index Cond: (coverage = '6/43225 43227'::smoc)
233+
Buffers: shared hit=3
234+
Planning:
235+
Buffers: shared hit=1
236+
(10 rows)
237+
238+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
239+
SELECT * FROM moc100 WHERE coverage = '0/';
240+
QUERY PLAN
241+
-----------------------------------------------------------------------------------------------------------
242+
Bitmap Heap Scan on moc100 (cost=12.83..16.84 rows=1 width=96) (actual rows=1 loops=1)
243+
Recheck Cond: (coverage = '0/'::smoc)
244+
Heap Blocks: exact=1
245+
Buffers: shared hit=5
246+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..12.83 rows=1 width=0) (actual rows=1 loops=1)
247+
Index Cond: (coverage = '0/'::smoc)
248+
Buffers: shared hit=4
249+
Planning:
250+
Buffers: shared hit=1
251+
(9 rows)
252+
253+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
254+
SELECT * FROM moc100 WHERE coverage <> '0/0-11';
255+
QUERY PLAN
256+
-------------------------------------------------------------------------------------------------------------------
257+
Bitmap Heap Scan on moc100 (cost=106888.23..106894.48 rows=100 width=96) (actual rows=78 loops=1)
258+
Recheck Cond: (coverage <> '0/0-11'::smoc)
259+
Rows Removed by Index Recheck: 23
260+
Heap Blocks: exact=5
261+
Buffers: shared hit=24821
262+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..106888.20 rows=100 width=0) (actual rows=101 loops=1)
263+
Index Cond: (coverage <> '0/0-11'::smoc)
264+
Buffers: shared hit=24762
265+
Planning:
266+
Buffers: shared hit=1
267+
JIT:
268+
Functions: 2
269+
Options: Inlining false, Optimization false, Expressions true, Deforming true
270+
(13 rows)
271+
272+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
273+
SELECT * FROM moc100 WHERE coverage <> '6/43225,43227';
274+
QUERY PLAN
275+
-------------------------------------------------------------------------------------------------------------------
276+
Bitmap Heap Scan on moc100 (cost=106888.23..106894.48 rows=100 width=96) (actual rows=100 loops=1)
277+
Recheck Cond: (coverage <> '6/43225 43227'::smoc)
278+
Rows Removed by Index Recheck: 1
279+
Heap Blocks: exact=5
280+
Buffers: shared hit=247
281+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..106888.20 rows=100 width=0) (actual rows=101 loops=1)
282+
Index Cond: (coverage <> '6/43225 43227'::smoc)
283+
Buffers: shared hit=188
284+
Planning:
285+
Buffers: shared hit=1
286+
JIT:
287+
Functions: 2
288+
Options: Inlining false, Optimization false, Expressions true, Deforming true
289+
(13 rows)
290+
291+
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
292+
SELECT * FROM moc100 WHERE coverage <> '0/';
293+
QUERY PLAN
294+
-------------------------------------------------------------------------------------------------------------------
295+
Bitmap Heap Scan on moc100 (cost=106888.23..106894.48 rows=100 width=96) (actual rows=100 loops=1)
296+
Recheck Cond: (coverage <> '0/'::smoc)
297+
Rows Removed by Index Recheck: 1
298+
Heap Blocks: exact=5
299+
Buffers: shared hit=245
300+
-> Bitmap Index Scan on moc100_coverage_idx (cost=0.00..106888.20 rows=100 width=0) (actual rows=101 loops=1)
301+
Index Cond: (coverage <> '0/'::smoc)
302+
Buffers: shared hit=186
303+
Planning:
304+
Buffers: shared hit=1
305+
JIT:
306+
Functions: 2
307+
Options: Inlining false, Optimization false, Expressions true, Deforming true
308+
(13 rows)
309+

0 commit comments

Comments
 (0)