Fixed const handling

timescale · Dec 13, 2023 · 36c7b22 · 36c7b22
1 parent e7db6b4
commit 36c7b22
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.unreleased/feature_6382 b/.unreleased/feature_6382
@@ -0,0 +1 @@
+Implements: #6382 Support for time_bucket with origin and offset in CAggs 
diff --git a/tsl/src/continuous_aggs/common.c b/tsl/src/continuous_aggs/common.c
@@ -294,8 +294,11 @@ caggtimebucket_validate(CAggTimebucketInfo *tbinfo, List *groupClause, List *tar
 					if (list_length(fe->args) >= 3 && exprType(lthird(fe->args)) == TIMESTAMPTZOID)
 					{
 						custom_origin = true;
-						tbinfo->origin =
-							DatumGetTimestampTz(castNode(Const, lthird(fe->args))->constvalue);
+						if (IsA(lthird(fe->args), Const))
+						{
+							tbinfo->origin =
+								DatumGetTimestampTz(castNode(Const, lthird(fe->args))->constvalue);
+						}
 					}
 					else if (list_length(fe->args) >= 4 &&
 							 exprType(lfourth(fe->args)) == TIMESTAMPTZOID)

diff --git a/tsl/test/expected/cagg_watermark.out b/tsl/test/expected/cagg_watermark.out
@@ -48,7 +48,7 @@ NOTICE:  adding not-null constraint to column "time"
  (2,public,continuous_agg_test_mat,t)
 (1 row)
 
-INSERT INTO _timescaledb_catalog.continuous_agg VALUES (2, 1, NULL, '','','','',0,'','');
+INSERT INTO _timescaledb_catalog.continuous_agg VALUES (2, 1, NULL, '', '', '', '', 0, NULL, NULL, '', '');
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 -- create the trigger
 CREATE TRIGGER continuous_agg_insert_trigger

diff --git a/tsl/test/sql/cagg_watermark.sql b/tsl/test/sql/cagg_watermark.sql
@@ -20,7 +20,7 @@ SELECT * from _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log;
 \c :TEST_DBNAME :ROLE_SUPERUSER
 CREATE TABLE continuous_agg_test_mat(time int);
 select create_hypertable('continuous_agg_test_mat', 'time', chunk_time_interval=> 10);
-INSERT INTO _timescaledb_catalog.continuous_agg VALUES (2, 1, NULL, '','','','',0,'','');
+INSERT INTO _timescaledb_catalog.continuous_agg VALUES (2, 1, NULL, '', '', '', '', 0, NULL, NULL, '', '');
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
 -- create the trigger