Reduce reliance on hardcoded chunk names for compressed relations

Adjust tests to not rely on hardcoded compressed chunk names by
using psql variables and joins with compression_settings.

Author: svenklemm

tsl/test/expected/chunk_merge.out

@@ -82,9 +82,11 @@ SELECT compress_chunk(i) FROM show_chunks('test1') i;
  _timescaledb_internal._hyper_1_2_chunk
  _timescaledb_internal._hyper_1_5_chunk
 
+SELECT compress_relid AS "COMPRESSED_CHUNK_1" FROM _timescaledb_catalog.compression_settings WHERE relid = '_timescaledb_internal._hyper_1_1_chunk'::regclass \gset
+SELECT compress_relid AS "COMPRESSED_CHUNK_2" FROM _timescaledb_catalog.compression_settings WHERE relid = '_timescaledb_internal._hyper_1_2_chunk'::regclass \gset
 \set ON_ERROR_STOP 0
 -- Cannot merge chunks internal compressed chunks, no dimensions on them.
-SELECT _timescaledb_internal.test_merge_chunks_on_dimension('_timescaledb_internal.compress_hyper_2_10_chunk','_timescaledb_internal.compress_hyper_2_11_chunk', 1);
+SELECT _timescaledb_internal.test_merge_chunks_on_dimension(:'COMPRESSED_CHUNK_1',:'COMPRESSED_CHUNK_2', 1);
 ERROR:  cannot find slice for merging dimension
 \set ON_ERROR_STOP 1
 -- This creates more data so caggs has multiple chunks.

tsl/test/expected/chunk_utils_internal.out

@@ -1763,7 +1763,7 @@ SELECT _timescaledb_functions.freeze_chunk(:'CHUNK');
 --------------
  t
 
-SELECT format('%I.%I', schema_name, table_name) AS "COMPRESSED_CHUNK" FROM _timescaledb_catalog.chunk ORDER BY id DESC LIMIT 1 \gset
+SELECT compress_relid::text AS "COMPRESSED_CHUNK" FROM _timescaledb_catalog.compression_settings WHERE relid = :'CHUNK'::regclass \gset
 -- DML on hypertable after freezing should be blocked
 \set ON_ERROR_STOP 0
 INSERT INTO dml_blocks VALUES ('2025-01-01','dev1',1.0);

tsl/test/expected/compress_bloom_sparse_debug.out

@@ -179,13 +179,11 @@ select count(compress_chunk(x)) from show_chunks('detoaster') x;
 
 with chunks as (
   select
-    row_number() over (order by cc.table_name) index,
-    cc.schema_name || '.' || cc.table_name chunk
+    row_number() over (order by cs.compress_relid::text) index,
+    cs.compress_relid::text chunk
   from _timescaledb_catalog.chunk ch
     join _timescaledb_catalog.compression_settings cs
       on cs.relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
-    join _timescaledb_catalog.chunk cc
-      on cs.compress_relid = format('%I.%I', cc.schema_name, cc.table_name)::regclass
   where ch.hypertable_id = (select id from _timescaledb_catalog.hypertable
         where table_name = 'detoaster')
 )

tsl/test/expected/compress_firstlast_sparse.out

@@ -54,9 +54,8 @@ select count(compress_chunk(x)) from show_chunks('fl_basic') x;
 -------
      1
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_basic')
 \gset
@@ -84,9 +83,8 @@ select count(compress_chunk(x)) from show_chunks('fl_nulls') x;
 -------
      1
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_nulls')
 \gset
@@ -115,9 +113,8 @@ select count(compress_chunk(x)) from show_chunks('fl_mixed') x;
 -------
      1
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_mixed')
 \gset
@@ -145,9 +142,8 @@ select count(compress_chunk(x)) from show_chunks('fl_firstnull') x;
 -------
      1
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_firstnull')
 \gset
@@ -175,9 +171,8 @@ select count(compress_chunk(x)) from show_chunks('fl_lastnull') x;
 -------
      1
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_lastnull')
 \gset
@@ -205,9 +200,8 @@ select count(compress_chunk(x)) from show_chunks('fl_single') x;
 -------
      1
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_single')
 \gset
@@ -234,9 +228,8 @@ select count(compress_chunk(x)) from show_chunks('fl_multi') x;
 -------
      1
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_multi')
 \gset
@@ -270,9 +263,8 @@ select count(compress_chunk(x, recompress:=true)) from show_chunks('fl_recompres
 -------
      1
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_recompress')
 \gset
@@ -482,12 +474,11 @@ select count(compress_chunk(x, recompress:=true)) from show_chunks('fl_push_reco
 -------
      2
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'fl_push_recompress')
-order by ch.id
+order by uc.id desc
 limit 1
 \gset
 -- both metadata kinds populated per batch
@@ -532,12 +523,11 @@ SELECT compress_chunk(c) FROM show_chunks('sensor_readings') c;
 ------------------------------------------
  _timescaledb_internal._hyper_30_60_chunk
 
-select ch.schema_name || '.' || ch.table_name as compressed_chunk
-from _timescaledb_catalog.chunk ch
-inner join _timescaledb_catalog.compression_settings cs on cs.compress_relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+select cs.compress_relid::text as compressed_chunk
+from _timescaledb_catalog.compression_settings cs
 inner join _timescaledb_catalog.chunk uc on cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
 where uc.hypertable_id = (select id from _timescaledb_catalog.hypertable where table_name = 'sensor_readings')
-order by ch.id
+order by uc.id
 limit 1
 \gset
 -- should see firstlast metadata columns also renamed

tsl/test/expected/compressed_collation.out

@@ -42,11 +42,13 @@ SELECT count(compress_chunk(ch)) FROM show_chunks('compressed_collation_ht') ch;
      1
 
 vacuum analyze compressed_collation_ht;
-SELECT format('%I.%I',ch.schema_name, ch.table_name) AS "CHUNK"
+SELECT cs.compress_relid::text AS "CHUNK"
 FROM _timescaledb_catalog.hypertable ht
     INNER JOIN _timescaledb_catalog.chunk ch
-    ON ch.hypertable_id = ht.compressed_hypertable_id
-        AND ht.table_name = 'compressed_collation_ht' \gset
+    ON ch.hypertable_id = ht.id
+    INNER JOIN _timescaledb_catalog.compression_settings cs
+    ON cs.relid = format('%I.%I', ch.schema_name, ch.table_name)::regclass
+WHERE ht.table_name = 'compressed_collation_ht' \gset
 create index on :CHUNK (name);
 set enable_seqscan to off;
 explain (buffers off, costs off)

tsl/test/expected/compression_bgw.out

@@ -322,15 +322,17 @@ SELECT
    c.schema_name as chunk_schema,
    c.table_name as chunk_name,
    c.status as chunk_status,
-   comp.schema_name as compressed_chunk_schema,
-   comp.table_name as compressed_chunk_name
+   comp_ns.nspname as compressed_chunk_schema,
+   comp_class.relname as compressed_chunk_name
 FROM
    _timescaledb_catalog.hypertable h JOIN
   _timescaledb_catalog.chunk c ON h.id = c.hypertable_id
    LEFT JOIN _timescaledb_catalog.compression_settings cs
 ON cs.relid = format('%I.%I', c.schema_name, c.table_name)::regclass
-   LEFT JOIN _timescaledb_catalog.chunk comp
-ON cs.compress_relid = format('%I.%I', comp.schema_name, comp.table_name)::regclass
+   LEFT JOIN pg_class comp_class
+ON cs.compress_relid = comp_class.oid
+   LEFT JOIN pg_namespace comp_ns
+ON comp_class.relnamespace = comp_ns.oid
 ;
 CREATE TABLE test2 (timec timestamptz NOT NULL, i integer ,
       b bigint, t text);
@@ -453,14 +455,14 @@ WHERE hypertable_name = 'test2' ORDER BY chunk_name;
 \set ON_ERROR_STOP 0
 -- call compress_chunk when status is not unordered
 SELECT compress_chunk(:'CHUNK_NAME'::regclass);
-psql:include/recompress_basic.sql:109: NOTICE:  chunk "_hyper_14_62_chunk" is already converted to columnstore
+psql:include/recompress_basic.sql:111: NOTICE:  chunk "_hyper_14_62_chunk" is already converted to columnstore
               compress_chunk              
 ------------------------------------------
  _timescaledb_internal._hyper_14_62_chunk
 
 -- This will succeed and compress the chunk for the test below.
 SELECT compress_chunk(:'CHUNK_NAME'::regclass);
-psql:include/recompress_basic.sql:112: NOTICE:  chunk "_hyper_14_62_chunk" is already converted to columnstore
+psql:include/recompress_basic.sql:114: NOTICE:  chunk "_hyper_14_62_chunk" is already converted to columnstore
               compress_chunk              
 ------------------------------------------
  _timescaledb_internal._hyper_14_62_chunk
@@ -569,7 +571,7 @@ SELECT chunk_status FROM compressed_chunk_info_view WHERE hypertable_name = 'met
 
 ---- nothing to do yet
 CALL run_job(:JOB_RECOMPRESS);
-psql:include/recompress_basic.sql:188: NOTICE:  no chunks for hypertable "public.metrics" that satisfy recompress chunk policy
+psql:include/recompress_basic.sql:190: NOTICE:  no chunks for hypertable "public.metrics" that satisfy recompress chunk policy
 ---- status should be 1
 SELECT chunk_status FROM compressed_chunk_info_view WHERE hypertable_name = 'metrics';
  chunk_status 

tsl/test/expected/compression_conflicts.out

@@ -195,12 +195,12 @@ INSERT INTO comp_conflicts_3 VALUES ('2020-01-01',NULL, 'label', 0.3);
 SELECT compress_chunk(c) AS "CHUNK" FROM show_chunks('comp_conflicts_3') c
 \gset
 INFO:  using tuplesort to scan rows from "_hyper_5_5_chunk" for converting to columnstore
-SELECT format('%I.%I', i.schemaname, i.indexname) AS "COMPRESSED_CHUNK_INDEX"
-FROM pg_indexes i
-JOIN _timescaledb_catalog.chunk cc ON i.schemaname = cc.schema_name AND i.tablename = cc.table_name
-JOIN _timescaledb_catalog.compression_settings cs ON cs.compress_relid = format('%I.%I', cc.schema_name, cc.table_name)::regclass
-JOIN _timescaledb_catalog.chunk uc ON cs.relid = format('%I.%I', uc.schema_name, uc.table_name)::regclass
-WHERE format('%I.%I', uc.schema_name, uc.table_name) = :'CHUNK'
+SELECT cs.compress_relid AS "COMPRESSED_CHUNK" FROM _timescaledb_catalog.compression_settings cs WHERE cs.relid = :'CHUNK'::regclass \gset
+SELECT format('%I.%I', n.nspname, i.relname) AS "COMPRESSED_CHUNK_INDEX"
+FROM pg_index idx
+JOIN pg_class i ON i.oid = idx.indexrelid
+JOIN pg_namespace n ON n.oid = i.relnamespace
+WHERE idx.indrelid = :'COMPRESSED_CHUNK'::regclass
 LIMIT 1 \gset
 -- after compression no data should be in uncompressed chunk
 SELECT count(*) FROM ONLY :CHUNK;
@@ -250,7 +250,7 @@ set timescaledb.debug_compression_path_info to on;
 -- ignore matching partial index
 BEGIN;
   DROP INDEX :COMPRESSED_CHUNK_INDEX;
-  CREATE INDEX partial_index ON _timescaledb_internal.compress_hyper_6_6_chunk (device, label, _ts_meta_min_1 DESC, _ts_meta_max_1 DESC)
+  CREATE INDEX partial_index ON :COMPRESSED_CHUNK (device, label, _ts_meta_min_1 DESC, _ts_meta_max_1 DESC)
 	WHERE label LIKE 'missing';
   INSERT INTO comp_conflicts_3 VALUES ('2020-01-01','d1', 'label', 0.1);
 INFO:  Using table scan with scan keys: index 0, heap 4, memory 1. 
@@ -259,39 +259,39 @@ ROLLBACK;
 -- ignore matching covering index
 BEGIN;
   DROP INDEX :COMPRESSED_CHUNK_INDEX;
-  CREATE INDEX covering_index ON _timescaledb_internal.compress_hyper_6_6_chunk (device) INCLUDE (label, _ts_meta_min_1, _ts_meta_max_1);
+  CREATE INDEX covering_index ON :COMPRESSED_CHUNK (device) INCLUDE (label, _ts_meta_min_1, _ts_meta_max_1);
   INSERT INTO comp_conflicts_3 VALUES ('2020-01-01','d1', 'label', 0.1);
 INFO:  Using index scan with scan keys: index 1, heap 3, memory 1. 
 ERROR:  duplicate key value violates unique constraint "5_comp_conflicts_3_time_device_label_key"
 ROLLBACK;
 -- out of order segmentby index, index is still usable
 BEGIN;
   DROP INDEX :COMPRESSED_CHUNK_INDEX;
-  CREATE INDEX partial_index ON _timescaledb_internal.compress_hyper_6_6_chunk (label, device, _ts_meta_min_1 DESC, _ts_meta_max_1 DESC);
+  CREATE INDEX partial_index ON :COMPRESSED_CHUNK (label, device, _ts_meta_min_1 DESC, _ts_meta_max_1 DESC);
   INSERT INTO comp_conflicts_3 VALUES ('2020-01-01','d1', 'label', 0.1);
 INFO:  Using index scan with scan keys: index 2, heap 2, memory 1. 
 ERROR:  duplicate key value violates unique constraint "5_comp_conflicts_3_time_device_label_key"
 ROLLBACK;
 -- index with sequence number in the middle, index should be usable with single index scan key
 BEGIN;
   DROP INDEX :COMPRESSED_CHUNK_INDEX;
-  CREATE INDEX covering_index ON _timescaledb_internal.compress_hyper_6_6_chunk (device, _ts_meta_min_1 DESC, _ts_meta_max_1 DESC, label);
+  CREATE INDEX covering_index ON :COMPRESSED_CHUNK (device, _ts_meta_min_1 DESC, _ts_meta_max_1 DESC, label);
   INSERT INTO comp_conflicts_3 VALUES ('2020-01-01','d1', 'label', 0.1);
 INFO:  Using index scan with scan keys: index 1, heap 3, memory 1. 
 ERROR:  duplicate key value violates unique constraint "5_comp_conflicts_3_time_device_label_key"
 ROLLBACK;
 -- ignore expression index
 BEGIN;
   DROP INDEX :COMPRESSED_CHUNK_INDEX;
-  CREATE INDEX partial_index ON _timescaledb_internal.compress_hyper_6_6_chunk (device, lower(label), _ts_meta_min_1 DESC, _ts_meta_max_1 DESC);
+  CREATE INDEX partial_index ON :COMPRESSED_CHUNK (device, lower(label), _ts_meta_min_1 DESC, _ts_meta_max_1 DESC);
   INSERT INTO comp_conflicts_3 VALUES ('2020-01-01','d1', 'label', 0.1);
 INFO:  Using table scan with scan keys: index 0, heap 4, memory 1. 
 ERROR:  duplicate key value violates unique constraint "5_comp_conflicts_3_time_device_label_key"
 ROLLBACK;
 -- ignore non-btree index
 BEGIN;
   DROP INDEX :COMPRESSED_CHUNK_INDEX;
-  CREATE INDEX partial_index ON _timescaledb_internal.compress_hyper_6_6_chunk USING brin (device, label, _ts_meta_min_1, _ts_meta_max_1);
+  CREATE INDEX partial_index ON :COMPRESSED_CHUNK USING brin (device, label, _ts_meta_min_1, _ts_meta_max_1);
   INSERT INTO comp_conflicts_3 VALUES ('2020-01-01','d1', 'label', 0.1);
 INFO:  Using table scan with scan keys: index 0, heap 4, memory 1. 
 ERROR:  duplicate key value violates unique constraint "5_comp_conflicts_3_time_device_label_key"

tsl/test/expected/compression_create_compressed_table.out

@@ -28,10 +28,12 @@ SELECT compress_chunk('_timescaledb_internal._hyper_1_1_chunk');
 ----------------------------------------
  _timescaledb_internal._hyper_1_1_chunk
 
+-- look up the compressed chunk relation for the chunk
+SELECT compress_relid AS "COMPRESSED_CHUNK" FROM _timescaledb_catalog.compression_settings WHERE relid = '_timescaledb_internal._hyper_1_1_chunk'::regclass \gset
 -- create custom compressed chunk table
-CREATE TABLE _timescaledb_internal.custom_compressed_chunk( LIKE _timescaledb_internal.compress_hyper_2_2_chunk);
+CREATE TABLE _timescaledb_internal.custom_compressed_chunk( LIKE :COMPRESSED_CHUNK);
 -- copy compressed row from compressed table into custom compressed chunk table
-INSERT INTO "_timescaledb_internal"."custom_compressed_chunk" SELECT * FROM "_timescaledb_internal"."compress_hyper_2_2_chunk";
+INSERT INTO "_timescaledb_internal"."custom_compressed_chunk" SELECT * FROM :COMPRESSED_CHUNK;
 -- decompress the rows, moving them back to uncompressed space
 SELECT decompress_chunk('"_timescaledb_internal"."_hyper_1_1_chunk"');
             decompress_chunk