Fix CAgg migration with timestamp without timezone

It was a leftover from the original implementation where we didn't add
tests for time dimension using `timestamp without timezone`.

Fixed it by dealing with this datatype and added regression tests.

Fixes timescale#4956

CHANGELOG.md

@@ -25,9 +25,11 @@ argument or resolve the type ambiguity by casting to the intended type.
 * #4696 Report warning when enabling compression on hypertable
 * #4745 Fix FK constraint violation error while insert into hypertable which references partitioned table
 * #4756 Improve compression job IO performance
-* #4807 Fix segmentation fault during INSERT into compressed hypertable.
+* #4807 Fix segmentation fault during INSERT into compressed hypertable
 * #4840 Fix performance regressions in the copy code
-* #4823 Fix a crash that could occur when using nested user-defined functions with hypertables.
+* #4823 Fix a crash that could occur when using nested user-defined functions with hypertables
+* #4898 Fix cagg migration failure when trying to resume
+* #4955 Fix cagg migration for hypertables using timestamp without timezone
 
 **Thanks**
 * @jflambert for reporting a crash with nested user-defined functions.

sql/cagg_migrate.sql

@@ -367,6 +367,8 @@ BEGIN
     CASE _plan_step.config->>'window_start_type'
         WHEN 'timestamp with time zone' THEN
             CALL @extschema@.refresh_continuous_aggregate(_cagg, (_plan_step.config->>'window_start')::timestamptz, NULL);
+        WHEN 'timestamp without time zone' THEN
+            CALL @extschema@.refresh_continuous_aggregate(_cagg, (_plan_step.config->>'window_start')::timestamp, NULL);
         WHEN 'bigint' THEN
             CALL @extschema@.refresh_continuous_aggregate(_cagg, (_plan_step.config->>'window_start')::bigint, NULL);
         WHEN 'integer' THEN

tsl/test/sql/CMakeLists.txt

@@ -58,6 +58,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
     cagg_migrate_integer_dist_ht.sql
     cagg_migrate_timestamp.sql
     cagg_migrate_timestamp_dist_ht.sql
+    cagg_migrate_timestamptz.sql
+    cagg_migrate_timestamptz_dist_ht.sql
     cagg_multi.sql
     continuous_aggs_deprecated.sql
     cagg_tableam.sql

tsl/test/sql/cagg_migrate_integer.sql

@@ -4,5 +4,6 @@
 
 \set IS_DISTRIBUTED FALSE
 \set IS_TIME_DIMENSION FALSE
+\set TIME_DIMENSION_DATATYPE INTEGER
 
 \ir include/cagg_migrate_common.sql

tsl/test/sql/cagg_migrate_integer_dist_ht.sql

@@ -23,6 +23,7 @@ GRANT USAGE ON FOREIGN SERVER :DATA_NODE_1, :DATA_NODE_2, :DATA_NODE_3 TO PUBLIC
 
 \set IS_DISTRIBUTED TRUE
 \set IS_TIME_DIMENSION FALSE
+\set TIME_DIMENSION_DATATYPE INTEGER
 
 \ir include/cagg_migrate_common.sql
 

tsl/test/sql/cagg_migrate_timestamp.sql

@@ -4,5 +4,6 @@
 
 \set IS_DISTRIBUTED FALSE
 \set IS_TIME_DIMENSION TRUE
+\set TIME_DIMENSION_DATATYPE TIMESTAMP
 
 \ir include/cagg_migrate_common.sql

tsl/test/sql/cagg_migrate_timestamp_dist_ht.sql

@@ -23,6 +23,7 @@ GRANT USAGE ON FOREIGN SERVER :DATA_NODE_1, :DATA_NODE_2, :DATA_NODE_3 TO PUBLIC
 
 \set IS_DISTRIBUTED TRUE
 \set IS_TIME_DIMENSION TRUE
+\set TIME_DIMENSION_DATATYPE TIMESTAMP
 
 \ir include/cagg_migrate_common.sql
 

tsl/test/sql/cagg_migrate_timestamptz.sql

@@ -0,0 +1,9 @@
+-- This file and its contents are licensed under the Timescale License.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-TIMESCALE for a copy of the license.
+
+\set IS_DISTRIBUTED FALSE
+\set IS_TIME_DIMENSION TRUE
+\set TIME_DIMENSION_DATATYPE TIMESTAMPTZ
+
+\ir include/cagg_migrate_common.sql

tsl/test/sql/cagg_migrate_timestamptz_dist_ht.sql

@@ -0,0 +1,34 @@
+-- This file and its contents are licensed under the Timescale License.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-TIMESCALE for a copy of the license.
+
+------------------------------------
+-- Set up a distributed environment
+------------------------------------
+\c :TEST_DBNAME :ROLE_CLUSTER_SUPERUSER
+
+\set DATA_NODE_1 :TEST_DBNAME _1
+\set DATA_NODE_2 :TEST_DBNAME _2
+\set DATA_NODE_3 :TEST_DBNAME _3
+
+\ir include/remote_exec.sql
+
+SELECT node_name, database, node_created, database_created, extension_created
+FROM (
+  SELECT (add_data_node(name, host => 'localhost', DATABASE => name)).*
+  FROM (VALUES (:'DATA_NODE_1'), (:'DATA_NODE_2'), (:'DATA_NODE_3')) v(name)
+) a;
+
+GRANT USAGE ON FOREIGN SERVER :DATA_NODE_1, :DATA_NODE_2, :DATA_NODE_3 TO PUBLIC;
+
+\set IS_DISTRIBUTED TRUE
+\set IS_TIME_DIMENSION TRUE
+\set TIME_DIMENSION_DATATYPE TIMESTAMPTZ
+
+\ir include/cagg_migrate_common.sql
+
+-- cleanup
+\c :TEST_DBNAME :ROLE_CLUSTER_SUPERUSER;
+DROP DATABASE :DATA_NODE_1;
+DROP DATABASE :DATA_NODE_2;
+DROP DATABASE :DATA_NODE_3;

tsl/test/sql/include/cagg_migrate_common.sql

@@ -10,14 +10,8 @@
 \echo 'Running local hypertable tests'
 \endif
 
-\if :IS_TIME_DIMENSION
-    \set TIME_DATATYPE TIMESTAMPTZ
-\else
-    \set TIME_DATATYPE INTEGER
-\endif
-
 CREATE TABLE conditions (
-    "time" :TIME_DATATYPE NOT NULL,
+    "time" :TIME_DIMENSION_DATATYPE NOT NULL,
     temperature NUMERIC
 );
 
@@ -42,18 +36,17 @@ CREATE TABLE conditions (
         0.25;
 \else
     CREATE OR REPLACE FUNCTION integer_now()
-    RETURNS integer LANGUAGE SQL STABLE AS
+    RETURNS :TIME_DIMENSION_DATATYPE LANGUAGE SQL STABLE AS
     $$
         SELECT coalesce(max(time), 0)
         FROM public.conditions
     $$;
 
     \if :IS_DISTRIBUTED
-        CALL distributed_exec (
-            $DIST$
-            CREATE OR REPLACE FUNCTION integer_now() RETURNS integer LANGUAGE SQL STABLE AS $$ SELECT coalesce(max(time), 0) FROM public.conditions $$;
-            $DIST$
-        );
+        SELECT
+            'CREATE OR REPLACE FUNCTION integer_now() RETURNS '||:'TIME_DIMENSION_DATATYPE'||' LANGUAGE SQL STABLE AS $$ SELECT coalesce(max(time), 0) FROM public.conditions $$;' AS "STMT"
+            \gset
+        CALL distributed_exec (:'STMT');
     \endif
 
     SELECT set_integer_now_func('conditions', 'integer_now');