Add special limit clause for group by tags
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 5ef759a..5621932 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
@@ -428,7 +428,7 @@ | groupByTimeClause havingClause? orderByClause? specialLimit? #groupByTimeStatement | groupByFillClause havingClause? orderByClause? specialLimit? #groupByFillStatement | groupByLevelClause havingClause? orderByClause? specialLimit? #groupByLevelStatement - | groupByTagClause orderByClause? #groupByTagStatement + | groupByTagClause orderByClause? specialLimit? #groupByTagStatement | fillClause orderByClause? specialLimit? #fillStatement ;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java index 925d555..6cb199c 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -381,7 +381,10 @@ boolean hasAlias = resultColumn.hasAlias(); List<Expression> resultExpressions = ExpressionAnalyzer.removeWildcardInExpression(resultColumn.getExpression(), schemaTree); - if (hasAlias && !queryStatement.isGroupByLevel() && resultExpressions.size() > 1) { + if (hasAlias + && !queryStatement.isGroupByLevel() + && !queryStatement.isGroupByTag() + && resultExpressions.size() > 1) { throw new SemanticException( String.format( "alias '%s' can only be matched with one time series", resultColumn.getAlias()));
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java index 14bf81b..c7a9488 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
@@ -1124,6 +1124,11 @@ parseOrderByClause(ctx.orderByClause()); } + // parse limit & offset + if (ctx.specialLimit() != null) { + return visit(ctx.specialLimit()); + } + return queryStatement; }
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java index ae6586d..e894c70 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java
@@ -314,18 +314,27 @@ throw new SemanticException("AGGREGATION doesn't support disable align clause."); } if (isGroupByLevel() && isAlignByDevice()) { - throw new SemanticException("group by level does not support align by device now."); + throw new SemanticException("GROUP BY LEVEL does not support align by device now."); } if (isGroupByTag() && isAlignByDevice()) { - throw new SemanticException("group by tag does not support align by device now."); + throw new SemanticException("GROUP BY TAGS does not support align by device now."); } - if (isGroupByTag() && isGroupByLevel()) { - throw new SemanticException("group by level cannot be used togather with group by tag"); - } + Set<String> outputColumn = new HashSet<>(); for (ResultColumn resultColumn : selectComponent.getResultColumns()) { if (resultColumn.getColumnType() != ResultColumn.ColumnType.AGGREGATION) { throw new SemanticException("Raw data and aggregation hybrid query is not supported."); } + outputColumn.add( + resultColumn.getAlias() != null + ? resultColumn.getAlias() + : resultColumn.getExpression().getExpressionString()); + } + if (isGroupByTag()) { + for (String s : getGroupByTagComponent().getTagKeys()) { + if (outputColumn.contains(s)) { + throw new SemanticException("Output column is duplicated with the tag key: " + s); + } + } } } else { if (isGroupByTime() || isGroupByLevel()) {
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/LogicalPlannerTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/LogicalPlannerTest.java index fe2b950..410caba 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/LogicalPlannerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/LogicalPlannerTest.java
@@ -683,6 +683,42 @@ } } + @Test + public void testGroupByTagWithIllegalSpecialLimitClause() { + String[] inputSql = + new String[] { + "select max_value(s1) from root.** group by tags(key1) disable align", + "select max_value(s1) from root.** group by tags(key1) align by device", + "select max_value(s1) from root.** group by tags(key1) without null any", + }; + String[] expectedMsg = + new String[] { + "AGGREGATION doesn't support disable align clause", + "GROUP BY TAGS does not support align by device now", + "WITHOUT NULL clause is not supported yet" + }; + for (int i = 0; i < inputSql.length; i++) { + try { + parseSQLToPlanNode(inputSql[i]); + fail(); + } catch (Exception e) { + Assert.assertTrue(inputSql[i], e.getMessage().contains(expectedMsg[i])); + } + } + } + + @Test + public void testGroupByTagWithDuplicatedAliasWithTagKey() { + String sql = "select max_value(s1) as key1 from root.** group by tags(key1)"; + try { + parseSQLToPlanNode(sql); + fail(); + } catch (Exception e) { + Assert.assertTrue( + e.getMessage().contains("Output column is duplicated with the tag key: key1")); + } + } + private PlanNode parseSQLToPlanNode(String sql) { Statement statement = StatementGenerator.createStatement(sql, ZonedDateTime.now().getOffset()); MPPQueryContext context = new MPPQueryContext(new QueryId("test_query"));