This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch DeviceId in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2ef93dbcbfededd3267cbd47ebca2d7af4ced1b6 Author: JackieTien97 <[email protected]> AuthorDate: Tue Apr 4 09:36:21 2023 +0800 Make DeviceId as KeyWords --- .../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 + docs/UserGuide/Reference/Keywords.md | 1 + docs/zh/UserGuide/Reference/Keywords.md | 1 + .../db/it/specialwords/IoTDBSpecialWordsIT.java | 77 ++++++++++++++++++++++ 4 files changed, 80 insertions(+) diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4 index 5889464db9..3477d54f5a 100644 --- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4 +++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4 @@ -73,6 +73,7 @@ keyWords | DESC | DESCRIBE | DEVICE + | DEVICEID | DEVICES | DETAILS | DISABLE diff --git a/docs/UserGuide/Reference/Keywords.md b/docs/UserGuide/Reference/Keywords.md index 28074a8677..88cd9c5b9e 100644 --- a/docs/UserGuide/Reference/Keywords.md +++ b/docs/UserGuide/Reference/Keywords.md @@ -86,6 +86,7 @@ Common Keywords: - DESC - DESCRIBE - DEVICE +- DEVICEID - DEVICES - DISABLE - DISCARD diff --git a/docs/zh/UserGuide/Reference/Keywords.md b/docs/zh/UserGuide/Reference/Keywords.md index fff9393965..2d98f03490 100644 --- a/docs/zh/UserGuide/Reference/Keywords.md +++ b/docs/zh/UserGuide/Reference/Keywords.md @@ -86,6 +86,7 @@ - DESC - DESCRIBE - DEVICE +- DEVICEID - DEVICES - DISABLE - DISCARD diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/specialwords/IoTDBSpecialWordsIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/specialwords/IoTDBSpecialWordsIT.java new file mode 100644 index 0000000000..6ccc2d3272 --- /dev/null +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/specialwords/IoTDBSpecialWordsIT.java @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iotdb.db.it.specialwords; + +import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; +import org.apache.iotdb.itbase.category.ClusterIT; +import org.apache.iotdb.itbase.category.LocalStandaloneIT; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +import static org.junit.Assert.assertEquals; + +@RunWith(IoTDBTestRunner.class) +@Category({LocalStandaloneIT.class, ClusterIT.class}) +public class IoTDBSpecialWordsIT { + + @Before + public void setUp() throws Exception { + EnvFactory.getEnv().initClusterEnvironment(); + } + + @After + public void tearDown() throws Exception { + EnvFactory.getEnv().cleanClusterEnvironment(); + } + + @Test + public void testDeviceId() { + try (Connection connection = EnvFactory.getEnv().getConnection(); + Statement statement = connection.createStatement()) { + statement.setFetchSize(5); + statement.execute("CREATE DATABASE root.sg1"); + statement.execute( + "CREATE TIMESERIES root.sg1.deviceId.s1 WITH DATATYPE=INT32,ENCODING=PLAIN"); + statement.execute("INSERT INTO root.sg1.deviceId(time, s1) values(1, 1)"); + + try (ResultSet resultSet = statement.executeQuery("select s1 from root.sg1.deviceId")) { + int count = 0; + while (resultSet.next()) { + assertEquals("1", resultSet.getString("Time")); + assertEquals("1", resultSet.getString("root.sg1.deviceId.s1")); + count++; + } + assertEquals(1, count); + } + + } catch (SQLException e) { + e.printStackTrace(); + } + } +}
