You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2023/09/28 07:58:39 UTC
[iotdb] branch rel_12_k8s_0928 created (now 27d372bb26e)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch rel_12_k8s_0928
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 27d372bb26e disable redirect
This branch includes the following new commits:
new 27d372bb26e disable redirect
The 1 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.
[iotdb] 01/01: disable redirect
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch rel_12_k8s_0928
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 27d372bb26e7d7d8638c8c25854f4b6a04d6b095
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Thu Sep 28 15:14:22 2023 +0800
disable redirect
---
.../queryengine/plan/execution/QueryExecution.java | 83 +++++++++++-----------
1 file changed, 40 insertions(+), 43 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java
index 14765cfe2aa..eb03ce474b7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/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.async.AsyncDataNodeInternalServiceClient;
import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient;
-import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics;
import org.apache.iotdb.db.conf.IoTDBConfig;
@@ -60,9 +59,6 @@ import org.apache.iotdb.db.queryengine.plan.scheduler.ClusterScheduler;
import org.apache.iotdb.db.queryengine.plan.scheduler.IScheduler;
import org.apache.iotdb.db.queryengine.plan.scheduler.load.LoadTsFileScheduler;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
-import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement;
-import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement;
-import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement;
import org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement;
import org.apache.iotdb.db.queryengine.plan.statement.crud.PipeEnrichedLoadTsFileStatement;
import org.apache.iotdb.db.utils.SetThreadName;
@@ -676,45 +672,46 @@ public class QueryExecution implements IQueryExecution {
tsstatus = stateMachine.getFailureStatus();
}
- // collect redirect info to client for writing
- // if 0.13_data_insert_adapt is true and ClientVersion is NOT V_1_0, stop returning redirect
- // info to client
- if (analysis.getStatement() instanceof InsertBaseStatement
- && !analysis.isFinishQueryAfterAnalyze()
- && (!config.isEnable13DataInsertAdapt()
- || IoTDBConstant.ClientVersion.V_1_0.equals(context.getSession().getVersion()))) {
- InsertBaseStatement insertStatement = (InsertBaseStatement) analysis.getStatement();
- List<TEndPoint> redirectNodeList = analysis.getRedirectNodeList();
- if (insertStatement instanceof InsertRowsStatement
- || insertStatement instanceof InsertMultiTabletsStatement) {
- // multiple devices
- if (statusCode == TSStatusCode.SUCCESS_STATUS) {
- boolean needRedirect = false;
- List<TSStatus> subStatus = new ArrayList<>();
- for (TEndPoint endPoint : redirectNodeList) {
- // redirect writing only if the redirectEndPoint is not the current node
- if (!config.getAddressAndPort().equals(endPoint)) {
- subStatus.add(
- RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS).setRedirectNode(endPoint));
- needRedirect = true;
- } else {
- subStatus.add(RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS));
- }
- }
- if (needRedirect) {
- tsstatus.setCode(TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode());
- tsstatus.setSubStatus(subStatus);
- }
- }
- } else {
- // single device
- TEndPoint redirectEndPoint = redirectNodeList.get(0);
- // redirect writing only if the redirectEndPoint is not the current node
- if (!config.getAddressAndPort().equals(redirectEndPoint)) {
- tsstatus.setRedirectNode(redirectEndPoint);
- }
- }
- }
+ // // collect redirect info to client for writing
+ // // if 0.13_data_insert_adapt is true and ClientVersion is NOT V_1_0, stop returning
+ // redirect
+ // // info to client
+ // if (analysis.getStatement() instanceof InsertBaseStatement
+ // && !analysis.isFinishQueryAfterAnalyze()
+ // && (!config.isEnable13DataInsertAdapt()
+ // || IoTDBConstant.ClientVersion.V_1_0.equals(context.getSession().getVersion()))) {
+ // InsertBaseStatement insertStatement = (InsertBaseStatement) analysis.getStatement();
+ // List<TEndPoint> redirectNodeList = analysis.getRedirectNodeList();
+ // if (insertStatement instanceof InsertRowsStatement
+ // || insertStatement instanceof InsertMultiTabletsStatement) {
+ // // multiple devices
+ // if (statusCode == TSStatusCode.SUCCESS_STATUS) {
+ // boolean needRedirect = false;
+ // List<TSStatus> subStatus = new ArrayList<>();
+ // for (TEndPoint endPoint : redirectNodeList) {
+ // // redirect writing only if the redirectEndPoint is not the current node
+ // if (!config.getAddressAndPort().equals(endPoint)) {
+ // subStatus.add(
+ // RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS).setRedirectNode(endPoint));
+ // needRedirect = true;
+ // } else {
+ // subStatus.add(RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS));
+ // }
+ // }
+ // if (needRedirect) {
+ // tsstatus.setCode(TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode());
+ // tsstatus.setSubStatus(subStatus);
+ // }
+ // }
+ // } else {
+ // // single device
+ // TEndPoint redirectEndPoint = redirectNodeList.get(0);
+ // // redirect writing only if the redirectEndPoint is not the current node
+ // if (!config.getAddressAndPort().equals(redirectEndPoint)) {
+ // tsstatus.setRedirectNode(redirectEndPoint);
+ // }
+ // }
+ // }
return new ExecutionResult(context.getQueryId(), tsstatus);
}