Separate read-only/mutable long diff sets interfaces and implementation

community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/NodeStateImpl.java

@@ -336,7 +336,7 @@ void addIndexDiff( MutableLongDiffSets diff )
     {
         if ( indexDiffs == null )
         {
-            indexDiffs = Collections.newSetFromMap( new IdentityHashMap<MutableLongDiffSets, Boolean>() );
+            indexDiffs = Collections.newSetFromMap( new IdentityHashMap<>() );
         }
         indexDiffs.add( diff );
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java

@@ -61,6 +61,7 @@
 import org.neo4j.kernel.impl.util.collection.OnHeapCollectionsFactory;
 import org.neo4j.kernel.impl.util.diffsets.DiffSets;
 import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSets;
+import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSetsImpl;
 import org.neo4j.kernel.impl.util.diffsets.RelationshipDiffSets;
 import org.neo4j.storageengine.api.Direction;
 import org.neo4j.storageengine.api.NodeItem;
@@ -1002,7 +1003,7 @@ public LongDiffSets indexUpdatesForScan( SchemaIndexDescriptor descriptor )
         {
             return LongDiffSets.EMPTY;
         }
-        MutableLongDiffSets diffs = new MutableLongDiffSets();
+        MutableLongDiffSetsImpl diffs = new MutableLongDiffSetsImpl();
         for ( MutableLongDiffSets diffSet : updates.values() )
         {
             diffs.addAll( diffSet.getAdded().longIterator() );
@@ -1026,7 +1027,7 @@ public LongDiffSets indexUpdatesForSuffixOrContains( SchemaIndexDescriptor descr
         {
             return LongDiffSets.EMPTY;
         }
-        MutableLongDiffSets diffs = new MutableLongDiffSets();
+        MutableLongDiffSetsImpl diffs = new MutableLongDiffSetsImpl();
         for ( Map.Entry<ValueTuple, MutableLongDiffSets> entry : updates.entrySet() )
         {
             if ( query.acceptsValue( entry.getKey().getOnlyValue() ) )
@@ -1093,7 +1094,7 @@ public LongDiffSets indexUpdatesForRangeSeek( SchemaIndexDescriptor descriptor,
     private LongDiffSets indexUpdatesForRangeSeek( TreeMap<ValueTuple, MutableLongDiffSets> sortedUpdates, ValueTuple lower,
             boolean includeLower, ValueTuple upper, boolean includeUpper )
     {
-        MutableLongDiffSets diffs = new MutableLongDiffSets();
+        MutableLongDiffSetsImpl diffs = new MutableLongDiffSetsImpl();
 
         Collection<MutableLongDiffSets> inRange = sortedUpdates.subMap( lower, includeLower, upper, includeUpper ).values();
         for ( MutableLongDiffSets diffForSpecificValue : inRange )
@@ -1113,7 +1114,7 @@ public LongDiffSets indexUpdatesForRangeSeekByPrefix( SchemaIndexDescriptor desc
             return LongDiffSets.EMPTY;
         }
         ValueTuple floor = ValueTuple.of( Values.stringValue( prefix ) );
-        MutableLongDiffSets diffs = new MutableLongDiffSets();
+        MutableLongDiffSetsImpl diffs = new MutableLongDiffSetsImpl();
         for ( Map.Entry<ValueTuple, MutableLongDiffSets> entry : sortedUpdates.tailMap( floor ).entrySet() )
         {
             ValueTuple key = entry.getKey();
@@ -1209,7 +1210,7 @@ private MutableLongDiffSets getIndexUpdatesForSeek(
     private MutableLongDiffSets getIndexUpdatesForSeek( Map<ValueTuple, MutableLongDiffSets> updates,
             ValueTuple values, boolean create )
     {
-        return create ? updates.computeIfAbsent( values, value -> new MutableLongDiffSets() ) : updates.get( values );
+        return create ? updates.computeIfAbsent( values, value -> new MutableLongDiffSetsImpl() ) : updates.get( values );
     }
 
     private Map<ValueTuple, MutableLongDiffSets> getIndexUpdatesByDescriptor( SchemaDescriptor schema,

community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/CollectionsFactory.java

@@ -25,7 +25,7 @@
 import org.eclipse.collections.api.set.primitive.MutableLongSet;
 
 import org.neo4j.kernel.impl.api.state.TxState;
-import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSets;
+import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSetsImpl;
 import org.neo4j.memory.MemoryTracker;
 
 /**
@@ -42,7 +42,7 @@ public interface CollectionsFactory
 
     <V> MutableIntObjectMap<V> newIntObjectMap();
 
-    MutableLongDiffSets newLongDiffSets();
+    MutableLongDiffSetsImpl newLongDiffSets();
 
     MemoryTracker getMemoryTracker();
 

community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/OffHeapCollectionsFactory.java

@@ -28,7 +28,7 @@
 import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
 import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet;
 
-import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSets;
+import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSetsImpl;
 import org.neo4j.memory.MemoryAllocationTracker;
 import org.neo4j.memory.MemoryTracker;
 
@@ -68,9 +68,9 @@ public <V> MutableIntObjectMap<V> newIntObjectMap()
     }
 
     @Override
-    public MutableLongDiffSets newLongDiffSets()
+    public MutableLongDiffSetsImpl newLongDiffSets()
     {
-        return new MutableLongDiffSets( this );
+        return new MutableLongDiffSetsImpl( this );
     }
 
     @Override

community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/OnHeapCollectionsFactory.java

@@ -29,7 +29,7 @@
 import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
 import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet;
 
-import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSets;
+import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSetsImpl;
 import org.neo4j.memory.MemoryTracker;
 
 public class OnHeapCollectionsFactory implements CollectionsFactory
@@ -66,9 +66,9 @@ public <V> MutableIntObjectMap<V> newIntObjectMap()
     }
 
     @Override
-    public MutableLongDiffSets newLongDiffSets()
+    public MutableLongDiffSetsImpl newLongDiffSets()
     {
-        return new MutableLongDiffSets( this );
+        return new MutableLongDiffSetsImpl( this );
     }
 
     @Override

community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/MutableLongDiffSets.java

@@ -17,191 +17,25 @@
  * 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.kernel.impl.util.diffsets;
 
 import org.eclipse.collections.api.iterator.LongIterator;
-import org.eclipse.collections.api.set.primitive.MutableLongSet;
-import org.eclipse.collections.impl.factory.primitive.LongSets;
 
 import java.io.Closeable;
-import java.util.Objects;
 
-import org.neo4j.collection.PrimitiveLongResourceIterator;
-import org.neo4j.kernel.impl.util.collection.CollectionsFactory;
-import org.neo4j.kernel.impl.util.collection.OnHeapCollectionsFactory;
 import org.neo4j.storageengine.api.txstate.LongDiffSets;
 
-/**
- * Primitive long version of collection that with given a sequence of add and removal operations, tracks
- * which elements need to actually be added and removed at minimum from some
- * target collection such that the result is equivalent to just
- * executing the sequence of additions and removals in order.
- */
-public class MutableLongDiffSets implements LongDiffSets, Closeable
+public interface MutableLongDiffSets extends LongDiffSets, Closeable
 {
-    private static final MutableLongSet NOT_INITIALIZED = LongSets.mutable.empty();
-
-    private final CollectionsFactory collectionsFactory;
-    private MutableLongSet addedElements;
-    private MutableLongSet removedElements;
-
-    public MutableLongDiffSets()
-    {
-        this( NOT_INITIALIZED, NOT_INITIALIZED, OnHeapCollectionsFactory.INSTANCE );
-    }
-
-    public MutableLongDiffSets( MutableLongSet addedElements, MutableLongSet removedElements, CollectionsFactory collectionsFactory )
-    {
-        this.addedElements = addedElements;
-        this.removedElements = removedElements;
-        this.collectionsFactory = collectionsFactory;
-    }
-
-    public MutableLongDiffSets( CollectionsFactory collectionsFactory )
-    {
-        this( NOT_INITIALIZED, NOT_INITIALIZED, collectionsFactory );
-    }
-
-    @Override
-    public boolean isAdded( long element )
-    {
-        return addedElements.contains( element );
-    }
-
-    @Override
-    public boolean isRemoved( long element )
-    {
-        return removedElements.contains( element );
-    }
-
-    public void removeAll( LongIterator elementsToRemove )
-    {
-        checkRemovedElements();
-        while ( elementsToRemove.hasNext() )
-        {
-            removeElement( elementsToRemove.next() );
-        }
-    }
-
-    public void addAll( LongIterator elementsToAdd )
-    {
-        checkAddedElements();
-        while ( elementsToAdd.hasNext() )
-        {
-            addElement( elementsToAdd.next() );
-        }
-    }
-
-    public void add( long element )
-    {
-        checkAddedElements();
-        addElement( element );
-    }
-
-    public boolean remove( long element )
-    {
-        checkRemovedElements();
-        return removeElement( element );
-    }
-
-    @Override
-    public LongIterator augment( LongIterator source )
-    {
-        return DiffApplyingPrimitiveLongIterator.augment( source, addedElements, removedElements );
-    }
-
-    @Override
-    public PrimitiveLongResourceIterator augment( PrimitiveLongResourceIterator source )
-    {
-        return DiffApplyingPrimitiveLongIterator.augment( source, addedElements, removedElements );
-    }
-
-    @Override
-    public int delta()
-    {
-        return addedElements.size() - removedElements.size();
-    }
-
-    @Override
-    public MutableLongSet getAdded()
-    {
-        return addedElements;
-    }
-
-    @Override
-    public MutableLongSet getRemoved()
-    {
-        return removedElements;
-    }
-
-    @Override
-    public MutableLongSet getAddedSnapshot()
-    {
-        return addedElements.toSet();
-    }
-
-    @Override
-    public boolean isEmpty()
-    {
-        return addedElements.isEmpty() && removedElements.isEmpty();
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() )
-        {
-            return false;
-        }
-        MutableLongDiffSets diffSets = (MutableLongDiffSets) o;
-        return Objects.equals( addedElements, diffSets.addedElements ) &&
-                Objects.equals( removedElements, diffSets.removedElements );
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash( addedElements, removedElements );
-    }
-
-    private void addElement( long element )
-    {
-        boolean removed = removedElements.remove( element );
-        if ( !removed )
-        {
-            addedElements.add( element );
-        }
-    }
+    void removeAll( LongIterator elements );
 
-    private boolean removeElement( long element )
-    {
-        boolean removed = addedElements.remove( element );
-        return removed || removedElements.add( element );
-    }
+    void addAll( LongIterator elements );
 
-    private void checkAddedElements()
-    {
-        if ( addedElements == NOT_INITIALIZED )
-        {
-            addedElements = collectionsFactory.newLongSet();
-        }
-    }
+    void add( long element );
 
-    private void checkRemovedElements()
-    {
-        if ( removedElements == NOT_INITIALIZED )
-        {
-            removedElements = collectionsFactory.newLongSet();
-        }
-    }
+    boolean remove( long element );
 
     @Override
-    public void close()
-    {
-        // nop
-    }
+    void close();
 }