This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/FixNodeName in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ea3d08ac45247542cb96cebe5dd24890d402cd0f Author: Minghui Liu <[email protected]> AuthorDate: Wed Apr 12 16:59:06 2023 +0800 fix --- .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 9 +++-- .../org/apache/iotdb/db/qp/sql/PathParser.g4 | 13 +++++-- .../db/it/IoTDBSyntaxConventionIdentifierIT.java | 40 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 index 80d024519d..7504ac4198 100644 --- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 +++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 @@ -1001,14 +1001,19 @@ intoPath nodeName : wildcard - | wildcard? identifier wildcard? - | identifier + | wildcard? nodeNameSlice wildcard? + | nodeNameWithoutWildcard ; nodeNameWithoutWildcard : identifier ; +nodeNameSlice + : identifier + | INTEGER_LITERAL + ; + nodeNameInIntoPath : nodeNameWithoutWildcard | DOUBLE_COLON diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/PathParser.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/PathParser.g4 index 546be58b6e..792fec173e 100644 --- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/PathParser.g4 +++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/PathParser.g4 @@ -42,8 +42,17 @@ suffixPath nodeName : wildcard - | wildcard? identifier wildcard? - | identifier + | wildcard? nodeNameSlice wildcard? + | nodeNameWithoutWildcard + ; + +nodeNameWithoutWildcard + : identifier + ; + +nodeNameSlice + : identifier + | INTEGER_LITERAL ; wildcard diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java index 010b455907..5f9d9e9f5a 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java @@ -1063,4 +1063,44 @@ public class IoTDBSyntaxConventionIdentifierIT { fail(); } } + + @Test + public void testNodeNameWithWildcard() { + try (Connection connection = EnvFactory.getEnv().getConnection(); + Statement statement = connection.createStatement()) { + statement.execute("CREATE TIMESERIES root.sg.device_123.s1 INT32"); + + try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.sg.device_123")) { + Assert.assertTrue(resultSet.next()); + Assert.assertFalse(resultSet.next()); + } + try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.sg.device_*")) { + Assert.assertTrue(resultSet.next()); + Assert.assertFalse(resultSet.next()); + } + try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.sg.*_123")) { + Assert.assertTrue(resultSet.next()); + Assert.assertFalse(resultSet.next()); + } + try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.sg.*123")) { + Assert.assertTrue(resultSet.next()); + Assert.assertFalse(resultSet.next()); + } + try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.sg.*_12*")) { + Assert.assertTrue(resultSet.next()); + Assert.assertFalse(resultSet.next()); + } + try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.sg.*12*")) { + Assert.assertTrue(resultSet.next()); + Assert.assertFalse(resultSet.next()); + } + try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.sg.*e*")) { + Assert.assertTrue(resultSet.next()); + Assert.assertFalse(resultSet.next()); + } + } catch (SQLException e) { + e.printStackTrace(); + fail(); + } + } }
