CREATE TABLE WITH

Author: svenklemm

src/CMakeLists.txt

@@ -10,6 +10,7 @@ set(SOURCES
     chunk_index.c
     chunk_scan.c
     constraint.c
+    create_table_with_clause.c
     cross_module_fn.c
     copy.c
     compression_with_clause.c

src/create_table_with_clause.c

@@ -0,0 +1,36 @@
+/*
+ * This file and its contents are licensed under the Apache License 2.0.
+ * Please see the included NOTICE for copyright information and
+ * LICENSE-APACHE for a copy of the license.
+ */
+
+#include <postgres.h>
+#include <access/htup_details.h>
+#include <catalog/dependency.h>
+#include <catalog/namespace.h>
+#include <catalog/pg_trigger.h>
+#include <catalog/pg_type.h>
+#include <commands/trigger.h>
+#include <fmgr.h>
+#include <parser/parser.h>
+#include <storage/lmgr.h>
+#include <utils/builtins.h>
+#include <utils/lsyscache.h>
+#include <utils/typcache.h>
+
+#include "compat/compat.h"
+#include "create_table_with_clause.h"
+#include "with_clause_parser.h"
+
+static const WithClauseDefinition create_table_with_clauses_def[] = {
+	[CreateTableFlagHypertable] = {.arg_names = {"hypertable", NULL}, .type_id = BOOLOID,},
+	[CreateTableFlagTimeColumn] = {.arg_names = {"time_column", NULL}, .type_id = TEXTOID,},
+};
+
+WithClauseResult *
+ts_create_table_with_clause_parse(const List *defelems)
+{
+	return ts_with_clauses_parse(defelems,
+								 create_table_with_clauses_def,
+								 TS_ARRAY_LEN(create_table_with_clauses_def));
+}

src/create_table_with_clause.h

@@ -0,0 +1,19 @@
+/*
+ * This file and its contents are licensed under the Apache License 2.0.
+ * Please see the included NOTICE for copyright information and
+ * LICENSE-APACHE for a copy of the license.
+ */
+#pragma once
+
+#include <postgres.h>
+#include <catalog/pg_type.h>
+
+#include "with_clause_parser.h"
+
+typedef enum CreateTableFlags
+{
+	CreateTableFlagHypertable = 0,
+	CreateTableFlagTimeColumn,
+} CreateTableFlags;
+
+WithClauseResult *ts_create_table_with_clause_parse(const List *defelems);

src/process_utility.c

@@ -58,6 +58,7 @@
 #include "chunk_index.h"
 #include "compression_with_clause.h"
 #include "copy.h"
+#include "create_table_with_clause.h"
 #include "cross_module_fn.h"
 #include "debug_assert.h"
 #include "debug_point.h"
@@ -101,6 +102,19 @@ static ProcessUtilityContext last_process_utility_context = PROCESS_UTILITY_TOPL
 static DDLResult process_altertable_set_options(AlterTableCmd *cmd, Hypertable *ht);
 static DDLResult process_altertable_reset_options(AlterTableCmd *cmd, Hypertable *ht);
 
+static Oid
+get_sizing_func_oid()
+{
+	const char *sizing_func_name = "calculate_chunk_interval";
+	const int sizing_func_nargs = 3;
+	static Oid sizing_func_arg_types[] = { INT4OID, INT8OID, INT8OID };
+
+	return ts_get_function_oid(sizing_func_name,
+							   INTERNAL_SCHEMA_NAME,
+							   sizing_func_nargs,
+							   sizing_func_arg_types);
+}
+
 /* Call the default ProcessUtility and handle PostgreSQL version differences */
 static void
 prev_ProcessUtility(ProcessUtilityArgs *args)
@@ -3665,6 +3679,13 @@ process_cluster_start(ProcessUtilityArgs *args)
 	return result;
 }
 
+typedef struct CreateTableInfo
+{
+	bool hypertable;
+	NameData time_column;
+} CreateTableInfo;
+
+static CreateTableInfo create_table_info = { 0 };
 /*
  * Process create table statements.
  *
@@ -3709,6 +3730,34 @@ process_create_table_end(Node *parsetree)
 				break;
 		}
 	}
+
+	if (true)
+	{
+		Oid table_relid = RangeVarGetRelid(stmt->relation, NoLock, true);
+
+		DimensionInfo *open_dim_info =
+			ts_dimension_info_create_open(table_relid,
+										  &create_table_info.time_column, /* column name */
+										  -1,							  /* interval */
+										  InvalidOid,					  /* interval type */
+										  InvalidOid					  /* partitioning func */
+			);
+
+		ChunkSizingInfo chunk_sizing_info = {
+			.table_relid = table_relid,
+			.func = get_sizing_func_oid(),
+			.colname = NameStr(create_table_info.time_column),
+		};
+
+		ts_hypertable_create_from_info(table_relid,
+									   INVALID_HYPERTABLE_ID,
+									   0,			  /* flags */
+									   open_dim_info, /* open_dim_info */
+									   NULL,		  /* closed_dim_info */
+									   NULL,		  /* associated_schema_name */
+									   NULL,		  /* associated_table_prefix */
+									   &chunk_sizing_info);
+	}
 }
 
 static inline const char *
@@ -4912,6 +4961,7 @@ process_create_stmt(ProcessUtilityArgs *args)
 {
 	CreateStmt *stmt = castNode(CreateStmt, args->parsetree);
 
+#if PG15_GE
 	if (stmt->accessMethod && strcmp(stmt->accessMethod, TS_HYPERCORE_TAM_NAME) == 0)
 		ereport(ERROR,
 				errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -4929,6 +4979,22 @@ process_create_stmt(ProcessUtilityArgs *args)
 				errhint("It does not make sense to set the default access method for all "
 						"tables to \"%s\" since it is only supported for hypertables.",
 						TS_HYPERCORE_TAM_NAME));
+#endif
+
+	List *pg_options = NIL, *hypertable_options = NIL;
+	ts_with_clause_filter(stmt->options, &hypertable_options, &pg_options);
+	stmt->options = pg_options;
+
+	if (hypertable_options)
+	{
+		WithClauseResult *parsed_with_clauses =
+			ts_create_table_with_clause_parse(hypertable_options);
+	}
+
+	create_table_info.hypertable =
+		DatumGetBool(parsed_with_clauses[CreateTableFlagHypertable].parsed);
+	namestrcpy(&create_table_info.time_column,
+			   TextDatumGetCString(parsed_with_clauses[CreateTableFlagTimeColumn].parsed));
 
 	return DDL_CONTINUE;
 }