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 2022/11/16 06:23:19 UTC
[iotdb] 01/01: tmp saved
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch kubernetes_version
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1961020186bfa50749dcb46399bafed937b68b1e
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed Nov 16 14:23:00 2022 +0800
tmp saved
---
.../multileader/logdispatcher/IndexController.java | 7 +--
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 12 ++---
.../db/mpp/plan/execution/QueryExecution.java | 63 +++++++++++-----------
3 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/IndexController.java b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/IndexController.java
index f43f0a4416..1f6eaaa535 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/IndexController.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/IndexController.java
@@ -37,7 +37,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class IndexController {
private final Logger logger = LoggerFactory.getLogger(IndexController.class);
-
+ private static final String FILE_NAME_INDEX_SPLITTER = "-";
private long lastFlushedIndex;
private long currentIndex;
@@ -51,7 +51,7 @@ public class IndexController {
public IndexController(String storageDir, String prefix, long initialIndex, long checkpointGap) {
this.storageDir = storageDir;
- this.prefix = prefix + '-';
+ this.prefix = prefix + FILE_NAME_INDEX_SPLITTER;
this.checkpointGap = checkpointGap;
this.initialIndex = initialIndex;
restore();
@@ -127,7 +127,8 @@ public class IndexController {
long maxVersion = 0;
int maxVersionIndex = 0;
for (int i = 0; i < versionFiles.length; i++) {
- long fileVersion = Long.parseLong(versionFiles[i].getName().split("-")[1]);
+ String[] splits = versionFiles[i].getName().split(FILE_NAME_INDEX_SPLITTER);
+ long fileVersion = Long.parseLong(splits[splits.length - 1]);
if (fileVersion > maxVersion) {
maxVersion = fileVersion;
maxVersionIndex = i;
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 186815d5c6..993185f818 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -202,12 +202,12 @@ public class IoTDBDescriptor {
conf.setRpcAddress(
properties.getProperty(IoTDBConstant.DN_RPC_ADDRESS, conf.getRpcAddress()).trim());
- // TODO: Use FQDN to identify our nodes afterwards
- try {
- replaceHostnameWithIP();
- } catch (Exception e) {
- logger.info(String.format("replace hostname with ip failed, %s", e.getMessage()));
- }
+ // // TODO: Use FQDN to identify our nodes afterwards
+ // try {
+ // replaceHostnameWithIP();
+ // } catch (Exception e) {
+ // logger.info(String.format("replace hostname with ip failed, %s", e.getMessage()));
+ // }
conf.setRpcThriftCompressionEnable(
Boolean.parseBoolean(
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 8c48c6a574..8d9433e8d9 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;
@@ -54,9 +53,6 @@ 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.scheduler.load.LoadTsFileScheduler;
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.db.mpp.plan.statement.crud.LoadTsFileStatement;
import org.apache.iotdb.db.utils.SetThreadName;
import org.apache.iotdb.rpc.RpcUtils;
@@ -70,7 +66,6 @@ import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CancellationException;
@@ -536,34 +531,36 @@ public class QueryExecution implements IQueryExecution {
}
// collect redirect info to client for writing
- if (analysis.getStatement() instanceof InsertBaseStatement
- && !analysis.isFinishQueryAfterAnalyze()) {
- 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
+ // && !analysis.isFinishQueryAfterAnalyze()) {
+ // 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);
}