This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new fe16c5c2ca1 [To rel/1.2] Fix authority check of altering view (#10369)
fe16c5c2ca1 is described below
commit fe16c5c2ca1993f75fdf15ccf4974c26204bdb70
Author: Marcos_Zyk <[email protected]>
AuthorDate: Thu Jun 29 14:20:39 2023 +0800
[To rel/1.2] Fix authority check of altering view (#10369)
---
.../org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java | 3 +--
.../statement/metadata/AlterTimeSeriesStatement.java | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 7 deletions(-)
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 6fb0c6d1e09..7fd3308e7c3 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
@@ -1081,10 +1081,9 @@ public class ASTVisitor extends
IoTDBSqlParserBaseVisitor<Statement> {
return alterLogicalViewStatement;
} else {
- AlterTimeSeriesStatement alterTimeSeriesStatement = new
AlterTimeSeriesStatement();
+ AlterTimeSeriesStatement alterTimeSeriesStatement = new
AlterTimeSeriesStatement(true);
alterTimeSeriesStatement.setPath(parseFullPath(ctx.fullPath()));
parseAlterClause(ctx.alterClause(), alterTimeSeriesStatement);
- alterTimeSeriesStatement.setAlterView(true);
if (alterTimeSeriesStatement.getAlias() != null) {
throw new SemanticException("View doesn't support alias.");
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/AlterTimeSeriesStatement.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/AlterTimeSeriesStatement.java
index 16841670181..4bc2af5156e 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/AlterTimeSeriesStatement.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/AlterTimeSeriesStatement.java
@@ -53,13 +53,24 @@ public class AlterTimeSeriesStatement extends Statement {
private Map<String, String> tagsMap;
private Map<String, String> attributesMap;
- private boolean isAlterView = false;
+ private final boolean isAlterView;
public AlterTimeSeriesStatement() {
super();
+ isAlterView = false;
statementType = StatementType.ALTER_TIMESERIES;
}
+ public AlterTimeSeriesStatement(boolean isAlterView) {
+ super();
+ this.isAlterView = isAlterView;
+ if (isAlterView) {
+ statementType = StatementType.ALTER_LOGICAL_VIEW;
+ } else {
+ statementType = StatementType.ALTER_TIMESERIES;
+ }
+ }
+
@Override
public List<PartialPath> getPaths() {
return Collections.singletonList(path);
@@ -117,10 +128,6 @@ public class AlterTimeSeriesStatement extends Statement {
return isAlterView;
}
- public void setAlterView(boolean alterView) {
- isAlterView = alterView;
- }
-
@Override
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
return visitor.visitAlterTimeseries(this, context);