You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/02/28 09:06:05 UTC
[incubator-iotdb] branch fix_sonar_bug updated: refactor 5 classes
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch fix_sonar_bug
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/fix_sonar_bug by this push:
new 2bb9ded refactor 5 classes
2bb9ded is described below
commit 2bb9ded6e5fcbb72d0b15e803465993676f6a5a8
Author: 江天 <jt...@163.com>
AuthorDate: Thu Feb 28 17:05:05 2019 +0800
refactor 5 classes
---
.../iotdb/db/auth/user/BasicUserManager.java | 3 ++-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 2 +-
.../org/apache/iotdb/db/concurrent/HashLock.java | 8 +++---
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 29 +++++++++++++---------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 ++---
5 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
index 8be5ee4..8e44df5 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
@@ -67,7 +67,7 @@ public abstract class BasicUserManager implements IUserManager {
try {
admin = getUser(IoTDBConstant.ADMIN_NAME);
} catch (AuthException e) {
- logger.warn("Cannot load admin because {}. Create a new one.", e.getMessage());
+ logger.warn("Cannot load admin, Creating a new one.", e);
admin = null;
}
@@ -196,6 +196,7 @@ public abstract class BasicUserManager implements IUserManager {
try {
AuthUtils.validatePassword(newPassword);
} catch (AuthException e) {
+ logger.debug("An illegal password detected ", e);
return false;
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
index 495577e..b3020ad 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
@@ -150,7 +150,7 @@ public class LocalFileUserAccessor implements IUserAccessor {
outputStream.flush();
} catch (Exception e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e);
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
index 970bfc5..e725b54 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
@@ -72,13 +72,13 @@ public class HashLock {
for (int i = 0; i < lockSize; i++) {
try {
locks[i].readLock().unlock();
- } catch (Exception ignored) {
- // do nothing
+ } catch (Exception e) {
+ LOGGER.debug("Cannot unlock because, ", e);
}
try {
locks[i].writeLock().unlock();
- } catch (Exception ignored) {
- // do nothing
+ } catch (Exception e) {
+ LOGGER.debug("Cannot unlock because, ", e);
}
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 96e2969..4d16bb0 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -23,16 +23,19 @@ import java.time.ZoneId;
import java.util.ArrayList;
import java.util.List;
import org.apache.iotdb.db.metadata.MManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IoTDBConfig {
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConfig.class);
public static final String CONFIG_NAME = "iotdb-engine.properties";
- public static final String default_data_dir = "data";
- public static final String default_sys_dir = "system";
- public static final String default_tsfile_dir = "settled";
- public static final String mult_dir_strategy_prefix =
+ public static final String DEFAULT_DATA_DIR = "data";
+ public static final String DEFAULT_SYS_DIR = "system";
+ public static final String DEFAULT_TSFILE_DIR = "settled";
+ public static final String MULT_DIR_STRATEGY_PREFIX =
"org.apache.iotdb.db.conf.directories.strategy.";
- public static final String default_mult_dir_strategy = "MaxDiskUsableSpaceFirstStrategy";
+ public static final String DEFAULT_MULT_DIR_STRATEGY = "MaxDiskUsableSpaceFirstStrategy";
public String rpcAddress = "0.0.0.0";
/**
@@ -297,7 +300,7 @@ public class IoTDBConfig {
overflowDataDir = dataDir + overflowDataDir;
if (bufferWriteDirs == null || bufferWriteDirs.length == 0) {
- bufferWriteDirs = new String[]{default_tsfile_dir};
+ bufferWriteDirs = new String[]{DEFAULT_TSFILE_DIR};
}
for (int i = 0; i < bufferWriteDirs.length; i++) {
if (new File(bufferWriteDirs[i]).isAbsolute()) {
@@ -362,13 +365,13 @@ public class IoTDBConfig {
private void preUpdatePath() {
if (dataDir == null) {
- dataDir = default_data_dir + File.separatorChar + default_data_dir;
+ dataDir = DEFAULT_DATA_DIR + File.separatorChar + DEFAULT_DATA_DIR;
}
if (sysDir == null) {
- sysDir = default_data_dir + File.separatorChar + default_sys_dir;
+ sysDir = DEFAULT_DATA_DIR + File.separatorChar + DEFAULT_SYS_DIR;
}
if (walDir == null) {
- walDir = default_data_dir;
+ walDir = DEFAULT_DATA_DIR;
}
List<String> dirs = new ArrayList<>();
@@ -394,16 +397,18 @@ public class IoTDBConfig {
private void confirmMultiDirStrategy() {
if (multDirStrategyClassName == null) {
- multDirStrategyClassName = default_mult_dir_strategy;
+ multDirStrategyClassName = DEFAULT_MULT_DIR_STRATEGY;
}
if (!multDirStrategyClassName.contains(".")) {
- multDirStrategyClassName = mult_dir_strategy_prefix + multDirStrategyClassName;
+ multDirStrategyClassName = MULT_DIR_STRATEGY_PREFIX + multDirStrategyClassName;
}
try {
Class.forName(multDirStrategyClassName);
} catch (ClassNotFoundException e) {
- multDirStrategyClassName = mult_dir_strategy_prefix + default_mult_dir_strategy;
+ LOGGER.warn("Cannot find given directory strategy {}, using the default value",
+ multDirStrategyClassName, e);
+ multDirStrategyClassName = MULT_DIR_STRATEGY_PREFIX + DEFAULT_MULT_DIR_STRATEGY;
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 5cb2fab..8177ca0 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -38,7 +38,7 @@ public class IoTDBDescriptor {
loadProps();
}
- public static final IoTDBDescriptor getInstance() {
+ public static IoTDBDescriptor getInstance() {
return IoTDBDescriptorHolder.INSTANCE;
}
@@ -50,7 +50,7 @@ public class IoTDBDescriptor {
* load an property file and set TsfileDBConfig variables.
*/
private void loadProps() {
- InputStream inputStream = null;
+ InputStream inputStream;
String url = System.getProperty(IoTDBConstant.IOTDB_CONF, null);
if (url == null) {
url = System.getProperty(IoTDBConstant.IOTDB_HOME, null);
@@ -128,7 +128,7 @@ public class IoTDBDescriptor {
Long.toString(conf.forceWalPeriodInMs)));
conf.dataDir = properties.getProperty("data_dir", conf.dataDir);
- conf.bufferWriteDirs = properties.getProperty("tsfile_dir", conf.default_tsfile_dir)
+ conf.bufferWriteDirs = properties.getProperty("tsfile_dir", conf.DEFAULT_TSFILE_DIR)
.split(",");
conf.sysDir = properties.getProperty("sys_dir", conf.sysDir);
conf.walDir = properties.getProperty("wal_dir", conf.walDir);