[incubator-iotdb] branch fix_49 updated: remove invalid reset()

[jiangtian]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch fix_49
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/fix_49 by this push:
     new 5c7d8dd  remove invalid reset()
5c7d8dd is described below

commit 5c7d8ddcf37c4854349da7a8b8631136a02d90a2
Author: jt <jt2594...@163.com>
AuthorDate: Sun Mar 17 10:22:10 2019 +0800

    remove invalid reset()
---
 .../apache/iotdb/db/auth/role/BasicRoleManager.java  |  1 -
 .../apache/iotdb/db/auth/user/BasicUserManager.java  |  1 -
 .../org/apache/iotdb/db/concurrent/HashLock.java     | 20 --------------------
 3 files changed, 22 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 80fd8e7..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
@@ -60,24 +60,4 @@ public class HashLock {
     this.locks[Math.abs(obj.hashCode() % lockSize)].writeLock().unlock();
   }
 
-  /**
-   * This method will unlock all locks. Only for test convenience.
-   *
-   * The exceptions are ignored because they do not provide any useful 
information.
-   */
-  @SuppressWarnings("squid:S1166")
-  public void reset() {
-    for (int i = 0; i < lockSize; i++) {
-      try {
-        locks[i].readLock().unlock();
-      } catch (Exception ignored) {
-        // not useful exception
-      }
-      try {
-        locks[i].writeLock().unlock();
-      } catch (Exception ignored) {
-        // not useful exception
-      }
-    }
-  }
 }