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/05/13 05:44:14 UTC
[incubator-iotdb] branch cluster updated: fix sonar list
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
The following commit(s) were added to refs/heads/cluster by this push:
new 0e1135d fix sonar list
0e1135d is described below
commit 0e1135d04a8e4022594674b9ef34a90450ed1063
Author: lta <li...@163.com>
AuthorDate: Mon May 13 13:43:56 2019 +0800
fix sonar list
---
.../apache/iotdb/cluster/concurrent/pool/QPTaskManager.java | 2 --
.../cluster/query/dataset/ClusterDataSetWithTimeGenerator.java | 5 +----
.../cluster/query/factory/ClusterSeriesReaderFactory.java | 3 +++
.../querynode/ClusterBatchReaderWithoutTimeGenerator.java | 1 -
.../query/reader/querynode/ClusterFilterSeriesBatchReader.java | 1 -
.../iotdb/cluster/query/utils/ClusterRpcReaderUtils.java | 6 ++++--
.../processor/nonquery/DataGroupNonQueryAsyncProcessor.java | 3 ---
.../raft/processor/querydata/QuerySeriesDataSyncProcessor.java | 1 -
.../iotdb/cluster/rpc/raft/request/BasicNonQueryRequest.java | 1 -
.../org/apache/iotdb/cluster/service/TSServiceClusterImpl.java | 2 +-
.../main/java/org/apache/iotdb/cluster/utils/RaftUtils.java | 10 ----------
11 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/concurrent/pool/QPTaskManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/concurrent/pool/QPTaskManager.java
index cc26913..d831157 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/concurrent/pool/QPTaskManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/concurrent/pool/QPTaskManager.java
@@ -19,9 +19,7 @@
package org.apache.iotdb.cluster.concurrent.pool;
import org.apache.iotdb.cluster.concurrent.ThreadName;
-import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
-import org.apache.iotdb.db.concurrent.IoTDBThreadPoolFactory;
/**
* Manage all qp tasks in thread.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/dataset/ClusterDataSetWithTimeGenerator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/dataset/ClusterDataSetWithTimeGenerator.java
index f3e4eaf..5a06ca8 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/dataset/ClusterDataSetWithTimeGenerator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/dataset/ClusterDataSetWithTimeGenerator.java
@@ -141,9 +141,6 @@ public class ClusterDataSetWithTimeGenerator extends QueryDataSet {
}
}
}
- if (cachedBatchTimestamp != null && cachedBatchTimestamp.hasNext()) {
- return true;
- }
- return false;
+ return cachedBatchTimestamp != null && cachedBatchTimestamp.hasNext();
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/factory/ClusterSeriesReaderFactory.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/factory/ClusterSeriesReaderFactory.java
index ddfa5eb..d65ed58 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/factory/ClusterSeriesReaderFactory.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/factory/ClusterSeriesReaderFactory.java
@@ -39,6 +39,9 @@ import org.apache.iotdb.tsfile.read.common.Path;
*/
public class ClusterSeriesReaderFactory {
+ private ClusterSeriesReaderFactory() {
+ }
+
/**
* Construct ReaderByTimestamp , include sequential data and unsequential data.
*
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterBatchReaderWithoutTimeGenerator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterBatchReaderWithoutTimeGenerator.java
index f3d443f..a59c79c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterBatchReaderWithoutTimeGenerator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterBatchReaderWithoutTimeGenerator.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.cluster.query.reader.querynode;
import java.io.IOException;
import java.util.List;
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.db.query.reader.IPointReader;
import org.apache.iotdb.db.utils.TimeValuePair;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFilterSeriesBatchReader.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFilterSeriesBatchReader.java
index 6690999..3f21835 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFilterSeriesBatchReader.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFilterSeriesBatchReader.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
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.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/utils/ClusterRpcReaderUtils.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/utils/ClusterRpcReaderUtils.java
index c3df421..cfa3c89 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/utils/ClusterRpcReaderUtils.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/utils/ClusterRpcReaderUtils.java
@@ -51,6 +51,9 @@ public class ClusterRpcReaderUtils {
private static final int TASK_MAX_RETRY = ClusterDescriptor.getInstance().getConfig()
.getQpTaskRedoCount();
+ private ClusterRpcReaderUtils() {
+ }
+
/**
* Create cluster series reader
*
@@ -60,8 +63,7 @@ public class ClusterRpcReaderUtils {
*/
public static BasicResponse createClusterSeriesReader(String groupId, PeerId peerId,
int readDataConsistencyLevel, Map<PathType, QueryPlan> allQueryPlan, String taskId,
- List<Filter> filterList)
- throws IOException, RaftConnectionException {
+ List<Filter> filterList) throws RaftConnectionException {
/** handle request **/
BasicRequest request = InitSeriesReaderRequest
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/nonquery/DataGroupNonQueryAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/nonquery/DataGroupNonQueryAsyncProcessor.java
index de2d2ab..d3537fe 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/nonquery/DataGroupNonQueryAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/nonquery/DataGroupNonQueryAsyncProcessor.java
@@ -40,9 +40,6 @@ public class DataGroupNonQueryAsyncProcessor extends
private static final Logger LOGGER = LoggerFactory
.getLogger(DataGroupNonQueryAsyncProcessor.class);
- public DataGroupNonQueryAsyncProcessor() {
- }
-
@Override
public void handleRequest(BizContext bizContext, AsyncContext asyncContext,
DataGroupNonQueryRequest request) {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querydata/QuerySeriesDataSyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querydata/QuerySeriesDataSyncProcessor.java
index 90dc24a..4c8e599 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querydata/QuerySeriesDataSyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querydata/QuerySeriesDataSyncProcessor.java
@@ -22,7 +22,6 @@ import com.alipay.remoting.BizContext;
import org.apache.iotdb.cluster.query.manager.querynode.ClusterLocalQueryManager;
import org.apache.iotdb.cluster.rpc.raft.processor.BasicSyncUserProcessor;
import org.apache.iotdb.cluster.rpc.raft.request.querydata.QuerySeriesDataRequest;
-import org.apache.iotdb.cluster.rpc.raft.response.querydata.QuerySeriesDataResponse;
public class QuerySeriesDataSyncProcessor extends
BasicSyncUserProcessor<QuerySeriesDataRequest> {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicNonQueryRequest.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicNonQueryRequest.java
index dc15158..33a4d8e 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicNonQueryRequest.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicNonQueryRequest.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.cluster.rpc.raft.request;
import java.io.IOException;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.iotdb.db.qp.physical.PhysicalPlan;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/service/TSServiceClusterImpl.java b/cluster/src/main/java/org/apache/iotdb/cluster/service/TSServiceClusterImpl.java
index ea98ac4..e658468 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/service/TSServiceClusterImpl.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/service/TSServiceClusterImpl.java
@@ -322,7 +322,7 @@ public class TSServiceClusterImpl extends TSServiceImpl {
/**
* Close cluster service
*/
- private void closeClusterService() {
+ public void closeClusterService() {
nonQueryExecutor.shutdown();
queryMetadataExecutor.shutdown();
}
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 3c41fbc..d5486fb 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
@@ -158,16 +158,6 @@ public class RaftUtils {
return peerIds;
}
- @Deprecated
- public static int getIndexOfIpFromRaftNodeList(String ip, PeerId[] peerIds) {
- for (int i = 0; i < peerIds.length; i++) {
- if (peerIds[i].getIp().equals(ip)) {
- return i;
- }
- }
- return -1;
- }
-
public static PhysicalNode[] getPhysicalNodeArrayFrom(PeerId[] peerIds) {
PhysicalNode[] physicalNodes = new PhysicalNode[peerIds.length];
for (int i = 0; i < peerIds.length; i++) {