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/28 13:52:34 UTC

[incubator-iotdb] branch fix_sonar updated: fix three hidden bugs

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 5663bb3  fix three hidden bugs
5663bb3 is described below

commit 5663bb3fa210146ff868ac41045f7a55ce09e62b
Author: kr11 <30...@qq.com>
AuthorDate: Mon Jan 28 21:52:21 2019 +0800

    fix three hidden bugs
---
 .../apache/iotdb/db/query/control/OpenedFilePathsManager.java |  4 +++-
 .../db/query/executor/EngineExecutorWithTimeGenerator.java    | 11 ++++-------
 iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java    |  4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/OpenedFilePathsManager.java b/iotdb/src/main/java/org/apache/iotdb/db/query/control/OpenedFilePathsManager.java
index b7b22a0..c68ad10 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/OpenedFilePathsManager.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/OpenedFilePathsManager.java
@@ -111,6 +111,8 @@ public class OpenedFilePathsManager {
   private static class OpenedFilePathsManagerHelper {
     private static final OpenedFilePathsManager INSTANCE = new OpenedFilePathsManager();
 
-    private OpenedFilePathsManagerHelper(){}
+    private OpenedFilePathsManagerHelper() {
+
+    }
   }
 }
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithTimeGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithTimeGenerator.java
index 4f90e15..813bbd6 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithTimeGenerator.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithTimeGenerator.java
@@ -66,14 +66,11 @@ public class EngineExecutorWithTimeGenerator {
     QueryTokenManager.getInstance()
         .beginQueryOfGivenExpression(jobId, queryExpression.getExpression());
 
-    EngineTimeGenerator timestampGenerator = null;
-    List<EngineReaderByTimeStamp> readersOfSelectedSeries = null;
+    EngineTimeGenerator timestampGenerator;
+    List<EngineReaderByTimeStamp> readersOfSelectedSeries;
     try {
-       timestampGenerator = new EngineTimeGenerator(jobId,
-              queryExpression.getExpression());
-
-       readersOfSelectedSeries = getReadersOfSelectedPaths(
-              queryExpression.getSelectedSeries());
+       timestampGenerator = new EngineTimeGenerator(jobId, queryExpression.getExpression());
+       readersOfSelectedSeries = getReadersOfSelectedPaths(queryExpression.getSelectedSeries());
     } catch (IOException ex){
       throw new FileNodeManagerException(ex);
     }
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
index a2e91e3..5ad29f1 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
@@ -170,7 +170,9 @@ public class IoTDB implements IoTDBMBean {
 
     private static final IoTDB INSTANCE = new IoTDB();
 
-    private IoTDBHolder(){}
+    private IoTDBHolder() {
+
+    }
   }
 
 }