Skip to content

Commit

Permalink
More SchemaDescriptorLookupSet testing and minor comment addressed
Browse files Browse the repository at this point in the history 
Also Junit5-ified SchemaDescriptorLookupSetTest
  • Loading branch information
@tinwelint
tinwelint committed Apr 8, 2019
1 parent 08a5162 commit a7d3860
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 36 deletions.
2 changes: 1 addition & 1 deletion community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/EntityCommandGrouper.java
View file
Expand Up @@ -115,7 +115,7 @@ public void clear()
* <ol> * <ol>
* <li>Call {@link #nextEntity()} to go to the next group, if any</li> * <li>Call {@link #nextEntity()} to go to the next group, if any</li>
* <li>A group may or may not have the entity command, as accessed by {@link #currentEntityCommand()}, * <li>A group may or may not have the entity command, as accessed by {@link #currentEntityCommand()},
* either way the node id is accessible using {@link #currentEntityId()}</li> * either way the entity id is accessible using {@link #currentEntityId()}</li>
* <li>Call {@link #nextProperty()} until it returns null, now all the {@link PropertyCommand} in this group have been accessed</li> * <li>Call {@link #nextProperty()} until it returns null, now all the {@link PropertyCommand} in this group have been accessed</li>
* </ol> * </ol>
*/ */
Expand Down
3 changes: 2 additions & 1 deletion community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcher.java
View file
Expand Up @@ -49,6 +49,7 @@ private NodeSchemaMatcher()
* @param schemaSuppliers The suppliers to match * @param schemaSuppliers The suppliers to match
* @param specialPropertyId This property id will always count as a match for the descriptor, regardless of * @param specialPropertyId This property id will always count as a match for the descriptor, regardless of
* whether the node has this property or not * whether the node has this property or not
* @param existingPropertyIds sorted array of property ids for the entity to match schema for.
* @param callback The action to take on match * @param callback The action to take on match
* @throws EXCEPTION This exception is propagated from the action * @throws EXCEPTION This exception is propagated from the action
*/ */
Expand Down Expand Up @@ -79,12 +80,12 @@ static <SUPPLIER extends SchemaDescriptorSupplier, EXCEPTION extends Exception>
* To avoid unnecessary store lookups, this implementation only gets propertyKeyIds for the node if some * To avoid unnecessary store lookups, this implementation only gets propertyKeyIds for the node if some
* descriptor has a valid label. * descriptor has a valid label.
* *
*
* @param <SUPPLIER> the type to match. Must implement SchemaDescriptorSupplier * @param <SUPPLIER> the type to match. Must implement SchemaDescriptorSupplier
* @param <EXCEPTION> The type of exception that can be thrown when taking the action * @param <EXCEPTION> The type of exception that can be thrown when taking the action
* @param schemaSuppliers The suppliers to match * @param schemaSuppliers The suppliers to match
* @param specialPropertyId This property id will always count as a match for the descriptor, regardless of * @param specialPropertyId This property id will always count as a match for the descriptor, regardless of
* whether the node has this property or not * whether the node has this property or not
* @param existingPropertyIds sorted array of property ids for the entity to match schema for.
* @param callback The action to take on match * @param callback The action to take on match
* @throws EXCEPTION This exception is propagated from the action * @throws EXCEPTION This exception is propagated from the action
*/ */
Expand Down
10 changes: 9 additions & 1 deletion community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/Command.java
View file
Expand Up @@ -382,7 +382,15 @@ public boolean handle( CommandVisitor handler ) throws IOException


public long getEntityId() public long getEntityId()
{ {
return after.isNodeSet() ? after.getNodeId() : after.getRelId(); if ( after.isNodeSet() )
{
return after.getNodeId();
}
if ( after.isRelSet() )
{
return after.getRelId();
}
throw new UnsupportedOperationException( format( "Unexpected owner of property %s, neither a node nor a relationship", after ) );
} }


public long getNodeId() public long getNodeId()
Expand Down
147 changes: 114 additions & 33 deletions ...y/kernel/src/test/java/org/neo4j/kernel/impl/api/index/SchemaDescriptorLookupSetTest.java
View file
Expand Up @@ -21,8 +21,11 @@


import org.eclipse.collections.api.set.primitive.MutableIntSet; import org.eclipse.collections.api.set.primitive.MutableIntSet;
import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.collections.impl.factory.primitive.IntSets;
import org.junit.Rule; import org.junit.jupiter.api.Test;
import org.junit.Test; import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.MethodSource;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
Expand All @@ -34,9 +37,11 @@


import org.neo4j.helpers.collection.Iterators; import org.neo4j.helpers.collection.Iterators;
import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.MultiTokenSchemaDescriptor;
import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
import org.neo4j.storageengine.api.EntityType; import org.neo4j.storageengine.api.EntityType;
import org.neo4j.test.extension.Inject;
import org.neo4j.test.extension.RandomExtension;
import org.neo4j.test.rule.RandomRule; import org.neo4j.test.rule.RandomRule;


import static java.util.Arrays.stream; import static java.util.Arrays.stream;
Expand All @@ -45,75 +50,80 @@
import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.Iterators.asSet;
import static org.neo4j.internal.kernel.api.schema.SchemaDescriptor.PropertySchemaType.COMPLETE_ALL_TOKENS; import static org.neo4j.internal.kernel.api.schema.SchemaDescriptor.PropertySchemaType.COMPLETE_ALL_TOKENS;


public class SchemaDescriptorLookupSetTest @ExtendWith( RandomExtension.class )
class SchemaDescriptorLookupSetTest
{ {
@Rule @Inject
public final RandomRule random = new RandomRule(); private RandomRule random;


@Test @ParameterizedTest
public void shouldLookupSingleKeyDescriptors() @EnumSource( DescriptorFactory.class )
void shouldLookupSingleKeyDescriptors( DescriptorFactory factory )
{ {
// given // given
SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>(); SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>();
LabelSchemaDescriptor expected = SchemaDescriptorFactory.forLabel( 1, 2 ); SchemaDescriptor expected = factory.descriptor( 1, 2 );
set.add( expected ); set.add( expected );


// when // when
Set<SchemaDescriptor> descriptors = new HashSet<>(); Set<SchemaDescriptor> descriptors = new HashSet<>();
set.matchingDescriptorsForPartialListOfProperties( descriptors, entityTokens( 1 ), properties( 2 ) ); set.matchingDescriptorsForPartialListOfProperties( descriptors, longs( 1 ), ints( 2 ) );


// then // then
assertEquals( asSet( expected ), descriptors ); assertEquals( asSet( expected ), descriptors );
} }


@Test @ParameterizedTest
public void shouldLookupSingleKeyAndSharedCompositeKeyDescriptors() @EnumSource( DescriptorFactory.class )
void shouldLookupSingleKeyAndSharedCompositeKeyDescriptors( DescriptorFactory factory )
{ {
// given // given
SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>(); SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>();
LabelSchemaDescriptor expected1 = SchemaDescriptorFactory.forLabel( 1, 2 ); SchemaDescriptor expected1 = factory.descriptor( 1, 2 );
LabelSchemaDescriptor expected2 = SchemaDescriptorFactory.forLabel( 1, 2, 3 ); SchemaDescriptor expected2 = factory.descriptor( 1, 2, 3 );
set.add( expected1 ); set.add( expected1 );
set.add( expected2 ); set.add( expected2 );


// when // when
Set<SchemaDescriptor> descriptors = new HashSet<>(); Set<SchemaDescriptor> descriptors = new HashSet<>();
set.matchingDescriptorsForPartialListOfProperties( descriptors, entityTokens( 1 ), properties( 2 ) ); set.matchingDescriptorsForPartialListOfProperties( descriptors, longs( 1 ), ints( 2 ) );


// then // then
assertEquals( asSet( expected1, expected2 ), descriptors ); assertEquals( asSet( expected1, expected2 ), descriptors );
} }


@Test @ParameterizedTest
public void shouldLookupCompositeKeyDescriptor() @EnumSource( DescriptorFactory.class )
void shouldLookupCompositeKeyDescriptor( DescriptorFactory factory )
{ {
// given // given
SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>(); SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>();
LabelSchemaDescriptor descriptor1 = SchemaDescriptorFactory.forLabel( 1, 2, 3 ); SchemaDescriptor descriptor1 = factory.descriptor( 1, 2, 3 );
LabelSchemaDescriptor descriptor2 = SchemaDescriptorFactory.forLabel( 1, 2, 4 ); SchemaDescriptor descriptor2 = factory.descriptor( 1, 2, 4 );
LabelSchemaDescriptor descriptor3 = SchemaDescriptorFactory.forLabel( 1, 2, 5, 6 ); SchemaDescriptor descriptor3 = factory.descriptor( 1, 2, 5, 6 );
set.add( descriptor1 ); set.add( descriptor1 );
set.add( descriptor2 ); set.add( descriptor2 );
set.add( descriptor3 ); set.add( descriptor3 );


// when // when
Set<SchemaDescriptor> descriptors = new HashSet<>(); Set<SchemaDescriptor> descriptors = new HashSet<>();
set.matchingDescriptorsForCompleteListOfProperties( descriptors, entityTokens( 1 ), properties( 2, 5, 6 ) ); set.matchingDescriptorsForCompleteListOfProperties( descriptors, longs( 1 ), ints( 2, 5, 6 ) );


// then // then
assertEquals( asSet( descriptor3 ), descriptors ); assertEquals( asSet( descriptor3 ), descriptors );
} }


@Test @ParameterizedTest
public void shouldLookupAllByEntityToken() @EnumSource( DescriptorFactory.class )
void shouldLookupAllByEntityToken( DescriptorFactory factory )
{ {
// given // given
SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>(); SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>();
LabelSchemaDescriptor descriptor1 = SchemaDescriptorFactory.forLabel( 1, 2, 3 ); SchemaDescriptor descriptor1 = factory.descriptor( 1, 2, 3 );
LabelSchemaDescriptor descriptor2 = SchemaDescriptorFactory.forLabel( 1, 2, 4 ); SchemaDescriptor descriptor2 = factory.descriptor( 1, 2, 4 );
LabelSchemaDescriptor descriptor3 = SchemaDescriptorFactory.forLabel( 1, 2, 5, 6 ); SchemaDescriptor descriptor3 = factory.descriptor( 1, 2, 5, 6 );
LabelSchemaDescriptor descriptor4 = SchemaDescriptorFactory.forLabel( 2, 2, 3 ); SchemaDescriptor descriptor4 = factory.descriptor( 2, 2, 3 );
LabelSchemaDescriptor descriptor5 = SchemaDescriptorFactory.forLabel( 3, 2, 5, 6 ); SchemaDescriptor descriptor5 = factory.descriptor( 3, 2, 5, 6 );
set.add( descriptor1 ); set.add( descriptor1 );
set.add( descriptor2 ); set.add( descriptor2 );
set.add( descriptor3 ); set.add( descriptor3 );
Expand All @@ -122,20 +132,63 @@ public void shouldLookupAllByEntityToken()


// when // when
Set<SchemaDescriptor> descriptors = new HashSet<>(); Set<SchemaDescriptor> descriptors = new HashSet<>();
set.matchingDescriptors( descriptors, entityTokens( 1 ) ); set.matchingDescriptors( descriptors, longs( 1 ) );


// then // then
assertEquals( asSet( descriptor1, descriptor2, descriptor3 ), descriptors ); assertEquals( asSet( descriptor1, descriptor2, descriptor3 ), descriptors );
} }


@ParameterizedTest
@MethodSource( "nodeAndRelationshipEntityTypes" )
void shouldMatchOnAnyEntityAndPropertyTokenForPartialPropertySchemaType( EntityType entityType )
{
// given
SchemaDescriptorLookupSet<SchemaDescriptor> set = new SchemaDescriptorLookupSet<>();
MultiTokenSchemaDescriptor descriptor1 = SchemaDescriptorFactory.multiToken( ints( 0, 1, 2 ), entityType, 3, 4, 5 );
MultiTokenSchemaDescriptor descriptor2 = SchemaDescriptorFactory.multiToken( ints( 0, 1 ), entityType, 3, 4 );
MultiTokenSchemaDescriptor descriptor3 = SchemaDescriptorFactory.multiToken( ints( 0, 2 ), entityType, 4, 5 );
set.add( descriptor1 );
set.add( descriptor2 );
set.add( descriptor3 );

// given that this test revolves around entity tokens 0,1,2 and property tokens 3,4,5 these 3 descriptors below matches either
// only those tokens for entity or property or neither. I.e. these should never be included in matching results
set.add( SchemaDescriptorFactory.multiToken( ints( 3, 4 ), entityType, 4, 5 ) );
set.add( SchemaDescriptorFactory.multiToken( ints( 0, 1 ), entityType, 6, 7 ) );
set.add( SchemaDescriptorFactory.multiToken( ints( 3, 4 ), entityType, 6, 7 ) );

// when matching these descriptors (in this case partial/complete list doesn't quite matter because the descriptors
// themselves are partially matched anyway.
Set<SchemaDescriptor> descriptors1 = new HashSet<>();
Set<SchemaDescriptor> descriptors1Partial = new HashSet<>();
Set<SchemaDescriptor> descriptors2 = new HashSet<>();
Set<SchemaDescriptor> descriptors2Partial = new HashSet<>();
Set<SchemaDescriptor> descriptors3 = new HashSet<>();
Set<SchemaDescriptor> descriptors3Partial = new HashSet<>();
set.matchingDescriptorsForCompleteListOfProperties( descriptors1, longs( 0, 1 ), ints( 4, 5 ) );
set.matchingDescriptorsForPartialListOfProperties( descriptors1Partial, longs( 0, 1 ), ints( 4, 5 ) );
set.matchingDescriptorsForCompleteListOfProperties( descriptors2, longs( 0 ), ints( 3 ) );
set.matchingDescriptorsForPartialListOfProperties( descriptors2Partial, longs( 0 ), ints( 3 ) );
set.matchingDescriptorsForCompleteListOfProperties( descriptors3, longs( 1 ), ints( 5 ) );
set.matchingDescriptorsForPartialListOfProperties( descriptors3Partial, longs( 1 ), ints( 5 ) );

// then
assertEquals( asSet( descriptor1, descriptor2, descriptor3 ), descriptors1 );
assertEquals( asSet( descriptor1, descriptor2, descriptor3 ), descriptors1Partial );
assertEquals( asSet( descriptor1, descriptor2 ), descriptors2 );
assertEquals( asSet( descriptor1, descriptor2 ), descriptors2Partial );
assertEquals( asSet( descriptor1 ), descriptors3 );
assertEquals( asSet( descriptor1 ), descriptors3Partial );
}

@Test @Test
public void shouldAddRemoveAndLookupRandomDescriptorsNoIdempotentOperations() void shouldAddRemoveAndLookupRandomDescriptorsNoIdempotentOperations()
{ {
shouldAddRemoveAndLookupRandomDescriptors( false ); shouldAddRemoveAndLookupRandomDescriptors( false );
} }


@Test @Test
public void shouldAddRemoveAndLookupRandomDescriptorsWithIdempotentOperations() void shouldAddRemoveAndLookupRandomDescriptorsWithIdempotentOperations()
{ {
shouldAddRemoveAndLookupRandomDescriptors( true ); shouldAddRemoveAndLookupRandomDescriptors( true );
} }
Expand Down Expand Up @@ -287,13 +340,41 @@ private static long[] toLongArray( int[] array )
return result; return result;
} }


private static int[] properties( int... properties ) private static int[] ints( int... properties )
{ {
return properties; return properties;
} }


private static long[] entityTokens( long... labels ) private static long[] longs( long... labels )
{ {
return labels; return labels;
} }

private static EntityType[] nodeAndRelationshipEntityTypes()
{
return new EntityType[]{EntityType.NODE, EntityType.RELATIONSHIP};
}

enum DescriptorFactory
{
NODE
{
@Override
SchemaDescriptor descriptor( int labelId, int... propertyKeyIds )
{
return SchemaDescriptorFactory.forLabel( labelId, propertyKeyIds );
}
},
RELATIONSHIP
{
@Override
SchemaDescriptor descriptor( int relTypeId, int... propertyKeyIds )
{
return SchemaDescriptorFactory.forRelType( relTypeId, propertyKeyIds );
}
},
;

abstract SchemaDescriptor descriptor( int entityTokenId, int... propertyKeyIds );
}
} }

0 comments on commit a7d3860

Please sign in to comment.