Moved offheap collections to kernel

neo4j · Jul 31, 2018 · 66f3078 · 66f3078
1 parent c7c5616
commit 66f3078
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 27 deletions.
diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/state/AppendOnlyValuesContainer.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/state/AppendOnlyValuesContainer.java
@@ -34,10 +34,10 @@
 import java.util.List;
 import javax.annotation.Nonnull;
 
-import org.neo4j.collection.offheap.Memory;
-import org.neo4j.collection.offheap.MemoryAllocator;
 import org.neo4j.graphdb.Resource;
 import org.neo4j.io.ByteUnit;
+import org.neo4j.kernel.impl.util.collection.Memory;
+import org.neo4j.kernel.impl.util.collection.MemoryAllocator;
 import org.neo4j.unsafe.impl.internal.dragons.UnsafeUtil;
 import org.neo4j.util.VisibleForTesting;
 import org.neo4j.values.storable.ArrayValue;

diff --git a/...fheap/AbstractLinearProbeLongHashSet.java → ...ction/AbstractLinearProbeLongHashSet.java b/...fheap/AbstractLinearProbeLongHashSet.java → ...ction/AbstractLinearProbeLongHashSet.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.collection.offheap;
+package org.neo4j.kernel.impl.util.collection;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.eclipse.collections.api.block.function.primitive.LongToObjectFunction;

diff --git a/...n/offheap/LinearProbeLongLongHashMap.java → ...ollection/LinearProbeLongLongHashMap.java b/...n/offheap/LinearProbeLongLongHashMap.java → ...ollection/LinearProbeLongLongHashMap.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.neo4j.collection.offheap;
+package org.neo4j.kernel.impl.util.collection;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.eclipse.collections.api.LazyLongIterable;

diff --git a/.../org/neo4j/collection/offheap/Memory.java → ...j/kernel/impl/util/collection/Memory.java b/.../org/neo4j/collection/offheap/Memory.java → ...j/kernel/impl/util/collection/Memory.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.neo4j.collection.offheap;
+package org.neo4j.kernel.impl.util.collection;
 
 import java.nio.ByteBuffer;
 

diff --git a/...j/collection/offheap/MemoryAllocator.java → ...impl/util/collection/MemoryAllocator.java b/...j/collection/offheap/MemoryAllocator.java → ...impl/util/collection/MemoryAllocator.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.collection.offheap;
+package org.neo4j.kernel.impl.util.collection;
 
 @FunctionalInterface
 public interface MemoryAllocator

diff --git a/...ffheap/MutableLinearProbeLongHashSet.java → ...ection/MutableLinearProbeLongHashSet.java b/...ffheap/MutableLinearProbeLongHashSet.java → ...ection/MutableLinearProbeLongHashSet.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.neo4j.collection.offheap;
+package org.neo4j.kernel.impl.util.collection;
 
 import org.eclipse.collections.api.LongIterable;
 import org.eclipse.collections.api.block.procedure.primitive.LongProcedure;

diff --git a/...kernel/src/main/java/org/neo4j/kernel/impl/util/collection/OffHeapCollectionsFactory.java b/...kernel/src/main/java/org/neo4j/kernel/impl/util/collection/OffHeapCollectionsFactory.java
@@ -25,9 +25,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.neo4j.collection.offheap.LinearProbeLongLongHashMap;
-import org.neo4j.collection.offheap.MemoryAllocator;
-import org.neo4j.collection.offheap.MutableLinearProbeLongHashSet;
 import org.neo4j.graphdb.Resource;
 import org.neo4j.kernel.impl.api.state.AppendOnlyValuesContainer;
 import org.neo4j.kernel.impl.api.state.ValuesContainer;

diff --git a/...ty/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/OffHeapMemoryAllocator.java b/...ty/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/OffHeapMemoryAllocator.java
@@ -22,8 +22,6 @@
 
 import java.nio.ByteBuffer;
 
-import org.neo4j.collection.offheap.Memory;
-import org.neo4j.collection.offheap.MemoryAllocator;
 import org.neo4j.kernel.impl.util.collection.OffHeapBlockAllocator.MemoryBlock;
 import org.neo4j.memory.MemoryAllocationTracker;
 import org.neo4j.unsafe.impl.internal.dragons.UnsafeUtil;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TestMemoryAllocator.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TestMemoryAllocator.java
@@ -23,8 +23,8 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.neo4j.collection.offheap.Memory;
-import org.neo4j.collection.offheap.MemoryAllocator;
+import org.neo4j.kernel.impl.util.collection.Memory;
+import org.neo4j.kernel.impl.util.collection.MemoryAllocator;
 import org.neo4j.memory.LocalMemoryTracker;
 import org.neo4j.memory.MemoryAllocationTracker;
 

diff --git a/...fheap/LinearProbeLongLongHashMapTest.java → ...ction/LinearProbeLongLongHashMapTest.java b/...fheap/LinearProbeLongLongHashMapTest.java → ...ction/LinearProbeLongLongHashMapTest.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.neo4j.collection.offheap;
+package org.neo4j.kernel.impl.util.collection;
 
 import org.eclipse.collections.api.block.function.primitive.LongFunction;
 import org.eclipse.collections.api.block.function.primitive.LongFunction0;
@@ -43,6 +43,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.function.Executable;
+import org.mockito.Mockito;
 
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -67,8 +68,8 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.neo4j.collection.offheap.LinearProbeLongLongHashMap.DEFAULT_CAPACITY;
-import static org.neo4j.collection.offheap.LinearProbeLongLongHashMap.REMOVALS_FACTOR;
+import static org.neo4j.kernel.impl.util.collection.LinearProbeLongLongHashMap.DEFAULT_CAPACITY;
+import static org.neo4j.kernel.impl.util.collection.LinearProbeLongLongHashMap.REMOVALS_FACTOR;
 
 class LinearProbeLongLongHashMapTest
 {
@@ -490,7 +491,7 @@ Collection<DynamicTest> failFastIterator()
     @Test
     void grow()
     {
-        map = spy( map );
+        map = Mockito.spy( map );
 
         for ( int i = 0; i < DEFAULT_CAPACITY; i++ )
         {
@@ -502,7 +503,7 @@ void grow()
     @Test
     void rehashWhenTooManyRemovals()
     {
-        map = spy( map );
+        map = Mockito.spy( map );
 
         final int numOfElements = DEFAULT_CAPACITY / 2;
         final int removalsToTriggerRehashing = (int) (DEFAULT_CAPACITY * REMOVALS_FACTOR);

diff --git a/...ap/MutableLinearProbeLongHashSetTest.java → ...on/MutableLinearProbeLongHashSetTest.java b/...ap/MutableLinearProbeLongHashSetTest.java → ...on/MutableLinearProbeLongHashSetTest.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.neo4j.collection.offheap;
+package org.neo4j.kernel.impl.util.collection;
 
 import org.eclipse.collections.api.block.procedure.primitive.LongProcedure;
 import org.eclipse.collections.api.iterator.LongIterator;
@@ -34,6 +34,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.function.Executable;
+import org.mockito.Mockito;
 
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -57,12 +58,11 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.neo4j.collection.offheap.MutableLinearProbeLongHashSet.DEFAULT_CAPACITY;
-import static org.neo4j.collection.offheap.MutableLinearProbeLongHashSet.REMOVALS_RATIO;
+import static org.neo4j.kernel.impl.util.collection.MutableLinearProbeLongHashSet.DEFAULT_CAPACITY;
+import static org.neo4j.kernel.impl.util.collection.MutableLinearProbeLongHashSet.REMOVALS_RATIO;
 
 class MutableLinearProbeLongHashSetTest
 {
@@ -79,7 +79,7 @@ void tearDown()
     @Test
     void addRemoveContains()
     {
-        set = spy( set );
+        set = Mockito.spy( set );
 
         assertFalse( set.contains( 0 ) );
         assertTrue( set.add( 0 ) );
@@ -155,7 +155,7 @@ void clear()
     @Test
     void grow()
     {
-        set = spy( set );
+        set = Mockito.spy( set );
 
         for ( int i = 0; i < DEFAULT_CAPACITY; i++ )
         {
@@ -167,7 +167,7 @@ void grow()
     @Test
     void rehashWhenTooManyRemovals()
     {
-        set = spy( set );
+        set = Mockito.spy( set );
 
         final int numOfElements = DEFAULT_CAPACITY / 2;
         final int removalsToTriggerRehashing = DEFAULT_CAPACITY / REMOVALS_RATIO;

diff --git a/...llection/offheap/TestMemoryAllocator.java → .../util/collection/TestMemoryAllocator.java b/...llection/offheap/TestMemoryAllocator.java → .../util/collection/TestMemoryAllocator.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.neo4j.collection.offheap;
+package org.neo4j.kernel.impl.util.collection;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;