You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/06/08 16:11:18 UTC
[incubator-iotdb] 04/04: fix sonar issues
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 6b948375b6876ef2df00f7944a836c2c45b64b91
Author: lta <li...@163.com>
AuthorDate: Sun Jun 9 00:10:51 2019 +0800
fix sonar issues
---
.../org/apache/iotdb/cluster/entity/Server.java | 4 ++--
.../cluster/qp/executor/QueryMetadataExecutor.java | 1 -
.../apache/iotdb/cluster/qp/task/BatchQPTask.java | 2 +-
.../apache/iotdb/cluster/qp/task/SingleQPTask.java | 2 --
.../ClusterGroupByDataSetWithOnlyTimeFilter.java | 1 +
.../executor/ClusterExecutorWithTimeGenerator.java | 3 ---
.../querynode/ClusterLocalQueryManager.java | 1 -
.../querynode/ClusterLocalSingleQueryManager.java | 8 +++----
.../ClusterFillSelectSeriesBatchReader.java | 1 -
.../querynode/ClusterSelectSeriesBatchReader.java | 4 ++--
.../ClusterSelectSeriesBatchReaderByTimestamp.java | 4 ++--
.../ClusterSelectSeriesBatchReaderEntity.java | 8 +++----
...r.java => IClusterSelectSeriesBatchReader.java} | 4 ++--
.../rpc/raft/impl/RaftNodeAsClientManager.java | 3 ---
.../querymetadata/QueryMetadataAsyncProcessor.java | 1 -
.../QueryMetadataInStringAsyncProcessor.java | 1 -
.../querymetadata/QueryPathsAsyncProcessor.java | 1 -
.../QuerySeriesTypeAsyncProcessor.java | 1 -
.../QueryTimeSeriesAsyncProcessor.java | 1 -
.../org/apache/iotdb/cluster/utils/RaftUtils.java | 8 ++-----
.../query/manager/ClusterLocalManagerTest.java | 27 +++++++++++-----------
21 files changed, 33 insertions(+), 53 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java b/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
index 418b625..41c4cb1 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
@@ -97,13 +97,13 @@ public class Server {
private RegisterManager registerManager = new RegisterManager();
public static void main(String[] args)
- throws ProcessorException, InterruptedException, RaftConnectionException, FileNodeManagerException {
+ throws ProcessorException, RaftConnectionException, FileNodeManagerException {
Server server = Server.getInstance();
server.start();
}
public void start()
- throws ProcessorException, InterruptedException, RaftConnectionException, FileNodeManagerException {
+ throws ProcessorException, RaftConnectionException, FileNodeManagerException {
/** Stand-alone version of IoTDB, be careful to replace the internal JDBC Server with a cluster version **/
iotdb = new IoTDB();
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/QueryMetadataExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/QueryMetadataExecutor.java
index 2d39863..ce4b920 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/QueryMetadataExecutor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/QueryMetadataExecutor.java
@@ -259,7 +259,6 @@ public class QueryMetadataExecutor extends AbstractQPExecutor {
success = true;
} catch (RaftConnectionException e1) {
LOGGER.debug("Query metadata task for group {} to node {} fail.", groupId, nextNode);
- continue;
}
}
LOGGER.debug("The final result for query metadata task is {}", success);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/qp/task/BatchQPTask.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/task/BatchQPTask.java
index c2b290f..8ede57d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/qp/task/BatchQPTask.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/task/BatchQPTask.java
@@ -109,7 +109,7 @@ public class BatchQPTask extends MultiQPTask {
batchResult.setAllSuccessful(false);
}
} catch (Exception ex) {
- ex.printStackTrace();
+ LOGGER.error("Execute batch statement occurs error.", ex);
} finally {
lock.unlock();
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/qp/task/SingleQPTask.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/task/SingleQPTask.java
index 1faef65..16ddf60 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/qp/task/SingleQPTask.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/task/SingleQPTask.java
@@ -20,8 +20,6 @@ package org.apache.iotdb.cluster.qp.task;
import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Process task(s) for only one raft group, which is used for operations except for querying data.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/dataset/ClusterGroupByDataSetWithOnlyTimeFilter.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/dataset/ClusterGroupByDataSetWithOnlyTimeFilter.java
index ef5386d..599439a 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/dataset/ClusterGroupByDataSetWithOnlyTimeFilter.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/dataset/ClusterGroupByDataSetWithOnlyTimeFilter.java
@@ -72,6 +72,7 @@ public class ClusterGroupByDataSetWithOnlyTimeFilter extends GroupByWithOnlyTime
/**
* init reader and aggregate function.
*/
+ @Override
public void initGroupBy(QueryContext context, List<String> aggres, IExpression expression)
throws FileNodeManagerException, PathErrorException, ProcessorException, IOException {
initAggreFuction(aggres);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterExecutorWithTimeGenerator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterExecutorWithTimeGenerator.java
index fe2511a..0cdd457 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterExecutorWithTimeGenerator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterExecutorWithTimeGenerator.java
@@ -22,17 +22,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.iotdb.cluster.query.dataset.ClusterDataSetWithTimeGenerator;
import org.apache.iotdb.cluster.query.factory.ClusterSeriesReaderFactory;
import org.apache.iotdb.cluster.query.manager.coordinatornode.ClusterRpcSingleQueryManager;
import org.apache.iotdb.cluster.query.manager.coordinatornode.FilterSeriesGroupEntity;
-import org.apache.iotdb.cluster.query.reader.coordinatornode.ClusterSelectSeriesReader;
import org.apache.iotdb.cluster.query.timegenerator.ClusterTimeGenerator;
import org.apache.iotdb.db.exception.FileNodeManagerException;
import org.apache.iotdb.db.exception.PathErrorException;
-import org.apache.iotdb.db.metadata.MManager;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.control.QueryResourceManager;
import org.apache.iotdb.db.query.reader.merge.EngineReaderByTimeStamp;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/ClusterLocalQueryManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/ClusterLocalQueryManager.java
index a602c84..e6149f2 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/ClusterLocalQueryManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/ClusterLocalQueryManager.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.iotdb.cluster.query.manager.coordinatornode.ClusterRpcSingleQueryManager;
import org.apache.iotdb.cluster.rpc.raft.request.querydata.InitSeriesReaderRequest;
import org.apache.iotdb.cluster.rpc.raft.request.querydata.QuerySeriesDataByTimestampRequest;
import org.apache.iotdb.cluster.rpc.raft.request.querydata.QuerySeriesDataRequest;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/ClusterLocalSingleQueryManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/ClusterLocalSingleQueryManager.java
index f2a9ca3..097f24d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/ClusterLocalSingleQueryManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/ClusterLocalSingleQueryManager.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.cluster.concurrent.pool.QueryTimerThreadManager;
import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.query.PathType;
import org.apache.iotdb.cluster.query.factory.ClusterSeriesReaderFactory;
-import org.apache.iotdb.cluster.query.reader.querynode.AbstractClusterSelectSeriesBatchReader;
+import org.apache.iotdb.cluster.query.reader.querynode.IClusterSelectSeriesBatchReader;
import org.apache.iotdb.cluster.query.reader.querynode.ClusterFillSelectSeriesBatchReader;
import org.apache.iotdb.cluster.query.reader.querynode.ClusterFilterSeriesBatchReaderEntity;
import org.apache.iotdb.cluster.query.reader.querynode.ClusterGroupBySelectSeriesBatchReaderEntity;
@@ -417,9 +417,9 @@ public class ClusterLocalSingleQueryManager implements IClusterLocalSingleQueryM
long targetQueryRounds = request.getQueryRounds();
if (targetQueryRounds != this.queryRound) {
this.queryRound = targetQueryRounds;
- List<AbstractClusterSelectSeriesBatchReader> readers = selectReaderEntity.getAllReaders();
+ List<IClusterSelectSeriesBatchReader> readers = selectReaderEntity.getAllReaders();
List<BatchData> batchDataList = new ArrayList<>();
- for (AbstractClusterSelectSeriesBatchReader reader : readers) {
+ for (IClusterSelectSeriesBatchReader reader : readers) {
batchDataList.add(reader.nextBatch(request.getBatchTimestamp()));
}
cachedBatchDataResult = batchDataList;
@@ -443,7 +443,7 @@ public class ClusterLocalSingleQueryManager implements IClusterLocalSingleQueryM
private List<BatchData> readSelectSeriesBatchData(List<Integer> seriesIndexs) throws IOException {
List<BatchData> batchDataList = new ArrayList<>();
for (int index : seriesIndexs) {
- AbstractClusterSelectSeriesBatchReader reader = selectReaderEntity.getReaderByIndex(index);
+ IClusterSelectSeriesBatchReader reader = selectReaderEntity.getReaderByIndex(index);
batchDataList.add(reader.nextBatch());
}
return batchDataList;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFillSelectSeriesBatchReader.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFillSelectSeriesBatchReader.java
index a16a220..a581d07 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFillSelectSeriesBatchReader.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFillSelectSeriesBatchReader.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.cluster.query.reader.querynode;
import java.io.IOException;
import org.apache.iotdb.cluster.query.common.ClusterNullableBatchData;
import org.apache.iotdb.db.query.reader.IPointReader;
-import org.apache.iotdb.db.utils.TimeValuePair;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.BatchData;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReader.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReader.java
index cbbad2e..b3c05d8 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReader.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReader.java
@@ -30,8 +30,8 @@ import org.apache.iotdb.tsfile.read.common.BatchData;
/**
* BatchReader without time generator for cluster which is used in query node.
*/
-public class ClusterSelectSeriesBatchReader extends
- AbstractClusterSelectSeriesBatchReader {
+public class ClusterSelectSeriesBatchReader implements
+ IClusterSelectSeriesBatchReader {
/**
* Data type
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReaderByTimestamp.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReaderByTimestamp.java
index 72dce05..fc6fe31 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReaderByTimestamp.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReaderByTimestamp.java
@@ -27,8 +27,8 @@ import org.apache.iotdb.tsfile.read.common.BatchData;
/**
* BatchReader by timestamp for cluster which is used in query node.
*/
-public class ClusterSelectSeriesBatchReaderByTimestamp extends
- AbstractClusterSelectSeriesBatchReader {
+public class ClusterSelectSeriesBatchReaderByTimestamp implements
+ IClusterSelectSeriesBatchReader {
/**
* Reader
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReaderEntity.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReaderEntity.java
index 484c423..7150ffa 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReaderEntity.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterSelectSeriesBatchReaderEntity.java
@@ -34,7 +34,7 @@ public class ClusterSelectSeriesBatchReaderEntity {
/**
* All select readers
*/
- private List<AbstractClusterSelectSeriesBatchReader> readers;
+ private List<IClusterSelectSeriesBatchReader> readers;
public ClusterSelectSeriesBatchReaderEntity() {
paths = new ArrayList<>();
@@ -45,15 +45,15 @@ public class ClusterSelectSeriesBatchReaderEntity {
this.paths.add(path);
}
- public void addReaders(AbstractClusterSelectSeriesBatchReader reader) {
+ public void addReaders(IClusterSelectSeriesBatchReader reader) {
this.readers.add(reader);
}
- public List<AbstractClusterSelectSeriesBatchReader> getAllReaders() {
+ public List<IClusterSelectSeriesBatchReader> getAllReaders() {
return readers;
}
- public AbstractClusterSelectSeriesBatchReader getReaderByIndex(int index) {
+ public IClusterSelectSeriesBatchReader getReaderByIndex(int index) {
return readers.get(index);
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/AbstractClusterSelectSeriesBatchReader.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/IClusterSelectSeriesBatchReader.java
similarity index 88%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/AbstractClusterSelectSeriesBatchReader.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/IClusterSelectSeriesBatchReader.java
index 6fe28e2..87a8329 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/AbstractClusterSelectSeriesBatchReader.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/IClusterSelectSeriesBatchReader.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.tsfile.read.common.BatchData;
/**
* Cluster batch reader, which provides another method to get batch data by batch timestamp.
*/
-public abstract class AbstractClusterSelectSeriesBatchReader implements IBatchReader {
+public interface IClusterSelectSeriesBatchReader extends IBatchReader {
/**
* Get batch data by batch time
@@ -34,6 +34,6 @@ public abstract class AbstractClusterSelectSeriesBatchReader implements IBatchRe
* @param batchTime valid batch timestamp
* @return corresponding batch data
*/
- public abstract BatchData nextBatch(List<Long> batchTime) throws IOException;
+ BatchData nextBatch(List<Long> batchTime) throws IOException;
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/impl/RaftNodeAsClientManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/impl/RaftNodeAsClientManager.java
index 8913086..cf41ae6 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/impl/RaftNodeAsClientManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/impl/RaftNodeAsClientManager.java
@@ -18,12 +18,10 @@
*/
package org.apache.iotdb.cluster.rpc.raft.impl;
-import com.alipay.remoting.InvokeCallback;
import com.alipay.remoting.exception.RemotingException;
import com.alipay.sofa.jraft.option.CliOptions;
import com.alipay.sofa.jraft.rpc.impl.cli.BoltCliClientService;
import java.util.LinkedList;
-import java.util.concurrent.Executor;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -32,7 +30,6 @@ import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
import org.apache.iotdb.cluster.exception.RaftConnectionException;
-import org.apache.iotdb.cluster.qp.task.QPTask.TaskState;
import org.apache.iotdb.cluster.qp.task.SingleQPTask;
import org.apache.iotdb.cluster.rpc.raft.NodeAsClient;
import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryMetadataAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryMetadataAsyncProcessor.java
index 446fe88..a8fa1fa 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryMetadataAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryMetadataAsyncProcessor.java
@@ -23,7 +23,6 @@ import com.alipay.remoting.BizContext;
import com.alipay.sofa.jraft.Status;
import com.alipay.sofa.jraft.closure.ReadIndexClosure;
import org.apache.iotdb.cluster.config.ClusterConsistencyLevel;
-import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
import org.apache.iotdb.cluster.rpc.raft.processor.BasicAsyncUserProcessor;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryMetadataInStringAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryMetadataInStringAsyncProcessor.java
index 857f360..7a46a14 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryMetadataInStringAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryMetadataInStringAsyncProcessor.java
@@ -23,7 +23,6 @@ import com.alipay.remoting.BizContext;
import com.alipay.sofa.jraft.Status;
import com.alipay.sofa.jraft.closure.ReadIndexClosure;
import org.apache.iotdb.cluster.config.ClusterConsistencyLevel;
-import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
import org.apache.iotdb.cluster.rpc.raft.processor.BasicAsyncUserProcessor;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryPathsAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryPathsAsyncProcessor.java
index 9f65929..3736105 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryPathsAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryPathsAsyncProcessor.java
@@ -23,7 +23,6 @@ import com.alipay.remoting.BizContext;
import com.alipay.sofa.jraft.Status;
import com.alipay.sofa.jraft.closure.ReadIndexClosure;
import org.apache.iotdb.cluster.config.ClusterConsistencyLevel;
-import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
import org.apache.iotdb.cluster.rpc.raft.processor.BasicAsyncUserProcessor;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QuerySeriesTypeAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QuerySeriesTypeAsyncProcessor.java
index dcb774f..c8df5a2 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QuerySeriesTypeAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QuerySeriesTypeAsyncProcessor.java
@@ -23,7 +23,6 @@ import com.alipay.remoting.BizContext;
import com.alipay.sofa.jraft.Status;
import com.alipay.sofa.jraft.closure.ReadIndexClosure;
import org.apache.iotdb.cluster.config.ClusterConsistencyLevel;
-import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
import org.apache.iotdb.cluster.rpc.raft.processor.BasicAsyncUserProcessor;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryTimeSeriesAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryTimeSeriesAsyncProcessor.java
index c36120f..d08cd1a 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryTimeSeriesAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querymetadata/QueryTimeSeriesAsyncProcessor.java
@@ -23,7 +23,6 @@ import com.alipay.remoting.BizContext;
import com.alipay.sofa.jraft.Status;
import com.alipay.sofa.jraft.closure.ReadIndexClosure;
import org.apache.iotdb.cluster.config.ClusterConsistencyLevel;
-import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
import org.apache.iotdb.cluster.rpc.raft.processor.BasicAsyncUserProcessor;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java b/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
index f8546b7..96e0363 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
@@ -79,8 +79,6 @@ import org.slf4j.LoggerFactory;
public class RaftUtils {
- private static final ClusterConfig CLUSTER_CONFIG = ClusterDescriptor.getInstance().getConfig();
-
private static final Logger LOGGER = LoggerFactory.getLogger(RaftUtils.class);
private static final Server server = Server.getInstance();
private static final Router router = Router.getInstance();
@@ -765,10 +763,8 @@ public class RaftUtils {
int[] nums1 = convertIPToNums(o1);
int[] nums2 = convertIPToNums(o2);
for (int i = 0; i < Math.min(nums1.length, nums2.length); i++) {
- if (nums1[i] == nums2[i]) {
- continue;
- } else {
- return ((Integer) nums1[i]).compareTo(nums2[i]);
+ if (nums1[i] != nums2[i]) {
+ return Integer.compare(nums1[i], nums2[i]);
}
}
return 0;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/manager/ClusterLocalManagerTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/manager/ClusterLocalManagerTest.java
index e71e489..7ba4547 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/manager/ClusterLocalManagerTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/manager/ClusterLocalManagerTest.java
@@ -32,14 +32,13 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
import org.apache.iotdb.cluster.entity.Server;
import org.apache.iotdb.cluster.query.manager.querynode.ClusterLocalQueryManager;
import org.apache.iotdb.cluster.query.manager.querynode.ClusterLocalSingleQueryManager;
-import org.apache.iotdb.cluster.query.reader.querynode.AbstractClusterSelectSeriesBatchReader;
+import org.apache.iotdb.cluster.query.reader.querynode.IClusterSelectSeriesBatchReader;
import org.apache.iotdb.cluster.query.reader.querynode.ClusterSelectSeriesBatchReader;
import org.apache.iotdb.cluster.query.reader.querynode.ClusterSelectSeriesBatchReaderByTimestamp;
import org.apache.iotdb.cluster.query.reader.querynode.ClusterFilterSeriesBatchReaderEntity;
@@ -224,11 +223,11 @@ public class ClusterLocalManagerTest {
ClusterSelectSeriesBatchReaderEntity selectSeriesBatchReaderEntity = singleQueryManager.getSelectReaderEntity();
assertEquals(3, selectSeriesBatchReaderEntity.getAllReaders().size());
Map<String, TSDataType> typeMap = singleQueryManager.getDataTypeMap();
- List<AbstractClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
+ List<IClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
List<String> paths = selectSeriesBatchReaderEntity.getAllPaths();
for (int i =0 ; i < readers.size(); i++) {
TSDataType dataType = typeMap.get(paths.get(i));
- AbstractClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
+ IClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
assertNotNull(((ClusterSelectSeriesBatchReader) clusterBatchReader).getReader());
assertEquals(dataType,
((ClusterSelectSeriesBatchReader) clusterBatchReader).getDataType());
@@ -251,11 +250,11 @@ public class ClusterLocalManagerTest {
ClusterSelectSeriesBatchReaderEntity selectSeriesBatchReaderEntity = singleQueryManager.getSelectReaderEntity();
assertEquals(3, selectSeriesBatchReaderEntity.getAllReaders().size());
Map<String, TSDataType> typeMap = singleQueryManager.getDataTypeMap();
- List<AbstractClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
+ List<IClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
List<String> paths = selectSeriesBatchReaderEntity.getAllPaths();
for (int i =0 ; i < readers.size(); i++) {
TSDataType dataType = typeMap.get(paths.get(i));
- AbstractClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
+ IClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
assertNotNull(((ClusterSelectSeriesBatchReader) clusterBatchReader).getReader());
assertEquals(dataType,
((ClusterSelectSeriesBatchReader) clusterBatchReader).getDataType());
@@ -278,11 +277,11 @@ public class ClusterLocalManagerTest {
ClusterSelectSeriesBatchReaderEntity selectSeriesBatchReaderEntity = singleQueryManager.getSelectReaderEntity();
assertEquals(3, selectSeriesBatchReaderEntity.getAllReaders().size());
Map<String, TSDataType> typeMap = singleQueryManager.getDataTypeMap();
- List<AbstractClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
+ List<IClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
List<String> paths = selectSeriesBatchReaderEntity.getAllPaths();
for (int i =0 ; i < readers.size(); i++) {
TSDataType dataType = typeMap.get(paths.get(i));
- AbstractClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
+ IClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
assertNotNull(((ClusterSelectSeriesBatchReader) clusterBatchReader).getReader());
assertEquals(dataType,
((ClusterSelectSeriesBatchReader) clusterBatchReader).getDataType());
@@ -322,11 +321,11 @@ public class ClusterLocalManagerTest {
assertNotNull(selectSeriesBatchReaderEntity.getAllReaders());
assertEquals(3, selectSeriesBatchReaderEntity.getAllReaders().size());
Map<String, TSDataType> typeMap = singleQueryManager.getDataTypeMap();
- List<AbstractClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
+ List<IClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
List<String> paths = selectSeriesBatchReaderEntity.getAllPaths();
for (int i =0 ; i < readers.size(); i++) {
TSDataType dataType = typeMap.get(paths.get(i));
- AbstractClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
+ IClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
assertNotNull(((ClusterSelectSeriesBatchReaderByTimestamp) clusterBatchReader).getReaderByTimeStamp());
assertEquals(dataType,
((ClusterSelectSeriesBatchReaderByTimestamp) clusterBatchReader).getDataType());
@@ -353,14 +352,14 @@ public class ClusterLocalManagerTest {
assertNotNull(filterReader.getQueryDataSet());
ClusterSelectSeriesBatchReaderEntity selectSeriesBatchReaderEntity = singleQueryManager.getSelectReaderEntity();
- List<AbstractClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
+ List<IClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
assertNotNull(readers);
assertEquals(3, readers.size());
Map<String, TSDataType> typeMap = singleQueryManager.getDataTypeMap();
List<String> paths = selectSeriesBatchReaderEntity.getAllPaths();
for (int i =0 ; i < readers.size(); i++) {
TSDataType dataType = typeMap.get(paths.get(i));
- AbstractClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
+ IClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
assertNotNull(((ClusterSelectSeriesBatchReaderByTimestamp) clusterBatchReader).getReaderByTimeStamp());
assertEquals(dataType,
((ClusterSelectSeriesBatchReaderByTimestamp) clusterBatchReader).getDataType());
@@ -387,14 +386,14 @@ public class ClusterLocalManagerTest {
assertNotNull(filterReader.getQueryDataSet());
ClusterSelectSeriesBatchReaderEntity selectSeriesBatchReaderEntity = singleQueryManager.getSelectReaderEntity();
- List<AbstractClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
+ List<IClusterSelectSeriesBatchReader> readers = selectSeriesBatchReaderEntity.getAllReaders();
assertNotNull(readers);
assertEquals(3, readers.size());
Map<String, TSDataType> typeMap = singleQueryManager.getDataTypeMap();
List<String> paths = selectSeriesBatchReaderEntity.getAllPaths();
for (int i =0 ; i < readers.size(); i++) {
TSDataType dataType = typeMap.get(paths.get(i));
- AbstractClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
+ IClusterSelectSeriesBatchReader clusterBatchReader = readers.get(i);
assertNotNull(((ClusterSelectSeriesBatchReaderByTimestamp) clusterBatchReader).getReaderByTimeStamp());
assertEquals(dataType,
((ClusterSelectSeriesBatchReaderByTimestamp) clusterBatchReader).getDataType());