This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 9b8b68a [IOTDB-49]Remove 2 unneeded logs. (#99)
9b8b68a is described below
commit 9b8b68a820bbbe7f29fe2e7646cfc9fa73f7b9e9
Author: Jiang Tian <[email protected]>
AuthorDate: Wed Mar 20 00:06:02 2019 -0500
[IOTDB-49]Remove 2 unneeded logs. (#99)
* Remove 2 unneeded logs.
* remove invalid reset()
---
.../iotdb/db/auth/role/BasicRoleManager.java | 1 -
.../iotdb/db/auth/user/BasicUserManager.java | 1 -
.../org/apache/iotdb/db/concurrent/HashLock.java | 22 ----------------------
3 files changed, 24 deletions(-)
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
index b435244..dfb70cb 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
@@ -159,7 +159,6 @@ public abstract class BasicRoleManager implements
IRoleManager {
public void reset() {
accessor.reset();
roleMap.clear();
- lock.reset();
}
@Override
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 8e44df5..e79b634 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
@@ -272,7 +272,6 @@ public abstract class BasicUserManager implements
IUserManager {
public void reset() throws AuthException {
accessor.reset();
userMap.clear();
- lock.reset();
initAdmin();
}
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 e725b54..197cb40 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
@@ -18,9 +18,6 @@
*/
package org.apache.iotdb.db.concurrent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
@@ -30,8 +27,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
*/
public class HashLock {
- private static final Logger LOGGER = LoggerFactory.getLogger(HashLock.class);
-
private static final int DEFAULT_LOCK_NUM = 100;
private ReentrantReadWriteLock[] locks;
@@ -65,21 +60,4 @@ public class HashLock {
this.locks[Math.abs(obj.hashCode() % lockSize)].writeLock().unlock();
}
- /**
- * This method will unlock all locks. Only for test convenience.
- */
- public void reset() {
- for (int i = 0; i < lockSize; i++) {
- try {
- locks[i].readLock().unlock();
- } catch (Exception e) {
- LOGGER.debug("Cannot unlock because, ", e);
- }
- try {
- locks[i].writeLock().unlock();
- } catch (Exception e) {
- LOGGER.debug("Cannot unlock because, ", e);
- }
- }
- }
}