You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2024/07/29 10:29:33 UTC
(iotdb) branch ty/TableModelGrammar updated: Forbid time category in create table / add table column sqls & unknown properties in table creation
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/TableModelGrammar
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ty/TableModelGrammar by this push:
new 6189a5cd3c4 Forbid time category in create table / add table column sqls & unknown properties in table creation
6189a5cd3c4 is described below
commit 6189a5cd3c4feb7bd4349fd2aaccc6c3132bcf5e
Author: Caideyipi <87...@users.noreply.github.com>
AuthorDate: Mon Jul 29 18:29:28 2024 +0800
Forbid time category in create table / add table column sqls & unknown properties in table creation
---
.../apache/iotdb/relational/it/schema/IoTDBTableIT.java | 15 +++++++++++++++
.../plan/execution/config/TableConfigTaskVisitor.java | 16 ++++++++++------
.../metadata/relational/AlterTableAddColumnTask.java | 5 +++++
.../metadata/fetcher/TableHeaderSchemaValidator.java | 3 ++-
4 files changed, 32 insertions(+), 7 deletions(-)
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
index 1063d831ebb..76bda1ee3a0 100644
--- 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
@@ -91,6 +91,21 @@ public class IoTDBTableIT {
statement.execute("use test2");
+ 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)");
+ } catch (final SQLException e) {
+ assertEquals(
+ "701: Create table 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)");
+ } catch (final SQLException e) {
+ assertEquals("701: Table property unknown is currently not allowed.", e.getMessage());
+ }
+
try {
statement.execute(
"create table table2(region_id TEXT ID, plant_id STRING ID, device_id STRING ID, model STRING ATTRIBUTE, temperature FLOAT MEASUREMENT, humidity DOUBLE MEASUREMENT) with (TTL=3600000)");
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
index 62cdf8c2810..69044b866f0 100644
--- 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
@@ -167,13 +167,17 @@ public class TableConfigTaskVisitor extends AstVisitor<IConfigTask, MPPQueryCont
final Map<String, String> map = new HashMap<>();
for (final Property property : node.getProperties()) {
final String key = property.getName().getValue().toLowerCase(Locale.ENGLISH);
- if (TABLE_ALLOWED_PROPERTIES.contains(key) && !property.isSetToDefault()) {
- final Expression value = property.getNonDefaultValue();
- if (!(value instanceof LongLiteral)) {
- throw new SemanticException(
- "TTL' value must be a LongLiteral, but now is: " + value.toString());
+ if (TABLE_ALLOWED_PROPERTIES.contains(key)) {
+ if (!property.isSetToDefault()) {
+ final Expression value = property.getNonDefaultValue();
+ if (!(value instanceof LongLiteral)) {
+ throw new SemanticException(
+ "TTL' value must be a LongLiteral, but now is: " + value.toString());
+ }
+ map.put(key, String.valueOf(((LongLiteral) value).getParsedValue()));
}
- map.put(key, String.valueOf(((LongLiteral) value).getParsedValue()));
+ } else {
+ throw new SemanticException("Table property " + key + " is currently not allowed.");
}
}
table.setProps(map);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/AlterTableAddColumnTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/AlterTableAddColumnTask.java
index f786e753023..4a531514650 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/AlterTableAddColumnTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/AlterTableAddColumnTask.java
@@ -91,6 +91,11 @@ public class AlterTableAddColumnTask implements IConfigTask {
getDefaultEncoding(dataType),
TSFileDescriptor.getInstance().getConfig().getCompressor()));
break;
+ case TIME:
+ throw new SemanticException(
+ "Adding column for column category "
+ + inputColumn.getColumnCategory()
+ + " is not supported");
default:
throw new IllegalStateException(
"Unknown ColumnCategory for adding column: " + inputColumn.getColumnCategory());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
index 3c51cd4d195..ca116146a39 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
@@ -202,7 +202,8 @@ public class TableHeaderSchemaValidator {
tsTable.addColumnSchema(new AttributeColumnSchema(columnName, dataType));
break;
case TIME:
- break;
+ throw new SemanticException(
+ "Create table statement shall not specify column category TIME");
case MEASUREMENT:
tsTable.addColumnSchema(
new MeasurementColumnSchema(