Merge remote-tracking branch 'origin/main' into HEAD

Author: akuzm

.gitignore

@@ -8,6 +8,7 @@
 /sql/pre_install/*.gen
 /sql/updates/*.gen
 /sql/updates/header.sql
+/sql/updates/views_detached.sql
 /data/
 /src/*.o
 /src/*.so

.unreleased/pr_9825

@@ -0,0 +1 @@
+Implements: #9825 Support ADD COLUMN on continuous aggregates

cmake/GenerateScripts.cmake

@@ -59,7 +59,7 @@ function(generate_downgrade_script)
   include(
     ${CMAKE_BINARY_DIR}/v${_downgrade_TARGET_VERSION}/cmake/ScriptFiles.cmake)
 
-  set(_downgrade_PRE_FILES "header.sql;${PRE_DOWNGRADE_FILES}")
+  set(_downgrade_PRE_FILES "header.sql;views_detached.sql;${PRE_DOWNGRADE_FILES}")
   set(_downgrade_POST_FILES "${PRE_INSTALL_FUNCTION_FILES};${SOURCE_FILES}" ${POST_UPDATE_FILES})
 
   # Fetch epilog from target version.

scripts/check_updates.py

@@ -6,6 +6,7 @@
 
 from pglast import parse_sql
 from pglast.ast import ColumnDef
+from pglast.enums.parsenodes import ObjectType
 from pglast.visitors import Visitor
 from pglast import enums
 import sys
@@ -178,6 +179,14 @@ def visit_CreateFunctionStmt(
                 "_timescaledb_functions should be used as schema for internal functions",
             )
 
+    def visit_DropStmt(self, _ancestors, node):
+        if node.removeType == ObjectType.OBJECT_VIEW:
+            if node.objects[0][0].sval == "timescaledb_information":
+                self.error(
+                    f"Attempting to drop view {node.objects[0][0].sval}.{node.objects[0][1].sval}",
+                    "Views in schema timescaledb_information must not be dropped in update scripts",
+                )
+
 
 # copied from pgspot
 def visit_sql(sql):

scripts/test_updates.sh

@@ -91,7 +91,9 @@ if [ -n "${VERSIONS}" ]; then
   for version in ${VERSIONS}; do
     ts_minor_version=$(echo "${version}" | awk -F. '{print $2}')
 
-    if [ "${ts_minor_version}" -ge 22 ]; then
+    if [ "${ts_minor_version}" -ge 25 ]; then
+        TEST_VERSION=v12
+    elif [ "${ts_minor_version}" -ge 22 ]; then
         TEST_VERSION=v11
     elif [ "${ts_minor_version}" -ge 20 ]; then
         TEST_VERSION=v10

sql/pre_install/tables.sql

@@ -320,15 +320,6 @@ CREATE TABLE _timescaledb_catalog.metadata (
 
 SELECT pg_catalog.pg_extension_config_dump('_timescaledb_catalog.metadata', $$ WHERE key <> 'uuid' $$);
 
--- Log with events that will be sent out with the telemetry. The log
--- will be flushed after it has been sent out. We do not save it to
--- backups since it should not contain important data.
-CREATE TABLE _timescaledb_catalog.telemetry_event (
-       created timestamptz NOT NULL DEFAULT current_timestamp,
-       tag name NOT NULL,
-       body jsonb NOT NULL
-);
-
 CREATE TABLE _timescaledb_catalog.continuous_agg (
   mat_hypertable_id integer NOT NULL,
   raw_hypertable_id integer NOT NULL,
@@ -340,6 +331,7 @@ CREATE TABLE _timescaledb_catalog.continuous_agg (
   direct_view_schema name NOT NULL,
   direct_view_name name NOT NULL,
   materialized_only bool NOT NULL DEFAULT FALSE,
+  schema_change_timestamp bigint,
   -- table constraints
   CONSTRAINT continuous_agg_pkey PRIMARY KEY (mat_hypertable_id),
   CONSTRAINT continuous_agg_partial_view_schema_partial_view_name_key UNIQUE (partial_view_schema, partial_view_name),

sql/updates/2.23.1--2.24.0.sql

@@ -1,5 +1,8 @@
 DROP FUNCTION IF EXISTS _timescaledb_functions.policy_job_stat_history_retention;
+DROP VIEW IF EXISTS timescaledb_information.hypertables;
 DROP VIEW IF EXISTS timescaledb_information.chunks;
+DROP VIEW IF EXISTS timescaledb_information.chunk_columnstore_settings;
+DROP VIEW IF EXISTS timescaledb_information.chunk_compression_settings;
 
 -- Add support for concurrent merge_chunks()
 CREATE TABLE _timescaledb_catalog.chunk_rewrite (
@@ -27,3 +30,4 @@ BEGIN
     END IF;
 END
 $$;
+

sql/updates/2.24.0--2.25.0.sql

@@ -1,4 +1,9 @@
 DROP VIEW IF EXISTS timescaledb_information.dimensions;
+DROP VIEW IF EXISTS timescaledb_information.hypertables;
+DROP VIEW IF EXISTS timescaledb_information.chunks;
+DROP VIEW IF EXISTS timescaledb_information.chunk_columnstore_settings;
+DROP VIEW IF EXISTS timescaledb_information.chunk_compression_settings;
+
 -- Block update if CAggs in old format are found
 DO
 $$
@@ -252,3 +257,4 @@ DROP FUNCTION timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts
 DROP FUNCTION timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts TIMESTAMPTZ);
 
 DROP FUNCTION timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts TIMESTAMPTZ, origin TIMESTAMPTZ);
+

sql/updates/2.25.2--2.26.0.sql

@@ -14,12 +14,8 @@ ALTER TABLE _timescaledb_catalog.compression_chunk_size DROP CONSTRAINT compress
 ALTER TABLE _timescaledb_catalog.compression_chunk_size DROP CONSTRAINT compression_chunk_size_compressed_chunk_id_fkey;
 
 --drop dependent views
-DROP VIEW IF EXISTS timescaledb_information.hypertables;
-DROP VIEW IF EXISTS timescaledb_information.chunks;
 DROP VIEW IF EXISTS _timescaledb_internal.hypertable_chunk_local_size;
 DROP VIEW IF EXISTS _timescaledb_internal.compressed_chunk_stats;
-DROP VIEW IF EXISTS timescaledb_information.chunk_columnstore_settings;
-DROP VIEW IF EXISTS timescaledb_information.chunk_compression_settings;
 
 ALTER EXTENSION timescaledb DROP TABLE _timescaledb_catalog.chunk;
 ALTER EXTENSION timescaledb DROP SEQUENCE _timescaledb_catalog.chunk_id_seq;

sql/updates/latest-dev.sql

@@ -11,16 +11,6 @@ BEGIN
 END;
 $$;
 
--- Drop obsolete chunk_constraint rows for inherited CHECK constraints on
--- OSM chunks; PG inheritance handles propagation now.
-DELETE FROM _timescaledb_catalog.chunk_constraint cc
-USING _timescaledb_catalog.chunk c
-WHERE cc.chunk_id = c.id
-  AND c.osm_chunk
-  AND cc.dimension_slice_id IS NULL
-  AND cc.hypertable_constraint_name IS NOT NULL
-  AND cc.constraint_name = cc.hypertable_constraint_name;
-
 -- Rename legacy chunk-side constraints to the names the new code recomputes:
 -- FKs use the parent's name; unique/PK/exclusion/trigger use the deterministic
 -- "<chunk_id>_<parent>" form
@@ -52,14 +42,6 @@ BEGIN
 END
 $$;
 
--- Remove the chunk_constraint rows that mirrored non-dimensional constraints.
--- FK chunk-side constraints are now located by name through the event-trigger
--- hooks; unique/PK/exclusion/trigger constraints through the deterministic
--- "<chunk_id>_<parent>" name pattern.
-DELETE FROM _timescaledb_catalog.chunk_constraint
-WHERE dimension_slice_id IS NULL
-  AND hypertable_constraint_name IS NOT NULL;
-
 ALTER TABLE _timescaledb_catalog.hypertable SET (user_catalog_table = true);
 ALTER TABLE _timescaledb_catalog.chunk SET (user_catalog_table = true);
 
@@ -72,8 +54,6 @@ CREATE TABLE _timescaledb_internal.tmp_dimension_slice_seq_value AS
 ALTER TABLE _timescaledb_catalog.chunk_constraint
     DROP CONSTRAINT IF EXISTS chunk_constraint_dimension_slice_id_fkey;
 
-DROP VIEW IF EXISTS timescaledb_information.chunks;
-
 ALTER EXTENSION timescaledb DROP TABLE _timescaledb_catalog.dimension_slice;
 ALTER EXTENSION timescaledb DROP SEQUENCE _timescaledb_catalog.dimension_slice_id_seq;
 
@@ -163,7 +143,6 @@ DROP FUNCTION _timescaledb_functions.chunk_constraint_add_table_constraint(
     _timescaledb_catalog.chunk_constraint);
 DROP FUNCTION IF EXISTS _timescaledb_internal.chunk_constraint_add_table_constraint(
     _timescaledb_catalog.chunk_constraint);
-DROP VIEW IF EXISTS timescaledb_information.chunks;
 
 ALTER EXTENSION timescaledb DROP TABLE _timescaledb_catalog.chunk_constraint;
 ALTER EXTENSION timescaledb DROP SEQUENCE _timescaledb_catalog.chunk_constraint_name;
@@ -181,3 +160,100 @@ DROP FUNCTION IF EXISTS _timescaledb_functions.calculate_chunk_interval(integer,
 -- chunk_target_size is no longer used, so its check constraint is dropped.
 ALTER TABLE _timescaledb_catalog.hypertable
     DROP CONSTRAINT IF EXISTS hypertable_chunk_target_size_check;
+
+-- Rebuild the catalog table `_timescaledb_catalog.continuous_agg` to add the
+-- `schema_change_timestamp` column.
+
+-- Drop views and foreign keys that depend on the catalog table.
+DROP VIEW IF EXISTS timescaledb_experimental.policies;
+
+ALTER TABLE _timescaledb_catalog.continuous_aggs_watermark
+    DROP CONSTRAINT continuous_aggs_watermark_mat_hypertable_id_fkey;
+ALTER TABLE _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
+    DROP CONSTRAINT continuous_aggs_materialization_invalid_materialization_id_fkey;
+ALTER TABLE _timescaledb_catalog.continuous_aggs_materialization_ranges
+    DROP CONSTRAINT continuous_aggs_materialization_ranges_materialization_id_fkey;
+ALTER TABLE _timescaledb_catalog.continuous_aggs_jobs_refresh_ranges
+    DROP CONSTRAINT continuous_aggs_jobs_refresh_ranges_materialization_id_fkey;
+
+ALTER EXTENSION timescaledb
+    DROP TABLE _timescaledb_catalog.continuous_agg;
+
+CREATE TABLE _timescaledb_catalog._tmp_continuous_agg AS
+    SELECT
+        mat_hypertable_id,
+        raw_hypertable_id,
+        parent_mat_hypertable_id,
+        user_view_schema,
+        user_view_name,
+        partial_view_schema,
+        partial_view_name,
+        direct_view_schema,
+        direct_view_name,
+        materialized_only
+    FROM
+        _timescaledb_catalog.continuous_agg
+    ORDER BY
+        mat_hypertable_id;
+
+DROP TABLE _timescaledb_catalog.continuous_agg;
+
+CREATE TABLE _timescaledb_catalog.continuous_agg (
+  mat_hypertable_id integer NOT NULL,
+  raw_hypertable_id integer NOT NULL,
+  parent_mat_hypertable_id integer,
+  user_view_schema name NOT NULL,
+  user_view_name name NOT NULL,
+  partial_view_schema name NOT NULL,
+  partial_view_name name NOT NULL,
+  direct_view_schema name NOT NULL,
+  direct_view_name name NOT NULL,
+  materialized_only bool NOT NULL DEFAULT FALSE,
+  schema_change_timestamp bigint,
+  -- table constraints
+  CONSTRAINT continuous_agg_pkey PRIMARY KEY (mat_hypertable_id),
+  CONSTRAINT continuous_agg_partial_view_schema_partial_view_name_key UNIQUE (partial_view_schema, partial_view_name),
+  CONSTRAINT continuous_agg_user_view_schema_user_view_name_key UNIQUE (user_view_schema, user_view_name),
+  CONSTRAINT continuous_agg_mat_hypertable_id_fkey FOREIGN KEY (mat_hypertable_id) REFERENCES _timescaledb_catalog.hypertable (id) ON DELETE CASCADE,
+  CONSTRAINT continuous_agg_raw_hypertable_id_fkey FOREIGN KEY (raw_hypertable_id) REFERENCES _timescaledb_catalog.hypertable (id) ON DELETE CASCADE,
+  CONSTRAINT continuous_agg_parent_mat_hypertable_id_fkey FOREIGN KEY (parent_mat_hypertable_id)
+    REFERENCES _timescaledb_catalog.continuous_agg (mat_hypertable_id) ON DELETE CASCADE
+);
+
+INSERT INTO _timescaledb_catalog.continuous_agg
+    (mat_hypertable_id, raw_hypertable_id, parent_mat_hypertable_id, user_view_schema,
+     user_view_name, partial_view_schema, partial_view_name, direct_view_schema,
+     direct_view_name, materialized_only)
+SELECT * FROM _timescaledb_catalog._tmp_continuous_agg;
+DROP TABLE _timescaledb_catalog._tmp_continuous_agg;
+
+CREATE INDEX continuous_agg_raw_hypertable_id_idx ON _timescaledb_catalog.continuous_agg (raw_hypertable_id);
+
+SELECT pg_catalog.pg_extension_config_dump('_timescaledb_catalog.continuous_agg', '');
+
+GRANT SELECT ON TABLE _timescaledb_catalog.continuous_agg TO PUBLIC;
+
+ALTER TABLE _timescaledb_catalog.continuous_aggs_watermark
+    ADD CONSTRAINT continuous_aggs_watermark_mat_hypertable_id_fkey
+        FOREIGN KEY (mat_hypertable_id)
+        REFERENCES _timescaledb_catalog.continuous_agg (mat_hypertable_id) ON DELETE CASCADE;
+ALTER TABLE _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
+    ADD CONSTRAINT continuous_aggs_materialization_invalid_materialization_id_fkey
+        FOREIGN KEY (materialization_id)
+        REFERENCES _timescaledb_catalog.continuous_agg (mat_hypertable_id) ON DELETE CASCADE;
+ALTER TABLE _timescaledb_catalog.continuous_aggs_materialization_ranges
+    ADD CONSTRAINT continuous_aggs_materialization_ranges_materialization_id_fkey
+        FOREIGN KEY (materialization_id)
+        REFERENCES _timescaledb_catalog.continuous_agg (mat_hypertable_id) ON DELETE CASCADE;
+ALTER TABLE _timescaledb_catalog.continuous_aggs_jobs_refresh_ranges
+    ADD CONSTRAINT continuous_aggs_jobs_refresh_ranges_materialization_id_fkey
+        FOREIGN KEY (materialization_id)
+        REFERENCES _timescaledb_catalog.continuous_agg (mat_hypertable_id) ON DELETE CASCADE;
+
+ANALYZE _timescaledb_catalog.continuous_agg;
+-- end rebuild _timescaledb_catalog.continuous_agg --
+
+-- drop telemetry_event
+ALTER EXTENSION timescaledb DROP TABLE _timescaledb_catalog.telemetry_event;
+DROP TABLE _timescaledb_catalog.telemetry_event;
+