Skip to content

Commit

Permalink
Replaced PrimitiveIntObjectMap
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrei Koval committed May 8, 2018
1 parent dd976be commit 699ae0e
Show file tree
Hide file tree
Showing 35 changed files with 178 additions and 1,734 deletions.
11 changes: 5 additions & 6 deletions ...sistency-check/src/main/java/org/neo4j/consistency/checking/full/MandatoryProperties.java
View file
Expand Up @@ -20,15 +20,14 @@
package org.neo4j.consistency.checking.full; package org.neo4j.consistency.checking.full;


import org.eclipse.collections.api.iterator.IntIterator; import org.eclipse.collections.api.iterator.IntIterator;
import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
import org.eclipse.collections.api.set.primitive.MutableIntSet; import org.eclipse.collections.api.set.primitive.MutableIntSet;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet; import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;


import java.util.Arrays; import java.util.Arrays;
import java.util.function.Function; import java.util.function.Function;


import org.neo4j.collection.primitive.Primitive;
import org.neo4j.collection.primitive.PrimitiveIntObjectMap;

import org.neo4j.consistency.RecordType; import org.neo4j.consistency.RecordType;
import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.report.ConsistencyReport;
import org.neo4j.consistency.report.ConsistencyReporter; import org.neo4j.consistency.report.ConsistencyReporter;
Expand All @@ -46,8 +45,8 @@


public class MandatoryProperties public class MandatoryProperties
{ {
private final PrimitiveIntObjectMap<int[]> nodes = Primitive.intObjectMap(); private final MutableIntObjectMap<int[]> nodes = new IntObjectHashMap<>();
private final PrimitiveIntObjectMap<int[]> relationships = Primitive.intObjectMap(); private final MutableIntObjectMap<int[]> relationships = new IntObjectHashMap<>();
private final StoreAccess storeAccess; private final StoreAccess storeAccess;


public MandatoryProperties( StoreAccess storeAccess ) public MandatoryProperties( StoreAccess storeAccess )
Expand Down Expand Up @@ -138,7 +137,7 @@ private Iterable<ConstraintRule> constraintsIgnoringMalformed( SchemaStorage sch
return schemaStorage::constraintsGetAllIgnoreMalformed; return schemaStorage::constraintsGetAllIgnoreMalformed;
} }


private static void recordConstraint( int labelOrRelType, int propertyKey, PrimitiveIntObjectMap<int[]> storage ) private static void recordConstraint( int labelOrRelType, int propertyKey, MutableIntObjectMap<int[]> storage )
{ {
int[] propertyKeys = storage.get( labelOrRelType ); int[] propertyKeys = storage.get( labelOrRelType );
if ( propertyKeys == null ) if ( propertyKeys == null )
Expand Down
16 changes: 8 additions & 8 deletions ...-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java
View file
Expand Up @@ -20,17 +20,17 @@
package org.neo4j.consistency.checking.full; package org.neo4j.consistency.checking.full;


import org.eclipse.collections.api.iterator.LongIterator; import org.eclipse.collections.api.iterator.LongIterator;
import org.eclipse.collections.api.map.primitive.IntObjectMap;
import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
import org.eclipse.collections.api.set.primitive.MutableIntSet; import org.eclipse.collections.api.set.primitive.MutableIntSet;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet; import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;


import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;


import org.neo4j.collection.primitive.Primitive;
import org.neo4j.collection.primitive.PrimitiveIntObjectMap;

import org.neo4j.consistency.checking.ChainCheck; import org.neo4j.consistency.checking.ChainCheck;
import org.neo4j.consistency.checking.CheckerEngine; import org.neo4j.consistency.checking.CheckerEngine;
import org.neo4j.consistency.checking.RecordCheck; import org.neo4j.consistency.checking.RecordCheck;
Expand Down Expand Up @@ -94,7 +94,7 @@ private void matchIndexesToNode(
Collection<PropertyRecord> propertyRecs ) Collection<PropertyRecord> propertyRecs )
{ {
Set<Long> labels = NodeLabelReader.getListOfLabels( record, records, engine ); Set<Long> labels = NodeLabelReader.getListOfLabels( record, records, engine );
PrimitiveIntObjectMap<PropertyBlock> nodePropertyMap = null; IntObjectMap<PropertyBlock> nodePropertyMap = null;
for ( IndexRule indexRule : indexes.onlineRules() ) for ( IndexRule indexRule : indexes.onlineRules() )
{ {
long labelId = indexRule.schema().keyId(); long labelId = indexRule.schema().keyId();
Expand Down Expand Up @@ -200,7 +200,7 @@ private void checkProperty( NodeRecord record,
} }
} }


private Value[] getPropertyValues( PrimitiveIntObjectMap<PropertyBlock> propertyMap, int[] indexPropertyIds ) private Value[] getPropertyValues( IntObjectMap<PropertyBlock> propertyMap, int[] indexPropertyIds )
{ {
Value[] values = new Value[indexPropertyIds.length]; Value[] values = new Value[indexPropertyIds.length];
for ( int i = 0; i < indexPropertyIds.length; i++ ) for ( int i = 0; i < indexPropertyIds.length; i++ )
Expand All @@ -211,9 +211,9 @@ private Value[] getPropertyValues( PrimitiveIntObjectMap<PropertyBlock> property
return values; return values;
} }


private PrimitiveIntObjectMap<PropertyBlock> properties( List<PropertyBlock> propertyBlocks ) private IntObjectMap<PropertyBlock> properties( List<PropertyBlock> propertyBlocks )
{ {
PrimitiveIntObjectMap<PropertyBlock> propertyIds = Primitive.intObjectMap(); final MutableIntObjectMap<PropertyBlock> propertyIds = new IntObjectHashMap<>();
for ( PropertyBlock propertyBlock : propertyBlocks ) for ( PropertyBlock propertyBlock : propertyBlocks )
{ {
propertyIds.put( propertyBlock.getKeyIndexId(), propertyBlock ); propertyIds.put( propertyBlock.getKeyIndexId(), propertyBlock );
Expand Down Expand Up @@ -252,7 +252,7 @@ private LongIterator queryIndexOrEmpty( IndexReader reader, IndexQuery[] query )
} }


private static boolean nodeHasSchemaProperties( private static boolean nodeHasSchemaProperties(
PrimitiveIntObjectMap<PropertyBlock> nodePropertyMap, int[] indexPropertyIds ) IntObjectMap<PropertyBlock> nodePropertyMap, int[] indexPropertyIds )
{ {
for ( int indexPropertyId : indexPropertyIds ) for ( int indexPropertyId : indexPropertyIds )
{ {
Expand Down
8 changes: 4 additions & 4 deletions community/graph-algo/src/main/java/org/neo4j/graphalgo/impl/path/ShortestPath.java
View file
Expand Up @@ -21,6 +21,8 @@


import org.apache.commons.lang3.mutable.MutableBoolean; import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.mutable.MutableInt;
import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
Expand All @@ -33,8 +35,6 @@
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Map; import java.util.Map;


import org.neo4j.collection.primitive.Primitive;
import org.neo4j.collection.primitive.PrimitiveIntObjectMap;
import org.neo4j.graphalgo.PathFinder; import org.neo4j.graphalgo.PathFinder;
import org.neo4j.graphalgo.impl.util.PathImpl; import org.neo4j.graphalgo.impl.util.PathImpl;
import org.neo4j.graphalgo.impl.util.PathImpl.Builder; import org.neo4j.graphalgo.impl.util.PathImpl.Builder;
Expand Down Expand Up @@ -572,13 +572,13 @@ void addRel( Relationship rel )
// One long lived instance // One long lived instance
private static class Hits private static class Hits
{ {
private final PrimitiveIntObjectMap<Collection<Hit>> hits = Primitive.intObjectMap(); private final MutableIntObjectMap<Collection<Hit>> hits = new IntObjectHashMap<>();
private int lowestDepth; private int lowestDepth;
private int totalHitCount; private int totalHitCount;


int add( Hit hit, int atDepth ) int add( Hit hit, int atDepth )
{ {
Collection<Hit> depthHits = hits.computeIfAbsent( atDepth, k -> new HashSet<>() ); Collection<Hit> depthHits = hits.getIfAbsentPut( atDepth, HashSet::new );
if ( depthHits.add( hit ) ) if ( depthHits.add( hit ) )
{ {
totalHitCount++; totalHitCount++;
Expand Down
6 changes: 3 additions & 3 deletions community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/LevelUnique.java
View file
Expand Up @@ -19,16 +19,16 @@
*/ */
package org.neo4j.graphdb.traversal; package org.neo4j.graphdb.traversal;


import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
import org.eclipse.collections.api.set.primitive.MutableLongSet; import org.eclipse.collections.api.set.primitive.MutableLongSet;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet; import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet;


import org.neo4j.collection.primitive.Primitive;
import org.neo4j.collection.primitive.PrimitiveIntObjectMap;
import org.neo4j.graphdb.Path; import org.neo4j.graphdb.Path;


class LevelUnique extends AbstractUniquenessFilter class LevelUnique extends AbstractUniquenessFilter
{ {
private final PrimitiveIntObjectMap<MutableLongSet> idsPerLevel = Primitive.intObjectMap(); private final MutableIntObjectMap<MutableLongSet> idsPerLevel = new IntObjectHashMap<>();


LevelUnique( PrimitiveTypeFetcher type ) LevelUnique( PrimitiveTypeFetcher type )
{ {
Expand Down
15 changes: 8 additions & 7 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java
View file
Expand Up @@ -21,7 +21,9 @@


import org.eclipse.collections.api.iterator.IntIterator; import org.eclipse.collections.api.iterator.IntIterator;
import org.eclipse.collections.api.iterator.LongIterator; import org.eclipse.collections.api.iterator.LongIterator;
import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
import org.eclipse.collections.api.set.primitive.IntSet; import org.eclipse.collections.api.set.primitive.IntSet;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;


import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
Expand All @@ -32,7 +34,6 @@
import java.util.function.BiConsumer; import java.util.function.BiConsumer;


import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.Primitive;
import org.neo4j.collection.primitive.PrimitiveIntObjectMap;
import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongCollections;
import org.neo4j.collection.primitive.PrimitiveLongObjectMap; import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
Expand All @@ -48,8 +49,8 @@ public final class IndexMap implements Cloneable
private final PrimitiveLongObjectMap<IndexProxy> indexesById; private final PrimitiveLongObjectMap<IndexProxy> indexesById;
private final Map<SchemaDescriptor,IndexProxy> indexesByDescriptor; private final Map<SchemaDescriptor,IndexProxy> indexesByDescriptor;
private final Map<SchemaDescriptor,Long> indexIdsByDescriptor; private final Map<SchemaDescriptor,Long> indexIdsByDescriptor;
private final PrimitiveIntObjectMap<Set<SchemaDescriptor>> descriptorsByLabel; private final MutableIntObjectMap<Set<SchemaDescriptor>> descriptorsByLabel;
private final PrimitiveIntObjectMap<Set<SchemaDescriptor>> descriptorsByProperty; private final MutableIntObjectMap<Set<SchemaDescriptor>> descriptorsByProperty;


public IndexMap() public IndexMap()
{ {
Expand All @@ -69,8 +70,8 @@ private IndexMap(
this.indexesById = indexesById; this.indexesById = indexesById;
this.indexesByDescriptor = indexesByDescriptor; this.indexesByDescriptor = indexesByDescriptor;
this.indexIdsByDescriptor = indexIdsByDescriptor; this.indexIdsByDescriptor = indexIdsByDescriptor;
this.descriptorsByLabel = Primitive.intObjectMap(); this.descriptorsByLabel = new IntObjectHashMap<>();
this.descriptorsByProperty = Primitive.intObjectMap(); this.descriptorsByProperty = new IntObjectHashMap<>();
for ( SchemaDescriptor schema : indexesByDescriptor.keySet() ) for ( SchemaDescriptor schema : indexesByDescriptor.keySet() )
{ {
addDescriptorToLookups( schema ); addDescriptorToLookups( schema );
Expand Down Expand Up @@ -214,7 +215,7 @@ private void addDescriptorToLookups( SchemaDescriptor schema )
private void addToLookup( private void addToLookup(
int key, int key,
SchemaDescriptor schema, SchemaDescriptor schema,
PrimitiveIntObjectMap<Set<SchemaDescriptor>> lookup ) MutableIntObjectMap<Set<SchemaDescriptor>> lookup )
{ {
Set<SchemaDescriptor> descriptors = lookup.get( key ); Set<SchemaDescriptor> descriptors = lookup.get( key );
if ( descriptors == null ) if ( descriptors == null )
Expand All @@ -228,7 +229,7 @@ private void addToLookup(
private void removeFromLookup( private void removeFromLookup(
int key, int key,
SchemaDescriptor schema, SchemaDescriptor schema,
PrimitiveIntObjectMap<Set<SchemaDescriptor>> lookup ) MutableIntObjectMap<Set<SchemaDescriptor>> lookup )
{ {
Set<SchemaDescriptor> descriptors = lookup.get( key ); Set<SchemaDescriptor> descriptors = lookup.get( key );
descriptors.remove( schema ); descriptors.remove( schema );
Expand Down
39 changes: 9 additions & 30 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java
View file
Expand Up @@ -20,17 +20,18 @@
package org.neo4j.kernel.impl.api.index; package org.neo4j.kernel.impl.api.index;


import org.eclipse.collections.api.iterator.IntIterator; import org.eclipse.collections.api.iterator.IntIterator;
import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
import org.eclipse.collections.api.set.primitive.IntSet; import org.eclipse.collections.api.set.primitive.IntSet;
import org.eclipse.collections.api.set.primitive.MutableIntSet; import org.eclipse.collections.api.set.primitive.MutableIntSet;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet; import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects;


import org.neo4j.collection.primitive.Primitive;
import org.neo4j.collection.primitive.PrimitiveArrays; import org.neo4j.collection.primitive.PrimitiveArrays;
import org.neo4j.collection.primitive.PrimitiveIntObjectMap;
import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Iterables;
import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
import org.neo4j.internal.kernel.api.schema.SchemaDescriptorSupplier; import org.neo4j.internal.kernel.api.schema.SchemaDescriptorSupplier;
Expand All @@ -39,7 +40,6 @@


import static java.lang.String.format; import static java.lang.String.format;
import static java.util.Arrays.binarySearch; import static java.util.Arrays.binarySearch;
import static org.neo4j.collection.primitive.PrimitiveIntCollections.asSet;
import static org.neo4j.kernel.impl.api.index.NodeUpdates.PropertyValueType.Changed; import static org.neo4j.kernel.impl.api.index.NodeUpdates.PropertyValueType.Changed;
import static org.neo4j.kernel.impl.api.index.NodeUpdates.PropertyValueType.NoValue; import static org.neo4j.kernel.impl.api.index.NodeUpdates.PropertyValueType.NoValue;


Expand All @@ -56,7 +56,7 @@ public class NodeUpdates implements PropertyLoader.PropertyLoadSink
private final long[] labelsBefore; private final long[] labelsBefore;
private final long[] labelsAfter; private final long[] labelsAfter;


private final PrimitiveIntObjectMap<PropertyValue> knownProperties; private final MutableIntObjectMap<PropertyValue> knownProperties;
private boolean hasLoadedAdditionalProperties; private boolean hasLoadedAdditionalProperties;


public static class Builder public static class Builder
Expand Down Expand Up @@ -123,7 +123,7 @@ private NodeUpdates( long nodeId, long[] labelsBefore, long[] labelsAfter )
this.nodeId = nodeId; this.nodeId = nodeId;
this.labelsBefore = labelsBefore; this.labelsBefore = labelsBefore;
this.labelsAfter = labelsAfter; this.labelsAfter = labelsAfter;
this.knownProperties = Primitive.intObjectMap(); this.knownProperties = new IntObjectHashMap<>();
} }


public final long getNodeId() public final long getNodeId()
Expand All @@ -145,7 +145,7 @@ IntSet propertiesChanged()
{ {
assert !hasLoadedAdditionalProperties : "Calling propertiesChanged() is not valid after non-changed " + assert !hasLoadedAdditionalProperties : "Calling propertiesChanged() is not valid after non-changed " +
"properties have already been loaded."; "properties have already been loaded.";
return asSet( knownProperties.intIterator() ); return knownProperties.keySet().toImmutable();
} }


@Override @Override
Expand Down Expand Up @@ -369,13 +369,12 @@ public String toString()
StringBuilder result = new StringBuilder( getClass().getSimpleName() ).append( "[" ).append( nodeId ); StringBuilder result = new StringBuilder( getClass().getSimpleName() ).append( "[" ).append( nodeId );
result.append( ", labelsBefore:" ).append( Arrays.toString( labelsBefore ) ); result.append( ", labelsBefore:" ).append( Arrays.toString( labelsBefore ) );
result.append( ", labelsAfter:" ).append( Arrays.toString( labelsAfter ) ); result.append( ", labelsAfter:" ).append( Arrays.toString( labelsAfter ) );
knownProperties.visitEntries( ( key, propertyValue ) -> knownProperties.forEachKeyValue( ( key, propertyValue ) ->
{ {
result.append( ", " ); result.append( ", " );
result.append( key ); result.append( key );
result.append( " -> " ); result.append( " -> " );
result.append( propertyValue ); result.append( propertyValue );
return false;
} ); } );
return result.append( ']' ).toString(); return result.append( ']' ).toString();
} }
Expand All @@ -389,7 +388,7 @@ public int hashCode()
result = prime * result + Arrays.hashCode( labelsAfter ); result = prime * result + Arrays.hashCode( labelsAfter );
result = prime * result + (int) (nodeId ^ (nodeId >>> 32)); result = prime * result + (int) (nodeId ^ (nodeId >>> 32));


final IntIterator propertyKeyIds = knownProperties.intIterator(); final IntIterator propertyKeyIds = knownProperties.keySet().intIterator();
while ( propertyKeyIds.hasNext() ) while ( propertyKeyIds.hasNext() )
{ {
int propertyKeyId = propertyKeyIds.next(); int propertyKeyId = propertyKeyIds.next();
Expand Down Expand Up @@ -418,27 +417,7 @@ public boolean equals( Object obj )
return Arrays.equals( labelsBefore, other.labelsBefore ) && return Arrays.equals( labelsBefore, other.labelsBefore ) &&
Arrays.equals( labelsAfter, other.labelsAfter ) && Arrays.equals( labelsAfter, other.labelsAfter ) &&
nodeId == other.nodeId && nodeId == other.nodeId &&
propertyMapEquals( knownProperties, other.knownProperties ); Objects.equals( knownProperties, other.knownProperties );
}

private boolean propertyMapEquals(
PrimitiveIntObjectMap<PropertyValue> a,
PrimitiveIntObjectMap<PropertyValue> b )
{
if ( a.size() != b.size() )
{
return false;
}
final IntIterator aIterator = a.intIterator();
while ( aIterator.hasNext() )
{
int key = aIterator.next();
if ( !a.get( key ).equals( b.get( key ) ) )
{
return false;
}
}
return true;
} }


enum PropertyValueType enum PropertyValueType
Expand Down
31 changes: 14 additions & 17 deletions ...nel/src/main/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverter.java
View file
Expand Up @@ -20,21 +20,18 @@
package org.neo4j.kernel.impl.api.index; package org.neo4j.kernel.impl.api.index;


import org.eclipse.collections.api.iterator.IntIterator; import org.eclipse.collections.api.iterator.IntIterator;
import org.eclipse.collections.api.map.primitive.IntObjectMap;
import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
import org.eclipse.collections.api.set.primitive.MutableIntSet;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;


import java.util.Iterator;

import org.neo4j.collection.primitive.Primitive;
import org.neo4j.collection.primitive.PrimitiveIntObjectMap;
import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.PropertyStore;
import org.neo4j.kernel.impl.store.record.PropertyBlock; import org.neo4j.kernel.impl.store.record.PropertyBlock;
import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.kernel.impl.store.record.PropertyRecord;
import org.neo4j.kernel.impl.transaction.state.PropertyRecordChange; import org.neo4j.kernel.impl.transaction.state.PropertyRecordChange;
import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Value;


import static org.neo4j.collection.primitive.PrimitiveIntCollections.concat;
import static org.neo4j.collection.primitive.PrimitiveIntCollections.deduplicate;
import static org.neo4j.helpers.collection.Iterators.asIterator;

public class PropertyPhysicalToLogicalConverter public class PropertyPhysicalToLogicalConverter
{ {
private final PropertyStore propertyStore; private final PropertyStore propertyStore;
Expand All @@ -50,8 +47,8 @@ public PropertyPhysicalToLogicalConverter( PropertyStore propertyStore )
public void convertPropertyRecord( long nodeId, Iterable<PropertyRecordChange> changes, public void convertPropertyRecord( long nodeId, Iterable<PropertyRecordChange> changes,
NodeUpdates.Builder properties ) NodeUpdates.Builder properties )
{ {
PrimitiveIntObjectMap<PropertyBlock> beforeMap = Primitive.intObjectMap(); MutableIntObjectMap<PropertyBlock> beforeMap = new IntObjectHashMap<>();
PrimitiveIntObjectMap<PropertyBlock> afterMap = Primitive.intObjectMap(); MutableIntObjectMap<PropertyBlock> afterMap = new IntObjectHashMap<>();
mapBlocks( nodeId, changes, beforeMap, afterMap ); mapBlocks( nodeId, changes, beforeMap, afterMap );


final IntIterator uniqueIntIterator = uniqueIntIterator( beforeMap, afterMap ); final IntIterator uniqueIntIterator = uniqueIntIterator( beforeMap, afterMap );
Expand Down Expand Up @@ -90,16 +87,16 @@ else if ( beforeBlock != null )
} }
} }


private IntIterator uniqueIntIterator( PrimitiveIntObjectMap<PropertyBlock> beforeMap, private IntIterator uniqueIntIterator( IntObjectMap<PropertyBlock> beforeMap, IntObjectMap<PropertyBlock> afterMap )
PrimitiveIntObjectMap<PropertyBlock> afterMap )
{ {
final Iterator<IntIterator> intIterator = final MutableIntSet keys = new IntHashSet();
asIterator( 2, beforeMap.intIterator(), afterMap.intIterator() ); keys.addAll( beforeMap.keySet() );
return deduplicate( concat( intIterator ) ); keys.addAll( afterMap.keySet() );
return keys.intIterator();
} }


private void mapBlocks( long nodeId, Iterable<PropertyRecordChange> changes, private void mapBlocks( long nodeId, Iterable<PropertyRecordChange> changes,
PrimitiveIntObjectMap<PropertyBlock> beforeMap, PrimitiveIntObjectMap<PropertyBlock> afterMap ) MutableIntObjectMap<PropertyBlock> beforeMap, MutableIntObjectMap<PropertyBlock> afterMap )
{ {
for ( PropertyRecordChange change : changes ) for ( PropertyRecordChange change : changes )
{ {
Expand All @@ -115,7 +112,7 @@ private void equalCheck( long nodeId, long expectedNodeId )
assert nodeId == expectedNodeId : "Node id differs expected " + expectedNodeId + ", but was " + nodeId; assert nodeId == expectedNodeId : "Node id differs expected " + expectedNodeId + ", but was " + nodeId;
} }


private void mapBlocks( PropertyRecord record, PrimitiveIntObjectMap<PropertyBlock> blocks ) private void mapBlocks( PropertyRecord record, MutableIntObjectMap<PropertyBlock> blocks )
{ {
for ( PropertyBlock block : record ) for ( PropertyBlock block : record )
{ {
Expand Down

0 comments on commit 699ae0e

Please sign in to comment.