Refactor more tests to use compression_settings for compressed relation lookup

Author: svenklemm

tsl/test/expected/cagg_add_column.out

@@ -392,16 +392,19 @@ WHERE c.hypertable_id = :mat_ht_id
 -----------------------------
                            3
 
--- every compressed chunk has min_temp
-SELECT count(*) AS compressed_chunks_with_min_temp
-FROM information_schema.columns ic, _timescaledb_catalog.chunk c
-WHERE c.hypertable_id = :compressed_ht_id
-  AND ic.table_schema = c.schema_name
-  AND ic.table_name = c.table_name
+-- every mat HT chunk has min_temp
+SELECT count(*) AS compressed_relations_with_min_temp
+FROM information_schema.columns ic,
+_timescaledb_catalog.chunk c,_timescaledb_catalog.compression_settings cs, pg_class
+WHERE c.hypertable_id = :mat_ht_id
+  AND cs.relid = format('%I.%I', c.schema_name, c.table_name)::regclass
+  AND pg_class.oid = cs.compress_relid
+  AND ic.table_schema = pg_class.relnamespace::regnamespace::text
+  AND ic.table_name = pg_class.relname
   AND ic.column_name = 'min_temp';
- compressed_chunks_with_min_temp 
----------------------------------
-                               3
+ compressed_relations_with_min_temp 
+------------------------------------
+                                  3
 
 -- before any further refresh, every row's min_temp is NULL
 SELECT count(*) AS rows_with_non_null_min_temp FROM cagg_compressed WHERE min_temp IS NOT NULL;

tsl/test/expected/compress_bgw_reorder_drop_chunks.out

@@ -101,9 +101,9 @@ WHERE hypertable.table_name like 'test_retention_table';
 
 SELECT count(*) as count_chunks_compressed
 FROM _timescaledb_catalog.chunk chunk
-INNER JOIN _timescaledb_catalog.hypertable comp_hyper ON (chunk.hypertable_id = comp_hyper.id)
-INNER JOIN _timescaledb_catalog.hypertable uncomp_hyper ON (comp_hyper.id = uncomp_hyper.compressed_hypertable_id)
-WHERE uncomp_hyper.table_name like 'test_retention_table';
+INNER JOIN _timescaledb_catalog.hypertable hypertable ON (chunk.hypertable_id = hypertable.id)
+INNER JOIN _timescaledb_catalog.compression_settings cs ON cs.relid = to_regclass(format('%I.%I', chunk.schema_name, chunk.table_name)) AND cs.compress_relid IS NOT NULL
+WHERE hypertable.table_name like 'test_retention_table';
  count_chunks_compressed 
 -------------------------
                        5
@@ -140,9 +140,9 @@ WHERE hypertable.table_name like 'test_retention_table';
 
 SELECT count(*) as count_chunks_compressed
 FROM _timescaledb_catalog.chunk chunk
-INNER JOIN _timescaledb_catalog.hypertable comp_hyper ON (chunk.hypertable_id = comp_hyper.id)
-INNER JOIN _timescaledb_catalog.hypertable uncomp_hyper ON (comp_hyper.id = uncomp_hyper.compressed_hypertable_id)
-WHERE uncomp_hyper.table_name like 'test_retention_table';
+INNER JOIN _timescaledb_catalog.hypertable hypertable ON (chunk.hypertable_id = hypertable.id)
+INNER JOIN _timescaledb_catalog.compression_settings cs ON cs.relid = to_regclass(format('%I.%I', chunk.schema_name, chunk.table_name)) AND cs.compress_relid IS NOT NULL
+WHERE hypertable.table_name like 'test_retention_table';
  count_chunks_compressed 
 -------------------------
                        3
@@ -187,9 +187,9 @@ WHERE hypertable.table_name like 'test_reorder_chunks_table';
 -- and 2 compressed ones:
 SELECT count(*) as count_chunks_compressed
 FROM _timescaledb_catalog.chunk chunk
-INNER JOIN _timescaledb_catalog.hypertable comp_hyper ON (chunk.hypertable_id = comp_hyper.id)
-INNER JOIN _timescaledb_catalog.hypertable uncomp_hyper ON (comp_hyper.id = uncomp_hyper.compressed_hypertable_id)
-WHERE uncomp_hyper.table_name like 'test_reorder_chunks_table';
+INNER JOIN _timescaledb_catalog.hypertable hypertable ON (chunk.hypertable_id = hypertable.id)
+INNER JOIN _timescaledb_catalog.compression_settings cs ON cs.relid = to_regclass(format('%I.%I', chunk.schema_name, chunk.table_name)) AND cs.compress_relid IS NOT NULL
+WHERE hypertable.table_name like 'test_reorder_chunks_table';
  count_chunks_compressed 
 -------------------------
                        2

tsl/test/expected/compress_compbloom_basics.out

@@ -5,7 +5,7 @@
 -- Config tests
 -------------------------------------------------------------------
 CREATE VIEW settings AS SELECT * FROM _timescaledb_catalog.compression_settings ORDER BY upper(relid::text) COLLATE "C";
-CREATE VIEW compressedcols AS select relname,attname,c.oid as reloid,attnum from pg_attribute a, pg_class c where c.oid=a.attrelid and relname like '%compress_hyper_%chunk' order by c.oid asc, a.attnum asc;
+CREATE VIEW compressedcols AS select h.table_name as relname, a.attname, cs.compress_relid as reloid, a.attnum from _timescaledb_catalog.compression_settings cs join _timescaledb_catalog.chunk ch on cs.relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass join _timescaledb_catalog.hypertable h on ch.hypertable_id = h.id join pg_attribute a on a.attrelid = cs.compress_relid order by cs.compress_relid asc, a.attnum asc;
 CREATE TABLE t(a int, b int, c int, d int, e int, f int, g int, h int, i int);
 SELECT create_hypertable('t', 'a');
  create_hypertable 
@@ -74,29 +74,29 @@ select relid,compress_relid,segmentby,orderby,orderby_desc,orderby_nullsfirst,in
 
 -- Check the auto generated compressed columns
 select relname,attname from compressedcols order by 1,2;
-         relname          |            attname            
---------------------------+-------------------------------
- compress_hyper_4_2_chunk | _ts_meta_count
- compress_hyper_4_2_chunk | _ts_meta_max_1
- compress_hyper_4_2_chunk | _ts_meta_max_2
- compress_hyper_4_2_chunk | _ts_meta_min_1
- compress_hyper_4_2_chunk | _ts_meta_min_2
- compress_hyper_4_2_chunk | regress-test-bloom_c
- compress_hyper_4_2_chunk | regress-test-bloom_ed4b_a_b_c
- compress_hyper_4_2_chunk | _ts_meta_v2_first_a
- compress_hyper_4_2_chunk | _ts_meta_v2_first_b
- compress_hyper_4_2_chunk | _ts_meta_v2_last_a
- compress_hyper_4_2_chunk | _ts_meta_v2_last_b
- compress_hyper_4_2_chunk | a
- compress_hyper_4_2_chunk | b
- compress_hyper_4_2_chunk | c
- compress_hyper_4_2_chunk | cmax
- compress_hyper_4_2_chunk | cmin
- compress_hyper_4_2_chunk | ctid
- compress_hyper_4_2_chunk | d
- compress_hyper_4_2_chunk | tableoid
- compress_hyper_4_2_chunk | xmax
- compress_hyper_4_2_chunk | xmin
+ relname |            attname            
+---------+-------------------------------
+ u       | _ts_meta_count
+ u       | _ts_meta_max_1
+ u       | _ts_meta_max_2
+ u       | _ts_meta_min_1
+ u       | _ts_meta_min_2
+ u       | regress-test-bloom_c
+ u       | regress-test-bloom_ed4b_a_b_c
+ u       | _ts_meta_v2_first_a
+ u       | _ts_meta_v2_first_b
+ u       | _ts_meta_v2_last_a
+ u       | _ts_meta_v2_last_b
+ u       | a
+ u       | b
+ u       | c
+ u       | cmax
+ u       | cmin
+ u       | ctid
+ u       | d
+ u       | tableoid
+ u       | xmax
+ u       | xmin
 
 ALTER TABLE u SET (timescaledb.compress_index = 'bloom("a","b","c")');
 NOTICE:  updated compression settings will only apply to future compressions
@@ -145,36 +145,36 @@ select relid,compress_relid,segmentby,orderby,orderby_desc,orderby_nullsfirst,in
  _timescaledb_internal._hyper_5_3_chunk | _timescaledb_internal.compress_hyper_6_4_chunk |           | {b_01234567890123456789,a_01234567890123456789} | {f,t}        | {f,t}              | [{"type": "bloom", "column": ["a_01234567890123456789", "b_01234567890123456789", "c_01234567890123456789", "d_01234567890123456789", "e_01234567890123456789"], "source": "default"}, {"type": "bloom", "column": "c_01234567890123456789", "source": "default"}, {"type": "bloom", "column": "d_01234567890123456789", "source": "default"}, {"type": "bloom", "column": "e_01234567890123456789", "source": "default"}, {"type": "minmax", "column": "b_01234567890123456789", "source": "orderby"}, {"type": "firstlast", "column": "b_01234567890123456789", "source": "orderby"}, {"type": "minmax", "column": "a_01234567890123456789", "source": "orderby"}, {"type": "firstlast", "column": "a_01234567890123456789", "source": "orderby"}]
 
 select relname,attname from compressedcols order by 1,2;
-         relname          |                             attname                             
---------------------------+-----------------------------------------------------------------
- compress_hyper_6_4_chunk | _ts_meta_count
- compress_hyper_6_4_chunk | _ts_meta_max_1
- compress_hyper_6_4_chunk | _ts_meta_max_2
- compress_hyper_6_4_chunk | _ts_meta_min_1
- compress_hyper_6_4_chunk | _ts_meta_min_2
- compress_hyper_6_4_chunk | regress-test-bloom_76d9_a_01234567890123456789_b_01234567890123
- compress_hyper_6_4_chunk | regress-test-bloom_c_01234567890123456789
- compress_hyper_6_4_chunk | regress-test-bloom_d_01234567890123456789
- compress_hyper_6_4_chunk | regress-test-bloom_e_01234567890123456789
- compress_hyper_6_4_chunk | _ts_meta_v2_first_a_01234567890123456789
- compress_hyper_6_4_chunk | _ts_meta_v2_first_b_01234567890123456789
- compress_hyper_6_4_chunk | _ts_meta_v2_last_a_01234567890123456789
- compress_hyper_6_4_chunk | _ts_meta_v2_last_b_01234567890123456789
- compress_hyper_6_4_chunk | a_01234567890123456789
- compress_hyper_6_4_chunk | b_01234567890123456789
- compress_hyper_6_4_chunk | c_01234567890123456789
- compress_hyper_6_4_chunk | cmax
- compress_hyper_6_4_chunk | cmin
- compress_hyper_6_4_chunk | ctid
- compress_hyper_6_4_chunk | d_01234567890123456789
- compress_hyper_6_4_chunk | e_01234567890123456789
- compress_hyper_6_4_chunk | f_01234567890123456789
- compress_hyper_6_4_chunk | g_01234567890123456789
- compress_hyper_6_4_chunk | h_01234567890123456789
- compress_hyper_6_4_chunk | i_01234567890123456789
- compress_hyper_6_4_chunk | tableoid
- compress_hyper_6_4_chunk | xmax
- compress_hyper_6_4_chunk | xmin
+ relname |                             attname                             
+---------+-----------------------------------------------------------------
+ v       | _ts_meta_count
+ v       | _ts_meta_max_1
+ v       | _ts_meta_max_2
+ v       | _ts_meta_min_1
+ v       | _ts_meta_min_2
+ v       | regress-test-bloom_76d9_a_01234567890123456789_b_01234567890123
+ v       | regress-test-bloom_c_01234567890123456789
+ v       | regress-test-bloom_d_01234567890123456789
+ v       | regress-test-bloom_e_01234567890123456789
+ v       | _ts_meta_v2_first_a_01234567890123456789
+ v       | _ts_meta_v2_first_b_01234567890123456789
+ v       | _ts_meta_v2_last_a_01234567890123456789
+ v       | _ts_meta_v2_last_b_01234567890123456789
+ v       | a_01234567890123456789
+ v       | b_01234567890123456789
+ v       | c_01234567890123456789
+ v       | cmax
+ v       | cmin
+ v       | ctid
+ v       | d_01234567890123456789
+ v       | e_01234567890123456789
+ v       | f_01234567890123456789
+ v       | g_01234567890123456789
+ v       | h_01234567890123456789
+ v       | i_01234567890123456789
+ v       | tableoid
+ v       | xmax
+ v       | xmin
 
 -- Make sure the duplicate column detection works for long column names
 \set ON_ERROR_STOP 0

tsl/test/expected/compress_compbloom_config.out

@@ -30,22 +30,22 @@ SELECT compress_chunk(c) FROM show_chunks('t') c;
 -- ERROR:  column regress-test-bloom_a_b_c specified more than once
 -- Check the bloom column names in the compressed chunk
 SELECT
-      relname,
-      attname
+      h.table_name AS relname,
+      a.attname
 FROM
-      pg_attribute a,
-      pg_class c
+      _timescaledb_catalog.compression_settings cs
+      JOIN _timescaledb_catalog.chunk ch ON cs.relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+      JOIN _timescaledb_catalog.hypertable h ON ch.hypertable_id = h.id
+      JOIN pg_attribute a ON a.attrelid = cs.compress_relid
 WHERE
-      c.oid=a.attrelid AND
-      attname LIKE '%_ts_meta%bloom%a_b_c%' AND
-      relname LIKE '%chunk'
+      a.attname LIKE '%_ts_meta%bloom%a_b_c%'
 ORDER BY
-      relname::text COLLATE "C",
-      attname::text COLLATE "C";
-         relname          |            attname            
---------------------------+-------------------------------
- compress_hyper_2_2_chunk | regress-test-bloom_c66a_a_b_c
- compress_hyper_2_2_chunk | regress-test-bloom_ee9c_a_b_c
+      h.table_name COLLATE "C",
+      a.attname::text COLLATE "C";
+ relname |            attname            
+---------+-------------------------------
+ t       | regress-test-bloom_c66a_a_b_c
+ t       | regress-test-bloom_ee9c_a_b_c
 
 -- Verify the assumption that the zero byte separator used in the
 -- bloom column names is not allowed in Postgres column names:

tsl/test/expected/compress_compbloom_naming.out

@@ -152,10 +152,10 @@ numrows_post_compression   | 1
 numrows_frozen_immediately | 1
 
 \x
-select  ch1.id, ch1.schema_name, ch1.table_name ,  ch2.table_name as compress_table
+select  ch1.id, ch1.schema_name, ch1.table_name ,  compress.relname as compress_table
 from
-_timescaledb_catalog.chunk ch1, _timescaledb_catalog.chunk ch2, _timescaledb_catalog.compression_settings cs
-where cs.relid = format('%I.%I', ch1.schema_name, ch1.table_name)::regclass AND cs.compress_relid = format('%I.%I', ch2.schema_name, ch2.table_name)::regclass;
+_timescaledb_catalog.chunk ch1, _timescaledb_catalog.compression_settings cs, pg_class compress
+where cs.relid = format('%I.%I', ch1.schema_name, ch1.table_name)::regclass AND cs.compress_relid = compress.oid;
  id |      schema_name      |    table_name    |      compress_table      
 ----+-----------------------+------------------+--------------------------
   2 | _timescaledb_internal | _hyper_1_2_chunk | compress_hyper_2_5_chunk
@@ -1178,11 +1178,11 @@ SELECT relpages, CASE WHEN reltuples > 0 THEN reltuples ELSE 0 END as reltuples
 ----------+-----------
         0 |         0
 
-SELECT compch.table_name  as "STAT_COMP_CHUNK_NAME"
+SELECT compch.relname  as "STAT_COMP_CHUNK_NAME"
 FROM _timescaledb_catalog.hypertable ht, _timescaledb_catalog.chunk ch
-       , _timescaledb_catalog.chunk compch, _timescaledb_catalog.compression_settings cs
+       , pg_class compch, _timescaledb_catalog.compression_settings cs
   WHERE ht.table_name = 'stattest' AND ch.hypertable_id = ht.id
-        AND cs.relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass AND cs.compress_relid = format('%I.%I', compch.schema_name, compch.table_name)::regclass  \gset
+        AND cs.relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass AND cs.compress_relid = compch.oid  \gset
 -- reltuples is initially -1 on PG14 before VACUUM/ANALYZE was run
 SELECT relpages, CASE WHEN reltuples > 0 THEN reltuples ELSE 0 END as reltuples FROM pg_class WHERE relname = :'STAT_COMP_CHUNK_NAME';
  relpages | reltuples