Removed ArrayMap and replaced it with HashMap

neo4j · Feb 19, 2018 · 33d2032 · 33d2032
1 parent 899d917
commit 33d2032
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 545 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RWLock.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RWLock.java
@@ -20,17 +20,18 @@
 package org.neo4j.kernel.impl.locking.community;
 
 import java.time.Clock;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.ListIterator;
+import java.util.Map;
 
 import org.neo4j.helpers.MathUtil;
 import org.neo4j.kernel.DeadlockDetectedException;
 import org.neo4j.kernel.impl.locking.LockAcquisitionTimeoutException;
 import org.neo4j.kernel.impl.locking.LockTracer;
 import org.neo4j.kernel.impl.locking.LockType;
 import org.neo4j.kernel.impl.locking.LockWaitEvent;
-import org.neo4j.kernel.impl.util.ArrayMap;
 import org.neo4j.logging.Logger;
 
 import static java.lang.Thread.currentThread;
@@ -68,7 +69,7 @@ class RWLock
 {
     private final LockResource resource; // the resource this RWLock locks
     private final LinkedList<LockRequest> waitingThreadList = new LinkedList<>();
-    private final ArrayMap<Object,TxLockElement> txLockElementMap = new ArrayMap<>( (byte) 5, false, true );
+    private final Map<Object, TxLockElement> txLockElementMap = new HashMap<>();
     private final RagManager ragManager;
     private final Clock clock;
     private final long lockAcquisitionTimeoutMillis;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RagManager.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RagManager.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 
 import org.neo4j.kernel.DeadlockDetectedException;
-import org.neo4j.kernel.impl.util.ArrayMap;
 
 /**
  * The Resource Allocation Graph manager is used for deadlock detection. It
@@ -69,9 +68,7 @@ public class RagManager
     // stopWaitOn( resource ) method must be invoked
 
     private final Map<Object,List<Object>> resourceMap = new HashMap<>();
-
-    private final ArrayMap<Object,Object> waitingTxMap =
-            new ArrayMap<>( (byte) 5, false, true );
+    private final Map<Object, Object> waitingTxMap = new HashMap<>();
 
     synchronized void lockAcquired( Object resource, Object tx )
     {

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ArrayMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ArrayMap.java