This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new a438aaeaaa Change meaning of Flush to Flush on Cluster (#6314)
a438aaeaaa is described below
commit a438aaeaaa55f772db76a9ad851516351c999cba
Author: Haonan <[email protected]>
AuthorDate: Thu Jun 16 20:44:26 2022 +0800
Change meaning of Flush to Flush on Cluster (#6314)
---
.../db/mpp/plan/execution/config/ConfigExecution.java | 4 ++--
.../iotdb/db/mpp/plan/execution/config/FlushTask.java | 6 +++---
...TaskExecutor.java => StandaloneConfigTaskExecutor.java} | 14 +++++++-------
.../org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java | 12 ++++++------
.../iotdb/db/mpp/plan/statement/sys/FlushStatement.java | 13 ++++++-------
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java
index 15ec6efa3d..a8ebfac6eb 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult;
import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution;
import
org.apache.iotdb.db.mpp.plan.execution.config.executor.ClusterConfigTaskExecutor;
import
org.apache.iotdb.db.mpp.plan.execution.config.executor.IConfigTaskExecutor;
-import
org.apache.iotdb.db.mpp.plan.execution.config.executor.StandsloneConfigTaskExecutor;
+import
org.apache.iotdb.db.mpp.plan.execution.config.executor.StandaloneConfigTaskExecutor;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -73,7 +73,7 @@ public class ConfigExecution implements IQueryExecution {
if (config.isClusterMode()) {
configTaskExecutor = ClusterConfigTaskExecutor.getInstance();
} else {
- configTaskExecutor = StandsloneConfigTaskExecutor.getInstance();
+ configTaskExecutor = StandaloneConfigTaskExecutor.getInstance();
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/FlushTask.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/FlushTask.java
index dcba6618fc..4fe27a20cd 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/FlushTask.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/FlushTask.java
@@ -54,10 +54,10 @@ public class FlushTask implements IConfigTask {
tFlushReq.setIsSeq(flushStatement.isSeq().toString());
}
IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
- if (flushStatement.isLocal()) {
- tFlushReq.setDataNodeId(config.getDataNodeId());
- } else {
+ if (flushStatement.isCluster()) {
tFlushReq.setDataNodeId(-1);
+ } else {
+ tFlushReq.setDataNodeId(config.getDataNodeId());
}
// If the action is executed successfully, return the Future.
// If your operation is async, you can return the corresponding future
directly.
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandsloneConfigTaskExecutor.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
similarity index 95%
rename from
server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandsloneConfigTaskExecutor.java
rename to
server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
index 7061be6eb3..b4970523bc 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandsloneConfigTaskExecutor.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
@@ -52,18 +52,18 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class StandsloneConfigTaskExecutor implements IConfigTaskExecutor {
+public class StandaloneConfigTaskExecutor implements IConfigTaskExecutor {
- private static final Logger LOGGER =
LoggerFactory.getLogger(StandsloneConfigTaskExecutor.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(StandaloneConfigTaskExecutor.class);
- private static final class StandsloneConfigTaskExecutorHolder {
- private static final StandsloneConfigTaskExecutor INSTANCE = new
StandsloneConfigTaskExecutor();
+ private static final class StandaloneConfigTaskExecutorHolder {
+ private static final StandaloneConfigTaskExecutor INSTANCE = new
StandaloneConfigTaskExecutor();
- private StandsloneConfigTaskExecutorHolder() {}
+ private StandaloneConfigTaskExecutorHolder() {}
}
- public static StandsloneConfigTaskExecutor getInstance() {
- return
StandsloneConfigTaskExecutor.StandsloneConfigTaskExecutorHolder.INSTANCE;
+ public static StandaloneConfigTaskExecutor getInstance() {
+ return StandaloneConfigTaskExecutorHolder.INSTANCE;
}
@Override
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 ccec168279..f33b9dbc8f 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
@@ -2200,13 +2200,13 @@ public class ASTVisitor extends
IoTDBSqlParserBaseVisitor<Statement> {
if (ctx.BOOLEAN_LITERAL() != null) {
flushStatement.setSeq(Boolean.parseBoolean(ctx.BOOLEAN_LITERAL().getText()));
}
- if (ctx.CLUSTER() != null) {
- if (!IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
- throw new SemanticException("FLUSH ON CLUSTER is not supported in
standalone mode");
- }
- flushStatement.setLocal(false);
+ if (ctx.CLUSTER() != null &&
!IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ throw new SemanticException("FLUSH ON CLUSTER is not supported in
standalone mode");
+ }
+ if (ctx.LOCAL() != null) {
+ flushStatement.setCluster(false);
} else {
- flushStatement.setLocal(true);
+ flushStatement.setCluster(true);
}
if (ctx.prefixPath(0) != null) {
storageGroups = new ArrayList<>();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/FlushStatement.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/FlushStatement.java
index 934073a541..6a511a4fed 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/FlushStatement.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/FlushStatement.java
@@ -25,7 +25,6 @@ import org.apache.iotdb.db.mpp.plan.constant.StatementType;
import org.apache.iotdb.db.mpp.plan.statement.IConfigStatement;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.db.mpp.plan.statement.StatementVisitor;
-import org.apache.iotdb.db.qp.physical.sys.FlushPlan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,14 +34,14 @@ import java.util.List;
public class FlushStatement extends Statement implements IConfigStatement {
- private static final Logger logger =
LoggerFactory.getLogger(FlushPlan.class);
+ private static final Logger logger =
LoggerFactory.getLogger(FlushStatement.class);
/** list of storage group */
private List<PartialPath> storageGroups;
// being null indicates flushing both seq and unseq data
private Boolean isSeq;
- private boolean isLocal;
+ private boolean isCluster;
public FlushStatement(StatementType flushType) {
this.statementType = flushType;
@@ -64,12 +63,12 @@ public class FlushStatement extends Statement implements
IConfigStatement {
isSeq = seq;
}
- public boolean isLocal() {
- return isLocal;
+ public boolean isCluster() {
+ return isCluster;
}
- public void setLocal(boolean local) {
- isLocal = local;
+ public void setCluster(boolean isCluster) {
+ this.isCluster = isCluster;
}
@Override
