Fix misreported toast_size in chunk_relation_size funcs

A bug in the SQL for getting the size of chunks would use the
TOAST size of the main/dummy table as the toast size for the
chunks rather than each chunks' own toast size.

Author: RobAtticus

sql/size_utils.sql

@@ -9,8 +9,8 @@
 --
 -- Returns:
 -- table_bytes        - Disk space used by main_table (like pg_relation_size(main_table))
--- index_bytes        - Disc space used by indexes
--- toast_bytes        - Disc space of toast tables
+-- index_bytes        - Disk space used by indexes
+-- toast_bytes        - Disk space of toast tables
 -- total_bytes        - Total disk space used by the specified table, including all indexes and TOAST data
 
 CREATE OR REPLACE FUNCTION hypertable_relation_size(
@@ -162,7 +162,7 @@ $BODY$;
 -- ranges                        - Partition ranges for each dimension of the chunk
 -- table_bytes                   - Disk space used by main_table
 -- index_bytes                   - Disk space used by indexes
--- toast_bytes                   - Disc space of toast tables
+-- toast_bytes                   - Disk space of toast tables
 -- total_bytes                   - Disk space used in total
 
 CREATE OR REPLACE FUNCTION chunk_relation_size(
@@ -227,9 +227,9 @@ BEGIN
                pg_namespace pns
                WHERE h.schema_name = %L
                      AND h.table_name = %L
-                     AND pgc.relname = h.table_name
+                     AND pgc.relname = c.table_name
                      AND pns.oid = pgc.relnamespace
-                     AND pns.nspname = h.schema_name
+                     AND pns.nspname = c.schema_name
                      AND relkind = 'r'
                      AND c.hypertable_id = h.id
                      AND c.id = cc.chunk_id
@@ -328,9 +328,9 @@ BEGIN
                pg_namespace pns
                WHERE h.schema_name = %L
                      AND h.table_name = %L
-                     AND pgc.relname = h.table_name
+                     AND pgc.relname = c.table_name
                      AND pns.oid = pgc.relnamespace
-                     AND pns.nspname = h.schema_name
+                     AND pns.nspname = c.schema_name
                      AND relkind = 'r'
                      AND c.hypertable_id = h.id
                      AND c.id = cc.chunk_id

test/expected/size_utils.out

@@ -139,6 +139,32 @@ SELECT * FROM chunk_relation_size_pretty('timestamp_partitioned_2');
         8 | "_timescaledb_internal"."_hyper_3_8_chunk" | {time,value}         | {"timestamp without time zone",character} | {NULL,_timescaledb_internal.get_partition_hash} | {"['Sat Nov 27 16:00:00 2004 PST','Mon Dec 27 16:00:00 2004 PST')","[1073741823,)"} | 8192 bytes | 32 kB      |            | 40 kB
 (2 rows)
 
+CREATE TABLE toast_test(time TIMESTAMP, value TEXT);
+-- Set storage type to EXTERNAL to prevent PostgreSQL from compressing my
+-- easily compressable string and instead store it with TOAST
+ALTER TABLE toast_test ALTER COLUMN value SET STORAGE EXTERNAL;
+SELECT * FROM create_hypertable('toast_test', 'time');
+NOTICE:  adding NOT NULL constraint to column "time"
+ create_hypertable 
+-------------------
+ 
+(1 row)
+
+INSERT INTO toast_test VALUES('2004-10-19 10:23:54', $$
+this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k.
+$$);
+SELECT * FROM chunk_relation_size('toast_test');
+ chunk_id |                chunk_table                 | partitioning_columns |    partitioning_column_types    | partitioning_hash_functions |                 ranges                  | table_bytes | index_bytes | toast_bytes | total_bytes 
+----------+--------------------------------------------+----------------------+---------------------------------+-----------------------------+-----------------------------------------+-------------+-------------+-------------+-------------
+        9 | "_timescaledb_internal"."_hyper_4_9_chunk" | {time}               | {"timestamp without time zone"} | {NULL}                      | {"[1096416000000000,1099008000000000)"} |        8192 |       16384 |       24576 |       49152
+(1 row)
+
+SELECT * FROM chunk_relation_size_pretty('toast_test');
+ chunk_id |                chunk_table                 | partitioning_columns |    partitioning_column_types    | partitioning_hash_functions |                               ranges                                | table_size | index_size | toast_size | total_size 
+----------+--------------------------------------------+----------------------+---------------------------------+-----------------------------+---------------------------------------------------------------------+------------+------------+------------+------------
+        9 | "_timescaledb_internal"."_hyper_4_9_chunk" | {time}               | {"timestamp without time zone"} | {NULL}                      | {"['Tue Sep 28 17:00:00 2004 PDT','Thu Oct 28 17:00:00 2004 PDT')"} | 8192 bytes | 16 kB      | 24 kB      | 48 kB
+(1 row)
+
 CREATE TABLE approx_count(time TIMESTAMP, value int);
 SELECT * FROM create_hypertable('approx_count', 'time');
 NOTICE:  adding not-null constraint to column "time"
@@ -171,6 +197,7 @@ SELECT * FROM hypertable_approximate_row_count();
  public      | approx_count            |           10
  public      | timestamp_partitioned   |            0
  public      | timestamp_partitioned_2 |            0
+ public      | toast_test              |            0
  public      | two_Partitions          |            0
-(4 rows)
+(5 rows)
 

test/sql/size_utils.sql

@@ -24,6 +24,18 @@ INSERT INTO timestamp_partitioned_2 VALUES('2004-12-19 10:23:54', '30');
 SELECT * FROM chunk_relation_size('timestamp_partitioned_2');
 SELECT * FROM chunk_relation_size_pretty('timestamp_partitioned_2');
 
+CREATE TABLE toast_test(time TIMESTAMP, value TEXT);
+-- Set storage type to EXTERNAL to prevent PostgreSQL from compressing my
+-- easily compressable string and instead store it with TOAST
+ALTER TABLE toast_test ALTER COLUMN value SET STORAGE EXTERNAL;
+SELECT * FROM create_hypertable('toast_test', 'time');
+
+INSERT INTO toast_test VALUES('2004-10-19 10:23:54', $$
+this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k. this must be over 2k.
+$$);
+SELECT * FROM chunk_relation_size('toast_test');
+SELECT * FROM chunk_relation_size_pretty('toast_test');
+
 CREATE TABLE approx_count(time TIMESTAMP, value int);
 SELECT * FROM create_hypertable('approx_count', 'time');
 INSERT INTO approx_count VALUES('2004-01-01 10:00:01', 1);