Skip to content

Commit a0af9b0

Browse files
committed
Remove PG14 leftovers
1 parent f9a9037 commit a0af9b0

File tree

4 files changed

+12
-57
lines changed

4 files changed

+12
-57
lines changed

sql/updates/post-update.sql

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -107,33 +107,6 @@ UPDATE pg_class cl SET relacl = tmpacl
107107

108108
DROP TABLE _timescaledb_internal.saved_privs;
109109

110-
-- warn about partial storage format change for numeric
111-
DO $$
112-
DECLARE
113-
cagg_name text;
114-
cagg_column text;
115-
cnt int := 0;
116-
BEGIN
117-
IF current_setting('server_version_num')::int < 140000 THEN
118-
FOR cagg_name, cagg_column IN
119-
SELECT
120-
attrelid::regclass::text,
121-
att.attname
122-
FROM _timescaledb_catalog.continuous_agg cagg
123-
INNER JOIN pg_attribute att ON (
124-
att.attrelid = format('%I.%I',cagg.user_view_schema,cagg.user_view_name)::regclass AND
125-
atttypid = 'numeric'::regtype)
126-
WHERE cagg.finalized = false
127-
LOOP
128-
RAISE WARNING 'Continuous Aggregate: % column: %', cagg_name, cagg_column;
129-
cnt := cnt + 1;
130-
END LOOP;
131-
IF cnt > 0 THEN
132-
RAISE WARNING 'The aggregation state format for numeric changed between PG13 and PG14. You should upgrade the above mentioned caggs to the new format before upgrading to PG14';
133-
END IF;
134-
END IF;
135-
END $$;
136-
137110
-- Report warning when partial aggregates are used
138111
DO $$
139112
DECLARE

test/sql/updates/post.repair.cagg_joins.sql

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
-- Please see the included NOTICE for copyright information and
33
-- LICENSE-APACHE for a copy of the license.
44

5-
SELECT current_setting('server_version_num')::int >= 140000 AS pg14ge \gset
6-
75
\d+ cagg_joins_upgrade_test_with_realtime
86
SELECT * FROM cagg_joins_upgrade_test_with_realtime ORDER BY bucket;
97

@@ -13,12 +11,9 @@ SELECT * FROM cagg_joins_upgrade_test ORDER BY bucket;
1311
\d+ cagg_joins_where
1412
SELECT * FROM cagg_joins_where ORDER BY bucket;
1513

16-
\if :pg14ge
17-
\d+ cagg_joins_upgrade_test_with_realtime_using
18-
\endif
14+
\d+ cagg_joins_upgrade_test_with_realtime_using
1915
SELECT * FROM cagg_joins_upgrade_test_with_realtime_using ORDER BY bucket;
2016

2117
\d+ cagg_joins_upgrade_test_using
2218
SELECT * FROM cagg_joins_upgrade_test_using ORDER BY bucket;
2319

24-

tsl/src/hypercore/hypercore_handler.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3766,11 +3766,7 @@ convert_to_hypercore_finish(Oid relid)
37663766
* relcache invalidations. Previously there was sometimes a crash here
37673767
* because the tuple sort state had a reference to a tuple descriptor in
37683768
* the relcache. */
3769-
#if (PG_VERSION_NUM >= 140001)
37703769
RelationCacheInvalidate(false);
3771-
#else
3772-
RelationCacheInvalidate();
3773-
#endif
37743770
#endif
37753771

37763772
Chunk *chunk = ts_chunk_get_by_relid(conversionstate->relid, true);

tsl/test/isolation/specs/CMakeLists.txt

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,10 @@ list(
2222
deadlock_drop_chunks_compress.spec
2323
deadlock_drop_index_vacuum.spec
2424
parallel_compression.spec
25-
osm_range_updates_iso.spec)
26-
27-
if(PG_VERSION VERSION_GREATER_EQUAL "14.0")
28-
list(APPEND TEST_FILES concurrent_decompress_update.spec)
29-
endif()
30-
31-
if(PG_VERSION VERSION_GREATER_EQUAL "15.0")
32-
list(APPEND TEST_FILES hypercore_tuple_lock.spec
33-
hypercore_concurrent_vacuum.spec)
34-
endif()
25+
osm_range_updates_iso.spec
26+
concurrent_decompress_update.spec
27+
hypercore_tuple_lock.spec
28+
hypercore_concurrent_vacuum.spec)
3529

3630
if(CMAKE_BUILD_TYPE MATCHES Debug)
3731
list(APPEND TEST_TEMPLATES_MODULE ${TEST_TEMPLATES_MODULE_DEBUG})
@@ -46,16 +40,13 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
4640
compression_recompress.spec
4741
decompression_chunk_and_parallel_query_wo_idx.spec
4842
merge_chunks_concurrent.spec
49-
split_chunk_concurrent.spec)
50-
if(PG_VERSION VERSION_GREATER_EQUAL "14.0")
51-
list(APPEND TEST_FILES freeze_chunk.spec compression_dml_iso.spec)
52-
endif()
53-
# These tests are using markers for the isolation tests (to avoid race
54-
# conditions causing differing output), which were added after 13.3 and in all
55-
# later major versions.
56-
if(PG_VERSION VERSION_GREATER "13.3")
57-
list(APPEND TEST_FILES deadlock_recompress_chunk.spec)
58-
endif()
43+
split_chunk_concurrent.spec
44+
freeze_chunk.spec
45+
compression_dml_iso.spec
46+
# These tests are using markers for the isolation tests (to avoid race
47+
# conditions causing differing output), which were added after 13.3 and in
48+
# all later major versions.
49+
deadlock_recompress_chunk.spec)
5950

6051
endif(CMAKE_BUILD_TYPE MATCHES Debug)
6152

0 commit comments

Comments
 (0)