Skip to content

Commit

Permalink
Use TokenWrite in integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
pontusmelke committed Mar 14, 2018
1 parent 9689e28 commit d461196
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 52 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
import org.neo4j.graphdb.schema.IndexDefinition;
import org.neo4j.helpers.collection.Iterables;
import org.neo4j.helpers.collection.Iterators;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException;
import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
import org.neo4j.kernel.api.DataWriteOperations;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.index.PropertyAccessor;
import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor;
Expand Down Expand Up @@ -75,7 +75,7 @@ public class IndexIT extends KernelIntegrationTest
@Before
public void createLabelAndProperty() throws Exception
{
TokenWriteOperations tokenWrites = tokenWriteOperationsInNewTransaction();
TokenWrite tokenWrites = tokenWriteInNewTransaction();
labelId = tokenWrites.labelGetOrCreateForName( LABEL );
propertyKeyId = tokenWrites.propertyKeyGetOrCreateForName( PROPERTY_KEY );
int propertyKeyId2 = tokenWrites.propertyKeyGetOrCreateForName( PROPERTY_KEY2 );
Expand All @@ -94,8 +94,8 @@ public void tearDown()
@Test
public void createIndexForAnotherLabelWhileHoldingSharedLockOnOtherLabel() throws KernelException
{
TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
int label2 = tokenWriteOperations.labelGetOrCreateForName( "Label2" );
TokenWrite tokenWrite = tokenWriteInNewTransaction();
int label2 = tokenWrite.labelGetOrCreateForName( "Label2" );

DataWriteOperations dataWriteOperations = dataWriteOperationsInNewTransaction();
long nodeId = dataWriteOperations.nodeCreate();
Expand All @@ -108,8 +108,8 @@ public void createIndexForAnotherLabelWhileHoldingSharedLockOnOtherLabel() throw
@Test( timeout = 10_000 )
public void createIndexesForDifferentLabelsConcurrently() throws Throwable
{
TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
int label2 = tokenWriteOperations.labelGetOrCreateForName( "Label2" );
TokenWrite tokenWrite = tokenWriteInNewTransaction();
int label2 = tokenWrite.labelGetOrCreateForName( "Label2" );

LabelSchemaDescriptor anotherLabelDescriptor = SchemaDescriptorFactory.forLabel( label2, propertyKeyId );
schemaWriteOperationsInNewTransaction().indexCreate( anotherLabelDescriptor );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
import org.neo4j.collection.RawIterator;
import org.neo4j.graphdb.Transaction;
import org.neo4j.helpers.collection.MapUtil;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
import org.neo4j.kernel.api.ResourceTracker;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.api.StubResourceManager;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.security.AnonymousContext;
import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory;
import org.neo4j.kernel.internal.Version;
Expand Down Expand Up @@ -81,7 +81,7 @@ public void listAllLabels() throws Throwable
public void listPropertyKeys() throws Throwable
{
// Given
TokenWriteOperations ops = tokenWriteOperationsInNewTransaction();
TokenWrite ops = tokenWriteInNewTransaction();
ops.propertyKeyGetOrCreateForName( "MyProp" );
commit();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
import org.neo4j.internal.kernel.api.Procedures;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.internal.kernel.api.security.LoginContext;
import org.neo4j.kernel.api.DataWriteOperations;
Expand All @@ -35,7 +36,6 @@
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.dbms.DbmsOperations;
import org.neo4j.kernel.api.exceptions.TransactionFailureException;
import org.neo4j.kernel.api.security.AnonymousContext;
Expand Down Expand Up @@ -72,11 +72,10 @@ protected Statement statementInNewTransaction( LoginContext loginContext ) throw
return statement;
}

protected TokenWriteOperations tokenWriteOperationsInNewTransaction() throws KernelException
protected TokenWrite tokenWriteInNewTransaction() throws KernelException
{
transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AnonymousContext.writeToken() );
statement = transaction.acquireStatement();
return statement.tokenWriteOperations();
return transaction.tokenWrite();
}

protected DataWriteOperations dataWriteOperationsInNewTransaction() throws KernelException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
import org.junit.Test;

import org.neo4j.graphdb.Transaction;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
import org.neo4j.internal.kernel.api.security.LoginContext;
import org.neo4j.kernel.api.DataWriteOperations;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.api.StatementConstants;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException;
import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException;
Expand All @@ -52,10 +52,10 @@ public class NodeGetUniqueFromIndexSeekIT extends KernelIntegrationTest
@Before
public void createKeys() throws Exception
{
TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
this.labelId = tokenWriteOperations.labelGetOrCreateForName( "Person" );
this.propertyId1 = tokenWriteOperations.propertyKeyGetOrCreateForName( "foo" );
this.propertyId2 = tokenWriteOperations.propertyKeyGetOrCreateForName( "bar" );
TokenWrite tokenWrite = tokenWriteInNewTransaction();
this.labelId = tokenWrite.labelGetOrCreateForName( "Person" );
this.propertyId1 = tokenWrite.propertyKeyGetOrCreateForName( "foo" );
this.propertyId2 = tokenWrite.propertyKeyGetOrCreateForName( "bar" );
commit();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

import org.junit.Test;

import org.neo4j.internal.kernel.api.TokenNameLookup;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.api.StatementTokenNameLookup;
import org.neo4j.internal.kernel.api.TokenNameLookup;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException;
import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor;
Expand Down Expand Up @@ -392,9 +392,9 @@ private void createConstraint( String label, String propertyKey ) throws KernelE
{
int labelId;
int propertyKeyId;
TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
labelId = tokenWriteOperations.labelGetOrCreateForName( label );
propertyKeyId = tokenWriteOperations.propertyKeyGetOrCreateForName( propertyKey );
TokenWrite tokenWrite = tokenWriteInNewTransaction();
labelId = tokenWrite.labelGetOrCreateForName( label );
propertyKeyId = tokenWrite.propertyKeyGetOrCreateForName( propertyKey );
commit();

SchemaWriteOperations schemaWriteOperations = schemaWriteOperationsInNewTransaction();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
import org.neo4j.graphdb.schema.IndexDefinition;
import org.neo4j.graphdb.schema.Schema;
import org.neo4j.helpers.collection.Iterables;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.exceptions.Status;
import org.neo4j.kernel.api.exceptions.TransactionFailureException;
import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException;
Expand Down Expand Up @@ -75,7 +75,7 @@ public abstract class AbstractConstraintCreationIT<Constraint extends Constraint
int propertyKeyId;
DESCRIPTOR descriptor;

abstract int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name )
abstract int initializeLabelOrRelType( TokenWrite tokenWrite, String name )
throws KernelException;

abstract Constraint createConstraint( SchemaWriteOperations writeOps, DESCRIPTOR descriptor ) throws Exception;
Expand All @@ -95,9 +95,9 @@ abstract int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations
@Before
public void createKeys() throws Exception
{
TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
this.typeId = initializeLabelOrRelType( tokenWriteOperations, KEY );
this.propertyKeyId = tokenWriteOperations.propertyKeyGetOrCreateForName( PROP );
TokenWrite tokenWrite = tokenWriteInNewTransaction();
this.typeId = initializeLabelOrRelType( tokenWrite, KEY );
this.propertyKeyId = tokenWrite.propertyKeyGetOrCreateForName( PROP );
this.descriptor = makeDescriptor( typeId, propertyKeyId );
commit();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
import org.neo4j.graphdb.Label;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.ResourceIterator;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory;
import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor;

public class NodeKeyConstraintCreationIT extends AbstractConstraintCreationIT<NodeKeyConstraintDescriptor,LabelSchemaDescriptor>
{
@Override
int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException
int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException
{
return tokenWriteOperations.labelGetOrCreateForName( name );
return tokenWrite.labelGetOrCreateForName( name );
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.ResourceIterator;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException;
import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException;
import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
Expand All @@ -51,9 +51,9 @@ public class NodePropertyExistenceConstraintCreationIT
extends AbstractConstraintCreationIT<NodeExistenceConstraintDescriptor,LabelSchemaDescriptor>
{
@Override
int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException
int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException
{
return tokenWriteOperations.labelGetOrCreateForName( name );
return tokenWrite.labelGetOrCreateForName( name );
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
import org.neo4j.graphdb.Label;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Transaction;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.kernel.api.DataWriteOperations;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.exceptions.ConstraintViolationTransactionFailureException;
import org.neo4j.kernel.api.exceptions.Status;
import org.neo4j.kernel.api.exceptions.TransactionFailureException;
Expand All @@ -55,8 +55,10 @@
import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forLabel;
import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forRelType;
import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.NodeKeyConstraintValidationIT;
import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.NodePropertyExistenceConstraintValidationIT;
import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.RelationshipPropertyExistenceConstraintValidationIT;
import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT
.NodePropertyExistenceConstraintValidationIT;
import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT
.RelationshipPropertyExistenceConstraintValidationIT;

@RunWith( Suite.class )
@SuiteClasses( {
Expand All @@ -71,9 +73,9 @@ public static class NodeKeyConstraintValidationIT extends NodePropertyExistenceC
@Override
void createConstraint( String key, String property ) throws KernelException
{
TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
int label = tokenWriteOperations.labelGetOrCreateForName( key );
int propertyKey = tokenWriteOperations.propertyKeyGetOrCreateForName( property );
TokenWrite tokenWrite = tokenWriteInNewTransaction();
int label = tokenWrite.labelGetOrCreateForName( key );
int propertyKey = tokenWrite.propertyKeyGetOrCreateForName( property );
commit();

SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction();
Expand Down Expand Up @@ -137,9 +139,9 @@ public void shouldAllowNoopLabelUpdate() throws Exception
@Override
void createConstraint( String key, String property ) throws KernelException
{
TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
int label = tokenWriteOperations.labelGetOrCreateForName( key );
int propertyKey = tokenWriteOperations.propertyKeyGetOrCreateForName( property );
TokenWrite tokenWrite = tokenWriteInNewTransaction();
int label = tokenWrite.labelGetOrCreateForName( key );
int propertyKey = tokenWrite.propertyKeyGetOrCreateForName( property );
commit();

SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction();
Expand Down Expand Up @@ -218,9 +220,9 @@ public static class RelationshipPropertyExistenceConstraintValidationIT
@Override
void createConstraint( String key, String property ) throws KernelException
{
TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
int relTypeId = tokenWriteOperations.relationshipTypeGetOrCreateForName( key );
int propertyKeyId = tokenWriteOperations.propertyKeyGetOrCreateForName( property );
TokenWrite tokenWrite = tokenWriteInNewTransaction();
int relTypeId = tokenWrite.relationshipTypeGetOrCreateForName( key );
int propertyKeyId = tokenWrite.propertyKeyGetOrCreateForName( property );
commit();

SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor;
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory;
import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor;
Expand All @@ -37,9 +37,9 @@ public class RelationshipPropertyExistenceConstraintCreationIT
extends AbstractConstraintCreationIT<RelExistenceConstraintDescriptor,RelationTypeSchemaDescriptor>
{
@Override
int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException
int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException
{
return tokenWriteOperations.relationshipTypeGetOrCreateForName( name );
return tokenWrite.relationshipTypeGetOrCreateForName( name );
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.ResourceIterator;
import org.neo4j.internal.kernel.api.TokenNameLookup;
import org.neo4j.internal.kernel.api.TokenWrite;
import org.neo4j.internal.kernel.api.exceptions.KernelException;
import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException;
import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
Expand All @@ -38,7 +39,6 @@
import org.neo4j.kernel.api.SchemaWriteOperations;
import org.neo4j.kernel.api.SilentTokenNameLookup;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.api.TokenWriteOperations;
import org.neo4j.kernel.api.exceptions.TransactionFailureException;
import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException;
import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException;
Expand Down Expand Up @@ -72,9 +72,9 @@ public class UniquenessConstraintCreationIT
private SchemaIndexDescriptor uniqueIndex;

@Override
int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException
int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException
{
return tokenWriteOperations.labelGetOrCreateForName( KEY );
return tokenWrite.labelGetOrCreateForName( KEY );
}

@Override
Expand Down

0 comments on commit d461196

Please sign in to comment.