Allow time column specification in table creation & Enhance table IT's TTL for insertion & disable SCHEMA_REPLICATION_FACTOR / DATA_REPLICATION_FACTOR in table database definition

Caideyipi · web-flow · commit 3ba0903a5d12 · 2024-11-25T14:24:31.000+08:00
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
@@ -157,10 +157,9 @@ public void testManageDatabase() {
 
       // Test create database with properties
       statement.execute(
-          "create database test_prop with (ttl=300, schema_replication_factor=DEFAULT, data_replication_factor=3, time_partition_interval=100000)");
+          "create database test_prop with (ttl=300, schema_region_group_num=DEFAULT, time_partition_interval=100000)");
       databaseNames = new String[] {"test_prop"};
       TTLs = new String[] {"300"};
-      dataReplicaFactors = new int[] {3};
       timePartitionInterval = new int[] {100000};
 
       // show
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java
@@ -68,7 +68,7 @@ public void testManageTable() {
         final Statement statement = connection.createStatement()) {
 
       statement.execute("create database test1");
-      statement.execute("create database test2 with (ttl=300)");
+      statement.execute("create database test2 with (ttl=3000000)");
 
       // should specify database before create table
       try {
@@ -130,22 +130,22 @@ public void testManageTable() {
       }
 
       // Alter table properties
-      statement.execute("alter table test1.table1 set properties ttl=1");
-      ttls = new String[] {"1"};
+      statement.execute("alter table test1.table1 set properties ttl=1000000");
+      ttls = new String[] {"1000000"};
 
       // Alter non-exist table
       try {
-        statement.execute("alter table test1.nonExist set properties ttl=1");
+        statement.execute("alter table test1.nonExist set properties ttl=1000000");
       } catch (final SQLException e) {
         assertEquals("550: Table 'test1.nonexist' does not exist", e.getMessage());
       }
 
       // If exists
-      statement.execute("alter table if exists test1.nonExist set properties ttl=1");
+      statement.execute("alter table if exists test1.nonExist set properties ttl=1000000");
 
       // Alter non-supported properties
       try {
-        statement.execute("alter table test1.table1 set properties nonSupport=1");
+        statement.execute("alter table test1.table1 set properties nonSupport=1000000");
       } catch (final SQLException e) {
         assertEquals("701: Table property 'nonsupport' is currently not allowed.", e.getMessage());
       }
@@ -191,16 +191,6 @@ public void testManageTable() {
       statement.execute(
           "create table if not exists test1.table1(region_id STRING ID, plant_id STRING ID, device_id STRING ID, model STRING ATTRIBUTE, temperature FLOAT MEASUREMENT, humidity DOUBLE MEASUREMENT)");
 
-      try {
-        statement.execute(
-            "create table table2(region_id STRING ID, plant_id STRING ID, device_id STRING ID, model STRING ATTRIBUTE, temperature FLOAT MEASUREMENT, humidity DOUBLE MEASUREMENT, time2 INT64 TIME) with (TTL=3600000)");
-        fail();
-      } catch (final SQLException e) {
-        assertEquals(
-            "701: Create table or add column statement shall not specify column category TIME",
-            e.getMessage());
-      }
-
       try {
         statement.execute(
             "create table table2(region_id STRING ID, plant_id STRING ID, device_id STRING ID, model STRING ATTRIBUTE, temperature FLOAT MEASUREMENT, humidity DOUBLE MEASUREMENT) with (UNKNOWN=3600000)");
@@ -291,7 +281,7 @@ public void testManageTable() {
       statement.execute("create table table3()");
 
       tableNames = new String[] {"table3", "table2"};
-      ttls = new String[] {"300", "6600000"};
+      ttls = new String[] {"3000000", "6600000"};
 
       // show tables from current database
       try (final ResultSet resultSet = statement.executeQuery("SHOW tables")) {
@@ -310,10 +300,10 @@ public void testManageTable() {
         assertEquals(tableNames.length, cnt);
       }
 
-      statement.execute("alter table table3 set properties ttl=300");
+      statement.execute("alter table table3 set properties ttl=1000000");
       statement.execute("alter table table3 set properties ttl=DEFAULT");
 
-      // The table3's ttl shall be also 300
+      // The table3's ttl shall be also 3000000
       try (final ResultSet resultSet = statement.executeQuery("SHOW tables")) {
         int cnt = 0;
         ResultSetMetaData metaData = resultSet.getMetaData();
@@ -535,6 +525,32 @@ public void testManageTable() {
         assertEquals("500: Unknown database test1", e.getMessage());
       }
 
+      // Test time column
+      statement.execute("create table test100 (time time)");
+      statement.execute("create table test101 (time timestamp time)");
+
+      try {
+        statement.execute("create table test102 (time timestamp id)");
+        fail();
+      } catch (final SQLException e) {
+        assertEquals(
+            "701: The time column category shall be bounded with column name 'time'.",
+            e.getMessage());
+      }
+
+      try {
+        statement.execute("create table test102 (time id)");
+        fail();
+      } catch (final SQLException e) {
+        assertEquals("701: The time column's type shall be 'timestamp'.", e.getMessage());
+      }
+
+      try {
+        statement.execute("create table test102 (time time, time time)");
+        fail();
+      } catch (final SQLException e) {
+        assertEquals("701: Columns in table shall not share the same name time.", e.getMessage());
+      }
     } catch (final SQLException e) {
       e.printStackTrace();
       fail(e.getMessage());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java
@@ -146,9 +146,7 @@
 import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES;
 import static org.apache.iotdb.commons.schema.table.TsTable.TTL_PROPERTY;
 import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.DATA_REGION_GROUP_NUM_KEY;
-import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.DATA_REPLICATION_FACTOR_KEY;
 import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.SCHEMA_REGION_GROUP_NUM_KEY;
-import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.SCHEMA_REPLICATION_FACTOR_KEY;
 import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.TIME_PARTITION_INTERVAL_KEY;
 import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.TTL_KEY;
 import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType;
@@ -193,8 +191,6 @@ protected IConfigTask visitCreateDB(final CreateDB node, final MPPQueryContext c
       if (property.isSetToDefault()) {
         switch (key) {
           case TTL_KEY:
-          case SCHEMA_REPLICATION_FACTOR_KEY:
-          case DATA_REPLICATION_FACTOR_KEY:
           case TIME_PARTITION_INTERVAL_KEY:
           case SCHEMA_REGION_GROUP_NUM_KEY:
           case DATA_REGION_GROUP_NUM_KEY:
@@ -219,13 +215,6 @@ protected IConfigTask visitCreateDB(final CreateDB node, final MPPQueryContext c
           }
           schema.setTTL(parseLongFromLiteral(value, TTL_KEY));
           break;
-        case SCHEMA_REPLICATION_FACTOR_KEY:
-          schema.setSchemaReplicationFactor(
-              parseIntFromLiteral(value, SCHEMA_REPLICATION_FACTOR_KEY));
-          break;
-        case DATA_REPLICATION_FACTOR_KEY:
-          schema.setDataReplicationFactor(parseIntFromLiteral(value, DATA_REPLICATION_FACTOR_KEY));
-          break;
         case TIME_PARTITION_INTERVAL_KEY:
           schema.setTimePartitionInterval(parseLongFromLiteral(value, TIME_PARTITION_INTERVAL_KEY));
           break;
@@ -323,20 +312,43 @@ protected IConfigTask visitCreateTable(final CreateTable node, final MPPQueryCon
     table.setProps(convertPropertiesToMap(node.getProperties(), false));
 
     // TODO: Place the check at statement analyzer
+    boolean hasTimeColumn = false;
     for (final ColumnDefinition columnDefinition : node.getElements()) {
       final TsTableColumnCategory category = columnDefinition.getColumnCategory();
       final String columnName = columnDefinition.getName().getValue();
+      final TSDataType dataType = getDataType(columnDefinition.getType());
+      if (checkTimeColumnIdempotent(category, columnName, dataType) && !hasTimeColumn) {
+        hasTimeColumn = true;
+        continue;
+      }
       if (table.getColumnSchema(columnName) != null) {
         throw new SemanticException(
             String.format("Columns in table shall not share the same name %s.", columnName));
       }
-      final TSDataType dataType = getDataType(columnDefinition.getType());
       table.addColumnSchema(
           TableHeaderSchemaValidator.generateColumnSchema(category, columnName, dataType));
     }
     return new CreateTableTask(table, databaseTablePair.getLeft(), node.isIfNotExists());
   }
 
+  private boolean checkTimeColumnIdempotent(
+      final TsTableColumnCategory category, final String columnName, final TSDataType dataType) {
+    if (category == TsTableColumnCategory.TIME || columnName.equals(TsTable.TIME_COLUMN_NAME)) {
+      if (category == TsTableColumnCategory.TIME
+          && columnName.equals(TsTable.TIME_COLUMN_NAME)
+          && dataType == TSDataType.TIMESTAMP) {
+        return true;
+      } else if (dataType == TSDataType.TIMESTAMP) {
+        throw new SemanticException(
+            "The time column category shall be bounded with column name 'time'.");
+      } else {
+        throw new SemanticException("The time column's type shall be 'timestamp'.");
+      }
+    }
+
+    return false;
+  }
+
   @Override
   protected IConfigTask visitRenameTable(final RenameTable node, final MPPQueryContext context) {
     context.setQueryType(QueryType.WRITE);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/CreateDBTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/CreateDBTask.java
@@ -30,12 +30,14 @@ public class CreateDBTask implements IConfigTask {
 
   /////////////////////////////// Allowed properties ///////////////////////////////
   public static final String TTL_KEY = "ttl";
-  public static final String SCHEMA_REPLICATION_FACTOR_KEY = "schema_replication_factor";
-  public static final String DATA_REPLICATION_FACTOR_KEY = "data_replication_factor";
   public static final String TIME_PARTITION_INTERVAL_KEY = "time_partition_interval";
   public static final String SCHEMA_REGION_GROUP_NUM_KEY = "schema_region_group_num";
   public static final String DATA_REGION_GROUP_NUM_KEY = "data_region_group_num";
 
+  // Deprecated
+  public static final String SCHEMA_REPLICATION_FACTOR_KEY = "schema_replication_factor";
+  public static final String DATA_REPLICATION_FACTOR_KEY = "data_replication_factor";
+
   /////////////////////////////// Fields ///////////////////////////////
 
   private final TDatabaseSchema schema;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java
@@ -62,10 +62,13 @@ public ColumnDefinition(
     super(requireNonNull(location, "location is null"));
     this.name = requireNonNull(name, "name is null");
     this.columnCategory = requireNonNull(columnCategory, "columnCategory is null");
-    if ((columnCategory == TsTableColumnCategory.ID
-            || columnCategory == TsTableColumnCategory.ATTRIBUTE)
-        && (Objects.isNull(type))) {
-      type = new GenericDataType(new Identifier("string"), new ArrayList<>());
+    if (Objects.isNull(type)) {
+      if ((columnCategory == TsTableColumnCategory.ID
+          || columnCategory == TsTableColumnCategory.ATTRIBUTE)) {
+        type = new GenericDataType(new Identifier("string"), new ArrayList<>());
+      } else if (columnCategory == TsTableColumnCategory.TIME) {
+        type = new GenericDataType(new Identifier("timestamp"), new ArrayList<>());
+      }
     }
     this.type = requireNonNull(type, "type is null");
     this.charsetName = charsetName;
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TimeColumnSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TimeColumnSchema.java
@@ -28,11 +28,12 @@
 import java.util.Map;
 
 public class TimeColumnSchema extends TsTableColumnSchema {
-  public TimeColumnSchema(String columnName, TSDataType dataType) {
+  public TimeColumnSchema(final String columnName, final TSDataType dataType) {
     super(columnName, dataType);
   }
 
-  public TimeColumnSchema(String columnName, TSDataType dataType, Map<String, String> props) {
+  public TimeColumnSchema(
+      final String columnName, final TSDataType dataType, final Map<String, String> props) {
     super(columnName, dataType, props);
   }
 
@@ -41,17 +42,17 @@ public TsTableColumnCategory getColumnCategory() {
     return TsTableColumnCategory.TIME;
   }
 
-  static TimeColumnSchema deserialize(InputStream stream) throws IOException {
-    String columnName = ReadWriteIOUtils.readString(stream);
-    TSDataType dataType = ReadWriteIOUtils.readDataType(stream);
-    Map<String, String> props = ReadWriteIOUtils.readMap(stream);
+  static TimeColumnSchema deserialize(final InputStream stream) throws IOException {
+    final String columnName = ReadWriteIOUtils.readString(stream);
+    final TSDataType dataType = ReadWriteIOUtils.readDataType(stream);
+    final Map<String, String> props = ReadWriteIOUtils.readMap(stream);
     return new TimeColumnSchema(columnName, dataType, props);
   }
 
-  static TimeColumnSchema deserialize(ByteBuffer buffer) {
-    String columnName = ReadWriteIOUtils.readString(buffer);
-    TSDataType dataType = ReadWriteIOUtils.readDataType(buffer);
-    Map<String, String> props = ReadWriteIOUtils.readMap(buffer);
+  static TimeColumnSchema deserialize(final ByteBuffer buffer) {
+    final String columnName = ReadWriteIOUtils.readString(buffer);
+    final TSDataType dataType = ReadWriteIOUtils.readDataType(buffer);
+    final Map<String, String> props = ReadWriteIOUtils.readMap(buffer);
     return new TimeColumnSchema(columnName, dataType, props);
   }
 }
diff --git a/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4 b/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
@@ -156,7 +156,7 @@ charsetDesc
     ;
 
 columnDefinition
-    : identifier columnCategory=(ID | ATTRIBUTE) charsetName?
+    : identifier columnCategory=(ID | ATTRIBUTE | TIME) charsetName?
     | identifier type (columnCategory=(ID | ATTRIBUTE | TIME | MEASUREMENT))? charsetName?
     ;
 

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ charsetDesc`
`156`	`156`	`;`
`157`	`157`
`158`	`158`	`columnDefinition`
`159`		`- : identifier columnCategory=(ID \| ATTRIBUTE) charsetName?`
	`159`	`+ : identifier columnCategory=(ID \| ATTRIBUTE \| TIME) charsetName?`
`160`	`160`	`\| identifier type (columnCategory=(ID \| ATTRIBUTE \| TIME \| MEASUREMENT))? charsetName?`
`161`	`161`	`;`
`162`	`162`