You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ka...@apache.org on 2019/01/25 15:45:41 UTC
[incubator-iotdb] branch fix_sonar updated: fix some comment by cao
gaofei
This is an automated email from the ASF dual-hosted git repository.
kangrong pushed a commit to branch fix_sonar
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/fix_sonar by this push:
new 9c07335 fix some comment by cao gaofei
9c07335 is described below
commit 9c0733546b8f9937619bdc5b9b9f88570dc64b75
Author: kr11 <30...@qq.com>
AuthorDate: Fri Jan 25 23:45:28 2019 +0800
fix some comment by cao gaofei
---
.../iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java | 10 ++++++----
.../db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java | 3 ++-
.../org/apache/iotdb/db/query/control/FileReaderManager.java | 2 +-
.../org/apache/iotdb/db/query/control/QueryTokenManager.java | 1 +
.../org/apache/iotdb/db/query/factory/SeriesReaderFactory.java | 1 +
.../src/main/java/org/apache/iotdb/db/service/JDBCService.java | 4 +++-
iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java | 2 +-
.../src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java | 4 +++-
iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java | 4 +++-
.../src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java | 2 +-
10 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
index 987e57b..8ceffdd 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
@@ -40,10 +40,12 @@ public class DnfFilterOptimizer implements IFilterOptimizer {
return getDnf(filter);
}
- private void dealWithLeftAndRightAndChildren(List<FilterOperator> leftAndChildren, List<FilterOperator> rightAndChildren, List<FilterOperator> newChildrenList) throws LogicalOptimizeException {
- for (FilterOperator laChild : leftAndChildren) {
- for (FilterOperator raChild : rightAndChildren) {
- FilterOperator r = mergeToConjunction(laChild.clone(), raChild.clone());
+ private void dealWithLeftAndRightAndChildren(
+ List<FilterOperator> leftAndChildren, List<FilterOperator> rightAndChildren,
+ List<FilterOperator> newChildrenList) throws LogicalOptimizeException {
+ for (FilterOperator leftAndChild : leftAndChildren) {
+ for (FilterOperator rightAndChild : rightAndChildren) {
+ FilterOperator r = mergeToConjunction(leftAndChild.clone(), rightAndChild.clone());
newChildrenList.add(r);
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
index 46aebdb..c72ddb7 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
@@ -134,7 +134,8 @@ public class MergeSingleFilterOptimizer implements IFilterOptimizer {
return addLastNullChild(children, ret, filter, i, childPath);
}
- private Path addLastNullChild(List<FilterOperator> children, List<FilterOperator> ret, FilterOperator filter, int i, Path childPath){
+ private Path addLastNullChild(List<FilterOperator> children, List<FilterOperator> ret,
+ FilterOperator filter, int i, Path childPath){
for (; i < children.size(); i++) {
ret.add(children.get(i));
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java b/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
index 678c93f..86230e3 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
@@ -87,7 +87,7 @@ public class FileReaderManager implements IService {
try {
reader.close();
} catch (IOException e) {
- LOGGER.error("Can not close TsFileSequenceReader {} !", reader.getFileName() + ": " + e);
+ LOGGER.error("Can not close TsFileSequenceReader {} !", reader.getFileName(), e);
}
fileReaderMap.remove(entry.getKey());
referenceMap.remove(entry.getKey());
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryTokenManager.java b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryTokenManager.java
index c97dea2..d727ba3 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryTokenManager.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryTokenManager.java
@@ -168,6 +168,7 @@ public class QueryTokenManager {
}
private static class QueryTokenManagerHelper {
+
private static final QueryTokenManager INSTANCE = new QueryTokenManager();
private QueryTokenManagerHelper(){}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java
index 7d5552f..4f1fe42 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java
@@ -168,6 +168,7 @@ public class SeriesReaderFactory {
}
private static class SeriesReaderFactoryHelper {
+
private static final SeriesReaderFactory INSTANCE = new SeriesReaderFactory();
private SeriesReaderFactoryHelper(){}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
index 033a6c3..6781541 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
@@ -161,7 +161,9 @@ public class JDBCService implements JDBCServiceMBean, IService {
private static final JDBCService INSTANCE = new JDBCService();
- private JDBCServiceHolder(){}
+ private JDBCServiceHolder() {
+
+ }
}
private class JDBCServiceThread implements Runnable {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java b/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java
index 9fd3a79..531940e 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java
@@ -5,7 +5,7 @@
* (the "License"); you may not use this file except in compliance with the License. You may obtain
* a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
index 3e0fd73..aa8b914 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
@@ -28,7 +28,9 @@ import org.apache.iotdb.db.sql.parse.ParseException;
*/
public final class ParseGenerator {
- private ParseGenerator(){}
+ private ParseGenerator() {
+
+ }
/**
* Parse the input {@link String} command and generate an AstNode Tree.
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java
index 7e544a0..c276f01 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java
@@ -28,7 +28,9 @@ import java.io.File;
*/
public class FileUtils {
- private FileUtils(){}
+ private FileUtils() {
+
+ }
public static double getLocalFileByte(String filePath, Unit unit) {
File f = new File(filePath);
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java
index fefb382..3f6ae36 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java
@@ -133,7 +133,7 @@ public class LoadDataUtils {
try {
nsPath = mmanager.getFileNameByPath(record.deviceId);
} catch (PathErrorException e) {
- logger.error("given seriesPath not found, given deviceId:{} ", record.deviceId, e);
+ logger.error("given seriesPath not found, given deviceId:{}", record.deviceId, e);
}
if (!writeInstanceMap.contains(nsPath)) {
if (writeInstanceMap.size() < writeInstanceThreshold) {