You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/05/30 06:29:38 UTC
[iotdb] branch query_plan_visualization updated (95884ad6b9 -> ee75739fa9)
This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch query_plan_visualization
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 95884ad6b9 [IOTDB-3277] [IOTDB-3310] [IOTDB-3311] Fix some SQL parser bugs in new cluster (#6060)
new 1aaee411cb add ExplainStatement & implement SQL parser
new ee75739fa9 analyze ExplainStatement
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 7 ++++++-
.../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 8 ++++++++
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 9 +++++++++
.../db/mpp/plan/statement/StatementVisitor.java | 5 +++++
.../ExplainStatement.java} | 23 +++++++++++++---------
5 files changed, 42 insertions(+), 10 deletions(-)
copy server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/{metadata/DeleteTimeSeriesStatement.java => sys/ExplainStatement.java} (67%)
[iotdb] 01/02: add ExplainStatement & implement SQL parser
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch query_plan_visualization
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1aaee411cb82080bad5c4522a906f13cad8dc146
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Mon May 30 14:20:18 2022 +0800
add ExplainStatement & implement SQL parser
---
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 7 +++-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 9 +++++
.../mpp/plan/statement/sys/ExplainStatement.java | 44 ++++++++++++++++++++++
3 files changed, 59 insertions(+), 1 deletion(-)
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 bc8167772e..9cef992cc8 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
@@ -60,7 +60,7 @@ dclStatement
;
utilityStatement
- : merge | fullMerge | flush | clearCache | settle
+ : merge | fullMerge | flush | clearCache | settle | explain
| setSystemStatus | showVersion | showFlushInfo | showLockInfo | showQueryResource
| showQueryProcesslist | killQuery | grantWatermarkEmbedding | revokeWatermarkEmbedding
| loadConfiguration | loadTimeseries | loadFile | removeFile | unloadFile;
@@ -622,6 +622,11 @@ settle
: SETTLE (prefixPath|tsFilePath=STRING_LITERAL)
;
+// Explain
+explain
+ : EXPLAIN selectStatement
+ ;
+
// Set System To ReadOnly/Writable
setSystemStatus
: SET SYSTEM TO (READONLY|WRITABLE)
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 463ff16649..4b0c9a0b42 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
@@ -92,6 +92,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.UnSetTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.sys.AuthorStatement;
+import org.apache.iotdb.db.mpp.plan.statement.sys.ExplainStatement;
import org.apache.iotdb.db.qp.constant.SQLConstant;
import org.apache.iotdb.db.qp.logical.sys.AuthorOperator;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser;
@@ -1762,6 +1763,14 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
return deleteStorageGroupStatement;
}
+ // Explain ========================================================================
+
+ @Override
+ public Statement visitExplain(IoTDBSqlParser.ExplainContext ctx) {
+ QueryStatement queryStatement = (QueryStatement) visitSelectStatement(ctx.selectStatement());
+ return new ExplainStatement(queryStatement);
+ }
+
/** function for parsing file path used by LOAD statement. */
public String parseFilePath(String src) {
return src.substring(1, src.length() - 1);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ExplainStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ExplainStatement.java
new file mode 100644
index 0000000000..cf8b06b84b
--- /dev/null
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ExplainStatement.java
@@ -0,0 +1,44 @@
+/*
+ * 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.mpp.plan.statement.sys;
+
+import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.db.mpp.plan.statement.Statement;
+import org.apache.iotdb.db.mpp.plan.statement.crud.QueryStatement;
+
+import java.util.List;
+
+public class ExplainStatement extends Statement {
+
+ private final QueryStatement queryStatement;
+
+ public ExplainStatement(QueryStatement queryStatement) {
+ this.queryStatement = queryStatement;
+ }
+
+ public QueryStatement getQueryStatement() {
+ return queryStatement;
+ }
+
+ @Override
+ public List<? extends PartialPath> getPaths() {
+ return queryStatement.getPaths();
+ }
+}
[iotdb] 02/02: analyze ExplainStatement
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch query_plan_visualization
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ee75739fa927ab3bf3f8ad2a6fd38530858be248
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Mon May 30 14:29:15 2022 +0800
analyze ExplainStatement
---
.../main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 8 ++++++++
.../org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java | 5 +++++
.../apache/iotdb/db/mpp/plan/statement/sys/ExplainStatement.java | 6 ++++++
3 files changed, 19 insertions(+)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
index eb7810e57b..50c29c3ecd 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
@@ -75,6 +75,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDevicesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTimeSeriesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.sys.ExplainStatement;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.filter.GroupByFilter;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
@@ -133,6 +134,13 @@ public class Analyzer {
"Unsupported statement type: " + node.getClass().getName());
}
+ @Override
+ public Analysis visitExplain(ExplainStatement explainStatement, MPPQueryContext context) {
+ Analysis analysis = visitQuery(explainStatement.getQueryStatement(), context);
+ analysis.setFinishQueryAfterAnalyze(true);
+ return analysis;
+ }
+
@Override
public Analysis visitQuery(QueryStatement queryStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
index 80a1111a02..724609ef7b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
@@ -51,6 +51,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.UnSetTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.sys.AuthorStatement;
+import org.apache.iotdb.db.mpp.plan.statement.sys.ExplainStatement;
/**
* This class provides a visitor of {@link org.apache.iotdb.db.mpp.plan.statement.StatementNode},
@@ -221,4 +222,8 @@ public abstract class StatementVisitor<R, C> {
public R visitShowChildNodes(ShowChildNodesStatement showChildNodesStatement, C context) {
return visitStatement(showChildNodesStatement, context);
}
+
+ public R visitExplain(ExplainStatement explainStatement, C context) {
+ return visitStatement(explainStatement, context);
+ }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ExplainStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ExplainStatement.java
index cf8b06b84b..6c2b294741 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ExplainStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ExplainStatement.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.db.mpp.plan.statement.sys;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
+import org.apache.iotdb.db.mpp.plan.statement.StatementVisitor;
import org.apache.iotdb.db.mpp.plan.statement.crud.QueryStatement;
import java.util.List;
@@ -41,4 +42,9 @@ public class ExplainStatement extends Statement {
public List<? extends PartialPath> getPaths() {
return queryStatement.getPaths();
}
+
+ @Override
+ public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
+ return visitor.visitExplain(this, context);
+ }
}