Allow tsdb as alias for timescaledb in WITH clauses

This patch allows tsdb as alias for timescaledb in WITH and SET clauses to save on some typing.
timescale · Feb 22, 2025 · c687fb7 · c687fb7
1 parent 5fcf4d8
commit c687fb7
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 4 deletions.
diff --git a/.unreleased/pr_7765 b/.unreleased/pr_7765
@@ -0,0 +1 @@
+Implements: #7765 Allow tsdb as alias for timescaledb in WITH and SET clauses
diff --git a/src/extension_constants.h b/src/extension_constants.h
@@ -10,6 +10,7 @@
 
 #define EXTENSION_NAME "timescaledb"	  /* Name of the actual extension */
 #define EXTENSION_NAMESPACE "timescaledb" /* Namespace for extension objects */
+#define EXTENSION_NAMESPACE_ALIAS "tsdb"  /* Namespace for extension objects */
 #define EXTENSION_FDW_NAME "timescaledb_fdw"
 #define TSL_LIBRARY_NAME "timescaledb-tsl"
 #define TS_LIBDIR "$libdir/"

diff --git a/src/with_clause_parser.c b/src/with_clause_parser.c
@@ -40,7 +40,9 @@ ts_with_clause_filter(const List *def_elems, List **within_namespace, List **not
 	{
 		DefElem *def = (DefElem *) lfirst(cell);
 
-		if (def->defnamespace != NULL && pg_strcasecmp(def->defnamespace, EXTENSION_NAMESPACE) == 0)
+		if (def->defnamespace != NULL &&
+			(pg_strcasecmp(def->defnamespace, EXTENSION_NAMESPACE) == 0 ||
+			 pg_strcasecmp(def->defnamespace, EXTENSION_NAMESPACE_ALIAS) == 0))
 		{
 			if (within_namespace != NULL)
 				*within_namespace = lappend(*within_namespace, def);

diff --git a/tsl/test/expected/cagg_ddl-14.out b/tsl/test/expected/cagg_ddl-14.out
@@ -2121,3 +2121,11 @@ SELECT * FROM _timescaledb_catalog.compression_settings;
 -------+-----------+---------+--------------+--------------------
 (0 rows)
 
+-- test WITH namespace alias
+CREATE TABLE with_alias(time timestamptz not null);
+CREATE MATERIALIZED VIEW cagg_alias
+WITH (tsdb.continuous, tsdb.materialized_only=false) AS
+SELECT time_bucket(INTERVAL '1 day', time) FROM conditions GROUP BY 1 WITH NO DATA;
+ALTER MATERIALIZED VIEW cagg_alias SET (timescaledb.materialized_only=false);
+ALTER MATERIALIZED VIEW cagg_alias SET (tsdb.materialized_only=false);
+DROP MATERIALIZED VIEW cagg_alias;
diff --git a/tsl/test/expected/cagg_ddl-15.out b/tsl/test/expected/cagg_ddl-15.out
@@ -2121,3 +2121,11 @@ SELECT * FROM _timescaledb_catalog.compression_settings;
 -------+-----------+---------+--------------+--------------------
 (0 rows)
 
+-- test WITH namespace alias
+CREATE TABLE with_alias(time timestamptz not null);
+CREATE MATERIALIZED VIEW cagg_alias
+WITH (tsdb.continuous, tsdb.materialized_only=false) AS
+SELECT time_bucket(INTERVAL '1 day', time) FROM conditions GROUP BY 1 WITH NO DATA;
+ALTER MATERIALIZED VIEW cagg_alias SET (timescaledb.materialized_only=false);
+ALTER MATERIALIZED VIEW cagg_alias SET (tsdb.materialized_only=false);
+DROP MATERIALIZED VIEW cagg_alias;
diff --git a/tsl/test/expected/cagg_ddl-16.out b/tsl/test/expected/cagg_ddl-16.out
@@ -2121,3 +2121,11 @@ SELECT * FROM _timescaledb_catalog.compression_settings;
 -------+-----------+---------+--------------+--------------------
 (0 rows)
 
+-- test WITH namespace alias
+CREATE TABLE with_alias(time timestamptz not null);
+CREATE MATERIALIZED VIEW cagg_alias
+WITH (tsdb.continuous, tsdb.materialized_only=false) AS
+SELECT time_bucket(INTERVAL '1 day', time) FROM conditions GROUP BY 1 WITH NO DATA;
+ALTER MATERIALIZED VIEW cagg_alias SET (timescaledb.materialized_only=false);
+ALTER MATERIALIZED VIEW cagg_alias SET (tsdb.materialized_only=false);
+DROP MATERIALIZED VIEW cagg_alias;
diff --git a/tsl/test/expected/cagg_ddl-17.out b/tsl/test/expected/cagg_ddl-17.out
@@ -2121,3 +2121,11 @@ SELECT * FROM _timescaledb_catalog.compression_settings;
 -------+-----------+---------+--------------+--------------------
 (0 rows)
 
+-- test WITH namespace alias
+CREATE TABLE with_alias(time timestamptz not null);
+CREATE MATERIALIZED VIEW cagg_alias
+WITH (tsdb.continuous, tsdb.materialized_only=false) AS
+SELECT time_bucket(INTERVAL '1 day', time) FROM conditions GROUP BY 1 WITH NO DATA;
+ALTER MATERIALIZED VIEW cagg_alias SET (timescaledb.materialized_only=false);
+ALTER MATERIALIZED VIEW cagg_alias SET (tsdb.materialized_only=false);
+DROP MATERIALIZED VIEW cagg_alias;
diff --git a/tsl/test/expected/compression_ddl.out b/tsl/test/expected/compression_ddl.out
@@ -2655,3 +2655,19 @@ SELECT compress_chunk(show_chunks('test_notnull'));
 
 -- broken atm due to bug in default handling in compression
 ALTER TABLE test_notnull ALTER COLUMN c2 SET NOT NULL;
+-- test alias in parameter name
+CREATE TABLE alias(time timestamptz NOT NULL);
+SELECT create_hypertable('alias','time');
+  create_hypertable  
+---------------------
+ (48,public,alias,t)
+(1 row)
+
+ALTER TABLE alias SET (tsdb.compress, tsdb.compress_orderby='time DESC',tsdb.compress_segmentby='');
+INSERT INTO alias SELECT '2025-01-01';
+SELECT count(compress_chunk(ch)) FROM show_chunks('alias') ch;
+ count 
+-------
+     1
+(1 row)
+
diff --git a/tsl/test/shared/expected/with_clause_parser.out b/tsl/test/shared/expected/with_clause_parser.out
@@ -14,15 +14,19 @@ SELECT * FROM test_with_clause_filter(
             {"baz", "bar", "foo"},
             {"timescaledb", "bar", "baz"},
             {"bar", "timescaledb", "baz"},
-            {"timescaledb", "baz", "bar"}
+            {"timescaledb", "baz", "bar"},
+            {"tsdb", "qux", "bar"},
+            {"tsdb", "quux", "bar"}
         }');
   namespace  |    name     | value | filtered 
 -------------+-------------+-------+----------
  timescaledb | bar         | baz   | t
  timescaledb | baz         | bar   | t
+ tsdb        | qux         | bar   | t
+ tsdb        | quux        | bar   | t
  baz         | bar         | foo   | f
  bar         | timescaledb | baz   | f
-(4 rows)
+(6 rows)
 
 SELECT * FROM test_with_clause_filter(
         '{

diff --git a/tsl/test/shared/sql/with_clause_parser.sql b/tsl/test/shared/sql/with_clause_parser.sql
@@ -18,7 +18,9 @@ SELECT * FROM test_with_clause_filter(
             {"baz", "bar", "foo"},
             {"timescaledb", "bar", "baz"},
             {"bar", "timescaledb", "baz"},
-            {"timescaledb", "baz", "bar"}
+            {"timescaledb", "baz", "bar"},
+            {"tsdb", "qux", "bar"},
+            {"tsdb", "quux", "bar"}
         }');
 
 SELECT * FROM test_with_clause_filter(

diff --git a/tsl/test/sql/cagg_ddl.sql.in b/tsl/test/sql/cagg_ddl.sql.in
@@ -1347,3 +1347,13 @@ SELECT count(compress_chunk(ch)) FROM show_chunks('cagg1') ch;
 DROP MATERIALIZED VIEW cagg1;
 SELECT * FROM _timescaledb_catalog.compression_settings;
 
+-- test WITH namespace alias
+CREATE TABLE with_alias(time timestamptz not null);
+CREATE MATERIALIZED VIEW cagg_alias
+WITH (tsdb.continuous, tsdb.materialized_only=false) AS
+SELECT time_bucket(INTERVAL '1 day', time) FROM conditions GROUP BY 1 WITH NO DATA;
+
+ALTER MATERIALIZED VIEW cagg_alias SET (timescaledb.materialized_only=false);
+ALTER MATERIALIZED VIEW cagg_alias SET (tsdb.materialized_only=false);
+
+DROP MATERIALIZED VIEW cagg_alias;
diff --git a/tsl/test/sql/compression_ddl.sql b/tsl/test/sql/compression_ddl.sql
@@ -1153,3 +1153,13 @@ SELECT compress_chunk(show_chunks('test_notnull'));
 -- broken atm due to bug in default handling in compression
 ALTER TABLE test_notnull ALTER COLUMN c2 SET NOT NULL;
 
+-- test alias in parameter name
+CREATE TABLE alias(time timestamptz NOT NULL);
+SELECT create_hypertable('alias','time');
+ALTER TABLE alias SET (tsdb.compress, tsdb.compress_orderby='time DESC',tsdb.compress_segmentby='');
+INSERT INTO alias SELECT '2025-01-01';
+SELECT count(compress_chunk(ch)) FROM show_chunks('alias') ch;
+
+
+
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Implements: #7765 Allow tsdb as alias for timescaledb in WITH and SET clauses