Cheaper clearing of primitive tables if empty

neo4j · May 26, 2016 · eda2a3e · eda2a3e
1 parent b669ced
commit eda2a3e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/...ections/src/main/java/org/neo4j/collection/primitive/hopscotch/IntArrayBasedKeyTable.java b/...ections/src/main/java/org/neo4j/collection/primitive/hopscotch/IntArrayBasedKeyTable.java
@@ -163,7 +163,10 @@ protected int index( int index )
     @Override
     public void clear()
     {
-        clearTable();
+        if ( size > 0 )
+        {
+            clearTable();
+        }
         super.clear();
     }
 }
diff --git a/...itive-collections/src/main/java/org/neo4j/collection/primitive/hopscotch/UnsafeTable.java b/...itive-collections/src/main/java/org/neo4j/collection/primitive/hopscotch/UnsafeTable.java
@@ -39,14 +39,22 @@ protected UnsafeTable( int capacity, int bytesPerKey, VALUE valueMarker )
         this.valueMarker = valueMarker;
         this.dataSize = (long)this.capacity*bytesPerEntry;
         this.address = UnsafeUtil.allocateMemory( dataSize );
-        clear();
+        clearTable();
+    }
+
+    private void clearTable()
+    {
+        UnsafeUtil.setMemory( address, dataSize, (byte)-1 );
     }
 
     @Override
     public void clear()
     {
+        if ( size > 0 )
+        {
+            clearTable();
+        }
         super.clear();
-        UnsafeUtil.setMemory( address, dataSize, (byte)-1 );
     }
 
     @Override