Skip to content

Commit

Permalink
Initial work on making PEC enterprise only
Browse files Browse the repository at this point in the history
  • Loading branch information
@lutovich @systay
lutovich authored and systay committed Aug 27, 2015
1 parent acc228d commit a94f2a1
Show file tree
Hide file tree
Showing 310 changed files with 1,769 additions and 2,395 deletions.
116 changes: 56 additions & 60 deletions ...ncy-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java
View file
Expand Up @@ -55,9 +55,12 @@
import org.neo4j.helpers.progress.ProgressMonitorFactory;
import org.neo4j.kernel.GraphDatabaseAPI;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.direct.DirectStoreAccess;
import org.neo4j.kernel.api.exceptions.TransactionFailureException;
import org.neo4j.kernel.api.exceptions.index.IndexCapacityExceededException;
import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException;
import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException;
import org.neo4j.kernel.api.index.IndexAccessor;
import org.neo4j.kernel.api.index.IndexConfiguration;
import org.neo4j.kernel.api.index.IndexDescriptor;
Expand All @@ -68,6 +71,7 @@
import org.neo4j.kernel.api.labelscan.LabelScanStore;
import org.neo4j.kernel.api.labelscan.NodeLabelUpdate;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.api.KernelStatement;
import org.neo4j.kernel.impl.api.index.IndexUpdateMode;
import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig;
import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
Expand All @@ -77,18 +81,17 @@
import org.neo4j.kernel.impl.store.PropertyType;
import org.neo4j.kernel.impl.store.RecordStore;
import org.neo4j.kernel.impl.store.SchemaStorage;
import org.neo4j.kernel.impl.store.SchemaStore;
import org.neo4j.kernel.impl.store.StoreAccess;
import org.neo4j.kernel.impl.store.record.DynamicRecord;
import org.neo4j.kernel.impl.store.record.IndexRule;
import org.neo4j.kernel.impl.store.record.LabelTokenRecord;
import org.neo4j.kernel.impl.store.record.NeoStoreRecord;
import org.neo4j.kernel.impl.store.record.NodePropertyExistenceConstraintRule;
import org.neo4j.kernel.impl.store.record.NodeRecord;
import org.neo4j.kernel.impl.store.record.PropertyBlock;
import org.neo4j.kernel.impl.store.record.PropertyRecord;
import org.neo4j.kernel.impl.store.record.RecordSerializer;
import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord;
import org.neo4j.kernel.impl.store.record.RelationshipPropertyExistenceConstraintRule;
import org.neo4j.kernel.impl.store.record.RelationshipRecord;
import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord;
import org.neo4j.kernel.impl.store.record.SchemaRule;
Expand Down Expand Up @@ -120,12 +123,12 @@
import static org.neo4j.kernel.impl.store.DynamicNodeLabels.dynamicPointer;
import static org.neo4j.kernel.impl.store.LabelIdArray.prependNodeId;
import static org.neo4j.kernel.impl.store.PropertyType.ARRAY;
import static org.neo4j.kernel.impl.store.record.NodePropertyExistenceConstraintRule.*;
import static org.neo4j.kernel.impl.store.record.NodePropertyExistenceConstraintRule.nodePropertyExistenceConstraintRule;
import static org.neo4j.kernel.impl.store.record.Record.NO_LABELS_FIELD;
import static org.neo4j.kernel.impl.store.record.Record.NO_NEXT_PROPERTY;
import static org.neo4j.kernel.impl.store.record.Record.NO_NEXT_RELATIONSHIP;
import static org.neo4j.kernel.impl.store.record.Record.NO_PREV_RELATIONSHIP;
import static org.neo4j.kernel.impl.store.record.RelationshipPropertyExistenceConstraintRule.*;
import static org.neo4j.kernel.impl.store.record.RelationshipPropertyExistenceConstraintRule.relPropertyExistenceConstraintRule;
import static org.neo4j.kernel.impl.util.Bits.bits;
import static org.neo4j.test.Property.property;
import static org.neo4j.test.Property.set;
Expand Down Expand Up @@ -155,8 +158,6 @@ protected void generateInitialData( GraphDatabaseService db )
{
db.schema().indexFor( label( "label3" ) ).on( "key" ).create();
db.schema().constraintFor( label( "label4" ) ).assertPropertyIsUnique( "key" ).create();
db.schema().constraintFor( label( "draconian" ) ).assertPropertyExists( "mandatory" ).create();
db.schema().constraintFor( withName( "M" ) ).assertPropertyExists( "mandatory" ).create();
tx.success();
}

Expand All @@ -175,12 +176,16 @@ protected void generateInitialData( GraphDatabaseService db )
label2 = readOperationsOn( db ).labelGetForName( "label2" );
label3 = readOperationsOn( db ).labelGetForName( "label3" );
label4 = readOperationsOn( db ).labelGetForName( "label4" );
draconian = readOperationsOn( db ).labelGetForName( "draconian" );
draconian = tokenWriteOperationsOn( db ).labelGetOrCreateForName( "draconian" );
key = readOperationsOn( db ).propertyKeyGetForName( "key" );
mandatory = readOperationsOn( db ).propertyKeyGetForName( "mandatory" );
mandatory = tokenWriteOperationsOn( db ).propertyKeyGetOrCreateForName( "mandatory" );
C = readOperationsOn( db ).relationshipTypeGetForName( "C" );
T = readOperationsOn( db ).relationshipTypeGetForName( "T" );
M = readOperationsOn( db ).relationshipTypeGetForName( "M" );
M = tokenWriteOperationsOn( db ).relationshipTypeGetOrCreateForName( "M" );
}
catch ( IllegalTokenNameException | TooManyLabelsException e )
{
throw new RuntimeException( e );
}
}
};
Expand Down Expand Up @@ -626,6 +631,8 @@ protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx,
}
} );

createNodePropertyExistenceConstraint( draconian, mandatory );

// when
ConsistencySummaryStatistics stats = check();

Expand Down Expand Up @@ -675,6 +682,8 @@ protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx,
}
} );

createRelationshipPropertyExistenceConstraint( M, mandatory );

// when
ConsistencySummaryStatistics stats = check();

Expand Down Expand Up @@ -1702,13 +1711,13 @@ public void shouldReportDuplicatedUniquenessConstraintRules() throws Exception
}

@Test
public void shouldReportDuplicatedMandatoryNodePropertyConstraintRules() throws Exception
public void shouldReportDuplicatedNodePropertyExistenceConstraintRules() throws Exception
{
// Given
int labelId = createLabel();
int propertyKeyId = createPropertyKey();
createMandatoryNodePropertyRule( labelId, propertyKeyId );
createMandatoryNodePropertyRule( labelId, propertyKeyId );
createNodePropertyExistenceConstraint( labelId, propertyKeyId );
createNodePropertyExistenceConstraint( labelId, propertyKeyId );

// When
ConsistencySummaryStatistics stats = check();
Expand All @@ -1718,13 +1727,13 @@ public void shouldReportDuplicatedMandatoryNodePropertyConstraintRules() throws
}

@Test
public void shouldReportDuplicatedMandatoryRelationshipPropertyConstraintRules() throws Exception
public void shouldReportDuplicatedRelationshipPropertyExistenceConstraintRules() throws Exception
{
// Given
int relTypeId = createRelType();
int propertyKeyId = createPropertyKey();
createMandatoryRelationshipPropertyRule( relTypeId, propertyKeyId );
createMandatoryRelationshipPropertyRule( relTypeId, propertyKeyId );
createRelationshipPropertyExistenceConstraint( relTypeId, propertyKeyId );
createRelationshipPropertyExistenceConstraint( relTypeId, propertyKeyId );

// When
ConsistencySummaryStatistics stats = check();
Expand Down Expand Up @@ -1765,12 +1774,12 @@ public void shouldReportInvalidLabelIdInUniquenessConstraintRule() throws Except
}

@Test
public void shouldReportInvalidLabelIdInMandatoryNodePropertyConstraintRule() throws Exception
public void shouldReportInvalidLabelIdInNodePropertyExistenceConstraintRule() throws Exception
{
// Given
int labelId = fixture.idGenerator().label();
int propertyKeyId = createPropertyKey();
createMandatoryNodePropertyRule( labelId, propertyKeyId );
createNodePropertyExistenceConstraint( labelId, propertyKeyId );

// When
ConsistencySummaryStatistics stats = check();
Expand Down Expand Up @@ -1811,12 +1820,12 @@ public void shouldReportInvalidPropertyKeyIdInUniquenessConstraintRule() throws
}

@Test
public void shouldReportInvalidPropertyKeyIdInMandatoryNodePropertyConstraintRule() throws Exception
public void shouldReportInvalidPropertyKeyIdInNodePropertyExistenceConstraintRule() throws Exception
{
// Given
int labelId = createLabel();
int propertyKeyId = fixture.idGenerator().propertyKey();
createMandatoryNodePropertyRule( labelId, propertyKeyId );
createNodePropertyExistenceConstraint( labelId, propertyKeyId );

// When
ConsistencySummaryStatistics stats = check();
Expand All @@ -1826,12 +1835,12 @@ public void shouldReportInvalidPropertyKeyIdInMandatoryNodePropertyConstraintRul
}

@Test
public void shouldReportInvalidRelTypeIdInMandatoryRelationshipPropertyConstraintRule() throws Exception
public void shouldReportInvalidRelTypeIdInRelationshipPropertyExistenceConstraintRule() throws Exception
{
// Given
int relTypeId = fixture.idGenerator().relationshipType();
int propertyKeyId = createPropertyKey();
createMandatoryRelationshipPropertyRule( relTypeId, propertyKeyId );
createRelationshipPropertyExistenceConstraint( relTypeId, propertyKeyId );

// When
ConsistencySummaryStatistics stats = check();
Expand All @@ -1841,14 +1850,14 @@ public void shouldReportInvalidRelTypeIdInMandatoryRelationshipPropertyConstrain
}

@Test
public void shouldReportNothingForUniquenessAndMandatoryPropertyConstraintOnSameLabelAndProperty() throws Exception
public void shouldReportNothingForUniquenessAndPropertyExistenceConstraintOnSameLabelAndProperty() throws Exception
{
// Given
int labelId = createLabel();
int propertyKeyId = createPropertyKey();

createMandatoryNodePropertyRule( labelId, propertyKeyId );
createUniquenessConstraintRule( labelId, propertyKeyId );
createNodePropertyExistenceConstraint( labelId, propertyKeyId );

// When
ConsistencySummaryStatistics stats = check();
Expand Down Expand Up @@ -2031,56 +2040,43 @@ protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx,
} );
}

private void createMandatoryNodePropertyRule( final int labelId, final int propertyKeyId ) throws Exception
private void createNodePropertyExistenceConstraint( int labelId, int propertyKeyId )
{
fixture.apply( new GraphStoreFixture.Transaction()
SchemaStore schemaStore = (SchemaStore) fixture.directStoreAccess().nativeStores().getSchemaStore();
SchemaRule rule = nodePropertyExistenceConstraintRule( schemaStore.nextId(), labelId, propertyKeyId );
Collection<DynamicRecord> records = schemaStore.allocateFrom( rule );
for ( DynamicRecord record : records )
{
@Override
protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx,
GraphStoreFixture.IdGenerator next )
{
int id = (int) next.schema();

DynamicRecord recordBefore = new DynamicRecord( id );
DynamicRecord recordAfter = recordBefore.clone();

NodePropertyExistenceConstraintRule rule = nodePropertyExistenceConstraintRule( id, labelId,
propertyKeyId );
Collection<DynamicRecord> records = serializeRule( rule, recordAfter );

tx.createSchema( singleton( recordBefore ), records, rule );
}
} );
schemaStore.updateRecord( record );
}
}

private void createMandatoryRelationshipPropertyRule( final int relTypeId, final int propertyKeyId )
throws Exception
private void createRelationshipPropertyExistenceConstraint( int relTypeId, int propertyKeyId )
{
fixture.apply( new GraphStoreFixture.Transaction()
SchemaStore schemaStore = (SchemaStore) fixture.directStoreAccess().nativeStores().getSchemaStore();
SchemaRule rule = relPropertyExistenceConstraintRule( schemaStore.nextId(), relTypeId, propertyKeyId );
Collection<DynamicRecord> records = schemaStore.allocateFrom( rule );
for ( DynamicRecord record : records )
{
@Override
protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx,
GraphStoreFixture.IdGenerator next )
{
int id = (int) next.schema();

DynamicRecord recordBefore = new DynamicRecord( id );
DynamicRecord recordAfter = recordBefore.clone();
schemaStore.updateRecord( record );
}
}

RelationshipPropertyExistenceConstraintRule rule = relPropertyExistenceConstraintRule( id, relTypeId,
propertyKeyId );
Collection<DynamicRecord> records = serializeRule( rule, recordAfter );
private static ReadOperations readOperationsOn( GraphDatabaseService db )
{
return statementOn( db ).readOperations();
}

tx.createSchema( singleton( recordBefore ), records, rule );
}
} );
private static TokenWriteOperations tokenWriteOperationsOn( GraphDatabaseService db )
{
return statementOn( db ).tokenWriteOperations();
}

private static ReadOperations readOperationsOn( GraphDatabaseService db )
private static KernelStatement statementOn( GraphDatabaseService db )
{
DependencyResolver resolver = ((GraphDatabaseAPI) db).getDependencyResolver();
ThreadToStatementContextBridge bridge = resolver.resolveDependency( ThreadToStatementContextBridge.class );
return bridge.get().readOperations();
return (KernelStatement) bridge.get();
}

private static class Reference<T>
Expand Down
52 changes: 0 additions & 52 deletions community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionResultTest.scala
View file
Expand Up @@ -132,56 +132,4 @@ class ExecutionResultTest extends ExecutionEngineFunSuite {
assert(stats.uniqueConstraintsAdded === 0)
assert(stats.uniqueConstraintsRemoved === 0)
}

test("correct statistics for added node property existence constraint") {
val result = execute("create constraint on (n:Person) assert exists(n.name)")
val stats = result.queryStatistics()

assert(stats.existenceConstraintsAdded === 1)
assert(stats.existenceConstraintsRemoved === 0)
}

test("correct statistics for node property existence constraint added twice") {
execute("create constraint on (n:Person) assert exists(n.name)")
val result = execute("create constraint on (n:Person) assert exists(n.name)")
val stats = result.queryStatistics()

assert(stats.existenceConstraintsAdded === 0)
assert(stats.existenceConstraintsRemoved === 0)
}

test("correct statistics for dropped node property existence constraint") {
execute("create constraint on (n:Person) assert exists(n.name)")
val result = execute("drop constraint on (n:Person) assert exists(n.name)")
val stats = result.queryStatistics()

assert(stats.existenceConstraintsAdded === 0)
assert(stats.existenceConstraintsRemoved === 1)
}

test("correct statistics for added relationship property existence constraint") {
val result = execute("create constraint on ()-[r:KNOWS]-() assert exists(r.since)")
val stats = result.queryStatistics()

assert(stats.existenceConstraintsAdded === 1)
assert(stats.existenceConstraintsRemoved === 0)
}

test("correct statistics for relationship property existence constraint added twice") {
execute("create constraint on ()-[r:KNOWS]-() assert exists(r.since)")
val result = execute("create constraint on ()-[r:KNOWS]-() assert exists(r.since)")
val stats = result.queryStatistics()

assert(stats.existenceConstraintsAdded === 0)
assert(stats.existenceConstraintsRemoved === 0)
}

test("correct statistics for dropped relationship property existence constraint") {
execute("create constraint on ()-[r:KNOWS]-() assert exists(r.since)")
val result = execute("drop constraint on ()-[r:KNOWS]-() assert exists(r.since)")
val stats = result.queryStatistics()

assert(stats.existenceConstraintsAdded === 0)
assert(stats.existenceConstraintsRemoved === 1)
}
}
6 changes: 4 additions & 2 deletions .../src/test/scala/org/neo4j/cypher/internal/spi/v2_2/TransactionBoundQueryContextTest.scala
View file
Expand Up @@ -24,6 +24,7 @@ import org.neo4j.cypher.internal.frontend.v2_3.SemanticDirection
import org.neo4j.cypher.internal.frontend.v2_3.test_helpers.CypherFunSuite
import org.neo4j.graphdb._
import org.mockito.Mockito._
import org.neo4j.kernel.SchemaRuleVerifier
import org.neo4j.kernel.api._
import org.neo4j.kernel.impl.api.{StatementOperationParts, KernelTransactionImplementation, KernelStatement}
import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge
Expand All @@ -36,10 +37,11 @@ class TransactionBoundQueryContextTest extends CypherFunSuite {
var statement: Statement = null

override def beforeEach() {
super.beforeEach ()
super.beforeEach()
graph = new ImpermanentGraphDatabase
outerTx = mock[Transaction]
statement = new KernelStatement( mock[KernelTransactionImplementation], null, null, null, null, null, null )
statement = new KernelStatement(mock[KernelTransactionImplementation], null, null, null, null, null, null,
mock[SchemaRuleVerifier])
}

test ("should_mark_transaction_successful_if_successful") {
Expand Down
3 changes: 0 additions & 3 deletions community/cypher/pom.xml
View file
Expand Up @@ -38,9 +38,6 @@
<module>cypher</module>
<module>acceptance</module>
<module>compatibility-suite</module>
<module>docs/cypher-docs</module>
<module>docs/graphgist</module>
<module>docs/refcard-tests</module>
</modules>

<repositories>
Expand Down

0 comments on commit a94f2a1

Please sign in to comment.