diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/SchemaDescriptorTranslation.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/SchemaDescriptorTranslation.scala index 64d88add606df..ec751d3f03960 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/SchemaDescriptorTranslation.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/SchemaDescriptorTranslation.scala @@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.spi.v2_3 import org.neo4j.cypher.internal.compiler.v2_3.spi.SchemaTypes import org.neo4j.kernel.api.schema.constaints.{NodeExistenceConstraintDescriptor, RelExistenceConstraintDescriptor, UniquenessConstraintDescriptor} -import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, PendingIndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, IndexDescriptor => KernelIndexDescriptor} trait SchemaDescriptorTranslation { implicit def cypherToKernel(index: SchemaTypes.IndexDescriptor): KernelIndexDescriptor = diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundPlanContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundPlanContext.scala index 5be5ae679403e..5ba273d513ecc 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundPlanContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundPlanContext.scala @@ -29,7 +29,7 @@ import org.neo4j.internal.kernel.api.exceptions.KernelException import org.neo4j.internal.kernel.api.{IndexReference, InternalIndexState} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor -import org.neo4j.kernel.api.schema.index.{PendingIndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} import org.neo4j.kernel.impl.transaction.log.TransactionIdStore import scala.collection.JavaConverters._ diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/SchemaDescriptorTranslation.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/SchemaDescriptorTranslation.scala index 62f02149eebd4..caa1197492239 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/SchemaDescriptorTranslation.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/SchemaDescriptorTranslation.scala @@ -22,7 +22,7 @@ package org.neo4j.cypher.internal.spi.v3_1 import org.neo4j.cypher.internal.compiler.v3_1.spi.SchemaTypes import org.neo4j.internal.kernel.api.schema.SchemaDescriptor import org.neo4j.kernel.api.schema.constaints.{ConstraintDescriptorFactory, NodeExistenceConstraintDescriptor, RelExistenceConstraintDescriptor, UniquenessConstraintDescriptor => KernelUniquenessConstraint} -import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, PendingIndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, IndexDescriptor => KernelIndexDescriptor} trait SchemaDescriptorTranslation { implicit def toKernel(index: SchemaTypes.IndexDescriptor): KernelIndexDescriptor = diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundPlanContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundPlanContext.scala index 73fefcb48fea9..e4e75a3330fcc 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundPlanContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundPlanContext.scala @@ -36,7 +36,7 @@ import org.neo4j.internal.kernel.api.procs.{DefaultParameterValue, Neo4jTypes} import org.neo4j.internal.kernel.api.{IndexReference, InternalIndexState, procs} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor -import org.neo4j.kernel.api.schema.index.{PendingIndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} import org.neo4j.procedure.Mode import scala.collection.JavaConverters._ diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/IndexDescriptorCompatibility.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/IndexDescriptorCompatibility.scala index 77e83c32317ae..d3ee0b72145b6 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/IndexDescriptorCompatibility.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/IndexDescriptorCompatibility.scala @@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.spi.v3_3 import org.neo4j.cypher.internal.compiler.v3_3.{IndexDescriptor => CypherIndexDescriptor} import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor -import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, PendingIndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, IndexDescriptor => KernelIndexDescriptor} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory trait IndexDescriptorCompatibility { diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/IndexDescriptorCompatibility.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/IndexDescriptorCompatibility.scala index 0fb71c1f0645d..f2957c04bb32d 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/IndexDescriptorCompatibility.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/IndexDescriptorCompatibility.scala @@ -22,7 +22,7 @@ package org.neo4j.cypher.internal.runtime.interpreted import org.neo4j.cypher.internal.planner.v3_5.spi.{IndexDescriptor => CypherIndexDescriptor} import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor import org.neo4j.kernel.api.schema.SchemaDescriptorFactory -import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, PendingIndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, IndexDescriptor => KernelIndexDescriptor} trait IndexDescriptorCompatibility { def cypherToKernel(index: CypherIndexDescriptor): KernelIndexDescriptor = diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java index 903d434f96916..b783d3967dbb4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java @@ -23,7 +23,7 @@ import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueTuple; @@ -58,7 +58,7 @@ public IndexEntryConflictException( long existingNodeId, long addedNodeId, Value * was caught but it should not have been allowed to be thrown in the first place. * Typically where the index we performed an operation on is not a unique index. */ - public RuntimeException notAllowed( PendingIndexDescriptor descriptor ) + public RuntimeException notAllowed( IndexDescriptor descriptor ) { return new IllegalStateException( String.format( "Index for (%s) should not require unique values.", diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexPopulator.java index c85bfd577285c..3492de8b6b7d3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexPopulator.java @@ -24,7 +24,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.UpdateMode; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexSample; @@ -107,19 +107,19 @@ void add( Collection> updates ) * Close this populator and releases any resources related to it. * If {@code populationCompletedSuccessfully} is {@code true} then it must mark this index * as {@link InternalIndexState#ONLINE} so that future invocations of its parent - * {@link IndexProvider#getInitialState(long, PendingIndexDescriptor)} also returns {@link InternalIndexState#ONLINE}. + * {@link IndexProvider#getInitialState(long, IndexDescriptor)} also returns {@link InternalIndexState#ONLINE}. * * @param populationCompletedSuccessfully {@code true} if the index population was successful, where the index should * be marked as {@link InternalIndexState#ONLINE}, otherwise {@code false} where index should be marked as * {@link InternalIndexState#FAILED} and the failure, previously handed to this populator using {@link #markAsFailed(String)} - * should be stored and made available for later requests from {@link IndexProvider#getPopulationFailure(long, PendingIndexDescriptor)}. + * should be stored and made available for later requests from {@link IndexProvider#getPopulationFailure(long, IndexDescriptor)}. * @throws IOException on I/O error. */ void close( boolean populationCompletedSuccessfully ) throws IOException; /** * Called then a population failed. The failure string should be stored for future retrieval by - * {@link IndexProvider#getPopulationFailure(long, PendingIndexDescriptor)}. Called before {@link #close(boolean)} + * {@link IndexProvider#getPopulationFailure(long, IndexDescriptor)}. Called before {@link #close(boolean)} * if there was a failure during population. * * @param failure the description of the failure. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java index ed2c4e5b1f9a3..7d0131b140271 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java @@ -27,7 +27,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -105,14 +105,14 @@ public void failedToOpenIndex( StoreIndexDescriptor schemaIndexDescriptor, Strin } @Override - public void recoveryCompleted( PendingIndexDescriptor schemaIndexDescriptor, String indexFile, Map data ) + public void recoveryCompleted( IndexDescriptor schemaIndexDescriptor, String indexFile, Map data ) { // no-op } } void failedToOpenIndex( StoreIndexDescriptor schemaIndexDescriptor, String action, Exception cause ); - void recoveryCompleted( PendingIndexDescriptor schemaIndexDescriptor, String indexFile, Map data ); + void recoveryCompleted( IndexDescriptor schemaIndexDescriptor, String indexFile, Map data ); } public static final IndexProvider EMPTY = diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java index 8f573d3bbd6b0..2d9c20335654b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java @@ -23,7 +23,7 @@ import java.util.StringJoiner; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.logging.Log; import static java.lang.String.format; @@ -44,7 +44,7 @@ public void failedToOpenIndex( StoreIndexDescriptor descriptor, String action, E } @Override - public void recoveryCompleted( PendingIndexDescriptor schemaIndexDescriptor, String indexFile, Map data ) + public void recoveryCompleted( IndexDescriptor schemaIndexDescriptor, String indexFile, Map data ) { StringJoiner joiner = new StringJoiner( ", ", "Schema index recovery completed: ", "" ); joiner.add( "descriptor=" + schemaIndexDescriptor ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/IndexBackedConstraintDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/IndexBackedConstraintDescriptor.java index b41b0b9448956..3d59006715cc8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/IndexBackedConstraintDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/IndexBackedConstraintDescriptor.java @@ -23,7 +23,7 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.internal.kernel.api.schema.SchemaUtil; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; public abstract class IndexBackedConstraintDescriptor extends ConstraintDescriptor implements LabelSchemaSupplier @@ -42,7 +42,7 @@ public LabelSchemaDescriptor schema() return schema; } - public PendingIndexDescriptor ownedIndexDescriptor() + public IndexDescriptor ownedIndexDescriptor() { return IndexDescriptorFactory.uniqueForSchema( schema ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/PendingIndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java similarity index 80% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/PendingIndexDescriptor.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java index 9cb0ecd9afd1f..bc575de6ae51d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/PendingIndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java @@ -36,14 +36,14 @@ import org.neo4j.values.storable.ValueCategory; import static java.lang.String.format; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Filter.GENERAL; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Filter.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Filter.GENERAL; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Filter.UNIQUE; /** * Internal representation of a graph index, including the schema unit it targets (eg. label-property combination) * and the type of index. UNIQUE indexes are used to back uniqueness constraints. */ -public class PendingIndexDescriptor implements SchemaDescriptorSupplier, CapableIndexReference +public class IndexDescriptor implements SchemaDescriptorSupplier, CapableIndexReference { public enum Type { @@ -51,12 +51,12 @@ public enum Type UNIQUE } - public enum Filter implements Predicate + public enum Filter implements Predicate { GENERAL { @Override - public boolean test( PendingIndexDescriptor index ) + public boolean test( IndexDescriptor index ) { return index.type == Type.GENERAL; } @@ -64,7 +64,7 @@ public boolean test( PendingIndexDescriptor index ) UNIQUE { @Override - public boolean test( PendingIndexDescriptor index ) + public boolean test( IndexDescriptor index ) { return index.type == Type.UNIQUE; } @@ -72,7 +72,7 @@ public boolean test( PendingIndexDescriptor index ) ANY { @Override - public boolean test( PendingIndexDescriptor index ) + public boolean test( IndexDescriptor index ) { return true; } @@ -81,18 +81,18 @@ public boolean test( PendingIndexDescriptor index ) public interface Supplier { - PendingIndexDescriptor getIndexDescriptor(); + IndexDescriptor getIndexDescriptor(); } protected final SchemaDescriptor schema; - protected final PendingIndexDescriptor.Type type; + protected final IndexDescriptor.Type type; protected final Optional name; protected final IndexProvider.Descriptor providerDescriptor; - public PendingIndexDescriptor( SchemaDescriptor schema, - Type type, - Optional name, - IndexProvider.Descriptor providerDescriptor ) + public IndexDescriptor( SchemaDescriptor schema, + Type type, + Optional name, + IndexProvider.Descriptor providerDescriptor ) { this.schema = schema; this.type = type; @@ -181,9 +181,9 @@ public String userDescription( TokenNameLookup tokenNameLookup ) @Override public boolean equals( Object o ) { - if ( o instanceof PendingIndexDescriptor ) + if ( o instanceof IndexDescriptor ) { - PendingIndexDescriptor that = (PendingIndexDescriptor)o; + IndexDescriptor that = (IndexDescriptor)o; return this.type() == that.type() && this.schema().equals( that.schema() ); } return false; @@ -208,9 +208,9 @@ public String toString() * @param indexes Indexes to sort * @return sorted indexes */ - public static Iterator sortByType( Iterator indexes ) + public static Iterator sortByType( Iterator indexes ) { - List materialized = Iterators.asList( indexes ); + List materialized = Iterators.asList( indexes ); return Iterators.concat( Iterators.filter( GENERAL, materialized.iterator() ), Iterators.filter( UNIQUE, materialized.iterator() ) ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java index 6791cf1d36143..2539cb791db04 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java @@ -26,8 +26,8 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.GENERAL; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; public class IndexDescriptorFactory { @@ -35,30 +35,30 @@ private IndexDescriptorFactory() { } - public static PendingIndexDescriptor forLabel( int labelId, int... propertyIds ) + public static IndexDescriptor forLabel( int labelId, int... propertyIds ) { return forSchema( SchemaDescriptorFactory.forLabel( labelId, propertyIds ) ); } - public static PendingIndexDescriptor uniqueForLabel( int labelId, int... propertyIds ) + public static IndexDescriptor uniqueForLabel( int labelId, int... propertyIds ) { return uniqueForSchema( SchemaDescriptorFactory.forLabel( labelId, propertyIds ) ); } - public static PendingIndexDescriptor forSchema( SchemaDescriptor schema ) + public static IndexDescriptor forSchema( SchemaDescriptor schema ) { - return new PendingIndexDescriptor( schema, GENERAL, null, null ); + return new IndexDescriptor( schema, GENERAL, null, null ); } - public static PendingIndexDescriptor forSchema( SchemaDescriptor schema, - Optional name, - IndexProvider.Descriptor providerDescriptor ) + public static IndexDescriptor forSchema( SchemaDescriptor schema, + Optional name, + IndexProvider.Descriptor providerDescriptor ) { - return new PendingIndexDescriptor( schema, GENERAL, name, providerDescriptor ); + return new IndexDescriptor( schema, GENERAL, name, providerDescriptor ); } - public static PendingIndexDescriptor uniqueForSchema( SchemaDescriptor schema ) + public static IndexDescriptor uniqueForSchema( SchemaDescriptor schema ) { - return new PendingIndexDescriptor( schema, UNIQUE, null, null ); + return new IndexDescriptor( schema, UNIQUE, null, null ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java index 5ed06bb576a44..04f93bf9e7bb9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java @@ -33,31 +33,31 @@ /** * A {@link Label} can have zero or more index rules which will have data specified in the rules indexed. */ -public class StoreIndexDescriptor extends PendingIndexDescriptor implements SchemaRule +public class StoreIndexDescriptor extends IndexDescriptor implements SchemaRule { private final long id; private final Long owningConstraintId; - public static StoreIndexDescriptor indexRule( long id, PendingIndexDescriptor descriptor, + public static StoreIndexDescriptor indexRule( long id, IndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor ) { return new StoreIndexDescriptor( id, providerDescriptor, descriptor, null ); } - public static StoreIndexDescriptor constraintIndexRule( long id, PendingIndexDescriptor descriptor, + public static StoreIndexDescriptor constraintIndexRule( long id, IndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor, Long owningConstraint ) { return new StoreIndexDescriptor( id, providerDescriptor, descriptor, owningConstraint ); } - public static StoreIndexDescriptor indexRule( long id, PendingIndexDescriptor descriptor, + public static StoreIndexDescriptor indexRule( long id, IndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor, String name ) { return new StoreIndexDescriptor( id, providerDescriptor, descriptor, null, name ); } - public static StoreIndexDescriptor constraintIndexRule( long id, PendingIndexDescriptor descriptor, + public static StoreIndexDescriptor constraintIndexRule( long id, IndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor, Long owningConstraint, String name ) { @@ -65,13 +65,13 @@ public static StoreIndexDescriptor constraintIndexRule( long id, PendingIndexDes } protected StoreIndexDescriptor( long id, IndexProvider.Descriptor providerDescriptor, - PendingIndexDescriptor descriptor, Long owningConstraintId ) + IndexDescriptor descriptor, Long owningConstraintId ) { this( id, providerDescriptor, descriptor, owningConstraintId, null ); } protected StoreIndexDescriptor( long id, IndexProvider.Descriptor providerDescriptor, - PendingIndexDescriptor descriptor, Long owningConstraintId, String name ) + IndexDescriptor descriptor, Long owningConstraintId, String name ) { super( descriptor.schema(), descriptor.type(), @@ -90,7 +90,7 @@ protected StoreIndexDescriptor( long id, IndexProvider.Descriptor providerDescri public boolean canSupportUniqueConstraint() { - return type() == PendingIndexDescriptor.Type.UNIQUE; + return type() == IndexDescriptor.Type.UNIQUE; } /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java index 88394ec311e67..bde0f7e6ea496 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java @@ -22,7 +22,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.txstate.ReadableTransactionState; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueTuple; @@ -77,11 +77,11 @@ public interface TransactionState extends ReadableTransactionState // SCHEMA RELATED - void indexRuleDoAdd( PendingIndexDescriptor descriptor ); + void indexRuleDoAdd( IndexDescriptor descriptor ); - void indexDoDrop( PendingIndexDescriptor descriptor ); + void indexDoDrop( IndexDescriptor descriptor ); - boolean indexDoUnRemove( PendingIndexDescriptor constraint ); + boolean indexDoUnRemove( IndexDescriptor constraint ); void constraintDoAdd( ConstraintDescriptor constraint ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/IndexReaderFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/IndexReaderFactory.java index f7d721875ad1c..97b5f711c4d3f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/IndexReaderFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/IndexReaderFactory.java @@ -23,22 +23,22 @@ import java.util.Map; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexProxy; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.storageengine.api.schema.IndexReader; public interface IndexReaderFactory { - IndexReader newReader( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexReader newReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; - IndexReader newUnCachedReader( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexReader newUnCachedReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; void close(); class Caching implements IndexReaderFactory { - private Map indexReaders; + private Map indexReaders; private final IndexingService indexingService; public Caching( IndexingService indexingService ) @@ -47,7 +47,7 @@ public Caching( IndexingService indexingService ) } @Override - public IndexReader newReader( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexReader newReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { if ( indexReaders == null ) { @@ -64,7 +64,7 @@ public IndexReader newReader( PendingIndexDescriptor descriptor ) throws IndexNo } @Override - public IndexReader newUnCachedReader( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexReader newUnCachedReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { IndexProxy index = indexingService.getIndexProxy( descriptor.schema() ); return index.newReader(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java index 82807db8ec97e..3ece156bcc9fb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java @@ -67,7 +67,7 @@ import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.api.txstate.TxStateHolder; @@ -426,7 +426,7 @@ private void dropCreatedConstraintIndexes() throws TransactionFailureException { if ( hasTxStateWithChanges() ) { - for ( PendingIndexDescriptor createdConstraintIndex : txState().constraintIndexesCreatedInTx() ) + for ( IndexDescriptor createdConstraintIndex : txState().constraintIndexesCreatedInTx() ) { // TODO logically, which statement should this operation be performed on? constraintIndexCreator.dropUniquenessConstraintIndex( createdConstraintIndex ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java index 2fd6995351fd3..1c479a830fea6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java @@ -24,7 +24,7 @@ import org.neo4j.internal.kernel.api.IndexValueCapability; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.ValueCategory; public class CapableIndexDescriptor extends StoreIndexDescriptor @@ -33,7 +33,7 @@ public class CapableIndexDescriptor extends StoreIndexDescriptor public CapableIndexDescriptor( long id, IndexProvider.Descriptor providerDescriptor, - PendingIndexDescriptor descriptor, + IndexDescriptor descriptor, Long owningConstraintId, IndexCapability indexCapability ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java index 8050027aa9e36..216218eb76e46 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java @@ -53,7 +53,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingController; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode; @@ -125,7 +125,7 @@ public interface Monitor void indexPopulationScanComplete(); - void awaitingPopulationOfRecoveredIndex( long indexId, PendingIndexDescriptor descriptor ); + void awaitingPopulationOfRecoveredIndex( long indexId, IndexDescriptor descriptor ); } public static class MonitorAdapter implements Monitor @@ -151,7 +151,7 @@ public void indexPopulationScanComplete() } @Override - public void awaitingPopulationOfRecoveredIndex( long indexId, PendingIndexDescriptor descriptor ) + public void awaitingPopulationOfRecoveredIndex( long indexId, IndexDescriptor descriptor ) { // Do nothing } } @@ -309,7 +309,7 @@ public void start() // This is why we now go and wait for those indexes to be fully populated. rebuildingDescriptors.forEachKeyValue( ( indexId, descriptor ) -> { - if ( descriptor.getIndexDescriptor().type() != PendingIndexDescriptor.Type.UNIQUE ) + if ( descriptor.getIndexDescriptor().type() != IndexDescriptor.Type.UNIQUE ) { // It's not a uniqueness constraint, so don't wait for it to be rebuilt return; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java index 752a1165f8d06..a72751209acab 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java @@ -26,7 +26,7 @@ import org.neo4j.collection.PrimitiveLongCollections; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMap; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; import org.neo4j.kernel.impl.api.index.IndexProxy; @@ -106,7 +106,7 @@ public void recoverIndexSamples() public interface RecoveryCondition { - boolean test( long indexId, PendingIndexDescriptor descriptor ); + boolean test( long indexId, IndexDescriptor descriptor ); } private void scheduleSampling( IndexSamplingMode mode, IndexMap indexMap ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerFactory.java index dbc91e26ddf0b..bcc8af3c921b2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerFactory.java @@ -22,7 +22,7 @@ import java.util.function.Predicate; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; import org.neo4j.kernel.impl.api.index.IndexStoreView; import org.neo4j.scheduler.JobScheduler; @@ -92,7 +92,7 @@ private IndexSamplingController.RecoveryCondition createIndexRecoveryCondition( private final DoubleLongRegister register = newDoubleLongRegister(); @Override - public boolean test( long indexId, PendingIndexDescriptor descriptor ) + public boolean test( long indexId, IndexDescriptor descriptor ) { boolean result = storeView.indexSample( indexId, register ).readSecond() == 0; if ( result ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/schema/BridgingIndexProgressor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/schema/BridgingIndexProgressor.java index b81cafa4be199..c709140cb8f4b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/schema/BridgingIndexProgressor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/schema/BridgingIndexProgressor.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; @@ -81,7 +81,7 @@ public void close() } @Override - public void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) + public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) { assertKeysAlign( descriptor.schema().getPropertyIds() ); progressors.add( progressor ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java index 4602108ad304c..beea21b594b3e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java @@ -45,13 +45,11 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; import org.neo4j.kernel.impl.api.index.IndexProxy; import org.neo4j.kernel.impl.api.index.IndexingService; -import org.neo4j.kernel.impl.api.store.DefaultCapableIndexReference; import org.neo4j.kernel.impl.locking.Locks.Client; import static org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException.Phase.VERIFICATION; @@ -196,7 +194,7 @@ private void releaseLabelLock( Client locks, int labelId ) /** * You MUST hold a schema write lock before you call this method. */ - public void dropUniquenessConstraintIndex( PendingIndexDescriptor descriptor ) + public void dropUniquenessConstraintIndex( IndexDescriptor descriptor ) throws TransactionFailureException { try ( Session session = kernelSupplier.get().beginSession( AUTH_DISABLED ); @@ -208,7 +206,7 @@ public void dropUniquenessConstraintIndex( PendingIndexDescriptor descriptor ) } } - private PendingIndexDescriptor asDescriptor( CapableIndexReference indexReference ) + private IndexDescriptor asDescriptor( CapableIndexReference indexReference ) { if ( indexReference.isUnique() ) { @@ -266,18 +264,18 @@ private CapableIndexReference getOrCreateUniquenessConstraintIndex( SchemaRead s // There's already an index for this schema descriptor, which isn't of the type we're after. throw new AlreadyIndexedException( schema, CONSTRAINT_CREATION ); } - PendingIndexDescriptor indexDescriptor = createConstraintIndex( schema ); + IndexDescriptor indexDescriptor = createConstraintIndex( schema ); IndexProxy indexProxy = indexingService.getIndexProxy( indexDescriptor.schema() ); return indexProxy.getDescriptor(); } - public PendingIndexDescriptor createConstraintIndex( final SchemaDescriptor schema ) + public IndexDescriptor createConstraintIndex( final SchemaDescriptor schema ) { try ( Session session = kernelSupplier.get().beginSession( AUTH_DISABLED ); Transaction transaction = session.beginTransaction( Transaction.Type.implicit ); Statement ignore = ((KernelTransaction)transaction).acquireStatement() ) { - PendingIndexDescriptor index = IndexDescriptorFactory.uniqueForSchema( schema ); + IndexDescriptor index = IndexDescriptorFactory.uniqueForSchema( schema ); ((KernelTransactionImplementation) transaction).txState().indexRuleDoAdd( index ); transaction.success(); return index; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java index de4032a80daa0..ef5d59e26a846 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java @@ -41,7 +41,7 @@ import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.cursor.TxAllPropertyCursor; @@ -100,7 +100,7 @@ public class TxState implements TransactionState, RelationshipVisitor.Home private MutableLongObjectMap createdRelationshipTypeTokens; private GraphState graphState; - private DiffSets indexChanges; + private DiffSets indexChanges; private DiffSets constraintsChanges; private RemovalsCountingDiffSets nodes; @@ -563,9 +563,9 @@ public LongDiffSets nodesWithLabelChanged( long label ) @Override public void - indexRuleDoAdd( PendingIndexDescriptor descriptor ) + indexRuleDoAdd( IndexDescriptor descriptor ) { - DiffSets diff = indexChangesDiffSets(); + DiffSets diff = indexChangesDiffSets(); if ( !diff.unRemove( descriptor ) ) { diff.add( descriptor ); @@ -574,31 +574,31 @@ public LongDiffSets nodesWithLabelChanged( long label ) } @Override - public void indexDoDrop( PendingIndexDescriptor descriptor ) + public void indexDoDrop( IndexDescriptor descriptor ) { indexChangesDiffSets().remove( descriptor ); changed(); } @Override - public boolean indexDoUnRemove( PendingIndexDescriptor descriptor ) + public boolean indexDoUnRemove( IndexDescriptor descriptor ) { return indexChangesDiffSets().unRemove( descriptor ); } @Override - public ReadableDiffSets indexDiffSetsByLabel( int labelId ) + public ReadableDiffSets indexDiffSetsByLabel( int labelId ) { return indexChangesDiffSets().filterAdded( SchemaDescriptorPredicates.hasLabel( labelId ) ); } @Override - public ReadableDiffSets indexChanges() + public ReadableDiffSets indexChanges() { return ReadableDiffSets.Empty.ifNull( indexChanges ); } - private DiffSets indexChangesDiffSets() + private DiffSets indexChangesDiffSets() { if ( indexChanges == null ) { @@ -736,7 +736,7 @@ public boolean constraintDoUnRemove( ConstraintDescriptor constraint ) } @Override - public Iterable constraintIndexesCreatedInTx() + public Iterable constraintIndexesCreatedInTx() { if ( createdConstraintIndexesByConstraint != null && !createdConstraintIndexesByConstraint.isEmpty() ) { @@ -753,7 +753,7 @@ public Long indexCreatedForConstraint( ConstraintDescriptor constraint ) } @Override - public LongDiffSets indexUpdatesForScan( PendingIndexDescriptor descriptor ) + public LongDiffSets indexUpdatesForScan( IndexDescriptor descriptor ) { if ( indexUpdates == null ) { @@ -774,7 +774,7 @@ public LongDiffSets indexUpdatesForScan( PendingIndexDescriptor descriptor ) } @Override - public LongDiffSets indexUpdatesForSuffixOrContains( PendingIndexDescriptor descriptor, IndexQuery query ) + public LongDiffSets indexUpdatesForSuffixOrContains( IndexDescriptor descriptor, IndexQuery query ) { assert descriptor.schema().getPropertyIds().length == 1 : "Suffix and contains queries are only supported for single property queries"; @@ -802,14 +802,14 @@ public LongDiffSets indexUpdatesForSuffixOrContains( PendingIndexDescriptor desc } @Override - public LongDiffSets indexUpdatesForSeek( PendingIndexDescriptor descriptor, ValueTuple values ) + public LongDiffSets indexUpdatesForSeek( IndexDescriptor descriptor, ValueTuple values ) { MutableLongDiffSets indexUpdatesForSeek = getIndexUpdatesForSeek( descriptor.schema(), values, /*create=*/false ); return indexUpdatesForSeek == null ? LongDiffSets.EMPTY : indexUpdatesForSeek; } @Override - public LongDiffSets indexUpdatesForRangeSeek( PendingIndexDescriptor descriptor, ValueGroup valueGroup, + public LongDiffSets indexUpdatesForRangeSeek( IndexDescriptor descriptor, ValueGroup valueGroup, Value lower, boolean includeLower, Value upper, boolean includeUpper ) { @@ -867,7 +867,7 @@ private LongDiffSets indexUpdatesForRangeSeek( TreeMap sortedUpdates = getSortedIndexUpdates( descriptor.schema() ); if ( sortedUpdates == null ) @@ -1007,7 +1007,7 @@ private MutableObjectLongMap createdConstraintI return createdConstraintIndexesByConstraint; } - private PendingIndexDescriptor getIndexForIndexBackedConstraint( IndexBackedConstraintDescriptor constraint ) + private IndexDescriptor getIndexForIndexBackedConstraint( IndexBackedConstraintDescriptor constraint ) { return constraint.ownedIndexDescriptor(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DefaultCapableIndexReference.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DefaultCapableIndexReference.java index 7d055cc0f23d1..4508fa7521de6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DefaultCapableIndexReference.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DefaultCapableIndexReference.java @@ -28,7 +28,7 @@ import org.neo4j.internal.kernel.api.IndexValueCapability; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.ValueCategory; public class DefaultCapableIndexReference implements CapableIndexReference @@ -124,9 +124,9 @@ public int hashCode() return result; } - public static CapableIndexReference fromDescriptor( PendingIndexDescriptor descriptor ) + public static CapableIndexReference fromDescriptor( IndexDescriptor descriptor ) { - boolean unique = descriptor.type() == PendingIndexDescriptor.Type.UNIQUE; + boolean unique = descriptor.type() == IndexDescriptor.Type.UNIQUE; final SchemaDescriptor schema = descriptor.schema(); return new DefaultCapableIndexReference( unique, IndexCapability.NO_CAPABILITY, IndexProvider.UNDECIDED, schema.keyId(), schema.getPropertyIds() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DefaultIndexReference.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DefaultIndexReference.java index c4763ba904654..3201e57d1b92d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DefaultIndexReference.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DefaultIndexReference.java @@ -22,9 +22,8 @@ import java.util.Arrays; import org.neo4j.internal.kernel.api.IndexReference; -import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; public class DefaultIndexReference implements IndexReference { @@ -79,7 +78,7 @@ public static IndexReference general( int label, int...properties ) return new DefaultIndexReference( false, label, properties ); } - public static PendingIndexDescriptor toDescriptor( IndexReference reference ) + public static IndexDescriptor toDescriptor( IndexReference reference ) { if ( reference.isUnique() ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.java index 37a9fc20b1cbd..5e07d9da66a26 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.ValueTuple; @@ -62,10 +62,10 @@ public class DeferredConflictCheckingIndexUpdater implements IndexUpdater { private final IndexUpdater actual; private final Supplier readerSupplier; - private final PendingIndexDescriptor schemaIndexDescriptor; + private final IndexDescriptor schemaIndexDescriptor; private final Set touchedTuples = new HashSet<>(); - public DeferredConflictCheckingIndexUpdater( IndexUpdater actual, Supplier readerSupplier, PendingIndexDescriptor schemaIndexDescriptor ) + public DeferredConflictCheckingIndexUpdater( IndexUpdater actual, Supplier readerSupplier, IndexDescriptor schemaIndexDescriptor ) { this.actual = actual; this.readerSupplier = readerSupplier; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndex.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndex.java index bfcb2e5fd6875..9602e27c5bf9c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndex.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndex.java @@ -32,7 +32,7 @@ import org.neo4j.io.pagecache.PageCursor; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import static org.neo4j.helpers.Format.duration; import static org.neo4j.helpers.collection.MapUtil.map; @@ -44,7 +44,7 @@ abstract class NativeSchemaIndex, VALUE extends final File storeFile; final Layout layout; final FileSystemAbstraction fileSystem; - final PendingIndexDescriptor descriptor; + final IndexDescriptor descriptor; private final IndexProvider.Monitor monitor; protected GBPTree tree; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java index ba52e1b5bcdae..03d3fedfac2bf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java @@ -54,8 +54,8 @@ import org.neo4j.util.concurrent.WorkSync; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.GENERAL; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; /** * {@link IndexPopulator} backed by a {@link GBPTree}. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexReader.java index cfc146ef4488f..50bd605a39013 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexReader.java @@ -33,7 +33,7 @@ import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.io.IOUtils; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexReader; @@ -43,7 +43,7 @@ abstract class NativeSchemaIndexReader, VALUE extends NativeSchemaValue> implements IndexReader { - protected final PendingIndexDescriptor descriptor; + protected final IndexDescriptor descriptor; final Layout layout; final Set,IOException>> openSeekers; private final GBPTree tree; @@ -51,7 +51,7 @@ abstract class NativeSchemaIndexReader, VALUE e NativeSchemaIndexReader( GBPTree tree, Layout layout, IndexSamplingConfig samplingConfig, - PendingIndexDescriptor descriptor ) + IndexDescriptor descriptor ) { this.tree = tree; this.layout = layout; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java index 95721b5bdc851..72446ceebdf9a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java @@ -24,7 +24,7 @@ import org.neo4j.collection.PrimitiveLongCollections; import org.neo4j.collection.PrimitiveLongResourceIterator; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; @@ -51,7 +51,7 @@ protected boolean fetchNext() } @Override - public void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) + public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) { this.progressor = progressor; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexReader.java index 6263fc60f94b3..75c167d477130 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexReader.java @@ -25,7 +25,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; import org.neo4j.internal.kernel.api.IndexQuery.RangePredicate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; @@ -33,7 +33,7 @@ class NumberSchemaIndexReader extends NativeSchemaIndexReader { NumberSchemaIndexReader( GBPTree tree, Layout layout, - IndexSamplingConfig samplingConfig, PendingIndexDescriptor descriptor ) + IndexSamplingConfig samplingConfig, IndexDescriptor descriptor ) { super( tree, layout, samplingConfig, descriptor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPartReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPartReader.java index 86d7e382440b6..c32a9d052a453 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPartReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPartReader.java @@ -34,7 +34,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; import org.neo4j.internal.kernel.api.IndexQuery.GeometryRangePredicate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.fusion.BridgingIndexProgressor; import org.neo4j.storageengine.api.schema.IndexProgressor; @@ -48,7 +48,7 @@ public class SpatialIndexPartReader extends Nat private final SpaceFillingCurveConfiguration configuration; SpatialIndexPartReader( GBPTree tree, Layout layout, - IndexSamplingConfig samplingConfig, PendingIndexDescriptor descriptor, + IndexSamplingConfig samplingConfig, IndexDescriptor descriptor, SpaceFillingCurveConfiguration configuration ) { super( tree, layout, samplingConfig, descriptor ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java index 460d259fa8766..fff047e450b64 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java @@ -25,7 +25,7 @@ import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExistsPredicate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.index.schema.fusion.BridgingIndexProgressor; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexSampler; import org.neo4j.storageengine.api.schema.IndexProgressor; @@ -39,9 +39,9 @@ class SpatialIndexReader extends SpatialIndexCache> implements IndexReader { - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; - SpatialIndexReader( PendingIndexDescriptor descriptor, SpatialIndexAccessor accessor ) + SpatialIndexReader( IndexDescriptor descriptor, SpatialIndexAccessor accessor ) { super( new PartFactory( accessor ) ); this.descriptor = descriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexReader.java index 77fa55f4dd716..102acd17ecbbb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexReader.java @@ -25,7 +25,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; import org.neo4j.internal.kernel.api.IndexQuery.RangePredicate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; @@ -35,7 +35,7 @@ class StringSchemaIndexReader extends NativeSchemaIndexReader { StringSchemaIndexReader( GBPTree tree, Layout layout, - IndexSamplingConfig samplingConfig, PendingIndexDescriptor descriptor ) + IndexSamplingConfig samplingConfig, IndexDescriptor descriptor ) { super( tree, layout, samplingConfig, descriptor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java index 8cd16e5537332..96dbe73b3ac7c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -50,7 +50,7 @@ class TemporalIndexAccessor extends TemporalIndexCache> implements IndexAccessor { - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; TemporalIndexAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, PageCache pageCache, FileSystemAbstraction fs, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, TemporalIndexFiles temporalIndexFiles ) throws IOException @@ -168,7 +168,7 @@ public boolean isDirty() static class PartAccessor> extends NativeSchemaIndexAccessor { private final Layout layout; - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; PartAccessor( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles.FileLayout fileLayout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPartReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPartReader.java index 74aab15e1af66..93fd9aabf9e25 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPartReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPartReader.java @@ -23,7 +23,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; @@ -33,7 +33,7 @@ class TemporalIndexPartReader> extends NativeSc TemporalIndexPartReader( GBPTree tree, Layout layout, IndexSamplingConfig samplingConfig, - PendingIndexDescriptor descriptor ) + IndexDescriptor descriptor ) { super( tree, layout, samplingConfig, descriptor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexReader.java index d9a5cd42e90e2..facd29492dbfb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexReader.java @@ -25,7 +25,7 @@ import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExistsPredicate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.index.schema.fusion.BridgingIndexProgressor; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexSampler; import org.neo4j.storageengine.api.schema.IndexProgressor; @@ -38,9 +38,9 @@ class TemporalIndexReader extends TemporalIndexCache> implements IndexReader { - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; - TemporalIndexReader( PendingIndexDescriptor descriptor, TemporalIndexAccessor accessor ) + TemporalIndexReader( IndexDescriptor descriptor, TemporalIndexAccessor accessor ) { super( new PartFactory( accessor ) ); this.descriptor = descriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/BridgingIndexProgressor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/BridgingIndexProgressor.java index 0ec2d44e03691..102478a976714 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/BridgingIndexProgressor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/BridgingIndexProgressor.java @@ -23,7 +23,7 @@ import java.util.Queue; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; @@ -79,7 +79,7 @@ public boolean needsValues() } @Override - public void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) + public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) { assertKeysAlign( descriptor.schema().getPropertyIds() ); progressors.add( progressor ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java index c8b46a1f9ad33..6c948052ec89a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java @@ -27,7 +27,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExistsPredicate; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.schema.BridgingIndexProgressor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexReader; @@ -41,9 +41,9 @@ class FusionIndexReader extends FusionIndexBase implements IndexReader { - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; - FusionIndexReader( SlotSelector slotSelector, LazyInstanceSelector instanceSelector, PendingIndexDescriptor descriptor ) + FusionIndexReader( SlotSelector slotSelector, LazyInstanceSelector instanceSelector, IndexDescriptor descriptor ) { super( slotSelector, instanceSelector ); this.descriptor = descriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java index 43fe50fcc1fee..096a999a898b7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java @@ -56,7 +56,7 @@ import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.TransactionCountingStateVisitor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.ClockContext; @@ -242,9 +242,9 @@ long graphPropertiesReference() @Override IndexReader indexReader( IndexReference index, boolean fresh ) throws IndexNotFoundKernelException { - PendingIndexDescriptor schemaIndexDescriptor = index.isUnique() ? - IndexDescriptorFactory.uniqueForLabel( index.label(), index.properties() ) : - IndexDescriptorFactory.forLabel( index.label(), index.properties() ); + IndexDescriptor schemaIndexDescriptor = index.isUnique() ? + IndexDescriptorFactory.uniqueForLabel( index.label(), index.properties() ) : + IndexDescriptorFactory.forLabel( index.label(), index.properties() ); return fresh ? storageReader.getFreshIndexReader( schemaIndexDescriptor ) : storageReader.getIndexReader( schemaIndexDescriptor ); } @@ -331,7 +331,7 @@ public CapableIndexReference index( int label, int... properties ) CapableIndexDescriptor indexDescriptor = storageReader.indexGetForSchema( descriptor ); if ( ktx.hasTxStateWithChanges() ) { - ReadableDiffSets diffSets = ktx.txState().indexDiffSetsByLabel( label ); + ReadableDiffSets diffSets = ktx.txState().indexDiffSetsByLabel( label ); if ( indexDescriptor != null ) { if ( diffSets.isRemoved( indexDescriptor ) ) @@ -345,7 +345,7 @@ public CapableIndexReference index( int label, int... properties ) } else { - Iterator fromTxState = + Iterator fromTxState = filter( SchemaDescriptor.equalTo( descriptor ), diffSets.getAdded().iterator() ); if ( fromTxState.hasNext() ) { @@ -367,7 +367,7 @@ public Iterator indexesGetForLabel( int labelId ) sharedOptimisticLock( ResourceTypes.LABEL, labelId ); ktx.assertOpen(); - Iterator iterator = storageReader.indexesGetForLabel( labelId ); + Iterator iterator = storageReader.indexesGetForLabel( labelId ); if ( ktx.hasTxStateWithChanges() ) { iterator = ktx.txState().indexDiffSetsByLabel( labelId ).apply( iterator ); @@ -380,7 +380,7 @@ public Iterator indexesGetAll() { ktx.assertOpen(); - Iterator iterator = storageReader.indexesGetAll(); + Iterator iterator = storageReader.indexesGetAll(); if ( ktx.hasTxStateWithChanges() ) { iterator = ktx.txState().indexChanges().apply( storageReader.indexesGetAll() ); @@ -408,7 +408,7 @@ public PopulationProgress indexGetPopulationProgress( IndexReference index ) { sharedOptimisticLock( ResourceTypes.LABEL, index.label() ); ktx.assertOpen(); - PendingIndexDescriptor descriptor = indexDescriptor( index ); + IndexDescriptor descriptor = indexDescriptor( index ); if ( ktx.hasTxStateWithChanges() ) { @@ -438,7 +438,7 @@ public long indexGetCommittedId( IndexReference index ) throws SchemaRuleNotFoun return storageReader.indexGetCommittedId( indexDescriptor( index ) ); } - PendingIndexDescriptor indexDescriptor( IndexReference index ) + IndexDescriptor indexDescriptor( IndexReference index ) { if ( index.isUnique() ) { @@ -516,7 +516,7 @@ public Register.DoubleLongRegister indexSample( IndexReference index, Register.D SchemaDescriptorFactory.forLabel( index.label(), index.properties() ), target ); } - CapableIndexReference indexGetCapability( PendingIndexDescriptor schemaIndexDescriptor ) + CapableIndexReference indexGetCapability( IndexDescriptor schemaIndexDescriptor ) { try { @@ -528,7 +528,7 @@ CapableIndexReference indexGetCapability( PendingIndexDescriptor schemaIndexDesc } } - InternalIndexState indexGetState( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException + InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { // If index is in our state, then return populating if ( ktx.hasTxStateWithChanges() ) @@ -543,15 +543,15 @@ InternalIndexState indexGetState( PendingIndexDescriptor descriptor ) throws Ind return storageReader.indexGetState( descriptor ); } - Long indexGetOwningUniquenessConstraintId( PendingIndexDescriptor index ) + Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) { return storageReader.indexGetOwningUniquenessConstraintId( index ); } - PendingIndexDescriptor indexGetForSchema( SchemaDescriptor descriptor ) + IndexDescriptor indexGetForSchema( SchemaDescriptor descriptor ) { - PendingIndexDescriptor indexDescriptor = storageReader.indexGetForSchema( descriptor ); - Iterator rules = iterator( indexDescriptor ); + IndexDescriptor indexDescriptor = storageReader.indexGetForSchema( descriptor ); + Iterator rules = iterator( indexDescriptor ); if ( ktx.hasTxStateWithChanges() ) { rules = filter( @@ -561,7 +561,7 @@ PendingIndexDescriptor indexGetForSchema( SchemaDescriptor descriptor ) return singleOrNull( rules ); } - private boolean checkIndexState( PendingIndexDescriptor index, ReadableDiffSets diffSet ) + private boolean checkIndexState( IndexDescriptor index, ReadableDiffSets diffSet ) throws IndexNotFoundKernelException { if ( diffSet.isAdded( index ) ) @@ -776,7 +776,7 @@ void getOrCreateRelationshipIndexConfig( String indexName, Map cu explicitIndexStore.getOrCreateRelationshipIndexConfig( indexName, customConfig ); } - String indexGetFailure( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException + String indexGetFailure( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { return storageReader.indexGetFailure( descriptor.schema() ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java index ca141f037fa57..98a29bb12a777 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java @@ -30,7 +30,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.NodeCursor; import org.neo4j.internal.kernel.api.NodeValueIndexCursor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexProgressor.NodeValueClient; @@ -63,7 +63,7 @@ final class DefaultNodeValueIndexCursor extends IndexCursor } @Override - public void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, + public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) { assert query != null && query.length > 0; @@ -235,7 +235,7 @@ public String toString() } } - private void prefixQuery( PendingIndexDescriptor descriptor, IndexQuery.StringPrefixPredicate predicate ) + private void prefixQuery( IndexDescriptor descriptor, IndexQuery.StringPrefixPredicate predicate ) { needsValues = true; if ( read.hasTxStateWithChanges() ) @@ -248,7 +248,7 @@ private void prefixQuery( PendingIndexDescriptor descriptor, IndexQuery.StringPr } } - private void rangeQuery( PendingIndexDescriptor descriptor, IndexQuery.RangePredicate predicate ) + private void rangeQuery( IndexDescriptor descriptor, IndexQuery.RangePredicate predicate ) { ValueGroup valueGroup = predicate.valueGroup(); ValueCategory category = valueGroup.category(); @@ -265,7 +265,7 @@ private void rangeQuery( PendingIndexDescriptor descriptor, IndexQuery.RangePred } } - private void scanQuery( PendingIndexDescriptor descriptor ) + private void scanQuery( IndexDescriptor descriptor ) { needsValues = true; if ( read.hasTxStateWithChanges() ) @@ -277,7 +277,7 @@ private void scanQuery( PendingIndexDescriptor descriptor ) } } - private void suffixOrContainsQuery( PendingIndexDescriptor descriptor, IndexQuery query ) + private void suffixOrContainsQuery( IndexDescriptor descriptor, IndexQuery query ) { needsValues = true; if ( read.hasTxStateWithChanges() ) @@ -289,7 +289,7 @@ private void suffixOrContainsQuery( PendingIndexDescriptor descriptor, IndexQuer } } - private void seekQuery( PendingIndexDescriptor descriptor, IndexQuery[] query ) + private void seekQuery( IndexDescriptor descriptor, IndexQuery[] query ) { needsValues = false; IndexQuery.ExactPredicate[] exactPreds = assertOnlyExactPredicates( query ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilter.java index cf0b5c2d4609e..d4aa1d24e02a4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilter.java @@ -23,7 +23,7 @@ import java.util.Comparator; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexProgressor.NodeValueClient; import org.neo4j.values.storable.Value; @@ -89,7 +89,7 @@ class NodeValueClientFilter implements NodeValueClient, IndexProgressor } @Override - public void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) + public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) { this.progressor = progressor; this.keys = descriptor.schema().getPropertyIds(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java index e45f12f9e5d78..b8070bd848cd1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java @@ -78,7 +78,7 @@ import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState; import org.neo4j.kernel.api.txstate.TransactionState; @@ -100,7 +100,7 @@ import static org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates.hasProperty; import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_NODE; import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_PROPERTY_KEY; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; import static org.neo4j.kernel.impl.locking.ResourceTypes.INDEX_ENTRY; import static org.neo4j.kernel.impl.locking.ResourceTypes.indexEntryResourceId; import static org.neo4j.kernel.impl.newapi.IndexTxStateUpdater.LabelChangeType.ADDED_LABEL; @@ -416,7 +416,7 @@ private void validateNoExistingNodeWithExactValues( IndexBackedConstraintDescrip { try ( DefaultNodeValueIndexCursor valueCursor = cursors.allocateNodeValueIndexCursor() ) { - PendingIndexDescriptor schemaIndexDescriptor = constraint.ownedIndexDescriptor(); + IndexDescriptor schemaIndexDescriptor = constraint.ownedIndexDescriptor(); assertIndexOnline( schemaIndexDescriptor ); int labelId = schemaIndexDescriptor.schema().keyId(); @@ -441,7 +441,7 @@ private void validateNoExistingNodeWithExactValues( IndexBackedConstraintDescrip } } - private void assertIndexOnline( PendingIndexDescriptor descriptor ) + private void assertIndexOnline( IndexDescriptor descriptor ) throws IndexNotFoundKernelException, IndexBrokenKernelException { switch ( allStoreHolder.indexGetState( descriptor ) ) @@ -890,7 +890,7 @@ public IndexReference indexCreate( SchemaDescriptor descriptor, assertIndexDoesNotExist( SchemaKernelException.OperationContext.INDEX_CREATION, descriptor ); IndexProvider.Descriptor providerDescriptor = ktx.indexProviderForOrDefault( provider ); - PendingIndexDescriptor index = + IndexDescriptor index = IndexDescriptorFactory.forSchema( descriptor, name, providerDescriptor ); @@ -908,7 +908,7 @@ public void indexDrop( IndexReference index ) throws SchemaKernelException org.neo4j.kernel.api.schema.LabelSchemaDescriptor descriptor = labelDescriptor( index ); try { - PendingIndexDescriptor existingIndex = allStoreHolder.indexGetForSchema( descriptor ); + IndexDescriptor existingIndex = allStoreHolder.indexGetForSchema( descriptor ); if ( existingIndex == null ) { @@ -1067,7 +1067,7 @@ public void constraintDrop( ConstraintDescriptor descriptor ) throws SchemaKerne private void assertIndexDoesNotExist( SchemaKernelException.OperationContext context, SchemaDescriptor descriptor ) throws AlreadyIndexedException, AlreadyConstrainedException { - PendingIndexDescriptor existingIndex = allStoreHolder.indexGetForSchema( descriptor ); + IndexDescriptor existingIndex = allStoreHolder.indexGetForSchema( descriptor ); if ( existingIndex != null ) { // OK so we found a matching constraint index. We check whether or not it has an owner @@ -1156,7 +1156,7 @@ private void assertNodeExists( long sourceNode ) throws EntityNotFoundException } } - private boolean constraintIndexHasOwner( PendingIndexDescriptor descriptor ) + private boolean constraintIndexHasOwner( IndexDescriptor descriptor ) { return allStoreHolder.indexGetOwningUniquenessConstraintId( descriptor ) != null; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java index 027555d3080e1..4629657c87c1d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.properties.PropertyKeyIdIterator; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; import org.neo4j.kernel.impl.api.IndexReaderFactory; import org.neo4j.kernel.impl.api.RelationshipVisitor; @@ -295,7 +295,7 @@ public Iterator indexesGetRelatedToProperty( int propert } @Override - public Long indexGetOwningUniquenessConstraintId( PendingIndexDescriptor index ) + public Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) { StoreIndexDescriptor rule = indexRule( index ); if ( rule != null ) @@ -308,7 +308,7 @@ public Long indexGetOwningUniquenessConstraintId( PendingIndexDescriptor index ) } @Override - public long indexGetCommittedId( PendingIndexDescriptor index ) + public long indexGetCommittedId( IndexDescriptor index ) throws SchemaRuleNotFoundException { StoreIndexDescriptor rule = indexRule( index ); @@ -320,12 +320,12 @@ public long indexGetCommittedId( PendingIndexDescriptor index ) } @Override - public InternalIndexState indexGetState( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException + public InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { return indexService.getIndexProxy( descriptor.schema() ).getState(); } - public CapableIndexReference indexReference( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException + public CapableIndexReference indexReference( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { IndexProxy indexProxy = indexService.getIndexProxy( descriptor.schema() ); return indexProxy.getDescriptor(); @@ -671,7 +671,7 @@ public void degrees( NodeItem nodeItem, DegreeVisitor visitor ) } } - private StoreIndexDescriptor indexRule( PendingIndexDescriptor index ) + private StoreIndexDescriptor indexRule( IndexDescriptor index ) { for ( StoreIndexDescriptor rule : schemaCache.indexRules() ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java index a2d3aef4fbad7..5e937878a9ce3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.IndexProviderMap; import org.neo4j.kernel.impl.constraints.ConstraintSemantics; @@ -164,7 +164,7 @@ public void visitNodeLabelChanges( long id, final LongSet added, final LongSet r } @Override - public void visitAddedIndex( PendingIndexDescriptor index ) + public void visitAddedIndex( IndexDescriptor index ) { IndexProvider.Descriptor providerDescriptor = indexProviderMap.getDefaultProvider().getProviderDescriptor(); @@ -173,7 +173,7 @@ public void visitAddedIndex( PendingIndexDescriptor index ) } @Override - public void visitRemovedIndex( PendingIndexDescriptor index ) + public void visitRemovedIndex( IndexDescriptor index ) { StoreIndexDescriptor rule = schemaStorage.indexGetForSchema( index ); if ( rule != null ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java index 533a9f9883485..5993b6e25b7e2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.exceptions.schema.DuplicateSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; @@ -54,7 +54,7 @@ public SchemaStorage( RecordStore schemaStore ) * @throws IllegalStateException if more than one matching rule. * @param descriptor the target IndexDescriptor */ - public StoreIndexDescriptor indexGetForSchema( final PendingIndexDescriptor descriptor ) + public StoreIndexDescriptor indexGetForSchema( final IndexDescriptor descriptor ) { Iterator rules = loadAllSchemaRules( descriptor::equals, StoreIndexDescriptor.class, false ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java index a0b333e221d87..64fe5d550e811 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java @@ -25,7 +25,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.storageengine.api.schema.SchemaRule.Kind; @@ -96,9 +96,9 @@ private static StoreIndexDescriptor readIndexRule( long id, boolean constraintIn { IndexProvider.Descriptor providerDescriptor = readIndexProviderDescriptor( serialized ); int[] propertyKeyIds = readIndexPropertyKeys( serialized ); - PendingIndexDescriptor descriptor = constraintIndex ? - IndexDescriptorFactory.uniqueForLabel( label, propertyKeyIds ) : - IndexDescriptorFactory.forLabel( label, propertyKeyIds ); + IndexDescriptor descriptor = constraintIndex ? + IndexDescriptorFactory.uniqueForLabel( label, propertyKeyIds ) : + IndexDescriptorFactory.forLabel( label, propertyKeyIds ); long owningConstraint = constraintIndex ? readOwningConstraint( serialized ) : NO_OWNING_CONSTRAINT; return StoreIndexDescriptor.constraintIndexRule( id, descriptor, providerDescriptor, owningConstraint ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java index af8f76d43e739..91e4377adf891 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.string.UTF8; @@ -133,7 +133,7 @@ public static byte[] serialize( StoreIndexDescriptor indexRule ) UTF8.putEncodedStringInto( providerDescriptor.getKey(), target ); UTF8.putEncodedStringInto( providerDescriptor.getVersion(), target ); - PendingIndexDescriptor schemaIndexDescriptor = indexRule; + IndexDescriptor schemaIndexDescriptor = indexRule; switch ( schemaIndexDescriptor.type() ) { case GENERAL: @@ -211,8 +211,8 @@ public static int lengthOf( StoreIndexDescriptor indexRule ) length += UTF8.computeRequiredByteBufferSize( providerDescriptor.getVersion() ); length += 1; // index type - PendingIndexDescriptor schemaIndexDescriptor = indexRule; - if ( schemaIndexDescriptor.type() == PendingIndexDescriptor.Type.UNIQUE ) + IndexDescriptor schemaIndexDescriptor = indexRule; + if ( schemaIndexDescriptor.type() == IndexDescriptor.Type.UNIQUE ) { length += 8; // owning constraint id } @@ -264,7 +264,7 @@ private static StoreIndexDescriptor readIndexRule( long id, ByteBuffer source ) case UNIQUE_INDEX: long owningConstraint = source.getLong(); schema = readLabelSchema( source ); - PendingIndexDescriptor descriptor = IndexDescriptorFactory.uniqueForSchema( schema ); + IndexDescriptor descriptor = IndexDescriptorFactory.uniqueForSchema( schema ); name = readRuleName( source ); return StoreIndexDescriptor.constraintIndexRule( id, descriptor, indexProvider, owningConstraint == NO_OWNING_CONSTRAINT_YET ? null : owningConstraint, name ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java index 467e82e6778c2..4879209e078b2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java @@ -35,11 +35,11 @@ import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import static java.lang.String.format; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.GENERAL; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; public enum DbStructureArgumentFormatter implements ArgumentFormatter { @@ -53,7 +53,7 @@ public enum DbStructureArgumentFormatter implements ArgumentFormatter NodeKeyConstraintDescriptor.class.getCanonicalName(), SchemaDescriptor.class.getCanonicalName(), SchemaDescriptorFactory.class.getCanonicalName(), - PendingIndexDescriptor.class.getCanonicalName(), + IndexDescriptor.class.getCanonicalName(), IndexDescriptorFactory.class.getCanonicalName() ); @@ -102,9 +102,9 @@ else if ( Double.isInfinite( d ) ) builder.append( 'd' ); } } - else if ( arg instanceof PendingIndexDescriptor ) + else if ( arg instanceof IndexDescriptor ) { - PendingIndexDescriptor descriptor = (PendingIndexDescriptor) arg; + IndexDescriptor descriptor = (IndexDescriptor) arg; String className = IndexDescriptorFactory.class.getSimpleName(); int labelId = descriptor.schema().keyId(); String methodName = descriptor.type() == GENERAL ? "forLabel" : "uniqueForLabel"; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java index b694613f4ca44..9014b34295469 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java @@ -37,10 +37,10 @@ import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import static java.lang.String.format; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; public class DbStructureCollector implements DbStructureVisitor { @@ -191,7 +191,7 @@ public void visitRelationshipType( int relTypeId, String relTypeName ) } @Override - public void visitIndex( PendingIndexDescriptor descriptor, String userDescription, + public void visitIndex( IndexDescriptor descriptor, String userDescription, double uniqueValuesPercentage, long size ) { IndexDescriptorMap indices = descriptor.type() == UNIQUE ? uniqueIndices : regularIndices; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureVisitor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureVisitor.java index edacd1a549e3d..023e2ec45899d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureVisitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureVisitor.java @@ -23,7 +23,7 @@ import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; public interface DbStructureVisitor { @@ -31,7 +31,7 @@ public interface DbStructureVisitor void visitPropertyKey( int propertyKeyId, String propertyKeyName ); void visitRelationshipType( int relTypeId, String relTypeName ); - void visitIndex( PendingIndexDescriptor descriptor, String userDescription, double uniqueValuesPercentage, long size ); + void visitIndex( IndexDescriptor descriptor, String userDescription, double uniqueValuesPercentage, long size ); void visitUniqueConstraint( UniquenessConstraintDescriptor constraint, String userDescription ); void visitNodePropertyExistenceConstraint( NodeExistenceConstraintDescriptor constraint, String userDescription ); void visitRelationshipPropertyExistenceConstraint( RelExistenceConstraintDescriptor constraint, diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageReader.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageReader.java index 80e9dd3bb1c3f..f6d6f98299ea7 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageReader.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageReader.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.index.CapableIndexDescriptor; @@ -209,7 +209,7 @@ Cursor acquireSinglePropertyCursor( long propertyId, int propertyK /** * @param labelId label to list indexes for. - * @return {@link PendingIndexDescriptor} associated with the given {@code labelId}. + * @return {@link IndexDescriptor} associated with the given {@code labelId}. */ Iterator indexesGetForLabel( int labelId ); @@ -228,14 +228,14 @@ Cursor acquireSinglePropertyCursor( long propertyId, int propertyK * @return schema rule id of uniqueness constraint that owns the given {@code index}, or {@code null} * if the given index isn't related to a uniqueness constraint. */ - Long indexGetOwningUniquenessConstraintId( PendingIndexDescriptor index ); + Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ); /** - * @param index {@link PendingIndexDescriptor} to get schema rule id for. + * @param index {@link IndexDescriptor} to get schema rule id for. * @return schema rule id for matching index. * @throws SchemaRuleNotFoundException if no such index exists in storage. */ - long indexGetCommittedId( PendingIndexDescriptor index ) + long indexGetCommittedId( IndexDescriptor index ) throws SchemaRuleNotFoundException; /** @@ -297,20 +297,20 @@ long indexGetCommittedId( PendingIndexDescriptor index ) /** * Returns state of a stored index. * - * @param descriptor {@link PendingIndexDescriptor} to get state for. + * @param descriptor {@link IndexDescriptor} to get state for. * @return {@link InternalIndexState} for index. * @throws IndexNotFoundKernelException if index not found. */ - InternalIndexState indexGetState( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException; + InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Return index reference of a stored index. * - * @param descriptor {@link PendingIndexDescriptor} to get provider reference for. + * @param descriptor {@link IndexDescriptor} to get provider reference for. * @return {@link IndexProvider.Descriptor} for index. * @throws IndexNotFoundKernelException if index not found. */ - CapableIndexReference indexReference( PendingIndexDescriptor descriptor ) throws IndexNotFoundKernelException; + CapableIndexReference indexReference( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * @param descriptor {@link SchemaDescriptor} to get population progress for. diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/AbstractIndexReader.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/AbstractIndexReader.java index b050596ba63e0..f4ca53cfed2c1 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/AbstractIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/AbstractIndexReader.java @@ -22,13 +22,13 @@ import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; public abstract class AbstractIndexReader implements IndexReader { - protected final PendingIndexDescriptor descriptor; + protected final IndexDescriptor descriptor; - protected AbstractIndexReader( PendingIndexDescriptor descriptor ) + protected AbstractIndexReader( IndexDescriptor descriptor ) { this.descriptor = descriptor; } diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexProgressor.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexProgressor.java index 1839ed8ed7090..7880ff4543540 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexProgressor.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexProgressor.java @@ -21,7 +21,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.LabelSet; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.index.labelscan.LabelScanValueIndexProgressor; import org.neo4j.kernel.impl.newapi.ExplicitIndexProgressor; import org.neo4j.values.storable.Value; @@ -78,7 +78,7 @@ interface NodeValueClient * @param progressor The progressor * @param query The query of this progression */ - void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, + void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ); /** diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java index 524d4c3b1627c..81e852015d0c5 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java @@ -25,7 +25,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptorSupplier; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; /** * Represents a stored schema rule. @@ -108,7 +108,7 @@ public static Kind forId( byte id ) throws MalformedSchemaRuleException throw new MalformedSchemaRuleException( null, "Unknown kind id %d", id ); } - public static Kind map( PendingIndexDescriptor descriptor ) + public static Kind map( IndexDescriptor descriptor ) { switch ( descriptor.type() ) { diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java index 5037b274a5b03..2d77547b8f8b0 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java @@ -27,7 +27,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.state.GraphState; import org.neo4j.storageengine.api.NodeItem; @@ -94,11 +94,11 @@ public interface ReadableTransactionState // SCHEMA RELATED - ReadableDiffSets indexDiffSetsByLabel( int labelId ); + ReadableDiffSets indexDiffSetsByLabel( int labelId ); - ReadableDiffSets indexChanges(); + ReadableDiffSets indexChanges(); - Iterable constraintIndexesCreatedInTx(); + Iterable constraintIndexesCreatedInTx(); ReadableDiffSets constraintsChanges(); @@ -110,17 +110,17 @@ public interface ReadableTransactionState Long indexCreatedForConstraint( ConstraintDescriptor constraint ); - LongDiffSets indexUpdatesForScan( PendingIndexDescriptor index ); + LongDiffSets indexUpdatesForScan( IndexDescriptor index ); - LongDiffSets indexUpdatesForSuffixOrContains( PendingIndexDescriptor index, IndexQuery query ); + LongDiffSets indexUpdatesForSuffixOrContains( IndexDescriptor index, IndexQuery query ); - LongDiffSets indexUpdatesForSeek( PendingIndexDescriptor index, ValueTuple values ); + LongDiffSets indexUpdatesForSeek( IndexDescriptor index, ValueTuple values ); - LongDiffSets indexUpdatesForRangeSeek( PendingIndexDescriptor index, ValueGroup valueGroup, + LongDiffSets indexUpdatesForRangeSeek( IndexDescriptor index, ValueGroup valueGroup, Value lower, boolean includeLower, Value upper, boolean includeUpper ); - LongDiffSets indexUpdatesForRangeSeekByPrefix( PendingIndexDescriptor index, String prefix ); + LongDiffSets indexUpdatesForRangeSeekByPrefix( IndexDescriptor index, String prefix ); NodeState getNodeState( long id ); diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java index 67dda4164639f..23eb92a646213 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java @@ -27,7 +27,7 @@ import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.StorageProperty; /** @@ -55,9 +55,9 @@ void visitGraphPropertyChanges( Iterator added, Iterator> batchedUpdates = new ArrayList<>( batchSize ); - IndexPopulatorWithSchema( IndexPopulator populator, PendingIndexDescriptor index ) + IndexPopulatorWithSchema( IndexPopulator populator, IndexDescriptor index ) { this.populator = populator; this.index = index; @@ -1320,7 +1320,7 @@ public SchemaDescriptor schema() return index.schema(); } - public PendingIndexDescriptor index() + public IndexDescriptor index() { return index; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java b/community/kernel/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java index d56be2aa10415..b7f9025dcd7c1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java @@ -43,7 +43,7 @@ import org.neo4j.internal.kernel.api.Write; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; import static org.neo4j.kernel.impl.api.store.DefaultCapableIndexReference.fromDescriptor; @RunWith( Parameterized.class ) @@ -73,7 +73,7 @@ public class CompositeIndexingIT @Rule public Timeout globalTimeout = Timeout.seconds( 200 ); - private final PendingIndexDescriptor index; + private final IndexDescriptor index; private GraphDatabaseAPI graphDatabaseAPI; @Before @@ -146,7 +146,7 @@ public static Iterable parameterValues() ); } - public CompositeIndexingIT( PendingIndexDescriptor nodeDescriptor ) + public CompositeIndexingIT( IndexDescriptor nodeDescriptor ) { this.index = nodeDescriptor; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java index 02ec665b3024e..d825cd3b58999 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.PointValue; @@ -44,7 +44,7 @@ public abstract class CompositeIndexAccessorCompatibility extends IndexAccessorCompatibility { public CompositeIndexAccessorCompatibility( - IndexProviderCompatibilityTestSuite testSuite, PendingIndexDescriptor descriptor ) + IndexProviderCompatibilityTestSuite testSuite, IndexDescriptor descriptor ) { super( testSuite, descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java index b2f5a7a1fe3cd..8080d842518c0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -50,7 +50,7 @@ public class CompositeIndexPopulatorCompatibility extends IndexProviderCompatibilityTestSuite.Compatibility { public CompositeIndexPopulatorCompatibility( - IndexProviderCompatibilityTestSuite testSuite, PendingIndexDescriptor descriptor ) + IndexProviderCompatibilityTestSuite testSuite, IndexDescriptor descriptor ) { super( testSuite, descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java index 60b6f1f8d4181..f54126f17d9bb 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -40,7 +40,7 @@ public abstract class IndexAccessorCompatibility extends IndexProviderCompatibil { protected IndexAccessor accessor; - public IndexAccessorCompatibility( IndexProviderCompatibilityTestSuite testSuite, PendingIndexDescriptor descriptor ) + public IndexAccessorCompatibility( IndexProviderCompatibilityTestSuite testSuite, IndexDescriptor descriptor ) { super( testSuite, descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java index 4a5e4e6127350..177c279f40e3f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java @@ -34,7 +34,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.test.rule.PageCacheAndDependenciesRule; import org.neo4j.test.rule.fs.DefaultFileSystemRule; import org.neo4j.test.runner.ParameterizedSuiteRunner; @@ -90,7 +90,7 @@ public void setup() indexProvider = testSuite.createIndexProvider( pageCache, fs, graphDbDir ); } - public Compatibility( IndexProviderCompatibilityTestSuite testSuite, PendingIndexDescriptor descriptor ) + public Compatibility( IndexProviderCompatibilityTestSuite testSuite, IndexDescriptor descriptor ) { this.testSuite = testSuite; this.descriptor = StoreIndexDescriptor.indexRule( 17, descriptor, indexProvider.getProviderDescriptor() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java index e5edd71edd93e..c85f3d2891459 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java @@ -30,7 +30,7 @@ import java.util.List; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.DateTimeValue; @@ -67,7 +67,7 @@ public abstract class SimpleIndexAccessorCompatibility extends IndexAccessorCompatibility { public SimpleIndexAccessorCompatibility( IndexProviderCompatibilityTestSuite testSuite, - PendingIndexDescriptor descriptor ) + IndexDescriptor descriptor ) { super( testSuite, descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java index bf8bc024f6af1..f95230711cf25 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java @@ -35,7 +35,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -64,7 +64,7 @@ public class SimpleIndexPopulatorCompatibility extends IndexProviderCompatibilityTestSuite.Compatibility { public SimpleIndexPopulatorCompatibility( - IndexProviderCompatibilityTestSuite testSuite, PendingIndexDescriptor descriptor ) + IndexProviderCompatibilityTestSuite testSuite, IndexDescriptor descriptor ) { super( testSuite, descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptorFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptorFactoryTest.java index 0f83ef1e606ec..4b5a7f382fdfd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptorFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptorFactoryTest.java @@ -35,42 +35,42 @@ public class SchemaIndexDescriptorFactoryTest @Test public void shouldCreateIndexDescriptors() { - PendingIndexDescriptor desc; + IndexDescriptor desc; desc = IndexDescriptorFactory.forLabel( LABEL_ID, 1 ); - assertThat( desc.type(), equalTo( PendingIndexDescriptor.Type.GENERAL ) ); + assertThat( desc.type(), equalTo( IndexDescriptor.Type.GENERAL ) ); assertThat( desc.schema(), equalTo( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ) ); } @Test public void shouldCreateUniqueIndexDescriptors() { - PendingIndexDescriptor desc; + IndexDescriptor desc; desc = IndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ); - assertThat( desc.type(), equalTo( PendingIndexDescriptor.Type.UNIQUE ) ); + assertThat( desc.type(), equalTo( IndexDescriptor.Type.UNIQUE ) ); assertThat( desc.schema(), equalTo( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ) ); } @Test public void shouldCreateIndexDescriptorsFromSchema() { - PendingIndexDescriptor desc; + IndexDescriptor desc; desc = IndexDescriptorFactory.forSchema( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ); - assertThat( desc.type(), equalTo( PendingIndexDescriptor.Type.GENERAL ) ); + assertThat( desc.type(), equalTo( IndexDescriptor.Type.GENERAL ) ); assertThat( desc.schema(), equalTo( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ) ); desc = IndexDescriptorFactory.uniqueForSchema( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ); - assertThat( desc.type(), equalTo( PendingIndexDescriptor.Type.UNIQUE) ); + assertThat( desc.type(), equalTo( IndexDescriptor.Type.UNIQUE) ); assertThat( desc.schema(), equalTo( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ) ); } @Test public void shouldCreateEqualDescriptors() { - PendingIndexDescriptor desc1; - PendingIndexDescriptor desc2; + IndexDescriptor desc1; + IndexDescriptor desc2; desc1 = IndexDescriptorFactory.forLabel( LABEL_ID, 1 ); desc2 = IndexDescriptorFactory.forLabel( LABEL_ID, 1 ); assertEquality( desc1, desc2 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/ResampleIndexProcedureTest.java b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/ResampleIndexProcedureTest.java index c081390bf11a5..fc2e9b26ea9b0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/ResampleIndexProcedureTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/ResampleIndexProcedureTest.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode; @@ -105,7 +105,7 @@ public void shouldThrowAnExceptionIfThePropertyKeyDoesntExist() public void shouldLookUpTheIndexByLabelIdAndPropertyKeyId() throws ProcedureException, SchemaRuleNotFoundException { - PendingIndexDescriptor index = IndexDescriptorFactory.forLabel( 0, 0 ); + IndexDescriptor index = IndexDescriptorFactory.forLabel( 0, 0 ); when( tokenRead.nodeLabel( anyString() ) ).thenReturn( 123 ); when( tokenRead.propertyKey( anyString() ) ).thenReturn( 456 ); when( schemaRead.index( anyInt(), any() ) ).thenReturn( fromDescriptor( index ) ); @@ -119,7 +119,7 @@ public void shouldLookUpTheIndexByLabelIdAndPropertyKeyId() public void shouldLookUpTheCompositeIndexByLabelIdAndPropertyKeyId() throws ProcedureException, SchemaRuleNotFoundException { - PendingIndexDescriptor index = IndexDescriptorFactory.forLabel( 0, 0, 1 ); + IndexDescriptor index = IndexDescriptorFactory.forLabel( 0, 0, 1 ); when( tokenRead.nodeLabel( anyString() ) ).thenReturn( 123 ); when( tokenRead.propertyKey( "name" ) ).thenReturn( 0 ); when( tokenRead.propertyKey( "lastName" ) ).thenReturn( 1 ); @@ -154,7 +154,7 @@ public void shouldThrowAnExceptionIfTheIndexDoesNotExist() public void shouldTriggerResampling() throws SchemaRuleNotFoundException, ProcedureException, IndexNotFoundKernelException { - PendingIndexDescriptor index = IndexDescriptorFactory.forLabel( 123, 456 ); + IndexDescriptor index = IndexDescriptorFactory.forLabel( 123, 456 ); when( schemaRead.index( anyInt(), any() ) ).thenReturn( fromDescriptor( index ) ); procedure.resampleIndex( ":Person(name)" ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java index 7cb79b5ed18f8..de57180b26887 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; @@ -81,7 +81,7 @@ public class ConstraintIndexCreatorTest private static final long INDEX_ID = 2468L; private final LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( LABEL_ID, PROPERTY_KEY_ID ); - private final PendingIndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 123, 456 ); + private final IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 123, 456 ); private final CapableIndexReference indexReference = new DefaultCapableIndexReference( true, IndexCapability.NO_CAPABILITY, new IndexProvider.Descriptor( "foo", "1.872" ), LABEL_ID, PROPERTY_KEY_ID ); @@ -153,7 +153,7 @@ public void shouldDropIndexIfPopulationFails() throws Exception } assertEquals( 2, kernel.transactions.size() ); TransactionState tx1 = kernel.transactions.get( 0 ).txState(); - PendingIndexDescriptor newIndex = IndexDescriptorFactory.uniqueForLabel( 123, 456 ); + IndexDescriptor newIndex = IndexDescriptorFactory.uniqueForLabel( 123, 456 ); verify( tx1 ).indexRuleDoAdd( newIndex ); verifyNoMoreInteractions( tx1 ); verify( schemaRead ).indexGetCommittedId( indexReference ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java index 935dab152d085..c06cdb7c4333c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java @@ -37,7 +37,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.locking.LockService; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; @@ -71,8 +71,8 @@ public class BatchingMultipleIndexPopulatorTest { public static final int propertyId = 1; public static final int labelId = 1; - private final PendingIndexDescriptor index1 = IndexDescriptorFactory.forLabel( 1, 1); - private final PendingIndexDescriptor index42 = IndexDescriptorFactory.forLabel( 42, 42); + private final IndexDescriptor index1 = IndexDescriptorFactory.forLabel( 1, 1); + private final IndexDescriptor index42 = IndexDescriptorFactory.forLabel( 42, 42); @After public void tearDown() @@ -257,7 +257,7 @@ public void populatorMarkedAsFailed() throws Exception NullLogProvider.getInstance() ); populator = addPopulator( batchingPopulator, index1 ); - List> expected = forUpdates( index1, update1, update2 ); + List> expected = forUpdates( index1, update1, update2 ); doThrow( batchFlushError ).when( populator ).add( expected ); batchingPopulator.indexAllNodes().run(); @@ -322,7 +322,7 @@ public void shouldApplyBatchesInParallel() throws Exception verify( executor, atLeast( 5 ) ).execute( any( Runnable.class ) ); } - private List> forUpdates( PendingIndexDescriptor index, NodeUpdates... updates ) + private List> forUpdates( IndexDescriptor index, NodeUpdates... updates ) { return Iterables.asList( Iterables.concat( @@ -340,7 +340,7 @@ private NodeUpdates nodeUpdates( int nodeId, int propertyId, String propertyValu .build(); } - private static IndexPopulator addPopulator( BatchingMultipleIndexPopulator batchingPopulator, PendingIndexDescriptor descriptor ) + private static IndexPopulator addPopulator( BatchingMultipleIndexPopulator batchingPopulator, IndexDescriptor descriptor ) { IndexPopulator populator = mock( IndexPopulator.class ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java index a146150fd6f4e..5c0d12cd98bbe 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.integrationtest.KernelIntegrationTest; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -180,7 +180,7 @@ public void shouldBeAbleToRemoveAConstraintIndexWithoutOwner() throws Exception PropertyAccessor propertyAccessor = mock( PropertyAccessor.class ); ConstraintIndexCreator creator = new ConstraintIndexCreator( () -> kernel, indexingService, propertyAccessor ); - PendingIndexDescriptor constraintIndex = creator.createConstraintIndex( descriptor ); + IndexDescriptor constraintIndex = creator.createConstraintIndex( descriptor ); // then Transaction transaction = newTransaction(); assertEquals( emptySet(), asSet( transaction.schemaRead().constraintsGetForLabel( labelId ) ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index 24747bb3d3817..40fc60c428383 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -55,7 +55,7 @@ import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.DatabaseSchemaState; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; @@ -585,7 +585,7 @@ private IndexPopulator inMemoryPopulator( boolean constraint ) throws TransactionFailureException, IllegalTokenNameException, TooManyLabelsException { IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); - PendingIndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); + IndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); return new InMemoryIndexProvider().getPopulator( StoreIndexDescriptor .indexRule( 21, descriptor, PROVIDER_DESCRIPTOR ), samplingConfig ); } @@ -614,7 +614,7 @@ private IndexPopulationJob newIndexPopulationJob( FailedIndexProxyFactory failur LogProvider logProvider, boolean constraint ) throws TransactionFailureException, IllegalTokenNameException, TooManyLabelsException { - PendingIndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); + IndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); long indexId = 0; flipper.setFlipTarget( mock( IndexProxyFactory.class ) ); @@ -625,16 +625,16 @@ private IndexPopulationJob newIndexPopulationJob( FailedIndexProxyFactory failur return job; } - private PendingIndexDescriptor indexDescriptor( Label label, String propertyKey, boolean constraint ) + private IndexDescriptor indexDescriptor( Label label, String propertyKey, boolean constraint ) throws TransactionFailureException, IllegalTokenNameException, TooManyLabelsException { try ( Transaction tx = session.beginTransaction( KernelTransaction.Type.implicit ) ) { int labelId = tx.tokenWrite().labelGetOrCreateForName( label.name() ); int propertyKeyId = tx.tokenWrite().propertyKeyGetOrCreateForName( propertyKey ); - PendingIndexDescriptor descriptor = constraint ? - IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ) : - IndexDescriptorFactory.forLabel( labelId, propertyKeyId ); + IndexDescriptor descriptor = constraint ? + IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ) : + IndexDescriptorFactory.forLabel( labelId, propertyKeyId ); tx.success(); return descriptor; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java index 16b5747ab45e5..7a97f74dddd9a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java @@ -34,7 +34,7 @@ import org.neo4j.graphdb.mockfs.UncloseableDelegatingFileSystemAbstraction; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.CountsAccessor; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; @@ -98,7 +98,7 @@ public void shouldRecoverIndexCountsBySamplingThemOnStartup() awaitIndexOnline( indexAliensBySpecimen() ); // where ALIEN and SPECIMEN are both the first ids of their kind - PendingIndexDescriptor index = IndexDescriptorFactory.forLabel( labelId( ALIEN ), pkId( SPECIMEN ) ); + IndexDescriptor index = IndexDescriptorFactory.forLabel( labelId( ALIEN ), pkId( SPECIMEN ) ); SchemaStorage storage = new SchemaStorage( neoStores().getSchemaStore() ); long indexId = storage.indexGetForSchema( index ).getId(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java index ab5ac9a9ed2b3..450b68deddbc3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java @@ -67,7 +67,7 @@ import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -150,7 +150,7 @@ public class IndexingServiceTest private final SchemaState schemaState = mock( SchemaState.class ); private final int labelId = 7; private final int propertyKeyId = 15; - private final PendingIndexDescriptor index = IndexDescriptorFactory.forLabel( labelId, propertyKeyId ); + private final IndexDescriptor index = IndexDescriptorFactory.forLabel( labelId, propertyKeyId ); private final IndexPopulator populator = mock( IndexPopulator.class ); private final IndexUpdater updater = mock( IndexUpdater.class ); private final IndexProvider indexProvider = mock( IndexProvider.class ); @@ -571,7 +571,7 @@ public void shouldLogTriggerSamplingOnAnIndexes() throws Exception // given long indexId = 0; IndexSamplingMode mode = TRIGGER_REBUILD_ALL; - PendingIndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 1 ); + IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 1 ); IndexingService indexingService = newIndexingServiceWithMockedDependencies( populator, accessor, withData(), StoreIndexDescriptor .indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ) ); @@ -797,7 +797,7 @@ public void shouldWaitForRecoveredUniquenessConstraintIndexesToBeFullyPopulated( IndexingService.Monitor monitor = new IndexingService.MonitorAdapter() { @Override - public void awaitingPopulationOfRecoveredIndex( long index, PendingIndexDescriptor descriptor ) + public void awaitingPopulationOfRecoveredIndex( long index, IndexDescriptor descriptor ) { // When we see that we start to await the index to populate, notify the slow-as-heck // populator that it can actually go and complete its job. diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java index 7a1918d596712..5d0e74fcc2735 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.locking.LockService; import org.neo4j.kernel.impl.store.InlineNodeLabels; import org.neo4j.kernel.impl.store.NeoStores; @@ -116,7 +116,7 @@ private IndexPopulator createIndexPopulator() } private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, - IndexPopulator indexPopulator, long indexId, PendingIndexDescriptor descriptor ) + IndexPopulator indexPopulator, long indexId, IndexDescriptor descriptor ) { return addPopulator( multipleIndexPopulator, StoreIndexDescriptor .indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ), indexPopulator, diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java index cc997725c3bd2..e4ae07d14e5d2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java @@ -27,7 +27,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -37,7 +37,7 @@ public class OnlineIndexProxyTest { private final long indexId = 1; - private final PendingIndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 2 ); + private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 2 ); private final IndexProvider.Descriptor providerDescriptor = mock( IndexProvider.Descriptor.class ); private final IndexAccessor accessor = mock( IndexAccessor.class ); private final IndexStoreView storeView = mock( IndexStoreView.class ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/HashBasedIndex.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/HashBasedIndex.java index 06e75b140fe9f..b806c76699276 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/HashBasedIndex.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/HashBasedIndex.java @@ -34,7 +34,7 @@ import org.neo4j.collection.PrimitiveLongResourceIterator; import org.neo4j.helpers.collection.Iterables; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexSampler; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; @@ -50,7 +50,7 @@ class HashBasedIndex extends InMemoryIndexImplementation { private Map,Set> data; - HashBasedIndex( PendingIndexDescriptor descriptor ) + HashBasedIndex( IndexDescriptor descriptor ) { super( descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndex.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndex.java index 47839c3daab19..1eec301fcf457 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndex.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndex.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; @@ -48,7 +48,7 @@ class InMemoryIndex private InternalIndexState state = InternalIndexState.POPULATING; String failure; - InMemoryIndex( PendingIndexDescriptor descriptor ) + InMemoryIndex( IndexDescriptor descriptor ) { this( new HashBasedIndex( descriptor ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexImplementation.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexImplementation.java index 82f89bc3ffd23..0c2abba35cecf 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexImplementation.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexImplementation.java @@ -24,13 +24,13 @@ import org.neo4j.collection.PrimitiveLongResourceIterator; import org.neo4j.helpers.collection.BoundedIterable; import org.neo4j.kernel.api.index.ArrayEncoder; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.AbstractIndexReader; import org.neo4j.values.storable.Value; abstract class InMemoryIndexImplementation extends AbstractIndexReader implements BoundedIterable { - InMemoryIndexImplementation( PendingIndexDescriptor descriptor ) + InMemoryIndexImplementation( IndexDescriptor descriptor ) { super( descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java index 03f4f95970c08..63e5be5109a7f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.kernel.impl.util.CopyOnWriteHashMap; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; public class InMemoryIndexProvider extends IndexProvider { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java index 61a8597f876ad..482e06895105b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.updater.UniquePropertyIndexUpdater; import org.neo4j.values.storable.Value; @@ -39,7 +39,7 @@ class UniqueInMemoryIndex extends InMemoryIndex { private final SchemaDescriptor schema; - UniqueInMemoryIndex( PendingIndexDescriptor descriptor ) + UniqueInMemoryIndex( IndexDescriptor descriptor ) { super( descriptor ); this.schema = descriptor.schema(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java index 3b5616cffab7e..e170c5d597322 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.neo4j.function.Predicates; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.CapableIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMap; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; @@ -351,7 +351,7 @@ private static class Always implements IndexSamplingController.RecoveryCondition } @Override - public boolean test( long indexId, PendingIndexDescriptor descriptor ) + public boolean test( long indexId, IndexDescriptor descriptor ) { return ans; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java index 570f476be53f8..94207fde2e468 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java @@ -30,7 +30,7 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.scheduler.JobScheduler; @@ -51,9 +51,9 @@ public class IndexSamplingJobTrackerTest LabelSchemaDescriptor descriptor11 = SchemaDescriptorFactory.forLabel( 1, 1 ); LabelSchemaDescriptor descriptor12 = SchemaDescriptorFactory.forLabel( 1, 2 ); LabelSchemaDescriptor descriptor22 = SchemaDescriptorFactory.forLabel( 2, 2 ); - PendingIndexDescriptor index11 = IndexDescriptorFactory.forSchema( descriptor11 ); - PendingIndexDescriptor index12 = IndexDescriptorFactory.forSchema( descriptor12 ); - PendingIndexDescriptor index22 = IndexDescriptorFactory.forSchema( descriptor22 ); + IndexDescriptor index11 = IndexDescriptorFactory.forSchema( descriptor11 ); + IndexDescriptor index12 = IndexDescriptorFactory.forSchema( descriptor12 ); + IndexDescriptor index22 = IndexDescriptorFactory.forSchema( descriptor22 ); long indexId11; long indexId12 = 1; long indexId22 = 2; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateCompositeIndexTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateCompositeIndexTest.java index 41dbdf4abe78b..aaf0e3b441dc4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateCompositeIndexTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateCompositeIndexTest.java @@ -27,7 +27,7 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.storageengine.api.txstate.LongDiffSets; @@ -43,10 +43,10 @@ public class TxStateCompositeIndexTest { private TransactionState state; - private final PendingIndexDescriptor indexOn_1_1_2 = IndexDescriptorFactory.forLabel( 1, 1, 2 ); - private final PendingIndexDescriptor indexOn_1_2_3 = IndexDescriptorFactory.forLabel( 1, 2, 3 ); - private final PendingIndexDescriptor indexOn_2_2_3 = IndexDescriptorFactory.uniqueForLabel( 2, 2, 3 ); - private final PendingIndexDescriptor indexOn_2_2_3_4 = IndexDescriptorFactory.forLabel( 2, 2, 3, 4 ); + private final IndexDescriptor indexOn_1_1_2 = IndexDescriptorFactory.forLabel( 1, 1, 2 ); + private final IndexDescriptor indexOn_1_2_3 = IndexDescriptorFactory.forLabel( 1, 2, 3 ); + private final IndexDescriptor indexOn_2_2_3 = IndexDescriptorFactory.uniqueForLabel( 2, 2, 3 ); + private final IndexDescriptor indexOn_2_2_3_4 = IndexDescriptorFactory.forLabel( 2, 2, 3, 4 ); @Before public void before() @@ -179,7 +179,7 @@ public void shouldSeekInComplexMix() assertSeek( indexOn_2_2_3_4, values3, 1000 ); } - private void addEntries( PendingIndexDescriptor index, ValueTuple[] values, long nodeIdStart ) + private void addEntries( IndexDescriptor index, ValueTuple[] values, long nodeIdStart ) { for ( int i = 0; i < values.length; i++ ) { @@ -187,7 +187,7 @@ private void addEntries( PendingIndexDescriptor index, ValueTuple[] values, long } } - private void assertSeek( PendingIndexDescriptor index, ValueTuple[] values, long nodeIdStart ) + private void assertSeek( IndexDescriptor index, ValueTuple[] values, long nodeIdStart ) { for ( int i = 0; i < values.length; i++ ) { @@ -208,7 +208,7 @@ private interface IndexUpdater void addDefaultStringProperties( long... nodeIds ); } - private IndexUpdater modifyIndex( final PendingIndexDescriptor descriptor ) + private IndexUpdater modifyIndex( final IndexDescriptor descriptor ) { return new IndexUpdater() { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java index ad46c3deece56..6a55e079802f2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java @@ -41,7 +41,7 @@ import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.util.collection.CollectionsFactory; import org.neo4j.kernel.impl.util.collection.CollectionsFactorySupplier; @@ -88,9 +88,9 @@ public final TestRule repeatWithDifferentRandomization() return RuleChain.outerRule( new RepeatRule() ).around( random ); } - private final PendingIndexDescriptor indexOn_1_1 = IndexDescriptorFactory.forLabel( 1, 1 ); - private final PendingIndexDescriptor indexOn_1_2 = IndexDescriptorFactory.forLabel( 1, 2 ); - private final PendingIndexDescriptor indexOn_2_1 = IndexDescriptorFactory.forLabel( 2, 1 ); + private final IndexDescriptor indexOn_1_1 = IndexDescriptorFactory.forLabel( 1, 1 ); + private final IndexDescriptor indexOn_1_2 = IndexDescriptorFactory.forLabel( 1, 2 ); + private final IndexDescriptor indexOn_2_1 = IndexDescriptorFactory.forLabel( 2, 1 ); private CollectionsFactory collectionsFactory; private TxState state; @@ -1505,7 +1505,7 @@ private interface IndexUpdater void withBooleanProperties( Collection> nodesWithValues ); } - private IndexUpdater addNodesToIndex( final PendingIndexDescriptor descriptor ) + private IndexUpdater addNodesToIndex( final IndexDescriptor descriptor ) { return new IndexUpdater() { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java index 07db0a2762861..30dafe16e0d80 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java @@ -31,7 +31,7 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.IndexProviderMap; import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics; @@ -202,7 +202,7 @@ public void shouldResolveIndexDescriptor() // When LabelSchemaDescriptor schema = forLabel( 1, 3 ); - PendingIndexDescriptor descriptor = cache.indexDescriptor( schema ); + IndexDescriptor descriptor = cache.indexDescriptor( schema ); // Then assertThat( descriptor.schema(), equalTo( schema ) ); @@ -215,7 +215,7 @@ public void shouldReturnNullWhenNoIndexExists() SchemaCache schemaCache = newSchemaCache(); // When - PendingIndexDescriptor schemaIndexDescriptor = schemaCache.indexDescriptor( forLabel( 1, 1 ) ); + IndexDescriptor schemaIndexDescriptor = schemaCache.indexDescriptor( forLabel( 1, 1 ) ); // Then assertNull( schemaIndexDescriptor ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java index 4ff16858a2ba3..61ce3bce8c6d8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java @@ -28,7 +28,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.DateValue; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.Value; @@ -46,7 +46,7 @@ public class DateLayoutTestUtil extends LayoutTestUtil createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } @@ -89,13 +89,13 @@ Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( ALL_EXTREME_VALUES ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java index 24859c694fd73..cc0fd968c3262 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java @@ -29,7 +29,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.DateTimeValue; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.Value; @@ -49,7 +49,7 @@ public class DateTimeLayoutTestUtil extends LayoutTestUtil createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } @@ -92,13 +92,13 @@ Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( ALL_EXTREME_VALUES ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdaterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdaterTest.java index 6f46a4b914648..3f135c81603c7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdaterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdaterTest.java @@ -28,7 +28,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.UpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; @@ -52,7 +52,7 @@ public class DeferredConflictCheckingIndexUpdaterTest { private final int labelId = 1; private final int[] propertyKeyIds = {2, 3}; - private final PendingIndexDescriptor descriptor = IndexDescriptorFactory.forLabel( labelId, propertyKeyIds ); + private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( labelId, propertyKeyIds ); @Test public void shouldQueryAboutAddedAndChangedValueTuples() throws Exception @@ -62,7 +62,7 @@ public void shouldQueryAboutAddedAndChangedValueTuples() throws Exception IndexReader reader = mock( IndexReader.class ); when( reader.query( anyVararg() ) ).thenAnswer( invocation -> iterator( 0 ) ); long nodeId = 0; - List> updates = new ArrayList<>(); + List> updates = new ArrayList<>(); updates.add( add( nodeId++, descriptor, tuple( 10, 11 ) ) ); updates.add( change( nodeId++, descriptor, tuple( "abc", "def" ), tuple( "ghi", "klm" ) ) ); updates.add( remove( nodeId++, descriptor, tuple( 1001L, 1002L ) ) ); @@ -71,7 +71,7 @@ public void shouldQueryAboutAddedAndChangedValueTuples() throws Exception try ( DeferredConflictCheckingIndexUpdater updater = new DeferredConflictCheckingIndexUpdater( actual, () -> reader, descriptor ) ) { // when - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { updater.process( update ); verify( actual ).process( update ); @@ -79,7 +79,7 @@ public void shouldQueryAboutAddedAndChangedValueTuples() throws Exception } // then - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { if ( update.updateMode() == UpdateMode.ADDED || update.updateMode() == UpdateMode.CHANGED ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java index df1d0111f66ee..ff1a15b0d5d4b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java @@ -27,7 +27,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.DurationValue; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.Value; @@ -47,7 +47,7 @@ public class DurationLayoutTestUtil extends LayoutTestUtil createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } @@ -90,13 +90,13 @@ Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( ALL_EXTREME_VALUES ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java index 03e8c185349b6..4866d2715d3d0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java @@ -34,7 +34,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.test.rule.RandomRule; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.Value; @@ -44,19 +44,19 @@ abstract class LayoutTestUtil, VALUE extends NativeSchemaValue> { - private static final Comparator> UPDATE_COMPARATOR = ( u1, u2 ) -> + private static final Comparator> UPDATE_COMPARATOR = ( u1, u2 ) -> Values.COMPARATOR.compare( u1.values()[0], u2.values()[0] ); final StoreIndexDescriptor indexDescriptor; - LayoutTestUtil( PendingIndexDescriptor indexDescriptor ) + LayoutTestUtil( IndexDescriptor indexDescriptor ) { this.indexDescriptor = StoreIndexDescriptor.indexRule( 0, indexDescriptor, PROVIDER_DESCRIPTOR ); } abstract Layout createLayout(); - abstract IndexEntryUpdate[] someUpdates(); + abstract IndexEntryUpdate[] someUpdates(); protected double fractionDuplicates() { @@ -76,17 +76,17 @@ void copyValue( VALUE value, VALUE intoValue ) { } - Iterator> randomUpdateGenerator( RandomRule random ) + Iterator> randomUpdateGenerator( RandomRule random ) { double fractionDuplicates = fractionDuplicates(); - return new PrefetchingIterator>() + return new PrefetchingIterator>() { private final Set uniqueCompareValues = new HashSet<>(); private final List uniqueValues = new ArrayList<>(); private long currentEntityId; @Override - protected IndexEntryUpdate fetchNextOrNull() + protected IndexEntryUpdate fetchNextOrNull() { Value value; if ( fractionDuplicates > 0 && !uniqueValues.isEmpty() && @@ -111,7 +111,7 @@ private Value existingNonUniqueValue( RandomRule randomRule ) abstract Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List uniqueValues ); - Value[] extractValuesFromUpdates( IndexEntryUpdate[] updates ) + Value[] extractValuesFromUpdates( IndexEntryUpdate[] updates ) { Value[] values = new Value[updates.length]; for ( int i = 0; i < updates.length; i++ ) @@ -125,14 +125,14 @@ Value[] extractValuesFromUpdates( IndexEntryUpdate[] upd return values; } - abstract IndexEntryUpdate[] someUpdatesNoDuplicateValues(); + abstract IndexEntryUpdate[] someUpdatesNoDuplicateValues(); - abstract IndexEntryUpdate[] someUpdatesWithDuplicateValues(); + abstract IndexEntryUpdate[] someUpdatesWithDuplicateValues(); - IndexEntryUpdate[] generateAddUpdatesFor( Object[] values ) + IndexEntryUpdate[] generateAddUpdatesFor( Object[] values ) { @SuppressWarnings( "unchecked" ) - IndexEntryUpdate[] indexEntryUpdates = new IndexEntryUpdate[values.length]; + IndexEntryUpdate[] indexEntryUpdates = new IndexEntryUpdate[values.length]; for ( int i = 0; i < indexEntryUpdates.length; i++ ) { indexEntryUpdates[i] = add( i, Values.of( values[i] ) ); @@ -140,12 +140,12 @@ IndexEntryUpdate[] generateAddUpdatesFor( Object[] value return indexEntryUpdates; } - protected IndexEntryUpdate add( long nodeId, Value value ) + protected IndexEntryUpdate add( long nodeId, Value value ) { return IndexEntryUpdate.add( nodeId, indexDescriptor, value ); } - static int countUniqueValues( IndexEntryUpdate[] updates ) + static int countUniqueValues( IndexEntryUpdate[] updates ) { return Stream.of( updates ).map( update -> update.values()[0] ).collect( Collectors.toSet() ).size(); } @@ -155,7 +155,7 @@ static int countUniqueValues( Object[] updates ) return Stream.of( updates ).collect( Collectors.toSet() ).size(); } - void sort( IndexEntryUpdate[] updates ) + void sort( IndexEntryUpdate[] updates ) { Arrays.sort( updates, UPDATE_COMPARATOR ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java index 4dd0ef21de303..d1ea881a69ec6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java @@ -28,7 +28,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.LocalDateTimeValue; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.Value; @@ -46,7 +46,7 @@ public class LocalDateTimeLayoutTestUtil extends LayoutTestUtil createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } @@ -89,13 +89,13 @@ Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( ALL_EXTREME_VALUES ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java index cc07090555be2..0af727f0dc345 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java @@ -29,7 +29,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.LocalTimeValue; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.Value; @@ -49,7 +49,7 @@ public class LocalTimeLayoutTestUtil extends LayoutTestUtil createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } @@ -92,13 +92,13 @@ Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( ALL_EXTREME_VALUES ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaIndexPopulatorTest.java index 9ad61ad9dae73..a4398d2d29412 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaIndexPopulatorTest.java @@ -26,7 +26,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.values.storable.Values; @@ -41,7 +41,7 @@ public void addShouldApplyDuplicateValues() throws Exception { // given populator.create(); - IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); // when populator.add( Arrays.asList( updates ) ); @@ -56,11 +56,11 @@ public void updaterShouldApplyDuplicateValues() throws Exception { // given populator.create(); - IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); try ( IndexUpdater updater = populator.newPopulatingUpdater( null_property_accessor ) ) { // when - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { updater.process( update ); } @@ -76,9 +76,9 @@ public void shouldSampleUpdatesIfConfiguredForOnlineSampling() throws Exception { // GIVEN populator.create(); - IndexEntryUpdate[] scanUpdates = layoutUtil.someUpdates(); + IndexEntryUpdate[] scanUpdates = layoutUtil.someUpdates(); populator.add( Arrays.asList( scanUpdates ) ); - Iterator> generator = layoutUtil.randomUpdateGenerator( random ); + Iterator> generator = layoutUtil.randomUpdateGenerator( random ); Object[] updates = new Object[5]; updates[0] = generator.next().values()[0].asObject(); updates[1] = generator.next().values()[0].asObject(); @@ -90,7 +90,7 @@ public void shouldSampleUpdatesIfConfiguredForOnlineSampling() throws Exception long nodeId = 1000; for ( Object value : updates ) { - IndexEntryUpdate update = layoutUtil.add( nodeId++, Values.of( value ) ); + IndexEntryUpdate update = layoutUtil.add( nodeId++, Values.of( value ) ); updater.process( update ); populator.includeSample( update ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java index adc722b6a499c..f107f8450da8e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -138,7 +138,7 @@ public void processMustThrowAfterClose() throws Exception public void shouldIndexAdd() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); try ( IndexUpdater updater = accessor.newUpdater( ONLINE ) ) { // when @@ -154,13 +154,13 @@ public void shouldIndexAdd() throws Exception public void shouldIndexChange() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); - Iterator> generator = filter( skipExisting( updates ), layoutUtil.randomUpdateGenerator( random ) ); + Iterator> generator = filter( skipExisting( updates ), layoutUtil.randomUpdateGenerator( random ) ); for ( int i = 0; i < updates.length; i++ ) { - IndexEntryUpdate update = updates[i]; + IndexEntryUpdate update = updates[i]; Value newValue = generator.next().values()[0]; updates[i] = change( update.getEntityId(), indexDescriptor, update.values()[0], newValue ); } @@ -177,14 +177,14 @@ public void shouldIndexChange() throws Exception public void shouldIndexRemove() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); for ( int i = 0; i < updates.length; i++ ) { // when - IndexEntryUpdate update = updates[i]; - IndexEntryUpdate remove = remove( update.getEntityId(), indexDescriptor, update.values() ); + IndexEntryUpdate update = updates[i]; + IndexEntryUpdate remove = remove( update.getEntityId(), indexDescriptor, update.values() ); processAll( remove ); forceAndCloseAccessor(); @@ -198,16 +198,16 @@ public void shouldIndexRemove() throws Exception public void shouldHandleRandomUpdates() throws Exception { // given - Set> expectedData = new HashSet<>(); - Iterator> newDataGenerator = layoutUtil.randomUpdateGenerator( random ); + Set> expectedData = new HashSet<>(); + Iterator> newDataGenerator = layoutUtil.randomUpdateGenerator( random ); // when int rounds = 50; for ( int round = 0; round < rounds; round++ ) { // generate a batch of updates (add, change, remove) - IndexEntryUpdate[] batch = generateRandomUpdates( expectedData, newDataGenerator, - random.nextInt( 5, 20 ), (float) round / rounds * 2 ); + IndexEntryUpdate[] batch = generateRandomUpdates( expectedData, newDataGenerator, + random.nextInt( 5, 20 ), (float) round / rounds * 2 ); // apply to tree processAll( batch ); // apply to expectedData @@ -228,7 +228,7 @@ public void shouldReturnZeroCountForEmptyIndex() try ( IndexReader reader = accessor.newReader() ) { // when - IndexEntryUpdate update = layoutUtil.randomUpdateGenerator( random ).next(); + IndexEntryUpdate update = layoutUtil.randomUpdateGenerator( random ).next(); long count = reader.countIndexedNodes( 123, update.values()[0] ); // then @@ -240,13 +240,13 @@ public void shouldReturnZeroCountForEmptyIndex() public void shouldReturnCountOneForExistingData() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); // when try ( IndexReader reader = accessor.newReader() ) { - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { long count = reader.countIndexedNodes( update.getEntityId(), update.values() ); @@ -255,7 +255,7 @@ public void shouldReturnCountOneForExistingData() throws Exception } // and when - Iterator> generator = filter( skipExisting( updates ), layoutUtil.randomUpdateGenerator( random ) ); + Iterator> generator = filter( skipExisting( updates ), layoutUtil.randomUpdateGenerator( random ) ); long count = reader.countIndexedNodes( 123, generator.next().values()[0] ); // then @@ -267,13 +267,13 @@ public void shouldReturnCountOneForExistingData() throws Exception public void shouldReturnCountZeroForMismatchingData() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); // when IndexReader reader = accessor.newReader(); - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { long countWithMismatchingData = reader.countIndexedNodes( update.getEntityId() + 1, update.values() ); long countWithNonExistentEntityId = reader.countIndexedNodes( NON_EXISTENT_ENTITY_ID, update.values() ); @@ -290,7 +290,7 @@ public void shouldReturnCountZeroForMismatchingData() throws Exception public void shouldReturnAllEntriesForExistsPredicate() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); // when @@ -317,12 +317,12 @@ public void shouldReturnNoEntriesForExistsPredicateForEmptyIndex() throws Except public void shouldReturnMatchingEntriesForExactPredicate() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); // when IndexReader reader = accessor.newReader(); - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { Value value = update.values()[0]; LongIterator result = query( reader, IndexQuery.exact( 0, value ) ); @@ -334,7 +334,7 @@ public void shouldReturnMatchingEntriesForExactPredicate() throws Exception public void shouldReturnNoEntriesForMismatchingExactPredicate() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); // when @@ -348,7 +348,7 @@ public void shouldReturnNoEntriesForMismatchingExactPredicate() throws Exception public void shouldReturnMatchingEntriesForRangePredicateWithInclusiveStartAndExclusiveEnd() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); processAll( updates ); layoutUtil.sort( updates ); @@ -363,7 +363,7 @@ public void shouldReturnMatchingEntriesForRangePredicateWithInclusiveStartAndExc public void shouldReturnMatchingEntriesForRangePredicateWithInclusiveStartAndInclusiveEnd() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); processAll( updates ); layoutUtil.sort( updates ); @@ -378,7 +378,7 @@ public void shouldReturnMatchingEntriesForRangePredicateWithInclusiveStartAndInc public void shouldReturnMatchingEntriesForRangePredicateWithExclusiveStartAndExclusiveEnd() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); processAll( updates ); layoutUtil.sort( updates ); @@ -393,7 +393,7 @@ public void shouldReturnMatchingEntriesForRangePredicateWithExclusiveStartAndExc public void shouldReturnMatchingEntriesForRangePredicateWithExclusiveStartAndInclusiveEnd() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); processAll( updates ); layoutUtil.sort( updates ); @@ -408,7 +408,7 @@ public void shouldReturnMatchingEntriesForRangePredicateWithExclusiveStartAndInc public void shouldReturnNoEntriesForRangePredicateOutsideAnyMatch() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); layoutUtil.sort( updates ); processAll( updates[0], updates[1], updates[updates.length - 1], updates[updates.length - 2] ); @@ -423,7 +423,7 @@ public void shouldReturnNoEntriesForRangePredicateOutsideAnyMatch() throws Excep public void mustHandleNestedQueries() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); layoutUtil.sort( updates ); @@ -451,7 +451,7 @@ public void mustHandleNestedQueries() throws Exception public void mustHandleMultipleNestedQueries() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); layoutUtil.sort( updates ); @@ -491,7 +491,7 @@ public void mustHandleMultipleNestedQueries() throws Exception assertEntityIdHits( expected1, result1 ); } - private long entityIdOf( IndexEntryUpdate update ) + private long entityIdOf( IndexEntryUpdate update ) { return update.getEntityId(); } @@ -500,10 +500,10 @@ private long entityIdOf( IndexEntryUpdate update ) public void shouldHandleMultipleConsecutiveUpdaters() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); // when - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { try ( IndexUpdater updater = accessor.newUpdater( ONLINE ) ) { @@ -547,7 +547,7 @@ public void dropShouldDeleteAndCloseIndex() throws Exception public void forceShouldCheckpointTree() throws Exception { // given - IndexEntryUpdate[] data = layoutUtil.someUpdates(); + IndexEntryUpdate[] data = layoutUtil.someUpdates(); processAll( data ); // when @@ -563,7 +563,7 @@ public void forceShouldCheckpointTree() throws Exception public void closeShouldCloseTreeWithoutCheckpoint() throws Exception { // given - IndexEntryUpdate[] data = layoutUtil.someUpdates(); + IndexEntryUpdate[] data = layoutUtil.someUpdates(); processAll( data ); // when @@ -589,7 +589,7 @@ public void snapshotFilesShouldReturnIndexFile() public void shouldSampleIndex() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); try ( IndexReader reader = accessor.newReader() ) { @@ -661,7 +661,7 @@ public void writingAfterCloseShouldThrow() throws Exception public void shouldSeeAllEntriesInAllEntriesReader() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); processAll( updates ); // when @@ -689,7 +689,7 @@ public void shouldSeeNoEntriesInAllEntriesReaderOnEmptyIndex() public void shouldNotSeeFilteredEntries() throws Exception { // given - IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesNoDuplicateValues(); processAll( updates ); layoutUtil.sort( updates ); IndexReader reader = accessor.newReader(); @@ -707,16 +707,16 @@ public void shouldNotSeeFilteredEntries() throws Exception assertFalse( iter.hasNext() ); } - private Value generateUniqueValue( IndexEntryUpdate[] updates ) + private Value generateUniqueValue( IndexEntryUpdate[] updates ) { return filter( skipExisting( updates ), layoutUtil.randomUpdateGenerator( random ) ).next().values()[0]; } - private static Predicate> skipExisting( IndexEntryUpdate[] existing ) + private static Predicate> skipExisting( IndexEntryUpdate[] existing ) { return update -> { - for ( IndexEntryUpdate e : existing ) + for ( IndexEntryUpdate e : existing ) { if ( Arrays.equals( e.values(), update.values() ) ) { @@ -727,7 +727,7 @@ private static Predicate> skipExisting( }; } - private Value valueOf( IndexEntryUpdate update ) + private Value valueOf( IndexEntryUpdate update ) { return update.values()[0]; } @@ -737,7 +737,7 @@ private IndexProgressor.NodeValueClient filterClient( final NodeValueIterator it return new IndexProgressor.NodeValueClient() { @Override - public void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) + public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) { iter.initialize( descriptor, progressor, query ); } @@ -807,13 +807,13 @@ private long[] extractEntityIds( IndexEntryUpdate[] updates, Predicate return Arrays.copyOf( entityIds, cursor ); } - private void applyUpdatesToExpectedData( Set> expectedData, - IndexEntryUpdate[] batch ) + private void applyUpdatesToExpectedData( Set> expectedData, + IndexEntryUpdate[] batch ) { - for ( IndexEntryUpdate update : batch ) + for ( IndexEntryUpdate update : batch ) { - IndexEntryUpdate addition = null; - IndexEntryUpdate removal = null; + IndexEntryUpdate addition = null; + IndexEntryUpdate removal = null; switch ( update.updateMode() ) { case ADDED: @@ -841,12 +841,12 @@ private void applyUpdatesToExpectedData( Set[] generateRandomUpdates( - Set> expectedData, - Iterator> newDataGenerator, int count, float removeFactor ) + private IndexEntryUpdate[] generateRandomUpdates( + Set> expectedData, + Iterator> newDataGenerator, int count, float removeFactor ) { @SuppressWarnings( "unchecked" ) - IndexEntryUpdate[] updates = new IndexEntryUpdate[count]; + IndexEntryUpdate[] updates = new IndexEntryUpdate[count]; float addChangeRatio = 0.5f; for ( int i = 0; i < count; i++ ) { @@ -854,15 +854,15 @@ private IndexEntryUpdate[] generateRandomUpdates( if ( !expectedData.isEmpty() && factor < removeFactor ) { // remove something - IndexEntryUpdate toRemove = selectRandomItem( expectedData ); + IndexEntryUpdate toRemove = selectRandomItem( expectedData ); updates[i] = remove( toRemove.getEntityId(), indexDescriptor, toRemove.values() ); } else if ( !expectedData.isEmpty() && factor < (1 - removeFactor) * addChangeRatio ) { // change - IndexEntryUpdate toChange = selectRandomItem( expectedData ); + IndexEntryUpdate toChange = selectRandomItem( expectedData ); // use the data generator to generate values, even if the whole update as such won't be used - IndexEntryUpdate updateContainingValue = newDataGenerator.next(); + IndexEntryUpdate updateContainingValue = newDataGenerator.next(); updates[i] = change( toChange.getEntityId(), indexDescriptor, toChange.values(), updateContainingValue.values() ); } @@ -876,18 +876,18 @@ else if ( !expectedData.isEmpty() && factor < (1 - removeFactor) * addChangeRati } @SuppressWarnings( "unchecked" ) - private IndexEntryUpdate selectRandomItem( Set> expectedData ) + private IndexEntryUpdate selectRandomItem( Set> expectedData ) { return expectedData.toArray( new IndexEntryUpdate[expectedData.size()] )[random.nextInt( expectedData.size() )]; } @SafeVarargs - final void processAll( IndexEntryUpdate... updates ) + final void processAll( IndexEntryUpdate... updates ) throws IOException, IndexEntryConflictException { try ( IndexUpdater updater = accessor.newUpdater( ONLINE ) ) { - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { updater.process( update ); } @@ -900,16 +900,16 @@ private void forceAndCloseAccessor() throws IOException closeAccessor(); } - private void processAll( IndexUpdater updater, IndexEntryUpdate[] updates ) + private void processAll( IndexUpdater updater, IndexEntryUpdate[] updates ) throws IOException, IndexEntryConflictException { - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { updater.process( update ); } } - private IndexEntryUpdate simpleUpdate() + private IndexEntryUpdate simpleUpdate() { return IndexEntryUpdate.add( 0, indexDescriptor, of( 0 ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulatorTest.java index 80b715acb000a..e03c877cb2809 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulatorTest.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.Values; @@ -158,7 +158,7 @@ public void addShouldApplyAllUpdatesOnce() throws Exception // given populator.create(); @SuppressWarnings( "unchecked" ) - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); // when populator.add( Arrays.asList( updates ) ); @@ -173,11 +173,11 @@ public void updaterShouldApplyUpdates() throws Exception { // given populator.create(); - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); try ( IndexUpdater updater = populator.newPopulatingUpdater( null_property_accessor ) ) { // when - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { updater.process( update ); } @@ -217,7 +217,7 @@ public void shouldApplyInterleavedUpdatesFromAddAndUpdater() throws Exception // given populator.create(); @SuppressWarnings( "unchecked" ) - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); // when applyInterleaved( updates, populator ); @@ -368,7 +368,7 @@ public void shouldApplyLargeAmountOfInterleavedRandomUpdates() throws Exception populator.create(); random.reset(); Random updaterRandom = new Random( random.seed() ); - Iterator> updates = layoutUtil.randomUpdateGenerator( random ); + Iterator> updates = layoutUtil.randomUpdateGenerator( random ); // when int count = interleaveLargeAmountOfUpdates( updaterRandom, updates ); @@ -483,7 +483,7 @@ public void unsuccessfulCloseMustThrowAfterDrop() throws Exception } private int interleaveLargeAmountOfUpdates( Random updaterRandom, - Iterator> updates ) throws IOException, IndexEntryConflictException + Iterator> updates ) throws IOException, IndexEntryConflictException { int count = 0; for ( int i = 0; i < LARGE_AMOUNT_OF_UPDATES; i++ ) @@ -538,13 +538,13 @@ private String longString( int length ) return RandomStringUtils.random( length, true, true ); } - private void applyInterleaved( IndexEntryUpdate[] updates, NativeSchemaIndexPopulator populator ) + private void applyInterleaved( IndexEntryUpdate[] updates, NativeSchemaIndexPopulator populator ) throws IOException, IndexEntryConflictException { boolean useUpdater = true; - Collection> populatorBatch = new ArrayList<>(); + Collection> populatorBatch = new ArrayList<>(); IndexUpdater updater = populator.newPopulatingUpdater( null_property_accessor ); - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { if ( random.nextInt( 100 ) < 20 ) { @@ -579,11 +579,11 @@ private void applyInterleaved( IndexEntryUpdate[] update } } - private void verifyUpdates( Iterator> indexEntryUpdateIterator, int count ) + private void verifyUpdates( Iterator> indexEntryUpdateIterator, int count ) throws IOException { @SuppressWarnings( "unchecked" ) - IndexEntryUpdate[] updates = new IndexEntryUpdate[count]; + IndexEntryUpdate[] updates = new IndexEntryUpdate[count]; for ( int i = 0; i < count; i++ ) { updates[i] = indexEntryUpdateIterator.next(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexTestUtil.java index 828cd042476e3..75e5b82dea5c9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexTestUtil.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RandomRule; import org.neo4j.test.rule.TestDirectory; @@ -95,7 +95,7 @@ private void copyValue( VALUE value, VALUE intoValue ) layoutUtil.copyValue( value, intoValue ); } - void verifyUpdates( IndexEntryUpdate[] updates ) + void verifyUpdates( IndexEntryUpdate[] updates ) throws IOException { Hit[] expectedHits = convertToHits( updates, layout ); @@ -166,11 +166,11 @@ private Hit deepCopy( Hit from ) return new SimpleHit<>( intoKey, intoValue ); } - private Hit[] convertToHits( IndexEntryUpdate[] updates, + private Hit[] convertToHits( IndexEntryUpdate[] updates, Layout layout ) { List> hits = new ArrayList<>( updates.length ); - for ( IndexEntryUpdate u : updates ) + for ( IndexEntryUpdate u : updates ) { KEY key = layout.newKey(); key.from( u.getEntityId(), u.values() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaIndexPopulatorTest.java index 5b0fcd72f52bb..8458e8bbb3540 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaIndexPopulatorTest.java @@ -27,7 +27,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexSample; import static java.util.Arrays.asList; @@ -43,7 +43,7 @@ public void addShouldThrowOnDuplicateValues() throws Exception { // given populator.create(); - IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); // when try @@ -66,11 +66,11 @@ public void updaterShouldThrowOnDuplicateValues() throws Exception { // given populator.create(); - IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); IndexUpdater updater = populator.newPopulatingUpdater( null_property_accessor ); // when - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { updater.process( update ); } @@ -95,11 +95,11 @@ public void shouldSampleUpdates() throws Exception { // GIVEN populator.create(); - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); // WHEN populator.add( asList( updates ) ); - for ( IndexEntryUpdate update : updates ) + for ( IndexEntryUpdate update : updates ) { populator.includeSample( update ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberFullScanNonUniqueIndexSamplerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberFullScanNonUniqueIndexSamplerTest.java index a2b560407a5c2..2e83e25d376c6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberFullScanNonUniqueIndexSamplerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberFullScanNonUniqueIndexSamplerTest.java @@ -27,7 +27,7 @@ import org.neo4j.index.internal.gbptree.Writer; import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexSample; @@ -64,7 +64,7 @@ public void shouldIncludeAllValuesInTree() throws Exception private Number[] generateNumberValues() { - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); Number[] result = new Number[updates.length]; for ( int i = 0; i < updates.length; i++ ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java index b80a19c9b5731..476f8c382771f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java @@ -27,7 +27,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.NumberValue; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.Value; @@ -58,7 +58,7 @@ abstract class NumberLayoutTestUtil extends LayoutTestUtil[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( ALL_EXTREME_VALUES ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberNonUniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberNonUniqueLayoutTestUtil.java index 0dd81918ee1bd..2219beb2e58a2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberNonUniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberNonUniqueLayoutTestUtil.java @@ -21,7 +21,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; class NumberNonUniqueLayoutTestUtil extends NumberLayoutTestUtil @@ -38,7 +38,7 @@ Layout createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessorTest.java index ac504a4580994..0871049f53418 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessorTest.java @@ -28,7 +28,7 @@ import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.SimpleNodeValueClient; @@ -51,7 +51,7 @@ NumberSchemaIndexAccessor makeAccessorWithSamplingConfig( IndexSamplingConfig sa public void respectIndexOrder() throws Exception { // given - IndexEntryUpdate[] someUpdates = layoutUtil.someUpdates(); + IndexEntryUpdate[] someUpdates = layoutUtil.someUpdates(); processAll( someUpdates ); Value[] expectedValues = layoutUtil.extractValuesFromUpdates( someUpdates ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberUniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberUniqueLayoutTestUtil.java index 67d86b3d734fd..2c600c18a91ab 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberUniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberUniqueLayoutTestUtil.java @@ -21,7 +21,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; public class NumberUniqueLayoutTestUtil extends NumberLayoutTestUtil @@ -38,7 +38,7 @@ public Layout createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesNoDuplicateValues(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java index 8ed269f15f162..458c0ee5533ba 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java @@ -29,7 +29,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.index.schema.config.SpaceFillingCurveSettings; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.PointValue; @@ -55,7 +55,7 @@ public class SpatialLayoutTestUtil extends LayoutTestUtil createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } @@ -104,13 +104,13 @@ Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( ALL_EXTREME_VALUES ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java index 53c043fad70a1..2cfec0c48ef22 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java @@ -26,7 +26,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.TextValue; import org.neo4j.values.storable.Value; @@ -38,7 +38,7 @@ abstract class StringLayoutTestUtil extends LayoutTestUtil { - StringLayoutTestUtil( PendingIndexDescriptor schemaIndexDescriptor ) + StringLayoutTestUtil( IndexDescriptor schemaIndexDescriptor ) { super( schemaIndexDescriptor ); } @@ -58,19 +58,19 @@ int compareIndexedPropertyValue( StringSchemaKey key1, StringSchemaKey key2 ) } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return generateAddUpdatesFor( STRINGS ); } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( STRINGS ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { Collection duplicates = new ArrayList<>( asList( STRINGS ) ); duplicates.addAll( asList( STRINGS ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringNonUniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringNonUniqueLayoutTestUtil.java index 8cc38aea27cf6..6c2441d8c772b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringNonUniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringNonUniqueLayoutTestUtil.java @@ -21,7 +21,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; class StringNonUniqueLayoutTestUtil extends StringLayoutTestUtil @@ -38,7 +38,7 @@ Layout createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueLayoutTestUtil.java index 5caed2ac62504..1ea14f470958a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueLayoutTestUtil.java @@ -21,7 +21,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; class StringUniqueLayoutTestUtil extends StringLayoutTestUtil @@ -38,7 +38,7 @@ Layout createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesNoDuplicateValues(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java index d7a440f21bd79..9362ed9bbfcbe 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java @@ -30,7 +30,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.TimeValue; import org.neo4j.values.storable.Value; @@ -52,7 +52,7 @@ public class TimeLayoutTestUtil extends LayoutTestUtil createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return someUpdatesWithDuplicateValues(); } @@ -95,13 +95,13 @@ Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return generateAddUpdatesFor( ALL_EXTREME_VALUES ); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java index 306d719dd4c0a..a11fc0018946f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java @@ -25,7 +25,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.RandomValues; import org.neo4j.values.storable.Value; @@ -47,7 +47,7 @@ Layout createLayout() } @Override - IndexEntryUpdate[] someUpdates() + IndexEntryUpdate[] someUpdates() { return delegate.someUpdatesNoDuplicateValues(); } @@ -71,13 +71,13 @@ Value newUniqueValue( RandomValues random, Set uniqueCompareValues, List } @Override - IndexEntryUpdate[] someUpdatesNoDuplicateValues() + IndexEntryUpdate[] someUpdatesNoDuplicateValues() { return delegate.someUpdatesNoDuplicateValues(); } @Override - IndexEntryUpdate[] someUpdatesWithDuplicateValues() + IndexEntryUpdate[] someUpdatesWithDuplicateValues() { return delegate.someUpdatesWithDuplicateValues(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/BridgingIndexProgressorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/BridgingIndexProgressorTest.java index daf8ed1bfd9ab..2b23d337afcc1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/BridgingIndexProgressorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/BridgingIndexProgressorTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.IndexProgressor; @@ -34,7 +34,7 @@ public class BridgingIndexProgressorTest @Test public void closeMustCloseAll() { - PendingIndexDescriptor index = IndexDescriptorFactory.forLabel( 1, 2, 3 ); + IndexDescriptor index = IndexDescriptorFactory.forLabel( 1, 2, 3 ); BridgingIndexProgressor progressor = new BridgingIndexProgressor( null, index.schema().getPropertyIds() ); IndexProgressor[] parts = {mock(IndexProgressor.class), mock(IndexProgressor.class)}; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java index 96b96fc5f26bf..2bd14c92bc8bb 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java @@ -33,7 +33,7 @@ import org.neo4j.internal.kernel.api.helpers.StubPropertyCursor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.index.IndexProxy; @@ -73,13 +73,13 @@ public class IndexTxStateUpdaterTest private TransactionState txState; private IndexTxStateUpdater indexTxUpdater; - private PendingIndexDescriptor indexOn1_1 = IndexDescriptorFactory.forLabel( labelId1, propId1 ); - private PendingIndexDescriptor indexOn2_new = IndexDescriptorFactory.forLabel( labelId2, newPropId ); - private PendingIndexDescriptor uniqueOn1_2 = IndexDescriptorFactory.uniqueForLabel( labelId1, propId2 ); - private PendingIndexDescriptor indexOn1_1_new = IndexDescriptorFactory.forLabel( labelId1, propId1, newPropId ); - private PendingIndexDescriptor uniqueOn2_2_3 = IndexDescriptorFactory + private IndexDescriptor indexOn1_1 = IndexDescriptorFactory.forLabel( labelId1, propId1 ); + private IndexDescriptor indexOn2_new = IndexDescriptorFactory.forLabel( labelId2, newPropId ); + private IndexDescriptor uniqueOn1_2 = IndexDescriptorFactory.uniqueForLabel( labelId1, propId2 ); + private IndexDescriptor indexOn1_1_new = IndexDescriptorFactory.forLabel( labelId1, propId1, newPropId ); + private IndexDescriptor uniqueOn2_2_3 = IndexDescriptorFactory .uniqueForLabel( labelId2, propId2, propId3 ); - private List indexes = + private List indexes = Arrays.asList( indexOn1_1, indexOn2_new, uniqueOn1_2, indexOn1_1_new, uniqueOn2_2_3 ); private StubNodeCursor node; private StubPropertyCursor propertyCursor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcherTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcherTest.java index 383a1a23370aa..de1eca1b9e784 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcherTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcherTest.java @@ -29,7 +29,7 @@ import org.neo4j.internal.kernel.api.helpers.StubNodeCursor; import org.neo4j.internal.kernel.api.helpers.StubPropertyCursor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.Value; import static org.hamcrest.MatcherAssert.assertThat; @@ -51,11 +51,11 @@ public class NodeSchemaMatcherTest private static final int nonExistentPropId = 23; private static final int specialPropId = 24; - PendingIndexDescriptor index1 = forLabel( labelId1, propId1 ); - PendingIndexDescriptor index1_2 = forLabel( labelId1, propId1, propId2 ); - PendingIndexDescriptor indexWithMissingProperty = forLabel( labelId1, propId1, nonExistentPropId ); - PendingIndexDescriptor indexWithMissingLabel = forLabel( nonExistentLabelId, propId1, propId2 ); - PendingIndexDescriptor indexOnSpecialProperty = forLabel( labelId1, propId1, specialPropId ); + IndexDescriptor index1 = forLabel( labelId1, propId1 ); + IndexDescriptor index1_2 = forLabel( labelId1, propId1, propId2 ); + IndexDescriptor indexWithMissingProperty = forLabel( labelId1, propId1, nonExistentPropId ); + IndexDescriptor indexWithMissingLabel = forLabel( nonExistentLabelId, propId1, propId2 ); + IndexDescriptor indexOnSpecialProperty = forLabel( labelId1, propId1, specialPropId ); private StubNodeCursor node; @Before @@ -74,7 +74,7 @@ public void setup() public void shouldMatchOnSingleProperty() { // when - List matched = new ArrayList<>(); + List matched = new ArrayList<>(); NodeSchemaMatcher.onMatchingSchema( iterator( index1 ), node, new StubPropertyCursor(), unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); @@ -86,7 +86,7 @@ public void shouldMatchOnSingleProperty() public void shouldMatchOnTwoProperties() { // when - List matched = new ArrayList<>(); + List matched = new ArrayList<>(); NodeSchemaMatcher.onMatchingSchema( iterator( index1_2 ), node, new StubPropertyCursor(), unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); @@ -98,7 +98,7 @@ public void shouldMatchOnTwoProperties() public void shouldNotMatchIfNodeIsMissingProperty() { // when - List matched = new ArrayList<>(); + List matched = new ArrayList<>(); NodeSchemaMatcher.onMatchingSchema( iterator( indexWithMissingProperty ), node, new StubPropertyCursor(), unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); @@ -110,7 +110,7 @@ public void shouldNotMatchIfNodeIsMissingProperty() public void shouldNotMatchIfNodeIsMissingLabel() { // when - List matched = new ArrayList<>(); + List matched = new ArrayList<>(); NodeSchemaMatcher.onMatchingSchema( iterator( indexWithMissingLabel ), node, new StubPropertyCursor(), unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); @@ -122,7 +122,7 @@ public void shouldNotMatchIfNodeIsMissingLabel() public void shouldMatchOnSpecialProperty() { // when - List matched = new ArrayList<>(); + List matched = new ArrayList<>(); NodeSchemaMatcher.onMatchingSchema( iterator( indexOnSpecialProperty ), node, new StubPropertyCursor(), specialPropId, ( schema, props ) -> matched.add( schema ) ); @@ -134,10 +134,10 @@ public void shouldMatchOnSpecialProperty() public void shouldMatchSeveralTimes() { // given - List indexes = Arrays.asList( index1, index1, index1_2, index1_2 ); + List indexes = Arrays.asList( index1, index1, index1_2, index1_2 ); // when - final List matched = new ArrayList<>(); + final List matched = new ArrayList<>(); NodeSchemaMatcher.onMatchingSchema( indexes.iterator(), node, new StubPropertyCursor(), unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilterTest.java index ca9c9e1748355..acd9199bb01d0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilterTest.java @@ -29,7 +29,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.security.SecurityContext; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexProgressor.NodeValueClient; @@ -152,7 +152,7 @@ private Event.Initialize initialize( int... keys ) } @Override - public void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) + public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) { events.add( new Event.Initialize( progressor, descriptor.schema().getPropertyIds() ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java index 4ef4302793baa..6f33a648c7b4a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.api.exceptions.schema.DuplicateSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; @@ -119,7 +119,7 @@ public void shouldReturnIndexRuleForLabelAndProperty() // Then assertNotNull( rule ); - assertRule( rule, LABEL1, PROP2, PendingIndexDescriptor.Type.GENERAL ); + assertRule( rule, LABEL1, PROP2, IndexDescriptor.Type.GENERAL ); } @Test @@ -145,7 +145,7 @@ public void shouldReturnIndexRuleForLabelAndPropertyComposite() assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( d ) ) ); assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( e ) ) ); assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( f ) ) ); - assertEquals( PendingIndexDescriptor.Type.GENERAL, rule.type() ); + assertEquals( IndexDescriptor.Type.GENERAL, rule.type() ); } @Test @@ -171,7 +171,7 @@ public void shouldReturnIndexRuleForLabelAndVeryManyPropertiesComposite() { assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( prop ) ) ); } - assertEquals( PendingIndexDescriptor.Type.GENERAL, rule.type() ); + assertEquals( IndexDescriptor.Type.GENERAL, rule.type() ); } @Test @@ -201,7 +201,7 @@ public void shouldListIndexRulesForLabelPropertyAndKind() // Then assertNotNull( rule ); - assertRule( rule, LABEL1, PROP1, PendingIndexDescriptor.Type.UNIQUE ); + assertRule( rule, LABEL1, PROP1, IndexDescriptor.Type.UNIQUE ); } @Test @@ -331,7 +331,7 @@ private TokenNameLookup getDefaultTokenNameLookup() return tokenNameLookup; } - private void assertRule( StoreIndexDescriptor rule, String label, String propertyKey, PendingIndexDescriptor.Type type ) + private void assertRule( StoreIndexDescriptor rule, String label, String propertyKey, IndexDescriptor.Type type ) { assertTrue( SchemaDescriptorPredicates.hasLabel( rule, labelId( label ) ) ); assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( propertyKey ) ) ); @@ -345,12 +345,12 @@ private void assertRule( ConstraintRule rule, String label, String propertyKey, assertEquals( type, rule.getConstraintDescriptor().type() ); } - private PendingIndexDescriptor indexDescriptor( String label, String property ) + private IndexDescriptor indexDescriptor( String label, String property ) { return IndexDescriptorFactory.forLabel( labelId( label ), propId( property ) ); } - private PendingIndexDescriptor uniqueIndexDescriptor( String label, String property ) + private IndexDescriptor uniqueIndexDescriptor( String label, String property ) { return IndexDescriptorFactory.uniqueForLabel( labelId( label ), propId( property ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/IndexRuleTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/IndexRuleTest.java index 53239416687d1..c9f5a7251d1ef 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/IndexRuleTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/IndexRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -38,7 +38,7 @@ public class IndexRuleTest extends SchemaRuleTestBase public void shouldCreateGeneralIndex() { // GIVEN - PendingIndexDescriptor descriptor = forLabel( LABEL_ID, PROPERTY_ID_1 ); + IndexDescriptor descriptor = forLabel( LABEL_ID, PROPERTY_ID_1 ); StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); // THEN @@ -55,7 +55,7 @@ public void shouldCreateGeneralIndex() public void shouldCreateUniqueIndex() { // GIVEN - PendingIndexDescriptor descriptor = uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ); + IndexDescriptor descriptor = uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ); StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); // THEN @@ -83,13 +83,13 @@ public void indexRulesAreEqualBasedOnIndexDescriptor() @Test public void detectUniqueIndexWithoutOwningConstraint() { - PendingIndexDescriptor descriptor = uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ); + IndexDescriptor descriptor = uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ); StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); assertTrue( indexRule.isIndexWithoutOwningConstraint() ); } - private void assertEqualityByDescriptor( PendingIndexDescriptor descriptor ) + private void assertEqualityByDescriptor( IndexDescriptor descriptor ) { StoreIndexDescriptor rule1 = StoreIndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); StoreIndexDescriptor rule2 = StoreIndexDescriptor.indexRule( RULE_ID_2, descriptor, PROVIDER_DESCRIPTOR_2 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java index a16a25f47bf26..ef99c023e14f2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -455,7 +455,7 @@ private void assertParseIndexRule( String serialized, String name ) throws Excep { // GIVEN long ruleId = 24; - PendingIndexDescriptor index = forLabel( 512, 4 ); + IndexDescriptor index = forLabel( 512, 4 ); IndexProvider.Descriptor indexProvider = new IndexProvider.Descriptor( "index-provider", "25.0" ); byte[] bytes = decodeBase64( serialized ); @@ -477,7 +477,7 @@ private void assertParseUniqueIndexRule( String serialized, String name ) throws // GIVEN long ruleId = 33; long constraintId = 11; - PendingIndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 61, 988 ); + IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 61, 988 ); IndexProvider.Descriptor indexProvider = new IndexProvider.Descriptor( "index-provider", "25.0" ); byte[] bytes = decodeBase64( serialized ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java index b688de60eb50d..f2cc1ceb0e49d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -154,7 +154,7 @@ public void visitsUniqueConstraintsAndIndices() throws Exception commitAndReOpen(); ConstraintDescriptor constraint = createUniqueConstraint( labelId, pkId ); - PendingIndexDescriptor descriptor = IndexDescriptorFactory.uniqueForLabel( labelId, pkId ); + IndexDescriptor descriptor = IndexDescriptorFactory.uniqueForLabel( labelId, pkId ); // WHEN accept( visitor ); diff --git a/community/kernel/src/test/java/org/neo4j/storageengine/api/schema/SimpleNodeValueClient.java b/community/kernel/src/test/java/org/neo4j/storageengine/api/schema/SimpleNodeValueClient.java index 44312480fb6ca..dda2a678566ef 100644 --- a/community/kernel/src/test/java/org/neo4j/storageengine/api/schema/SimpleNodeValueClient.java +++ b/community/kernel/src/test/java/org/neo4j/storageengine/api/schema/SimpleNodeValueClient.java @@ -20,7 +20,7 @@ package org.neo4j.storageengine.api.schema; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.Value; public class SimpleNodeValueClient implements IndexProgressor.NodeValueClient @@ -40,7 +40,7 @@ public boolean next() } @Override - public void initialize( PendingIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) + public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) { this.progressor = progressor; } diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java index 9511851fe351c..4163c2a7c1b8f 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java @@ -66,7 +66,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.labelscan.LabelScanStore; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.MyRelTypes; @@ -140,8 +140,8 @@ public class BatchInsertTest { private final int denseNodeThreshold; // This is the assumed internal index descriptor based on knowledge of what ids get assigned - private static final PendingIndexDescriptor internalIndex = IndexDescriptorFactory.forLabel( 0, 0 ); - private static final PendingIndexDescriptor internalUniqueIndex = IndexDescriptorFactory.uniqueForLabel( 0, 0 ); + private static final IndexDescriptor internalIndex = IndexDescriptorFactory.forLabel( 0, 0 ); + private static final IndexDescriptor internalUniqueIndex = IndexDescriptorFactory.uniqueForLabel( 0, 0 ); @Parameterized.Parameters public static Collection data() diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessor.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessor.java index a1e88b93270b7..510083f9f7bd9 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessor.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessor.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.LuceneIndexValueValidator; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; @@ -42,9 +42,9 @@ public class LuceneIndexAccessor implements IndexAccessor { private final LuceneIndexWriter writer; private final SchemaIndex luceneIndex; - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; - public LuceneIndexAccessor( SchemaIndex luceneIndex, PendingIndexDescriptor descriptor ) + public LuceneIndexAccessor( SchemaIndex luceneIndex, IndexDescriptor descriptor ) { this.luceneIndex = luceneIndex; this.descriptor = descriptor; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java index 302a2e29cc97d..f54ee6dc07bc1 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java @@ -37,14 +37,14 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.factory.OperationalMode; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.kernel.impl.storemigration.participant.SchemaIndexMigrator; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; public class LuceneIndexProvider extends IndexProvider { @@ -170,7 +170,7 @@ private PartitionedIndexStorage getIndexStorage( long indexId ) return indexStorageFactory.indexStorageOf( indexId ); } - private boolean indexIsOnline( PartitionedIndexStorage indexStorage, PendingIndexDescriptor descriptor ) throws IOException + private boolean indexIsOnline( PartitionedIndexStorage indexStorage, IndexDescriptor descriptor ) throws IOException { try ( SchemaIndex index = LuceneSchemaIndexBuilder.create( descriptor, config ).withIndexStorage( indexStorage ).build() ) { diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndex.java index 61ce0c8a362bf..b90ff71fb1329 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndex.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.impl.schema.writer.LuceneIndexWriter; import org.neo4j.kernel.api.impl.schema.writer.PartitionedIndexWriter; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.Value; @@ -59,12 +59,12 @@ class LuceneSchemaIndex extends AbstractLuceneIndex private static final String ONLINE = "online"; private static final Map ONLINE_COMMIT_USER_DATA = singletonMap( KEY_STATUS, ONLINE ); - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final TaskCoordinator taskCoordinator = new TaskCoordinator( 10, TimeUnit.MILLISECONDS ); - LuceneSchemaIndex( PartitionedIndexStorage indexStorage, PendingIndexDescriptor descriptor, + LuceneSchemaIndex( PartitionedIndexStorage indexStorage, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, IndexPartitionFactory partitionFactory ) { super( indexStorage, partitionFactory ); @@ -86,7 +86,7 @@ public IndexReader getIndexReader() throws IOException : createPartitionedReader( partitions ); } - public PendingIndexDescriptor getDescriptor() + public IndexDescriptor getDescriptor() { return descriptor; } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java index db679b38965cc..9f214a986f65d 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java @@ -28,7 +28,7 @@ import org.neo4j.kernel.api.impl.index.partition.ReadOnlyIndexPartitionFactory; import org.neo4j.kernel.api.impl.index.partition.WritableIndexPartitionFactory; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -42,11 +42,11 @@ */ public class LuceneSchemaIndexBuilder extends AbstractLuceneIndexBuilder { - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; private IndexSamplingConfig samplingConfig; private Factory writerConfigFactory = IndexWriterConfigs::standard; - private LuceneSchemaIndexBuilder( PendingIndexDescriptor descriptor, Config config ) + private LuceneSchemaIndexBuilder( IndexDescriptor descriptor, Config config ) { super( config ); this.descriptor = descriptor; @@ -59,7 +59,7 @@ private LuceneSchemaIndexBuilder( PendingIndexDescriptor descriptor, Config conf * @return new LuceneSchemaIndexBuilder * @param descriptor The descriptor for this index */ - public static LuceneSchemaIndexBuilder create( PendingIndexDescriptor descriptor, Config config ) + public static LuceneSchemaIndexBuilder create( IndexDescriptor descriptor, Config config ) { return new LuceneSchemaIndexBuilder( descriptor, config ); } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/ReadOnlyDatabaseSchemaIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/ReadOnlyDatabaseSchemaIndex.java index 4b677fb85ed6f..7abafec7e0058 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/ReadOnlyDatabaseSchemaIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/ReadOnlyDatabaseSchemaIndex.java @@ -28,7 +28,7 @@ import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; import org.neo4j.kernel.api.impl.schema.writer.LuceneIndexWriter; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.Value; @@ -38,7 +38,7 @@ */ public class ReadOnlyDatabaseSchemaIndex extends ReadOnlyAbstractDatabaseIndex implements SchemaIndex { - public ReadOnlyDatabaseSchemaIndex( PartitionedIndexStorage indexStorage, PendingIndexDescriptor descriptor, + public ReadOnlyDatabaseSchemaIndex( PartitionedIndexStorage indexStorage, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, ReadOnlyIndexPartitionFactory readOnlyIndexPartitionFactory ) { super( new LuceneSchemaIndex( indexStorage, descriptor, samplingConfig, readOnlyIndexPartitionFactory ) ); @@ -57,7 +57,7 @@ public IndexReader getIndexReader() throws IOException } @Override - public PendingIndexDescriptor getDescriptor() + public IndexDescriptor getDescriptor() { return luceneIndex.getDescriptor(); } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/SchemaIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/SchemaIndex.java index 818b813a722e7..902d3620a9408 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/SchemaIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/SchemaIndex.java @@ -27,7 +27,7 @@ import org.neo4j.kernel.api.impl.schema.verification.UniquenessVerifier; import org.neo4j.kernel.api.impl.schema.writer.LuceneIndexWriter; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.Value; @@ -40,7 +40,7 @@ public interface SchemaIndex extends DatabaseIndex IndexReader getIndexReader() throws IOException; - PendingIndexDescriptor getDescriptor(); + IndexDescriptor getDescriptor(); /** * Verifies uniqueness of property values present in this index. diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/WritableDatabaseSchemaIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/WritableDatabaseSchemaIndex.java index b65a835b293ad..2cc307121dd47 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/WritableDatabaseSchemaIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/WritableDatabaseSchemaIndex.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; import org.neo4j.kernel.api.impl.schema.writer.LuceneIndexWriter; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.Value; @@ -40,7 +40,7 @@ public class WritableDatabaseSchemaIndex extends WritableAbstractDatabaseIndex implements SchemaIndex { - public WritableDatabaseSchemaIndex( PartitionedIndexStorage storage, PendingIndexDescriptor descriptor, + public WritableDatabaseSchemaIndex( PartitionedIndexStorage storage, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, WritableIndexPartitionFactory writableIndexPartitionFactory ) { super( new LuceneSchemaIndex( storage, descriptor, samplingConfig, writableIndexPartitionFactory ) ); @@ -59,7 +59,7 @@ public IndexReader getIndexReader() throws IOException } @Override - public PendingIndexDescriptor getDescriptor() + public IndexDescriptor getDescriptor() { return luceneIndex.getDescriptor(); } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/UniqueLuceneIndexPopulator.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/UniqueLuceneIndexPopulator.java index b1e53b03dfee3..92366aad95f55 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/UniqueLuceneIndexPopulator.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/UniqueLuceneIndexPopulator.java @@ -26,7 +26,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.UniqueIndexSampler; import org.neo4j.storageengine.api.schema.IndexSample; @@ -41,7 +41,7 @@ public class UniqueLuceneIndexPopulator extends LuceneIndexPopulator private final int[] propertyKeyIds; private final UniqueIndexSampler sampler; - public UniqueLuceneIndexPopulator( SchemaIndex index, PendingIndexDescriptor descriptor ) + public UniqueLuceneIndexPopulator( SchemaIndex index, IndexDescriptor descriptor ) { super( index ); this.propertyKeyIds = descriptor.schema().getPropertyIds(); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReader.java index 8bb7a9bc2606d..e814be6fe68dd 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReader.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; import org.neo4j.kernel.api.impl.index.sampler.AggregatingIndexSampler; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.schema.BridgingIndexProgressor; import org.neo4j.storageengine.api.schema.AbstractIndexReader; @@ -54,7 +54,7 @@ public class PartitionedIndexReader extends AbstractIndexReader private final List indexReaders; public PartitionedIndexReader( List partitionSearchers, - PendingIndexDescriptor descriptor, + IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, TaskCoordinator taskCoordinator ) { @@ -64,7 +64,7 @@ public PartitionedIndexReader( List partitionSearchers, .collect( Collectors.toList() ) ); } - PartitionedIndexReader( PendingIndexDescriptor descriptor, List readers ) + PartitionedIndexReader( IndexDescriptor descriptor, List readers ) { super( descriptor ); this.indexReaders = readers; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReader.java index f93c58d22a9bc..48cf67831f8fc 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReader.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure; import org.neo4j.kernel.api.impl.schema.sampler.NonUniqueLuceneIndexSampler; import org.neo4j.kernel.api.impl.schema.sampler.UniqueLuceneIndexSampler; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.AbstractIndexReader; import org.neo4j.storageengine.api.schema.IndexProgressor; @@ -51,7 +51,7 @@ import static java.lang.String.format; import static org.neo4j.internal.kernel.api.IndexQuery.IndexQueryType.exact; import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.NODE_ID_KEY; -import static org.neo4j.kernel.api.schema.index.PendingIndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; /** * Schema index reader that is able to read/sample a single partition of a partitioned Lucene index. @@ -61,12 +61,12 @@ public class SimpleIndexReader extends AbstractIndexReader { private final PartitionSearcher partitionSearcher; - private final PendingIndexDescriptor descriptor; + private final IndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final TaskCoordinator taskCoordinator; public SimpleIndexReader( PartitionSearcher partitionSearcher, - PendingIndexDescriptor descriptor, + IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, TaskCoordinator taskCoordinator ) { diff --git a/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java b/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java index f3db58270c908..d7c5fd3876047 100644 --- a/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.store.DefaultIndexReference; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; @@ -82,7 +82,7 @@ public void shouldNotAllowConcurrentViolationOfConstraint() throws Exception KernelTransaction ktx = ktxSupplier.get(); int labelId = ktx.tokenRead().nodeLabel( label.name() ); int propertyKeyId = ktx.tokenRead().propertyKey( propertyKey ); - PendingIndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ); + IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ); Read read = ktx.dataRead(); try ( NodeValueIndexCursor cursor = ktx.cursors().allocateNodeValueIndexCursor() ) { diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java index 7448264553c90..c14d97528ddde 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -64,7 +64,7 @@ public class LuceneSchemaIndexPopulationIT public final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); private final int affectedNodes; - private final PendingIndexDescriptor descriptor = IndexDescriptorFactory.uniqueForLabel( 0, 0 ); + private final IndexDescriptor descriptor = IndexDescriptorFactory.uniqueForLabel( 0, 0 ); @Before public void before() diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java index 3d4b676bee2f6..9cabb27a26cb2 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java @@ -47,7 +47,7 @@ import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexBuilder; import org.neo4j.kernel.api.impl.schema.SchemaIndex; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.test.rule.TestDirectory; @@ -65,7 +65,7 @@ public class LuceneSchemaIndexUniquenessVerificationIT { private static final int DOCS_PER_PARTITION = ThreadLocalRandom.current().nextInt( 10, 100 ); private static final int PROPERTY_KEY_ID = 42; - private static final PendingIndexDescriptor descriptor = IndexDescriptorFactory + private static final IndexDescriptor descriptor = IndexDescriptorFactory .uniqueForLabel( 0, PROPERTY_KEY_ID ); @Rule diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AccessUniqueDatabaseIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AccessUniqueDatabaseIndexTest.java index 6343362d39ad5..619b781446bb8 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AccessUniqueDatabaseIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AccessUniqueDatabaseIndexTest.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexQueryHelper; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -53,7 +53,7 @@ public class AccessUniqueDatabaseIndexTest public final EphemeralFileSystemRule fileSystemRule = new EphemeralFileSystemRule(); private final DirectoryFactory directoryFactory = new DirectoryFactory.InMemoryDirectoryFactory(); private final File storeDirectory = new File( "db" ); - private final PendingIndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 1000, 100 ); + private final IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 1000, 100 ); @Test public void shouldAddUniqueEntries() throws Exception diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseCompositeIndexAccessorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseCompositeIndexAccessorTest.java index 82dc04f47f999..806aa11b3f056 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseCompositeIndexAccessorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseCompositeIndexAccessorTest.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.api.index.IndexQueryHelper; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -68,7 +68,7 @@ public class DatabaseCompositeIndexAccessorTest { private static final int PROP_ID1 = 1; private static final int PROP_ID2 = 2; - private static final PendingIndexDescriptor + private static final IndexDescriptor DESCRIPTOR = IndexDescriptorFactory.forLabel( 0, PROP_ID1, PROP_ID2 ); private static final Config config = Config.defaults(); @Rule @@ -85,9 +85,9 @@ public class DatabaseCompositeIndexAccessorTest private final Object[] values = {"value1", "values2"}; private final Object[] values2 = {40, 42}; private DirectoryFactory.InMemoryDirectoryFactory dirFactory; - private static final PendingIndexDescriptor SCHEMA_INDEX_DESCRIPTOR = IndexDescriptorFactory + private static final IndexDescriptor SCHEMA_INDEX_DESCRIPTOR = IndexDescriptorFactory .forLabel( 0, PROP_ID1, PROP_ID2 ); - private static final PendingIndexDescriptor UNIQUE_SCHEMA_INDEX_DESCRIPTOR = IndexDescriptorFactory + private static final IndexDescriptor UNIQUE_SCHEMA_INDEX_DESCRIPTOR = IndexDescriptorFactory .uniqueForLabel( 1, PROP_ID1, PROP_ID2 ); @Parameterized.Parameters( name = "{0}" ) diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java index 5af654cf1c12c..8e7aa8340a852 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.api.index.IndexQueryHelper; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -76,7 +76,7 @@ public class DatabaseIndexAccessorTest public static final EphemeralFileSystemRule fileSystemRule = new EphemeralFileSystemRule(); @Parameterized.Parameter( 0 ) - public PendingIndexDescriptor index; + public IndexDescriptor index; @Parameterized.Parameter( 1 ) public IOFunction accessorFactory; @@ -86,8 +86,8 @@ public class DatabaseIndexAccessorTest private final Object value = "value"; private final Object value2 = 40; private DirectoryFactory.InMemoryDirectoryFactory dirFactory; - private static final PendingIndexDescriptor GENERAL_INDEX = IndexDescriptorFactory.forLabel( 0, PROP_ID ); - private static final PendingIndexDescriptor UNIQUE_INDEX = IndexDescriptorFactory.uniqueForLabel( 1, PROP_ID ); + private static final IndexDescriptor GENERAL_INDEX = IndexDescriptorFactory.forLabel( 0, PROP_ID ); + private static final IndexDescriptor UNIQUE_INDEX = IndexDescriptorFactory.uniqueForLabel( 1, PROP_ID ); private static final Config CONFIG = Config.defaults(); @Parameterized.Parameters( name = "{0}" ) @@ -123,7 +123,7 @@ public static Collection implementations() } private static Object[] arg( - PendingIndexDescriptor index, + IndexDescriptor index, IOFunction foo ) { return new Object[]{index, foo}; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java index cb387acf7c6da..0ef3b96d6ba82 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java @@ -25,7 +25,7 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -37,7 +37,7 @@ public class LuceneIndexAccessorTest @Mock private SchemaIndex schemaIndex; @Mock - private PendingIndexDescriptor schemaIndexDescriptor; + private IndexDescriptor schemaIndexDescriptor; private LuceneIndexAccessor accessor; @Before diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilderTest.java index 7dcf71886a3c8..6ed422a70b4e1 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilderTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; @@ -41,7 +41,7 @@ public class LuceneSchemaIndexBuilderTest @Rule public final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); - private final PendingIndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 0 ); + private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 0 ); @Test public void readOnlyIndexCreation() throws Exception diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java index db0221106291c..7e0e450294edf 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.api.impl.index.LuceneAllDocumentsReader; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -66,7 +66,7 @@ public class LuceneSchemaIndexIT @Rule public final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); - private final PendingIndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 0 ); + private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 0 ); private final Config config = Config.defaults(); @Before diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java index bd63cf815a91e..d3430aea2b93f 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java @@ -32,7 +32,7 @@ import org.neo4j.io.IOUtils; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.test.rule.TestDirectory; @@ -49,7 +49,7 @@ public class LuceneSchemaIndexTest private final DirectoryFactory dirFactory = new DirectoryFactory.InMemoryDirectoryFactory(); private SchemaIndex index; - private final PendingIndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 3, 5 ); + private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 3, 5 ); @After public void closeIndex() throws Exception diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueDatabaseIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueDatabaseIndexPopulatorTest.java index 81c6c80340f70..d6d8dbd4c124e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueDatabaseIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueDatabaseIndexPopulatorTest.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.impl.schema.SchemaIndex; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -72,7 +72,7 @@ public void setUp() File folder = testDir.directory( "folder" ); PartitionedIndexStorage indexStorage = new PartitionedIndexStorage( dirFactory, fileSystemRule.get(), folder ); - PendingIndexDescriptor descriptor = IndexDescriptorFactory.forSchema( labelSchemaDescriptor ); + IndexDescriptor descriptor = IndexDescriptorFactory.forSchema( labelSchemaDescriptor ); index = LuceneSchemaIndexBuilder.create( descriptor, Config.defaults() ) .withIndexStorage( indexStorage ) .build(); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java index 50886596bb04f..3ba07425bc905 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.storageengine.api.schema.IndexReader; @@ -85,7 +85,7 @@ public class UniqueDatabaseIndexPopulatorTest private static final int PROPERTY_KEY_ID = 2; private final DirectoryFactory directoryFactory = new DirectoryFactory.InMemoryDirectoryFactory(); - private static final PendingIndexDescriptor descriptor = IndexDescriptorFactory + private static final IndexDescriptor descriptor = IndexDescriptorFactory .forLabel( LABEL_ID, PROPERTY_KEY_ID ); private final PropertyAccessor propertyAccessor = mock( PropertyAccessor.class ); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReaderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReaderTest.java index 580e9010ae3fa..c22ce39050dd6 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReaderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReaderTest.java @@ -35,7 +35,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexSample; @@ -51,7 +51,7 @@ public class PartitionedIndexReaderTest { - private PendingIndexDescriptor schemaIndexDescriptor = IndexDescriptorFactory.forLabel( 0, 1 ); + private IndexDescriptor schemaIndexDescriptor = IndexDescriptorFactory.forLabel( 0, 1 ); @Mock private IndexSamplingConfig samplingConfig; @Mock diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/MultipleOpenCursorsTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/MultipleOpenCursorsTest.java index 9466a63f29901..b8f17d0fb24a3 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/MultipleOpenCursorsTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/MultipleOpenCursorsTest.java @@ -49,7 +49,7 @@ import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; @@ -433,7 +433,7 @@ private static class StringCompositeIndexCoordinator extends IndexCoordinator } @Override - protected PendingIndexDescriptor extractIndexDescriptor() + protected IndexDescriptor extractIndexDescriptor() { return IndexDescriptorFactory.forLabel( indexedLabelId, stringPropId1, stringPropId2 ); } @@ -498,7 +498,7 @@ private static class NumberCompositeIndexCoordinator extends IndexCoordinator } @Override - protected PendingIndexDescriptor extractIndexDescriptor() + protected IndexDescriptor extractIndexDescriptor() { return IndexDescriptorFactory.forLabel( indexedLabelId, numberPropId1, numberPropId2 ); } @@ -562,7 +562,7 @@ private static class StringIndexCoordinator extends IndexCoordinator } @Override - protected PendingIndexDescriptor extractIndexDescriptor() + protected IndexDescriptor extractIndexDescriptor() { return IndexDescriptorFactory.forLabel( indexedLabelId, stringPropId1 ); } @@ -633,7 +633,7 @@ private static class NumberIndexCoordinator extends IndexCoordinator } @Override - protected PendingIndexDescriptor extractIndexDescriptor() + protected IndexDescriptor extractIndexDescriptor() { return IndexDescriptorFactory.forLabel( indexedLabelId, numberPropId1 ); } @@ -715,7 +715,7 @@ private abstract static class IndexCoordinator int numberPropId2; int stringPropId1; int stringPropId2; - PendingIndexDescriptor indexDescriptor; + IndexDescriptor indexDescriptor; IndexCoordinator( Label indexLabel, String numberProp1, String numberProp2, String stringProp1, String stringProp2 ) @@ -774,7 +774,7 @@ void init( DatabaseRule db ) indexDescriptor = extractIndexDescriptor(); } - protected abstract PendingIndexDescriptor extractIndexDescriptor(); + protected abstract IndexDescriptor extractIndexDescriptor(); void createIndex( DatabaseRule db ) { @@ -822,7 +822,7 @@ void assertSameContent( List actual, List expected ) abstract void doCreateIndex( DatabaseRule db ); - NodeValueIndexCursor indexQuery( KernelTransaction ktx, PendingIndexDescriptor indexDescriptor, + NodeValueIndexCursor indexQuery( KernelTransaction ktx, IndexDescriptor indexDescriptor, IndexQuery... indexQueries ) throws KernelException diff --git a/community/neo4j/src/test/java/migration/StartOldDbOn3_4AndCreateFusionIndexIT.java b/community/neo4j/src/test/java/migration/StartOldDbOn3_4AndCreateFusionIndexIT.java index 975ff01082ad3..b79ca9ceb1775 100644 --- a/community/neo4j/src/test/java/migration/StartOldDbOn3_4AndCreateFusionIndexIT.java +++ b/community/neo4j/src/test/java/migration/StartOldDbOn3_4AndCreateFusionIndexIT.java @@ -53,7 +53,7 @@ import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory20; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; @@ -433,7 +433,7 @@ private boolean hasIndex( GraphDatabaseService db, Label label, String... keys ) private class IndexRecoveryTracker extends IndexingService.MonitorAdapter { - Map initialStateMap = new HashMap<>(); + Map initialStateMap = new HashMap<>(); @Override public void initialState( StoreIndexDescriptor descriptor, InternalIndexState state ) diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/HaCountsIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/HaCountsIT.java index 7c6bc1034a35b..18dc09faec89a 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/HaCountsIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/HaCountsIT.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.store.DefaultIndexReference; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; @@ -135,7 +135,7 @@ public void shouldUpdateCountsOnSlavesWhenCreatingAnIndexOnMaster() throws Excep { // when creating a node on the master createANode( master, LABEL, PROPERTY_VALUE, PROPERTY_NAME ); - PendingIndexDescriptor schemaIndexDescriptor = createAnIndex( master, LABEL, PROPERTY_NAME ); + IndexDescriptor schemaIndexDescriptor = createAnIndex( master, LABEL, PROPERTY_NAME ); long indexId = awaitOnline( master, schemaIndexDescriptor ); // and the slaves got the updates @@ -155,7 +155,7 @@ public void shouldUpdateCountsOnClusterWhenCreatingANodeOnSlaveAndAnIndexOnMaste { // when creating a node on the master createANode( slave1, LABEL, PROPERTY_VALUE, PROPERTY_NAME ); - PendingIndexDescriptor schemaIndexDescriptor = createAnIndex( master, LABEL, PROPERTY_NAME ); + IndexDescriptor schemaIndexDescriptor = createAnIndex( master, LABEL, PROPERTY_NAME ); long indexId = awaitOnline( master, schemaIndexDescriptor ); // and the updates are propagate in the cluster @@ -180,7 +180,7 @@ private void createANode( HighlyAvailableGraphDatabase db, Label label, String v } } - private PendingIndexDescriptor createAnIndex( HighlyAvailableGraphDatabase db, Label label, String propertyName ) + private IndexDescriptor createAnIndex( HighlyAvailableGraphDatabase db, Label label, String propertyName ) throws KernelException { try ( Transaction tx = db.beginTx() ) @@ -250,7 +250,7 @@ private IndexingService indexingService( HighlyAvailableGraphDatabase db ) return db.getDependencyResolver().resolveDependency( IndexingService.class ); } - private long awaitOnline( HighlyAvailableGraphDatabase db, PendingIndexDescriptor index ) + private long awaitOnline( HighlyAvailableGraphDatabase db, IndexDescriptor index ) throws KernelException { long start = System.currentTimeMillis(); diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java index 121819774bbb6..7f16f91dfc2d0 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java @@ -47,7 +47,7 @@ import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; @@ -70,7 +70,7 @@ public class UniquenessConstraintCreationIT extends AbstractConstraintCreationIT { private static final String DUPLICATED_VALUE = "apa"; - private PendingIndexDescriptor uniqueIndex; + private IndexDescriptor uniqueIndex; @Override int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException diff --git a/integrationtests/src/test/java/org/neo4j/consistency/HalfCreatedConstraintIT.java b/integrationtests/src/test/java/org/neo4j/consistency/HalfCreatedConstraintIT.java index 3a0dcbf3dd3be..a83ee29209efc 100644 --- a/integrationtests/src/test/java/org/neo4j/consistency/HalfCreatedConstraintIT.java +++ b/integrationtests/src/test/java/org/neo4j/consistency/HalfCreatedConstraintIT.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; @@ -100,7 +100,7 @@ private void addIndex( GraphDatabaseService database ) ((GraphDatabaseAPI) database).getDependencyResolver().provideDependency( ThreadToStatementContextBridge.class ).get(); KernelTransaction kernelTransaction = statementBridge.getKernelTransactionBoundToThisThread( true ); LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( 0, 0 ); - PendingIndexDescriptor index = IndexDescriptorFactory.uniqueForSchema( descriptor ); + IndexDescriptor index = IndexDescriptorFactory.uniqueForSchema( descriptor ); ((KernelTransactionImplementation) kernelTransaction).txState().indexRuleDoAdd( index ); transaction.success(); } diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java index 680cc71ac5f38..4bdfa6d14396f 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java @@ -36,7 +36,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.api.StatementConstants; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.CountsVisitor; import org.neo4j.kernel.impl.core.RelationshipTypeToken; @@ -123,12 +123,12 @@ public static void dumpCountsStore( FileSystemAbstraction fs, File path, PrintSt } private final PrintStream out; - private final Map indexes; + private final Map indexes; private final List labels; private final List relationshipTypes; private final List propertyKeys; - private DumpCountsStore( PrintStream out, Map indexes, List labels, + private DumpCountsStore( PrintStream out, Map indexes, List labels, List relationshipTypes, List propertyKeys ) { @@ -168,7 +168,7 @@ public void visitRelationshipCount( int startLabelId, int typeId, int endLabelId @Override public void visitIndexStatistics( long indexId, long updates, long size ) { - PendingIndexDescriptor index = indexes.get( indexId ); + IndexDescriptor index = indexes.get( indexId ); out.printf( "\tIndexStatistics[(%s {%s})]:\tupdates=%d, size=%d%n", label( index.schema().keyId() ), propertyKeys( index.schema().getPropertyIds() ), updates, size ); } @@ -176,7 +176,7 @@ public void visitIndexStatistics( long indexId, long updates, long size ) @Override public void visitIndexSample( long indexId, long unique, long size ) { - PendingIndexDescriptor index = indexes.get( indexId ); + IndexDescriptor index = indexes.get( indexId ); out.printf( "\tIndexSample[(%s {%s})]:\tunique=%d, size=%d%n", label( index.schema().keyId() ), propertyKeys( index.schema().getPropertyIds() ), unique, size ); } @@ -258,9 +258,9 @@ private static List allTokensFrom( TokenStore getAllIndexesFrom( SchemaStorage storage ) + private static Map getAllIndexesFrom( SchemaStorage storage ) { - HashMap indexes = new HashMap<>(); + HashMap indexes = new HashMap<>(); Iterator indexRules = storage.indexesGetAll(); while ( indexRules.hasNext() ) { diff --git a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java index 1b83eeb9096c5..d3f33186ff8bb 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java @@ -32,7 +32,7 @@ import java.util.List; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.core.RelationshipTypeToken; import org.neo4j.kernel.impl.store.LabelTokenStore; @@ -73,7 +73,7 @@ public class DumpCountsStoreTest private static final String INDEX_PROPERTY = "indexProperty"; private static final long indexId = 0; - private static final PendingIndexDescriptor descriptor = + private static final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( INDEX_LABEL_ID, INDEX_PROPERTY_KEY_ID ); @Rule