This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch ml_0729_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ml_0729_test by this push:
new e5aa536cd3 add test
e5aa536cd3 is described below
commit e5aa536cd37941545da39b19ee184d2675e65f2f
Author: Jinrui.Zhang <[email protected]>
AuthorDate: Fri Jul 29 17:39:43 2022 +0800
add test
---
.../statemachine/DataRegionStateMachine.java | 7 +--
.../db/mpp/plan/execution/QueryExecution.java | 61 ++++++++++------------
2 files changed, 33 insertions(+), 35 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
index 7863eb7e22..0c8ea15444 100644
---
a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
+++
b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
@@ -157,9 +157,10 @@ public class DataRegionStateMachine extends
BaseStateMachine {
innerNode.setSearchIndex(indexedRequest.getSearchIndex());
insertNodes.add(innerNode);
}
- planNode = mergeInsertNodes(insertNodes);
- // planNode = cacheAndGetLatestInsertNode(
- // indexedRequest.getSyncIndex(),
mergeInsertNodes(insertNodes));
+ // planNode = mergeInsertNodes(insertNodes);
+ planNode =
+ cacheAndGetLatestInsertNode(
+ indexedRequest.getSyncIndex(), mergeInsertNodes(insertNodes));
// TODO: tmp way to do the test
if (planNode == null) {
return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
index 4534b7b740..d505457e48 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient;
import org.apache.iotdb.commons.exception.IoTDBException;
-import org.apache.iotdb.commons.utils.StatusUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException;
@@ -53,9 +52,6 @@ import
org.apache.iotdb.db.mpp.plan.scheduler.ClusterScheduler;
import org.apache.iotdb.db.mpp.plan.scheduler.IScheduler;
import org.apache.iotdb.db.mpp.plan.scheduler.StandaloneScheduler;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
-import org.apache.iotdb.db.mpp.plan.statement.crud.InsertBaseStatement;
-import org.apache.iotdb.db.mpp.plan.statement.crud.InsertMultiTabletsStatement;
-import org.apache.iotdb.db.mpp.plan.statement.crud.InsertRowsStatement;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.tsfile.read.common.block.TsBlock;
@@ -67,7 +63,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CancellationException;
@@ -468,33 +463,35 @@ public class QueryExecution implements IQueryExecution {
}
// collect redirect info to client for writing
- if (analysis.getStatement() instanceof InsertBaseStatement) {
- InsertBaseStatement insertStatement = (InsertBaseStatement)
analysis.getStatement();
- List<TEndPoint> redirectNodeList;
- if (config.isClusterMode()) {
- redirectNodeList =
insertStatement.collectRedirectInfo(analysis.getDataPartitionInfo());
- } else {
- redirectNodeList = Collections.emptyList();
- }
- if (insertStatement instanceof InsertRowsStatement
- || insertStatement instanceof InsertMultiTabletsStatement) {
- // multiple devices
- if (statusCode == TSStatusCode.SUCCESS_STATUS) {
- List<TSStatus> subStatus = new ArrayList<>();
- tsstatus.setCode(TSStatusCode.NEED_REDIRECTION.getStatusCode());
- for (TEndPoint endPoint : redirectNodeList) {
- subStatus.add(
-
StatusUtils.getStatus(TSStatusCode.NEED_REDIRECTION).setRedirectNode(endPoint));
- }
- tsstatus.setSubStatus(subStatus);
- }
- } else {
- // single device
- if (config.isClusterMode()) {
- tsstatus.setRedirectNode(redirectNodeList.get(0));
- }
- }
- }
+ // if (analysis.getStatement() instanceof InsertBaseStatement) {
+ // InsertBaseStatement insertStatement = (InsertBaseStatement)
analysis.getStatement();
+ // List<TEndPoint> redirectNodeList;
+ // if (config.isClusterMode()) {
+ // redirectNodeList =
+ // insertStatement.collectRedirectInfo(analysis.getDataPartitionInfo());
+ // } else {
+ // redirectNodeList = Collections.emptyList();
+ // }
+ // if (insertStatement instanceof InsertRowsStatement
+ // || insertStatement instanceof InsertMultiTabletsStatement) {
+ // // multiple devices
+ // if (statusCode == TSStatusCode.SUCCESS_STATUS) {
+ // List<TSStatus> subStatus = new ArrayList<>();
+ //
tsstatus.setCode(TSStatusCode.NEED_REDIRECTION.getStatusCode());
+ // for (TEndPoint endPoint : redirectNodeList) {
+ // subStatus.add(
+ //
+ //
StatusUtils.getStatus(TSStatusCode.NEED_REDIRECTION).setRedirectNode(endPoint));
+ // }
+ // tsstatus.setSubStatus(subStatus);
+ // }
+ // } else {
+ // // single device
+ // if (config.isClusterMode()) {
+ // tsstatus.setRedirectNode(redirectNodeList.get(0));
+ // }
+ // }
+ // }
return new ExecutionResult(context.getQueryId(), tsstatus);
}
