Skip to content

Commit

Permalink
checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@fickludd
fickludd committed Mar 28, 2017
1 parent 12323e9 commit d7de96d
Show file tree
Hide file tree
Showing 6 changed files with 135 additions and 44 deletions.
127 changes: 100 additions & 27 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java
View file
Expand Up @@ -133,41 +133,28 @@ public Iterable<IndexProxy> getAllIndexProxies()

/**
* Get all indexes that would be affected by changes in the input labels and/or properties
* @param labels set of labels
* @param changedLabels set of labels that have changed
* @param unchangedLabels set of labels that are unchanged
* @param properties set of properties
* @return set of LabelSchemaDescriptors describing the effected indexes
* @return set of LabelSchemaDescriptors describing the potentially affected indexes
*/
public Set<LabelSchemaDescriptor> getRelatedIndexes( long[] labels, PrimitiveIntCollection properties )
public Set<LabelSchemaDescriptor> getRelatedIndexes(
long[] changedLabels, long[] unchangedLabels, PrimitiveIntCollection properties )
{
if ( labels.length == 1 && properties.isEmpty() )
if ( changedLabels.length == 1 && properties.isEmpty() )
{
Set<LabelSchemaDescriptor> descriptors = descriptorsByLabel.get( (int)labels[0] );
Set<LabelSchemaDescriptor> descriptors = descriptorsByLabel.get( (int)changedLabels[0] );
return descriptors == null ? Collections.emptySet() : descriptors;
}

if ( labels.length == 0 && properties.size() == 1 )
if ( changedLabels.length == 0 && properties.size() == 1 )
{
Set<LabelSchemaDescriptor> descriptors = descriptorsByProperty.get( properties.iterator().next() );
return descriptors == null ? Collections.emptySet() : descriptors;
return getDescriptorsByProperties( unchangedLabels, properties );
}

Set<LabelSchemaDescriptor> descriptors = new HashSet<>();
for ( long label : labels )
{
Set<LabelSchemaDescriptor> toAdd = descriptorsByLabel.get( (int) label );
if ( toAdd != null )
{
descriptors.addAll( toAdd );
}
}
for ( PrimitiveIntIterator property = properties.iterator(); property.hasNext(); )
{
Set<LabelSchemaDescriptor> toAdd = descriptorsByProperty.get( property.next() );
if ( toAdd != null )
{
descriptors.addAll( toAdd );
}
}
Set<LabelSchemaDescriptor> descriptors = extractIndexesByLabels( changedLabels );
descriptors.addAll( getDescriptorsByProperties( unchangedLabels, properties ) );

return descriptors;
}

Expand Down Expand Up @@ -239,7 +226,7 @@ private void removeFromLookup(
}
}

public static Map<LabelSchemaDescriptor, IndexProxy> indexesByDescriptor( Map<Long, IndexProxy> indexesById )
private static Map<LabelSchemaDescriptor, IndexProxy> indexesByDescriptor( Map<Long,IndexProxy> indexesById )
{
Map<LabelSchemaDescriptor, IndexProxy> map = new HashMap<>();
for ( IndexProxy proxy : indexesById.values() )
Expand All @@ -249,7 +236,7 @@ public static Map<LabelSchemaDescriptor, IndexProxy> indexesByDescriptor( Map<Lo
return map;
}

public static Map<LabelSchemaDescriptor, Long> indexIdsByDescriptor( Map<Long, IndexProxy> indexesById )
private static Map<LabelSchemaDescriptor, Long> indexIdsByDescriptor( Map<Long,IndexProxy> indexesById )
{
Map<LabelSchemaDescriptor, Long> map = new HashMap<>();
for ( Map.Entry<Long,IndexProxy> entry : indexesById.entrySet() )
Expand All @@ -258,4 +245,90 @@ public static Map<LabelSchemaDescriptor, Long> indexIdsByDescriptor( Map<Long, I
}
return map;
}

/**
* Get descriptors affected by changed properties. Implementation is smart about whether doing
* the lookup using the unchanged labels or the changed properties given the smallest final
* set of indexes.
*
* @param unchangedLabels set of labels that are unchanged
* @param properties set of properties that have changed
* @return set of LabelSchemaDescriptors describing the potentially affected indexes
*/
private Set<LabelSchemaDescriptor> getDescriptorsByProperties(
long[] unchangedLabels,
PrimitiveIntCollection properties )
{
int nIndexesForLabels = countIndexesByLabels( unchangedLabels );
int nIndexesForProperties = countIndexesByProperties( properties );

if ( nIndexesForLabels == 0 || nIndexesForProperties == 0 )
{
return Collections.emptySet();
}
if ( nIndexesForLabels < nIndexesForProperties )
{
return extractIndexesByLabels( unchangedLabels );
}
else
{
return extractIndexesByProperties( properties );
}
}

private Set<LabelSchemaDescriptor> extractIndexesByLabels( long[] labels )
{
Set<LabelSchemaDescriptor> set = new HashSet<>();
for ( long label : labels )
{
Set<LabelSchemaDescriptor> forLabel = descriptorsByLabel.get( (int) label );
if ( forLabel != null )
{
set.addAll( forLabel );
}
}
return set;
}

private int countIndexesByLabels( long[] labels )
{
int count = 0;
for ( long label : labels )
{
Set<LabelSchemaDescriptor> forLabel = descriptorsByLabel.get( (int) label );
if ( forLabel != null )
{
count += forLabel.size();
}
}
return count;
}

private Set<LabelSchemaDescriptor> extractIndexesByProperties( PrimitiveIntCollection properties )
{
Set<LabelSchemaDescriptor> set = new HashSet<>();
for ( PrimitiveIntIterator iterator = properties.iterator(); iterator.hasNext(); )
{
Set<LabelSchemaDescriptor> forProperty = descriptorsByProperty.get( iterator.next() );
if ( forProperty != null )
{
set.addAll( forProperty );
}
}
return set;
}

private int countIndexesByProperties( PrimitiveIntCollection properties )
{
int count = 0;
for ( PrimitiveIntIterator iterator = properties.iterator(); iterator.hasNext(); )
{
Set<LabelSchemaDescriptor> forProperty = descriptorsByProperty.get( iterator.next() );
if ( forProperty != null )
{
count += forProperty.size();
}
}
return count;
}
}
5 changes: 3 additions & 2 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java
View file
Expand Up @@ -81,9 +81,10 @@ public Iterable<IndexProxy> getAllIndexProxies()
return indexMap.getAllIndexProxies();
}

public Iterable<LabelSchemaDescriptor> getRelatedIndexes( long[] labels, PrimitiveIntCollection properties )
public Iterable<LabelSchemaDescriptor> getRelatedIndexes(
long[] changedLabels, long[] unchangedLabels, PrimitiveIntCollection properties )
{
return indexMap.getRelatedIndexes( labels, properties );
return indexMap.getRelatedIndexes( changedLabels, unchangedLabels, properties );
}

public void setIndexMap( IndexMap newIndexMap )
Expand Down
8 changes: 5 additions & 3 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java
View file
Expand Up @@ -508,9 +508,11 @@ public void convertToIndexUpdatesAndApply( Iterable<NodeUpdates> updates, IndexU
@Override
public Iterable<IndexEntryUpdate<LabelSchemaDescriptor>> convertToIndexUpdates( NodeUpdates nodeUpdates )
{
Iterable<LabelSchemaDescriptor> relatedIndexes = indexMapRef.getRelatedIndexes(
nodeUpdates.labelsChanged(),
nodeUpdates.propertiesChanged() );
Iterable<LabelSchemaDescriptor> relatedIndexes =
indexMapRef.getRelatedIndexes(
nodeUpdates.labelsChanged(),
nodeUpdates.labelsUnchanged(),
nodeUpdates.propertiesChanged() );

return nodeUpdates.forIndexKeys( relatedIndexes, storeView );
}
Expand Down
5 changes: 5 additions & 0 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java
View file
Expand Up @@ -136,6 +136,11 @@ public long[] labelsChanged()
return SortedLongArrayUtil.symmetricDifference( labelsBefore, labelsAfter );
}

public long[] labelsUnchanged()
{
return SortedLongArrayUtil.intersect( labelsBefore, labelsAfter );
}

public PrimitiveIntCollection propertiesChanged()
{
assert !hasLoadedAdditionalProperties : "Calling propertiesChanged() is not valid after non-changed " +
Expand Down
6 changes: 4 additions & 2 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java
View file
Expand Up @@ -103,7 +103,8 @@ public void onPropertyAdd( KernelStatement state, NodeItem node, DefinedProperty
Iterator<NewIndexDescriptor> indexes =
storeReadLayer.indexesAndUniqueIndexesRelatedToProperty( after.propertyKeyId() );
nodeIndexMatcher.onMatchingSchema( state, indexes, node, after.propertyKeyId(),
index -> {
index ->
{
Validators.INDEX_VALUE_VALIDATOR.validate( after.value() );
OrderedPropertyValues values =
getOrderedPropertyValues( state, node, after, index.schema().getPropertyIds() );
Expand All @@ -117,7 +118,8 @@ public void onPropertyRemove( KernelStatement state, NodeItem node, DefinedPrope
Iterator<NewIndexDescriptor> indexes =
storeReadLayer.indexesAndUniqueIndexesRelatedToProperty( before.propertyKeyId() );
nodeIndexMatcher.onMatchingSchema( state, indexes, node, before.propertyKeyId(),
index -> {
index ->
{
OrderedPropertyValues values =
getOrderedPropertyValues( state, node, before, index.schema().getPropertyIds() );
state.txState().indexDoUpdateEntry( index.schema(), node.id(), values, null );
Expand Down
28 changes: 18 additions & 10 deletions community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java
View file
Expand Up @@ -38,6 +38,7 @@
public class IndexMapTest
{

private static final long[] noLabel = {};
private IndexMap indexMap;

private LabelSchemaDescriptor schema3_4 = SchemaDescriptorFactory.forLabel( 3, 4 );
Expand All @@ -59,66 +60,73 @@ public void setup()
public void shouldGetRelatedIndexForLabel()
{
assertThat(
indexMap.getRelatedIndexes( new long[]{3}, emptySet() ),
indexMap.getRelatedIndexes( label( 3 ), noLabel, emptySet() ),
containsInAnyOrder( schema3_4 ) );
}

@Test
public void shouldGetRelatedIndexForProperty()
{
assertThat(
indexMap.getRelatedIndexes( new long[]{}, properties( 4 ) ),
indexMap.getRelatedIndexes( noLabel, label( 3, 4, 5 ), properties( 4 ) ),
containsInAnyOrder( schema3_4 ) );
}

@Test
public void shouldGetRelatedIndexesForLabel()
{
assertThat(
indexMap.getRelatedIndexes( new long[]{5}, emptySet() ),
indexMap.getRelatedIndexes( label( 5 ), label( 3, 4 ), emptySet() ),
containsInAnyOrder( schema5_6_7, schema5_8 ) );
}

@Test
public void shouldGetRelatedIndexes()
{
assertThat(
indexMap.getRelatedIndexes( new long[]{3}, properties( 7 ) ),
indexMap.getRelatedIndexes( label( 3 ), label( 4, 5 ), properties( 7 ) ),
containsInAnyOrder( schema3_4, schema5_6_7 ) );
}

@Test
public void shouldGetRelatedIndexOnce()
{
assertThat(
indexMap.getRelatedIndexes( new long[]{3}, properties( 4 ) ),
indexMap.getRelatedIndexes( label( 3 ), noLabel, properties( 4 ) ),
containsInAnyOrder( schema3_4 ) );

assertThat(
indexMap.getRelatedIndexes( new long[]{}, properties( 6, 7 ) ),
indexMap.getRelatedIndexes( noLabel, label( 5 ), properties( 6, 7 ) ),
containsInAnyOrder( schema5_6_7 ) );
}

@Test
public void shouldHandleUnrelated()
{
assertThat(
indexMap.getRelatedIndexes( new long[]{}, emptySet() ),
indexMap.getRelatedIndexes( noLabel, noLabel, emptySet() ),
emptyIterableOf( LabelSchemaDescriptor.class ) );

assertThat(
indexMap.getRelatedIndexes( new long[]{2}, emptySet() ),
indexMap.getRelatedIndexes( label( 2 ), noLabel, emptySet() ),
emptyIterableOf( LabelSchemaDescriptor.class ) );

assertThat(
indexMap.getRelatedIndexes( new long[]{}, properties( 1 ) ),
indexMap.getRelatedIndexes( noLabel, label( 2 ), properties( 1 ) ),
emptyIterableOf( LabelSchemaDescriptor.class ) );

assertThat(
indexMap.getRelatedIndexes( new long[]{2}, properties( 1 ) ),
indexMap.getRelatedIndexes( label( 2 ), label( 2 ), properties( 1 ) ),
emptyIterableOf( LabelSchemaDescriptor.class ) );
}

// HELPERS

private long[] label( long... labels)
{
return labels;
}

private PrimitiveIntSet properties( int... propertyIds )
{
return PrimitiveIntCollections.asSet( propertyIds );
Expand Down

0 comments on commit d7de96d

Please sign in to comment.