diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java index 6493ae99be8af..95ab760b557df 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java @@ -21,7 +21,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.IndexRule; @@ -52,20 +52,20 @@ public static ConstraintRule relPropertyExistenceConstraintRule( long ruleId, in public static IndexRule indexRule( long ruleId, int labelId, int propertyId, IndexProvider.Descriptor descriptor ) { - return IndexRule.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor ); + return IndexRule.indexRule( ruleId, SchemaIndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor ); } public static IndexRule constraintIndexRule( long ruleId, int labelId, int propertyId, IndexProvider.Descriptor descriptor, long constraintId ) { - return IndexRule.constraintIndexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), + return IndexRule.constraintIndexRule( ruleId, SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), descriptor, constraintId ); } public static IndexRule constraintIndexRule( long ruleId, int labelId, int propertyId, IndexProvider.Descriptor descriptor ) { - return IndexRule.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), + return IndexRule.indexRule( ruleId, SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), descriptor ); } } diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java index 16d252472397a..f4d73123c30e2 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java @@ -75,7 +75,7 @@ import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.impl.api.KernelStatement; @@ -135,8 +135,8 @@ import static org.neo4j.kernel.api.ReadOperations.ANY_LABEL; import static org.neo4j.kernel.api.ReadOperations.ANY_RELATIONSHIP_TYPE; import static org.neo4j.kernel.api.labelscan.NodeLabelUpdate.labelChanges; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.uniqueForLabel; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.forLabel; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.uniqueForLabel; import static org.neo4j.kernel.impl.store.AbstractDynamicStore.readFullByteArrayFromHeavyRecords; import static org.neo4j.kernel.impl.store.DynamicArrayStore.allocateFromNumbers; import static org.neo4j.kernel.impl.store.DynamicArrayStore.getRightArray; @@ -568,7 +568,7 @@ public void shouldReportNodesThatAreNotIndexed() throws Exception while ( indexRuleIterator.hasNext() ) { IndexRule indexRule = indexRuleIterator.next(); - IndexDescriptor descriptor = indexRule.getIndexDescriptor(); + SchemaIndexDescriptor descriptor = indexRule.getIndexDescriptor(); IndexAccessor accessor = fixture.directStoreAccess().indexes(). apply( indexRule.getProviderDescriptor() ).getOnlineAccessor( indexRule.getId(), descriptor, samplingConfig ); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java index 641cc7c685891..53b877855bd24 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java @@ -55,7 +55,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.NodeLabelRange; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.IndexRule; @@ -389,7 +389,7 @@ private Object parameter( Class type ) } if ( type == IndexRule.class ) { - return IndexRule.indexRule( 1, IndexDescriptorFactory.forLabel( 2, 3 ), + return IndexRule.indexRule( 1, SchemaIndexDescriptorFactory.forLabel( 2, 3 ), new IndexProvider.Descriptor( "provider", "version" ) ); } if ( type == SchemaRule.class ) 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 9a88b3f9c04e7..60b17f353aa89 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,11 +21,11 @@ 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, IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptorFactory, SchemaIndexDescriptor => KernelIndexDescriptor} trait SchemaDescriptorTranslation { implicit def cypherToKernel(index: SchemaTypes.IndexDescriptor): KernelIndexDescriptor = - IndexDescriptorFactory.forLabel(index.labelId, index.propertyId) + SchemaIndexDescriptorFactory.forLabel(index.labelId, index.propertyId) implicit def kernelToCypher(index: KernelIndexDescriptor): SchemaTypes.IndexDescriptor = if (index.schema().getPropertyIds.length == 1) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundGraphStatistics.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundGraphStatistics.scala index 704c6fe25a1c8..864b9c1cd3706 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundGraphStatistics.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundGraphStatistics.scala @@ -24,7 +24,7 @@ import org.neo4j.cypher.internal.compiler.v2_3.spi.{GraphStatistics, StatisticsC import org.neo4j.cypher.internal.frontend.v2_3.{LabelId, NameId, PropertyKeyId, RelTypeId} import org.neo4j.kernel.api.ReadOperations import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory object TransactionBoundGraphStatistics { def apply(ops: ReadOperations) = new StatisticsCompletingGraphStatistics(new BaseTransactionBoundGraphStatistics(ops)) @@ -35,7 +35,7 @@ object TransactionBoundGraphStatistics { def indexSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] = try { - val indexDescriptor = IndexDescriptorFactory.forLabel( label, property ) + val indexDescriptor = SchemaIndexDescriptorFactory.forLabel( label, property ) val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble // Probability of any node with the given label, to have a property with a given value @@ -51,7 +51,7 @@ object TransactionBoundGraphStatistics { def indexPropertyExistsSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] = try { - val indexDescriptor = IndexDescriptorFactory.forLabel( label, property ) + val indexDescriptor = SchemaIndexDescriptorFactory.forLabel( label, property ) val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble // Probability of any node with the given label, to have a given property 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 a6aca9d738636..21f6927f43fce 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.InternalIndexState import org.neo4j.internal.kernel.api.exceptions.KernelException import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor -import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptor => 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/v2_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala index 5bad35befa08c..c9f629b557ffe 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala @@ -47,7 +47,7 @@ import org.neo4j.kernel.GraphDatabaseQueryService import org.neo4j.kernel.api.exceptions.schema.{AlreadyConstrainedException, AlreadyIndexedException} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory import org.neo4j.kernel.api.{SilentTokenNameLookup, StatementConstants} import org.neo4j.kernel.impl.core.EmbeddedProxySPI import org.neo4j.values.storable.Values @@ -480,7 +480,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) } def dropIndexRule(labelId: Int, propertyKeyId: Int) = - tc.statement.schemaWriteOperations().indexDrop(IndexDescriptorFactory.forLabel( labelId, propertyKeyId )) + tc.statement.schemaWriteOperations().indexDrop(SchemaIndexDescriptorFactory.forLabel( labelId, propertyKeyId )) def createUniqueConstraint(labelId: Int, propertyKeyId: Int): IdempotentResult[SchemaTypes.UniquenessConstraint] = try { IdempotentResult( 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 02dccaa126bc1..080ad021cdd71 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,11 +22,11 @@ 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, IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptorFactory, SchemaIndexDescriptor => KernelIndexDescriptor} trait SchemaDescriptorTranslation { implicit def toKernel(index: SchemaTypes.IndexDescriptor): KernelIndexDescriptor = - IndexDescriptorFactory.forLabel(index.labelId, index.propertyId) + SchemaIndexDescriptorFactory.forLabel(index.labelId, index.propertyId) implicit def toCypher(index: KernelIndexDescriptor): SchemaTypes.IndexDescriptor = { assertSingleProperty(index.schema()) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundGraphStatistics.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundGraphStatistics.scala index 04bbea446e015..61b38c22ece91 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundGraphStatistics.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundGraphStatistics.scala @@ -24,7 +24,7 @@ import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, StatisticsC import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, NameId, PropertyKeyId, RelTypeId} import org.neo4j.kernel.api.ReadOperations import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory object TransactionBoundGraphStatistics { def apply(ops: ReadOperations) = new StatisticsCompletingGraphStatistics(new BaseTransactionBoundGraphStatistics(ops)) @@ -35,7 +35,7 @@ object TransactionBoundGraphStatistics { def indexSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] = try { - val indexDescriptor = IndexDescriptorFactory.forLabel( label, property ) + val indexDescriptor = SchemaIndexDescriptorFactory.forLabel( label, property ) val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble // Probability of any node with the given label, to have a property with a given value @@ -51,7 +51,7 @@ object TransactionBoundGraphStatistics { def indexPropertyExistsSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] = try { - val indexDescriptor = IndexDescriptorFactory.forLabel( label, property ) + val indexDescriptor = SchemaIndexDescriptorFactory.forLabel( label, property ) val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble // Probability of any node with the given label, to have a given property 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 0e4c5572d1c60..e65085b851bb8 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 @@ -37,7 +37,7 @@ import org.neo4j.internal.kernel.api.procs.{DefaultParameterValue, Neo4jTypes} import org.neo4j.internal.kernel.api.{InternalIndexState, procs} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor -import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptor => 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_1/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala index ce897a3d53e24..0105162779f60 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala @@ -53,7 +53,7 @@ import org.neo4j.kernel.api.dbms.DbmsOperations import org.neo4j.kernel.api.exceptions.schema.{AlreadyConstrainedException, AlreadyIndexedException} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory import org.neo4j.kernel.impl.core.EmbeddedProxySPI import org.neo4j.kernel.impl.locking.ResourceTypes import org.neo4j.kernel.impl.util.ValueUtils @@ -490,7 +490,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) } override def dropIndexRule(labelId: Int, propertyKeyId: Int) = - txContext.statement.schemaWriteOperations().indexDrop(IndexDescriptorFactory.forLabel( labelId, propertyKeyId )) + txContext.statement.schemaWriteOperations().indexDrop(SchemaIndexDescriptorFactory.forLabel( labelId, propertyKeyId )) override def createUniqueConstraint(labelId: Int, propertyKeyId: Int): IdempotentResult[UniquenessConstraint] = try { IdempotentResult( diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/codegen/GeneratedMethodStructure.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/codegen/GeneratedMethodStructure.scala index b5d18c92497c3..1b61c54c28236 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/codegen/GeneratedMethodStructure.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/codegen/GeneratedMethodStructure.scala @@ -36,7 +36,7 @@ import org.neo4j.cypher.internal.frontend.v3_1.{ParameterNotFoundException, Sema import org.neo4j.cypher.internal.spi.v3_1.codegen.Methods._ import org.neo4j.cypher.internal.spi.v3_1.codegen.Templates.{createNewInstance, handleKernelExceptions, newRelationshipDataExtractor, tryCatch} import org.neo4j.graphdb.Direction -import org.neo4j.kernel.api.schema.index.{IndexDescriptor, IndexDescriptorFactory} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptor, SchemaIndexDescriptorFactory} import org.neo4j.kernel.impl.api.RelationshipDataExtractor import org.neo4j.kernel.impl.api.store.RelationshipIterator @@ -750,9 +750,9 @@ case class GeneratedMethodStructure(fields: Fields, generator: CodeBlock, aux: A generator.assign(typeRef[Int], propIdVar, invoke(readOperations, propertyKeyGetForName, constant(propName))) override def newIndexDescriptor(descriptorVar: String, labelVar: String, propKeyVar: String) = { - val getIndexDescriptor = method[IndexDescriptorFactory, IndexDescriptor]("forLabel", typeRef[Int], typeRef[Array[Int]]) + val getIndexDescriptor = method[SchemaIndexDescriptorFactory, SchemaIndexDescriptor]("forLabel", typeRef[Int], typeRef[Array[Int]]) val propertyIdsExpr = Expression.newArray(typeRef[Int], generator.load(propKeyVar)) - generator.assign(typeRef[IndexDescriptor], descriptorVar, + generator.assign(typeRef[SchemaIndexDescriptor], descriptorVar, invoke(getIndexDescriptor, generator.load(labelVar), propertyIdsExpr)) } diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/codegen/Methods.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/codegen/Methods.scala index 8c19792aaef54..375722f69b86b 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/codegen/Methods.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/codegen/Methods.scala @@ -30,7 +30,7 @@ import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultRow, InternalR import org.neo4j.graphdb.Direction import org.neo4j.helpers.collection.MapUtil import org.neo4j.kernel.api.ReadOperations -import org.neo4j.kernel.api.schema.index.IndexDescriptor +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor import org.neo4j.kernel.impl.api.store.RelationshipIterator import org.neo4j.kernel.impl.api.{RelationshipDataExtractor, RelationshipVisitor} import org.neo4j.kernel.impl.core.{EmbeddedProxySPI, NodeProxy, RelationshipProxy} @@ -81,8 +81,8 @@ object Methods { val nodeExists = method[ReadOperations, Boolean]("nodeExists", typeRef[Long]) val nodesGetAll = method[ReadOperations, PrimitiveLongIterator]("nodesGetAll") val nodeGetProperty = method[ReadOperations, Value]("nodeGetProperty", typeRef[Long], typeRef[Int]) - val nodesGetFromIndexLookup = method[ReadOperations, PrimitiveLongIterator]("nodesGetFromIndexSeek", typeRef[IndexDescriptor], typeRef[Object]) - val nodeGetUniqueFromIndexLookup = method[ReadOperations, Long]("nodeGetFromUniqueIndexSeek", typeRef[IndexDescriptor], typeRef[Object]) + val nodesGetFromIndexLookup = method[ReadOperations, PrimitiveLongIterator]("nodesGetFromIndexSeek", typeRef[SchemaIndexDescriptor], typeRef[Object]) + val nodeGetUniqueFromIndexLookup = method[ReadOperations, Long]("nodeGetFromUniqueIndexSeek", typeRef[SchemaIndexDescriptor], typeRef[Object]) val relationshipGetProperty = method[ReadOperations, Value]("relationshipGetProperty", typeRef[Long], typeRef[Int]) val nodesGetForLabel = method[ReadOperations, PrimitiveLongIterator]("nodesGetForLabel", typeRef[Int]) val nodeHasLabel = method[ReadOperations, Boolean]("nodeHasLabel", typeRef[Long], typeRef[Int]) 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 b40128dfa1824..68951d4b0cf97 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,12 +21,12 @@ 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, IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptorFactory, SchemaIndexDescriptor => KernelIndexDescriptor} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory trait IndexDescriptorCompatibility { def cypherToKernel(index: CypherIndexDescriptor): KernelIndexDescriptor = - IndexDescriptorFactory.forLabel(index.label.id, index.properties.map(_.id):_*) + SchemaIndexDescriptorFactory.forLabel(index.label.id, index.properties.map(_.id):_*) def kernelToCypher(index: KernelIndexDescriptor): CypherIndexDescriptor = CypherIndexDescriptor(index.schema().getLabelId, index.schema().getPropertyIds) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundPlanContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundPlanContext.scala index 254e82e1479ff..154718fb70e30 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundPlanContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundPlanContext.scala @@ -34,7 +34,7 @@ import org.neo4j.internal.kernel.api.procs.{DefaultParameterValue, Neo4jTypes} import org.neo4j.internal.kernel.api.{InternalIndexState, procs} import org.neo4j.kernel.api.ReadOperations import org.neo4j.kernel.api.schema.SchemaDescriptorFactory -import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptor => KernelIndexDescriptor} import org.neo4j.procedure.Mode import scala.collection.JavaConverters._ 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 6e03d9b08174b..5087d8ae2973c 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,11 +22,11 @@ package org.neo4j.cypher.internal.runtime.interpreted import org.neo4j.cypher.internal.planner.v3_4.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, IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptorFactory, SchemaIndexDescriptor => KernelIndexDescriptor} trait IndexDescriptorCompatibility { def cypherToKernel(index: CypherIndexDescriptor): KernelIndexDescriptor = - IndexDescriptorFactory.forLabel(index.label.id, index.properties.map(_.id):_*) + SchemaIndexDescriptorFactory.forLabel(index.label.id, index.properties.map(_.id):_*) def kernelToCypher(index: KernelIndexDescriptor): CypherIndexDescriptor = CypherIndexDescriptor(index.schema().getLabelId, index.schema().getPropertyIds) diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundPlanContext.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundPlanContext.scala index 3775f3030d6bc..33ae60bceff27 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundPlanContext.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundPlanContext.scala @@ -32,7 +32,7 @@ import org.neo4j.internal.kernel.api.procs.Neo4jTypes.AnyType import org.neo4j.internal.kernel.api.procs.{DefaultParameterValue, Neo4jTypes} import org.neo4j.internal.kernel.api.{InternalIndexState, procs} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory -import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.kernel.api.schema.index.{SchemaIndexDescriptor => KernelIndexDescriptor} import org.neo4j.procedure.Mode import scala.collection.JavaConverters._ diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala index 2113ef6c345ce..6a96443a423fd 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala @@ -52,7 +52,7 @@ import org.neo4j.kernel.api._ import org.neo4j.kernel.api.exceptions.schema.{AlreadyConstrainedException, AlreadyIndexedException} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory import org.neo4j.kernel.guard.TerminationGuard import org.neo4j.kernel.impl.api.RelationshipVisitor import org.neo4j.kernel.impl.api.operations.KeyReadOperations @@ -462,7 +462,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona override def lockingUniqueIndexSeek(indexReference: IndexReference, values: Seq[Any]): Option[NodeValue] = { indexSearchMonitor.lockingUniqueIndexSeek(indexReference, values) - val index = IndexDescriptorFactory.uniqueForLabel(indexReference.label, indexReference.properties:_*) + val index = SchemaIndexDescriptorFactory.uniqueForLabel(indexReference.label, indexReference.properties:_*) val predicates = indexReference.properties.zip(values).map(p => IndexQuery.exact(p._1, p._2)) val nodeId = transactionalContext.statement.readOperations().nodeGetFromUniqueIndexSeek(index, predicates:_*) if (StatementConstants.NO_SUCH_NODE == nodeId) None else Some(nodeOps.getById(nodeId)) @@ -1273,4 +1273,4 @@ object TransactionBoundQueryContext { def lockingUniqueIndexSeek(index: IndexReference, values: Seq[Any]): Unit } -} \ No newline at end of file +} diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java index b3793fd4bef18..1eb8eaae979ba 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java @@ -50,7 +50,7 @@ import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; import org.neo4j.kernel.impl.api.store.RelationshipIterator; @@ -127,7 +127,7 @@ public interface ReadOperations * @return ids of the matching nodes * @throws org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException if no such index is found. */ - PrimitiveLongResourceIterator indexQuery( IndexDescriptor index, IndexQuery... predicates ) + PrimitiveLongResourceIterator indexQuery( SchemaIndexDescriptor index, IndexQuery... predicates ) throws IndexNotFoundKernelException, IndexNotApplicableKernelException; /** @@ -157,10 +157,10 @@ RelationshipIterator nodeGetRelationships( long nodeId, Direction direction, int * * @throws org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException if no such index found. */ - long nodeGetFromUniqueIndexSeek( IndexDescriptor index, IndexQuery.ExactPredicate... predicates ) throws IndexNotFoundKernelException, + long nodeGetFromUniqueIndexSeek( SchemaIndexDescriptor index, IndexQuery.ExactPredicate... predicates ) throws IndexNotFoundKernelException, IndexBrokenKernelException, IndexNotApplicableKernelException; - long nodesCountIndexed( IndexDescriptor index, long nodeId, Value value ) + long nodesCountIndexed( SchemaIndexDescriptor index, long nodeId, Value value ) throws IndexNotFoundKernelException, IndexBrokenKernelException; boolean nodeExists( long nodeId ); @@ -227,32 +227,32 @@ void relationshipVisit( long relId, RelationshipVi //=========================================== /** Returns the index rule for the given LabelSchemaDescriptor. */ - IndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) + SchemaIndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) throws SchemaRuleNotFoundException; /** Get all indexes for a label. */ - Iterator indexesGetForLabel( int labelId ); + Iterator indexesGetForLabel( int labelId ); /** Returns all indexes. */ - Iterator indexesGetAll(); + Iterator indexesGetAll(); /** Retrieve the state of an index. */ - InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + InternalIndexState indexGetState( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** Retrieve provider descriptor for an index. */ - IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexProvider.Descriptor indexGetProviderDescriptor( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** Retrieve the population progress of an index. */ - PopulationProgress indexGetPopulationProgress( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + PopulationProgress indexGetPopulationProgress( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** Get the index size. */ - long indexSize( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + long indexSize( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** Calculate the index unique values percentage (range: {@code 0.0} exclusive to {@code 1.0} inclusive). */ - double indexUniqueValuesSelectivity( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + double indexUniqueValuesSelectivity( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** Returns the failure description of a failed index. */ - String indexGetFailure( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + String indexGetFailure( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Get all constraints applicable to label and propertyKey. @@ -277,7 +277,7 @@ IndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) /** * Get the owning constraint for a constraint index. Returns null if the index does not have an owning constraint. */ - Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ); + Long indexGetOwningUniquenessConstraintId( SchemaIndexDescriptor index ); V schemaStateGetOrCreate( K key, Function creator ); @@ -485,10 +485,10 @@ ExplicitIndexHits relationshipExplicitIndexQuery( String indexName, Object query */ long countsForRelationshipWithoutTxState( int startLabelId, int typeId, int endLabelId ); - DoubleLongRegister indexUpdatesAndSize( IndexDescriptor index, DoubleLongRegister target ) + DoubleLongRegister indexUpdatesAndSize( SchemaIndexDescriptor index, DoubleLongRegister target ) throws IndexNotFoundKernelException; - DoubleLongRegister indexSample( IndexDescriptor index, DoubleLongRegister target ) + DoubleLongRegister indexSample( SchemaIndexDescriptor index, DoubleLongRegister target ) throws IndexNotFoundKernelException; //=========================================== diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/SchemaWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/SchemaWriteOperations.java index 67135e663150e..fa70b278d81dc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/SchemaWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/SchemaWriteOperations.java @@ -32,7 +32,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; public interface SchemaWriteOperations { @@ -41,11 +41,11 @@ public interface SchemaWriteOperations * {@code labelId}. * @param schemaDescriptor */ - IndexDescriptor indexCreate( LabelSchemaDescriptor schemaDescriptor ) + SchemaIndexDescriptor indexCreate( LabelSchemaDescriptor schemaDescriptor ) throws AlreadyIndexedException, AlreadyConstrainedException, RepeatedPropertyInCompositeSchemaException; - /** Drops a {@link IndexDescriptor} from the database */ - void indexDrop( IndexDescriptor descriptor ) throws DropIndexFailureException; + /** Drops a {@link SchemaIndexDescriptor} from the database */ + void indexDrop( SchemaIndexDescriptor descriptor ) throws DropIndexFailureException; NodeKeyConstraintDescriptor nodeKeyConstraintCreate( LabelSchemaDescriptor descriptor ) throws CreateConstraintFailureException, AlreadyConstrainedException, AlreadyIndexedException, 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 726ed28c07663..4373b390ea010 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.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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( IndexDescriptor descriptor ) + public RuntimeException notAllowed( SchemaIndexDescriptor 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 b46362081d614..b77fa7cb62401 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.UpdateMode; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexSample; @@ -110,19 +110,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, IndexDescriptor)} also returns {@link InternalIndexState#ONLINE}. + * {@link IndexProvider#getInitialState(long, SchemaIndexDescriptor)} 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, IndexDescriptor)}. + * should be stored and made available for later requests from {@link IndexProvider#getPopulationFailure(long, SchemaIndexDescriptor)}. * @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, IndexDescriptor)}. Called before {@link #close(boolean)} + * {@link IndexProvider#getPopulationFailure(long, SchemaIndexDescriptor)}. 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 5a2dfffad66c5..43c84aa87a86a 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 @@ -26,7 +26,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -42,7 +42,7 @@ * * When an index rule is added, the {@link IndexingService} is notified. It will, in turn, ask * your {@link IndexProvider} for a - * {@link #getPopulator(long, IndexDescriptor, IndexSamplingConfig) batch index writer}. + * {@link #getPopulator(long, SchemaIndexDescriptor, IndexSamplingConfig) batch index writer}. * * A background index job is triggered, and all existing data that applies to the new rule, as well as new data * from the "outside", will be inserted using the writer. You are guaranteed that usage of this writer, @@ -87,7 +87,7 @@ *

Online operation

* * Once the index is online, the database will move to using the - * {@link #getOnlineAccessor(long, IndexDescriptor, IndexSamplingConfig) online accessor} to + * {@link #getOnlineAccessor(long, SchemaIndexDescriptor, IndexSamplingConfig) online accessor} to * write to the index. */ public abstract class IndexProvider extends LifecycleAdapter implements Comparable @@ -99,19 +99,19 @@ public interface Monitor class Adaptor implements Monitor { @Override - public void failedToOpenIndex( long indexId, IndexDescriptor indexDescriptor, String action, Exception cause ) + public void failedToOpenIndex( long indexId, SchemaIndexDescriptor schemaIndexDescriptor, String action, Exception cause ) { // no-op } @Override - public void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Map data ) + public void recoveryCompleted( long indexId, SchemaIndexDescriptor schemaIndexDescriptor, Map data ) { // no-op } } - void failedToOpenIndex( long indexId, IndexDescriptor indexDescriptor, String action, Exception cause ); + void failedToOpenIndex( long indexId, SchemaIndexDescriptor schemaIndexDescriptor, String action, Exception cause ); - void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Map data ); + void recoveryCompleted( long indexId, SchemaIndexDescriptor schemaIndexDescriptor, Map data ); } public static final IndexProvider NO_INDEX_PROVIDER = @@ -121,27 +121,27 @@ public void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Ma private final IndexPopulator singlePopulator = new IndexPopulator.Adapter(); @Override - public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor, + public IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { return singleWriter; } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { return singlePopulator; } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { return InternalIndexState.POPULATING; } @Override - public IndexCapability getCapability( IndexDescriptor indexDescriptor ) + public IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { return IndexCapability.NO_CAPABILITY; } @@ -154,7 +154,7 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio } @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { throw new IllegalStateException(); } @@ -189,13 +189,13 @@ protected IndexProvider( Descriptor descriptor, int priority, /** * Used for initially populating a created index, using batch insertion. */ - public abstract IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, + public abstract IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ); /** * Used for updating an index once initial population has completed. */ - public abstract IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor, + public abstract IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException; /** @@ -203,26 +203,26 @@ public abstract IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor d * * Implementations are expected to persist this failure * @param indexId the id of the index. - * @param descriptor {@link IndexDescriptor} of the index. + * @param descriptor {@link SchemaIndexDescriptor} of the index. * @return failure, in the form of a stack trace, that happened during population. * @throws IllegalStateException If there was no failure during population. */ - public abstract String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException; + public abstract String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException; /** * Called during startup to find out which state an index is in. If {@link InternalIndexState#FAILED} - * is returned then a further call to {@link #getPopulationFailure(long, IndexDescriptor)} is expected and should return + * is returned then a further call to {@link #getPopulationFailure(long, SchemaIndexDescriptor)} is expected and should return * the failure accepted by any call to {@link IndexPopulator#markAsFailed(String)} call at the time * of failure. */ - public abstract InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ); + public abstract InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ); /** - * Return {@link IndexCapability} for this index provider for a given {@link IndexDescriptor}. + * Return {@link IndexCapability} for this index provider for a given {@link SchemaIndexDescriptor}. * - * @param indexDescriptor {@link IndexDescriptor} to get IndexCapability for. + * @param schemaIndexDescriptor {@link SchemaIndexDescriptor} to get IndexCapability for. */ - public abstract IndexCapability getCapability( IndexDescriptor indexDescriptor ); + public abstract IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ); /** * @return a description of this index provider 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 fb15c7c211d0d..f64b3b1938ba2 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 @@ -21,7 +21,7 @@ import java.util.Map; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.logging.Log; import static java.lang.String.format; @@ -36,17 +36,18 @@ public LoggingMonitor( Log log ) } @Override - public void failedToOpenIndex( long indexId, IndexDescriptor indexDescriptor, String action, Exception cause ) + public void failedToOpenIndex( long indexId, SchemaIndexDescriptor schemaIndexDescriptor, String action, Exception cause ) { log.error( "Failed to open index:" + indexId + ". " + action, cause ); } @Override - public void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Map data ) + public void recoveryCompleted( long indexId, SchemaIndexDescriptor schemaIndexDescriptor, Map data ) { StringBuilder builder = new StringBuilder( - "Schema index recovery completed: indexId: " + indexId + " descriptor: " + indexDescriptor.toString() ); + "Schema index recovery completed: indexId: " + indexId + " descriptor: " + schemaIndexDescriptor + .toString() ); data.forEach( ( key, value ) -> builder.append( format( " %s: %s", key, value ) ) ); log.info( builder.toString() ); } 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 d3e39d251a178..06784a2ded283 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,8 +23,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; public abstract class IndexBackedConstraintDescriptor extends ConstraintDescriptor implements LabelSchemaSupplier { @@ -42,9 +42,9 @@ public LabelSchemaDescriptor schema() return schema; } - public IndexDescriptor ownedIndexDescriptor() + public SchemaIndexDescriptor ownedIndexDescriptor() { - return IndexDescriptorFactory.uniqueForSchema( schema ); + return SchemaIndexDescriptorFactory.uniqueForSchema( schema ); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptor.java similarity index 80% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptor.java index c38edac405823..4236814e599b5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptor.java @@ -30,14 +30,14 @@ import org.neo4j.internal.kernel.api.schema.SchemaUtil; import static java.lang.String.format; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Filter.GENERAL; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Filter.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Filter.GENERAL; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.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 IndexDescriptor implements LabelSchemaSupplier +public class SchemaIndexDescriptor implements LabelSchemaSupplier { public enum Type { @@ -45,12 +45,12 @@ public enum Type UNIQUE } - public enum Filter implements Predicate + public enum Filter implements Predicate { GENERAL { @Override - public boolean test( IndexDescriptor index ) + public boolean test( SchemaIndexDescriptor index ) { return index.type == Type.GENERAL; } @@ -58,7 +58,7 @@ public boolean test( IndexDescriptor index ) UNIQUE { @Override - public boolean test( IndexDescriptor index ) + public boolean test( SchemaIndexDescriptor index ) { return index.type == Type.UNIQUE; } @@ -66,7 +66,7 @@ public boolean test( IndexDescriptor index ) ANY { @Override - public boolean test( IndexDescriptor index ) + public boolean test( SchemaIndexDescriptor index ) { return true; } @@ -75,13 +75,13 @@ public boolean test( IndexDescriptor index ) public interface Supplier { - IndexDescriptor getIndexDescriptor(); + SchemaIndexDescriptor getIndexDescriptor(); } private final LabelSchemaDescriptor schema; - private final IndexDescriptor.Type type; + private final SchemaIndexDescriptor.Type type; - public IndexDescriptor( LabelSchemaDescriptor schema, Type type ) + public SchemaIndexDescriptor( LabelSchemaDescriptor schema, Type type ) { this.schema = schema; this.type = type; @@ -126,9 +126,9 @@ public boolean isSame( Supplier supplier ) @Override public boolean equals( Object o ) { - if ( o instanceof IndexDescriptor ) + if ( o instanceof SchemaIndexDescriptor ) { - IndexDescriptor that = (IndexDescriptor)o; + SchemaIndexDescriptor that = (SchemaIndexDescriptor)o; return this.type() == that.type() && this.schema().equals( that.schema() ); } return false; @@ -153,9 +153,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/SchemaIndexDescriptorFactory.java similarity index 64% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptorFactory.java index 2bf130f87c017..24403f465ea24 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/SchemaIndexDescriptorFactory.java @@ -23,32 +23,32 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.GENERAL; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; -public class IndexDescriptorFactory +public class SchemaIndexDescriptorFactory { - private IndexDescriptorFactory() + private SchemaIndexDescriptorFactory() { } - public static IndexDescriptor forLabel( int labelId, int... propertyIds ) + public static SchemaIndexDescriptor forLabel( int labelId, int... propertyIds ) { return forSchema( SchemaDescriptorFactory.forLabel( labelId, propertyIds ) ); } - public static IndexDescriptor uniqueForLabel( int labelId, int... propertyIds ) + public static SchemaIndexDescriptor uniqueForLabel( int labelId, int... propertyIds ) { return uniqueForSchema( SchemaDescriptorFactory.forLabel( labelId, propertyIds ) ); } - public static IndexDescriptor forSchema( LabelSchemaDescriptor schema ) + public static SchemaIndexDescriptor forSchema( LabelSchemaDescriptor schema ) { - return new IndexDescriptor( schema, GENERAL ); + return new SchemaIndexDescriptor( schema, GENERAL ); } - public static IndexDescriptor uniqueForSchema( LabelSchemaDescriptor schema ) + public static SchemaIndexDescriptor uniqueForSchema( LabelSchemaDescriptor schema ) { - return new IndexDescriptor( schema, UNIQUE ); + return new SchemaIndexDescriptor( schema, 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 b134fba712548..d699f7d2e53b7 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.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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( IndexDescriptor descriptor ); + void indexRuleDoAdd( SchemaIndexDescriptor descriptor ); - void indexDoDrop( IndexDescriptor descriptor ); + void indexDoDrop( SchemaIndexDescriptor descriptor ); - boolean indexDoUnRemove( IndexDescriptor constraint ); + boolean indexDoUnRemove( SchemaIndexDescriptor constraint ); void constraintDoAdd( ConstraintDescriptor constraint ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java index 3896416cd1a12..0d01e5c0e1fc7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java @@ -55,7 +55,7 @@ import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.TokenAccess; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -66,7 +66,7 @@ import org.neo4j.values.storable.Values; import static org.neo4j.helpers.collection.Iterators.asList; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; import static org.neo4j.procedure.Mode.READ; import static org.neo4j.procedure.Mode.WRITE; @@ -117,11 +117,11 @@ public Stream listIndexes() throws ProcedureException ReadOperations operations = statement.readOperations(); TokenNameLookup tokens = new SilentTokenNameLookup( tx.tokenRead() ); - List indexes = asList( operations.indexesGetAll() ); + List indexes = asList( operations.indexesGetAll() ); indexes.sort( Comparator.comparing( a -> a.userDescription( tokens ) ) ); ArrayList result = new ArrayList<>(); - for ( IndexDescriptor index : indexes ) + for ( SchemaIndexDescriptor index : indexes ) { try { @@ -591,7 +591,7 @@ private Map indexProviderDescriptorMap( IndexProvider.Descriptor "version", providerDescriptor.getVersion() ); } - private List propertyNames( TokenNameLookup tokens, IndexDescriptor index ) + private List propertyNames( TokenNameLookup tokens, SchemaIndexDescriptor index ) { int[] propertyIds = index.schema().getPropertyIds(); List propertyNames = new ArrayList<>( propertyIds.length ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/IndexProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/IndexProcedures.java index b1b458135162a..ecc0b77c8df7d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/IndexProcedures.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/IndexProcedures.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; @@ -111,7 +111,7 @@ private int[] getPropertyIds( String[] propertyKeyNames ) throws ProcedureExcept return propertyKeyIds; } - private IndexDescriptor getIndex( int labelId, int[] propertyKeyIds, IndexSpecifier index ) throws + private SchemaIndexDescriptor getIndex( int labelId, int[] propertyKeyIds, IndexSpecifier index ) throws ProcedureException { try @@ -125,8 +125,8 @@ private IndexDescriptor getIndex( int labelId, int[] propertyKeyIds, IndexSpecif } } - private void waitUntilOnline( IndexDescriptor index, IndexSpecifier indexDescription, - long timeout, TimeUnit timeoutUnits ) + private void waitUntilOnline( SchemaIndexDescriptor index, IndexSpecifier indexDescription, + long timeout, TimeUnit timeoutUnits ) throws ProcedureException { try @@ -140,7 +140,7 @@ private void waitUntilOnline( IndexDescriptor index, IndexSpecifier indexDescrip } } - private boolean isOnline( IndexSpecifier indexDescription, IndexDescriptor index ) throws ProcedureException + private boolean isOnline( IndexSpecifier indexDescription, SchemaIndexDescriptor index ) throws ProcedureException { InternalIndexState state = getState( indexDescription, index ); switch ( state ) @@ -157,7 +157,7 @@ private boolean isOnline( IndexSpecifier indexDescription, IndexDescriptor index } } - private InternalIndexState getState( IndexSpecifier indexDescription, IndexDescriptor index ) + private InternalIndexState getState( IndexSpecifier indexDescription, SchemaIndexDescriptor index ) throws ProcedureException { try @@ -170,7 +170,7 @@ private InternalIndexState getState( IndexSpecifier indexDescription, IndexDescr } } - private void triggerSampling( IndexDescriptor index ) throws IndexNotFoundKernelException + private void triggerSampling( SchemaIndexDescriptor index ) throws IndexNotFoundKernelException { indexingService.triggerIndexSampling( index.schema(), IndexSamplingMode.TRIGGER_REBUILD_ALL ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java index 765ef562fcae7..e47fdf12f671d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java @@ -60,7 +60,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.operations.EntityOperations; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; import org.neo4j.kernel.impl.api.operations.EntityWriteOperations; @@ -243,7 +243,7 @@ private void validateNoExistingNodeWithExactValues( { try { - IndexDescriptor index = constraint.ownedIndexDescriptor(); + SchemaIndexDescriptor index = constraint.ownedIndexDescriptor(); assertIndexOnline( state, index ); int labelId = index.schema().getLabelId(); @@ -266,15 +266,16 @@ private void validateNoExistingNodeWithExactValues( } } - private void assertIndexOnline( KernelStatement state, IndexDescriptor indexDescriptor ) + private void assertIndexOnline( KernelStatement state, SchemaIndexDescriptor schemaIndexDescriptor ) throws IndexNotFoundKernelException, IndexBrokenKernelException { - switch ( schemaReadOperations.indexGetState( state, indexDescriptor ) ) + switch ( schemaReadOperations.indexGetState( state, schemaIndexDescriptor ) ) { case ONLINE: return; default: - throw new IndexBrokenKernelException( schemaReadOperations.indexGetFailure( state, indexDescriptor ) ); + throw new IndexBrokenKernelException( schemaReadOperations.indexGetFailure( state, + schemaIndexDescriptor ) ); } } @@ -357,7 +358,7 @@ public PrimitiveLongResourceIterator nodesGetForLabel( KernelStatement state, in } @Override - public PrimitiveLongResourceIterator indexQuery( KernelStatement statement, IndexDescriptor index, + public PrimitiveLongResourceIterator indexQuery( KernelStatement statement, SchemaIndexDescriptor index, IndexQuery[] predicates ) throws IndexNotFoundKernelException, IndexNotApplicableKernelException { @@ -367,7 +368,7 @@ public PrimitiveLongResourceIterator indexQuery( KernelStatement statement, Inde @Override public long nodeGetFromUniqueIndexSeek( KernelStatement state, - IndexDescriptor index, + SchemaIndexDescriptor index, ExactPredicate... predicates ) throws IndexNotFoundKernelException, IndexBrokenKernelException, IndexNotApplicableKernelException { @@ -422,7 +423,7 @@ private void assertPredicatesMatchSchema( LabelSchemaDescriptor schema, ExactPre } @Override - public long nodesCountIndexed( KernelStatement statement, IndexDescriptor index, long nodeId, Value value ) + public long nodesCountIndexed( KernelStatement statement, SchemaIndexDescriptor index, long nodeId, Value value ) throws IndexNotFoundKernelException, IndexBrokenKernelException { return entityReadOperations.nodesCountIndexed( statement, index, nodeId, value ); @@ -555,20 +556,20 @@ public Cursor nodeGetRelationships( KernelStatement statement, } @Override - public IndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) throws AlreadyIndexedException, AlreadyConstrainedException, RepeatedPropertyInCompositeSchemaException { return schemaWriteOperations.indexCreate( state, descriptor ); } @Override - public void indexDrop( KernelStatement state, IndexDescriptor descriptor ) throws DropIndexFailureException + public void indexDrop( KernelStatement state, SchemaIndexDescriptor descriptor ) throws DropIndexFailureException { schemaWriteOperations.indexDrop( state, descriptor ); } @Override - public void uniqueIndexDrop( KernelStatement state, IndexDescriptor descriptor ) throws DropIndexFailureException + public void uniqueIndexDrop( KernelStatement state, SchemaIndexDescriptor descriptor ) throws DropIndexFailureException { schemaWriteOperations.uniqueIndexDrop( state, descriptor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java index 7bb9378756247..d9e41ddb6fa0d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java @@ -44,13 +44,13 @@ 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.operations.KeyWriteOperations; import org.neo4j.kernel.impl.api.operations.SchemaReadOperations; import org.neo4j.kernel.impl.api.operations.SchemaWriteOperations; import static org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException.OperationContext.CONSTRAINT_CREATION; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; public class DataIntegrityValidatingStatementOperations implements KeyWriteOperations, @@ -113,7 +113,7 @@ public void relationshipTypeCreateForName( KernelStatement state, String relatio } @Override - public IndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) throws AlreadyIndexedException, AlreadyConstrainedException, RepeatedPropertyInCompositeSchemaException { assertValidDescriptor( descriptor, OperationContext.INDEX_CREATION ); @@ -122,11 +122,11 @@ public IndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor } @Override - public void indexDrop( KernelStatement state, IndexDescriptor index ) throws DropIndexFailureException + public void indexDrop( KernelStatement state, SchemaIndexDescriptor index ) throws DropIndexFailureException { try { - IndexDescriptor existingIndex = + SchemaIndexDescriptor existingIndex = schemaReadDelegate.indexGetForSchema( state, index.schema() ); if ( existingIndex == null ) @@ -150,7 +150,7 @@ public void indexDrop( KernelStatement state, IndexDescriptor index ) throws Dro } @Override - public void uniqueIndexDrop( KernelStatement state, IndexDescriptor index ) throws DropIndexFailureException + public void uniqueIndexDrop( KernelStatement state, SchemaIndexDescriptor index ) throws DropIndexFailureException { schemaWriteDelegate.uniqueIndexDrop( state, index ); } @@ -228,7 +228,7 @@ private void assertIndexDoesNotExist( KernelStatement state, OperationContext co LabelSchemaDescriptor descriptor ) throws AlreadyIndexedException, AlreadyConstrainedException { - IndexDescriptor existingIndex = schemaReadDelegate.indexGetForSchema( state, descriptor ); + SchemaIndexDescriptor existingIndex = schemaReadDelegate.indexGetForSchema( state, descriptor ); if ( existingIndex != null ) { // OK so we found a matching constraint index. We check whether or not it has an owner @@ -249,7 +249,7 @@ private void assertIndexDoesNotExist( KernelStatement state, OperationContext co } } - private boolean constraintIndexHasOwner( KernelStatement state, IndexDescriptor descriptor ) + private boolean constraintIndexHasOwner( KernelStatement state, SchemaIndexDescriptor descriptor ) { return schemaReadDelegate.indexGetOwningUniquenessConstraintId( state, descriptor ) != null; } 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 00cc0e1a6130a..f0344a1ff74cb 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexReader newReader( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; - IndexReader newUnCachedReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexReader newUnCachedReader( SchemaIndexDescriptor 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( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexReader newReader( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { if ( indexReaders == null ) { @@ -64,7 +64,7 @@ public IndexReader newReader( IndexDescriptor descriptor ) throws IndexNotFoundK } @Override - public IndexReader newUnCachedReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexReader newUnCachedReader( SchemaIndexDescriptor 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 5ec076f9f49af..727f6c12188c1 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 @@ -63,7 +63,7 @@ import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.api.txstate.TxStateHolder; @@ -400,7 +400,7 @@ private void dropCreatedConstraintIndexes() throws TransactionFailureException { if ( hasTxStateWithChanges() ) { - for ( IndexDescriptor createdConstraintIndex : txState().constraintIndexesCreatedInTx() ) + for ( SchemaIndexDescriptor 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/LockingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java index 7d88adc4e9c57..27ac08b6b3a1b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java @@ -49,7 +49,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; import org.neo4j.kernel.impl.api.operations.EntityWriteOperations; import org.neo4j.kernel.impl.api.operations.LockOperations; @@ -112,7 +112,7 @@ public boolean nodeRemoveLabel( KernelStatement state, long nodeId, int labelId } @Override - public IndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) throws AlreadyIndexedException, AlreadyConstrainedException, RepeatedPropertyInCompositeSchemaException { exclusiveLabelLock( state, descriptor.getLabelId() ); @@ -121,7 +121,7 @@ public IndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor } @Override - public void indexDrop( KernelStatement state, IndexDescriptor descriptor ) throws DropIndexFailureException + public void indexDrop( KernelStatement state, SchemaIndexDescriptor descriptor ) throws DropIndexFailureException { exclusiveLabelLock( state, descriptor.schema().getLabelId() ); state.assertOpen(); @@ -129,7 +129,7 @@ public void indexDrop( KernelStatement state, IndexDescriptor descriptor ) throw } @Override - public void uniqueIndexDrop( KernelStatement state, IndexDescriptor descriptor ) throws DropIndexFailureException + public void uniqueIndexDrop( KernelStatement state, SchemaIndexDescriptor descriptor ) throws DropIndexFailureException { exclusiveLabelLock( state, descriptor.schema().getLabelId() ); state.assertOpen(); @@ -158,7 +158,7 @@ public void schemaStateFlush( KernelStatement state ) } @Override - public Iterator indexesGetForLabel( KernelStatement state, int labelId ) + public Iterator indexesGetForLabel( KernelStatement state, int labelId ) { sharedLabelLock( state, labelId ); state.assertOpen(); @@ -166,7 +166,7 @@ public Iterator indexesGetForLabel( KernelStatement state, int } @Override - public IndexDescriptor indexGetForSchema( KernelStatement state, LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexGetForSchema( KernelStatement state, LabelSchemaDescriptor descriptor ) { sharedLabelLock( state, descriptor.getLabelId() ); state.assertOpen(); @@ -174,7 +174,7 @@ public IndexDescriptor indexGetForSchema( KernelStatement state, LabelSchemaDesc } @Override - public Iterator indexesGetAll( KernelStatement state ) + public Iterator indexesGetAll( KernelStatement state ) { state.assertOpen(); return Iterators.map( indexDescriptor -> @@ -185,7 +185,7 @@ public Iterator indexesGetAll( KernelStatement state ) } @Override - public InternalIndexState indexGetState( KernelStatement state, IndexDescriptor descriptor ) + public InternalIndexState indexGetState( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { sharedLabelLock( state, descriptor.schema().getLabelId() ); @@ -194,7 +194,7 @@ public InternalIndexState indexGetState( KernelStatement state, IndexDescriptor } @Override - public IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { sharedLabelLock( state, descriptor.schema().getLabelId() ); state.assertOpen(); @@ -202,7 +202,7 @@ public IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement stat } @Override - public PopulationProgress indexGetPopulationProgress( KernelStatement state, IndexDescriptor descriptor ) + public PopulationProgress indexGetPopulationProgress( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { sharedLabelLock( state, descriptor.schema().getLabelId() ); @@ -211,7 +211,7 @@ public PopulationProgress indexGetPopulationProgress( KernelStatement state, Ind } @Override - public long indexSize( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public long indexSize( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { sharedLabelLock( state, descriptor.schema().getLabelId() ); state.assertOpen(); @@ -220,7 +220,7 @@ public long indexSize( KernelStatement state, IndexDescriptor descriptor ) throw @Override public double indexUniqueValuesPercentage( KernelStatement state, - IndexDescriptor descriptor ) throws IndexNotFoundKernelException + SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { sharedLabelLock( state, descriptor.schema().getLabelId() ); state.assertOpen(); @@ -228,7 +228,7 @@ public double indexUniqueValuesPercentage( KernelStatement state, } @Override - public Long indexGetOwningUniquenessConstraintId( KernelStatement state, IndexDescriptor index ) + public Long indexGetOwningUniquenessConstraintId( KernelStatement state, SchemaIndexDescriptor index ) { sharedLabelLock( state, index.schema().getLabelId() ); state.assertOpen(); @@ -236,7 +236,7 @@ public Long indexGetOwningUniquenessConstraintId( KernelStatement state, IndexDe } @Override - public long indexGetCommittedId( KernelStatement state, IndexDescriptor index ) + public long indexGetCommittedId( KernelStatement state, SchemaIndexDescriptor index ) throws SchemaRuleNotFoundException { sharedLabelLock( state, index.schema().getLabelId() ); @@ -496,7 +496,7 @@ public void releaseShared( KernelStatement state, ResourceType type, long... ids } @Override - public String indexGetFailure( Statement state, IndexDescriptor descriptor ) + public String indexGetFailure( Statement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return schemaReadDelegate.indexGetFailure( state, descriptor ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java index c255353fe0ceb..0e6221bade8c9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java @@ -88,7 +88,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.operations.CountsOperations; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; import org.neo4j.kernel.impl.api.operations.EntityWriteOperations; @@ -230,7 +230,7 @@ public PrimitiveLongResourceIterator nodesGetForLabel( int labelId ) } @Override - public PrimitiveLongResourceIterator indexQuery( IndexDescriptor index, IndexQuery... predicates ) + public PrimitiveLongResourceIterator indexQuery( SchemaIndexDescriptor index, IndexQuery... predicates ) throws IndexNotFoundKernelException, IndexNotApplicableKernelException { statement.assertOpen(); @@ -238,7 +238,7 @@ public PrimitiveLongResourceIterator indexQuery( IndexDescriptor index, IndexQue } @Override - public long nodeGetFromUniqueIndexSeek( IndexDescriptor index, IndexQuery.ExactPredicate... predicates ) + public long nodeGetFromUniqueIndexSeek( SchemaIndexDescriptor index, IndexQuery.ExactPredicate... predicates ) throws IndexNotFoundKernelException, IndexBrokenKernelException, IndexNotApplicableKernelException { statement.assertOpen(); @@ -513,7 +513,7 @@ public Set proceduresGetAll() } @Override - public long nodesCountIndexed( IndexDescriptor index, long nodeId, Value value ) + public long nodesCountIndexed( SchemaIndexDescriptor index, long nodeId, Value value ) throws IndexNotFoundKernelException, IndexBrokenKernelException { statement.assertOpen(); @@ -554,76 +554,76 @@ public Cursor relationshipGetProperties( RelationshipItem relation // @Override - public IndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) throws SchemaRuleNotFoundException { statement.assertOpen(); - IndexDescriptor indexDescriptor = schemaRead().indexGetForSchema( statement, descriptor ); - if ( indexDescriptor == null ) + SchemaIndexDescriptor schemaIndexDescriptor = schemaRead().indexGetForSchema( statement, descriptor ); + if ( schemaIndexDescriptor == null ) { throw new SchemaRuleNotFoundException( SchemaRule.Kind.INDEX_RULE, descriptor ); } - return indexDescriptor; + return schemaIndexDescriptor; } @Override - public Iterator indexesGetForLabel( int labelId ) + public Iterator indexesGetForLabel( int labelId ) { statement.assertOpen(); return schemaRead().indexesGetForLabel( statement, labelId ); } @Override - public Iterator indexesGetAll() + public Iterator indexesGetAll() { statement.assertOpen(); return schemaRead().indexesGetAll( statement ); } @Override - public Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) + public Long indexGetOwningUniquenessConstraintId( SchemaIndexDescriptor index ) { statement.assertOpen(); return schemaRead().indexGetOwningUniquenessConstraintId( statement, index ); } @Override - public InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public InternalIndexState indexGetState( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { statement.assertOpen(); return schemaRead().indexGetState( statement, descriptor ); } @Override - public IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { statement.assertOpen(); return schemaRead().indexGetProviderDescriptor( statement, descriptor ); } @Override - public PopulationProgress indexGetPopulationProgress( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public PopulationProgress indexGetPopulationProgress( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { statement.assertOpen(); return schemaRead().indexGetPopulationProgress( statement, descriptor ); } @Override - public long indexSize( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public long indexSize( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { statement.assertOpen(); return schemaRead().indexSize( statement, descriptor ); } @Override - public double indexUniqueValuesSelectivity( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public double indexUniqueValuesSelectivity( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { statement.assertOpen(); return schemaRead().indexUniqueValuesPercentage( statement, descriptor ); } @Override - public String indexGetFailure( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public String indexGetFailure( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { statement.assertOpen(); return schemaRead().indexGetFailure( statement, descriptor ); @@ -940,7 +940,7 @@ public Value graphRemoveProperty( int propertyKeyId ) // @Override - public IndexDescriptor indexCreate( LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexCreate( LabelSchemaDescriptor descriptor ) throws AlreadyIndexedException, AlreadyConstrainedException, RepeatedPropertyInCompositeSchemaException { statement.assertOpen(); @@ -948,7 +948,7 @@ public IndexDescriptor indexCreate( LabelSchemaDescriptor descriptor ) } @Override - public void indexDrop( IndexDescriptor descriptor ) throws DropIndexFailureException + public void indexDrop( SchemaIndexDescriptor descriptor ) throws DropIndexFailureException { statement.assertOpen(); schemaWrite().indexDrop( statement, descriptor ); @@ -1296,7 +1296,7 @@ public long countsForRelationshipWithoutTxState( int startLabelId, int typeId, i } @Override - public DoubleLongRegister indexUpdatesAndSize( IndexDescriptor index, DoubleLongRegister target ) + public DoubleLongRegister indexUpdatesAndSize( SchemaIndexDescriptor index, DoubleLongRegister target ) throws IndexNotFoundKernelException { statement.assertOpen(); @@ -1304,7 +1304,7 @@ public DoubleLongRegister indexUpdatesAndSize( IndexDescriptor index, DoubleLong } @Override - public DoubleLongRegister indexSample( IndexDescriptor index, DoubleLongRegister target ) + public DoubleLongRegister indexSample( SchemaIndexDescriptor index, DoubleLongRegister target ) throws IndexNotFoundKernelException { statement.assertOpen(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java index 2cd26d13ee7c9..111537b6e40cd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java @@ -66,8 +66,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionCountingStateVisitor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.operations.CountsOperations; @@ -558,21 +558,21 @@ public long relationshipsGetCount( KernelStatement state ) } @Override - public IndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) { - IndexDescriptor indexDescriptor = IndexDescriptorFactory.forSchema( descriptor ); - state.txState().indexRuleDoAdd( indexDescriptor ); - return indexDescriptor; + SchemaIndexDescriptor schemaIndexDescriptor = SchemaIndexDescriptorFactory.forSchema( descriptor ); + state.txState().indexRuleDoAdd( schemaIndexDescriptor ); + return schemaIndexDescriptor; } @Override - public void indexDrop( KernelStatement state, IndexDescriptor descriptor ) + public void indexDrop( KernelStatement state, SchemaIndexDescriptor descriptor ) { state.txState().indexDoDrop( descriptor ); } @Override - public void uniqueIndexDrop( KernelStatement state, IndexDescriptor descriptor ) + public void uniqueIndexDrop( KernelStatement state, SchemaIndexDescriptor descriptor ) { state.txState().indexDoDrop( descriptor ); } @@ -726,10 +726,10 @@ public void constraintDrop( KernelStatement state, ConstraintDescriptor constrai } @Override - public IndexDescriptor indexGetForSchema( KernelStatement state, LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexGetForSchema( KernelStatement state, LabelSchemaDescriptor descriptor ) { - IndexDescriptor indexDescriptor = storeLayer.indexGetForSchema( descriptor ); - Iterator rules = iterator( indexDescriptor ); + SchemaIndexDescriptor schemaIndexDescriptor = storeLayer.indexGetForSchema( descriptor ); + Iterator rules = iterator( schemaIndexDescriptor ); if ( state.hasTxStateWithChanges() ) { rules = filter( @@ -740,7 +740,7 @@ public IndexDescriptor indexGetForSchema( KernelStatement state, LabelSchemaDesc } @Override - public InternalIndexState indexGetState( KernelStatement state, IndexDescriptor descriptor ) + public InternalIndexState indexGetState( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { // If index is in our state, then return populating @@ -757,7 +757,7 @@ public InternalIndexState indexGetState( KernelStatement state, IndexDescriptor } @Override - public IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { if ( state.hasTxStateWithChanges() ) { @@ -771,7 +771,7 @@ public IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement stat } @Override - public PopulationProgress indexGetPopulationProgress( KernelStatement state, IndexDescriptor descriptor ) throws + public PopulationProgress indexGetPopulationProgress( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { // If index is in our state, then return 0% @@ -787,7 +787,7 @@ public PopulationProgress indexGetPopulationProgress( KernelStatement state, Ind return storeLayer.indexGetPopulationProgress( descriptor.schema() ); } - private boolean checkIndexState( IndexDescriptor index, ReadableDiffSets diffSet ) + private boolean checkIndexState( SchemaIndexDescriptor index, ReadableDiffSets diffSet ) throws IndexNotFoundKernelException { if ( diffSet.isAdded( index ) ) @@ -803,7 +803,7 @@ private boolean checkIndexState( IndexDescriptor index, ReadableDiffSets indexesGetForLabel( KernelStatement state, int labelId ) + public Iterator indexesGetForLabel( KernelStatement state, int labelId ) { if ( state.hasTxStateWithChanges() ) { @@ -814,7 +814,7 @@ public Iterator indexesGetForLabel( KernelStatement state, int } @Override - public Iterator indexesGetAll( KernelStatement state ) + public Iterator indexesGetAll( KernelStatement state ) { if ( state.hasTxStateWithChanges() ) { @@ -826,7 +826,7 @@ public Iterator indexesGetAll( KernelStatement state ) @Override public long nodeGetFromUniqueIndexSeek( - KernelStatement state, IndexDescriptor index, IndexQuery.ExactPredicate... query ) + KernelStatement state, SchemaIndexDescriptor index, IndexQuery.ExactPredicate... query ) throws IndexNotFoundKernelException, IndexNotApplicableKernelException { IndexReader reader = state.getStoreStatement().getFreshIndexReader( index ); @@ -845,7 +845,7 @@ public long nodeGetFromUniqueIndexSeek( } @Override - public PrimitiveLongResourceIterator indexQuery( KernelStatement state, IndexDescriptor index, IndexQuery... predicates ) + public PrimitiveLongResourceIterator indexQuery( KernelStatement state, SchemaIndexDescriptor index, IndexQuery... predicates ) throws IndexNotFoundKernelException, IndexNotApplicableKernelException { StorageStatement storeStatement = state.getStoreStatement(); @@ -934,7 +934,7 @@ private void assertSinglePredicate( IndexQuery[] predicates ) } @Override - public long nodesCountIndexed( KernelStatement statement, IndexDescriptor index, long nodeId, Value value ) + public long nodesCountIndexed( KernelStatement statement, SchemaIndexDescriptor index, long nodeId, Value value ) throws IndexNotFoundKernelException { IndexReader reader = statement.getStoreStatement().getIndexReader( index ); @@ -942,7 +942,7 @@ public long nodesCountIndexed( KernelStatement statement, IndexDescriptor index, } private PrimitiveLongResourceIterator filterIndexStateChangesForScan( - KernelStatement state, PrimitiveLongResourceIterator nodeIds, IndexDescriptor index ) + KernelStatement state, PrimitiveLongResourceIterator nodeIds, SchemaIndexDescriptor index ) { if ( state.hasTxStateWithChanges() ) { @@ -957,7 +957,7 @@ private PrimitiveLongResourceIterator filterIndexStateChangesForScan( } private PrimitiveLongResourceIterator filterIndexStateChangesForSeek( - KernelStatement state, PrimitiveLongResourceIterator nodeIds, IndexDescriptor index, + KernelStatement state, PrimitiveLongResourceIterator nodeIds, SchemaIndexDescriptor index, ValueTuple propertyValues ) { if ( state.hasTxStateWithChanges() ) @@ -973,7 +973,7 @@ private PrimitiveLongResourceIterator filterIndexStateChangesForSeek( } private PrimitiveLongResourceIterator filterIndexStateChangesForRangeSeekByNumber( KernelStatement state, - IndexDescriptor index, + SchemaIndexDescriptor index, Number lower, boolean includeLower, Number upper, boolean includeUpper, PrimitiveLongResourceIterator nodeIds ) @@ -992,7 +992,7 @@ private PrimitiveLongResourceIterator filterIndexStateChangesForRangeSeekByNumbe } private PrimitiveLongResourceIterator filterIndexStateChangesForRangeSeekByGeometry( KernelStatement state, - IndexDescriptor index, + SchemaIndexDescriptor index, PointValue lower, boolean includeLower, PointValue upper, boolean includeUpper, PrimitiveLongResourceIterator nodeIds ) @@ -1011,7 +1011,7 @@ private PrimitiveLongResourceIterator filterIndexStateChangesForRangeSeekByGeome } private PrimitiveLongResourceIterator filterIndexStateChangesForRangeSeekByString( KernelStatement state, - IndexDescriptor index, + SchemaIndexDescriptor index, String lower, boolean includeLower, String upper, boolean includeUpper, PrimitiveLongResourceIterator nodeIds ) @@ -1030,7 +1030,7 @@ private PrimitiveLongResourceIterator filterIndexStateChangesForRangeSeekByStrin } private PrimitiveLongResourceIterator filterIndexStateChangesForRangeSeekByPrefix( KernelStatement state, - IndexDescriptor index, + SchemaIndexDescriptor index, String prefix, PrimitiveLongResourceIterator nodeIds ) { @@ -1297,28 +1297,28 @@ public long countsForRelationshipWithoutTxState( KernelStatement statement, int } @Override - public long indexSize( KernelStatement statement, IndexDescriptor descriptor ) + public long indexSize( KernelStatement statement, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return storeLayer.indexSize( descriptor.schema() ); } @Override - public double indexUniqueValuesPercentage( KernelStatement statement, IndexDescriptor descriptor ) + public double indexUniqueValuesPercentage( KernelStatement statement, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return storeLayer.indexUniqueValuesPercentage( descriptor.schema() ); } @Override - public DoubleLongRegister indexUpdatesAndSize( KernelStatement statement, IndexDescriptor index, + public DoubleLongRegister indexUpdatesAndSize( KernelStatement statement, SchemaIndexDescriptor index, DoubleLongRegister target ) throws IndexNotFoundKernelException { return storeLayer.indexUpdatesAndSize( index.schema(), target ); } @Override - public DoubleLongRegister indexSample( KernelStatement statement, IndexDescriptor index, DoubleLongRegister target ) + public DoubleLongRegister indexSample( KernelStatement statement, SchemaIndexDescriptor index, DoubleLongRegister target ) throws IndexNotFoundKernelException { return storeLayer.indexSample( index.schema(), target ); @@ -1329,20 +1329,20 @@ public DoubleLongRegister indexSample( KernelStatement statement, IndexDescripto // @Override - public Long indexGetOwningUniquenessConstraintId( KernelStatement state, IndexDescriptor index ) + public Long indexGetOwningUniquenessConstraintId( KernelStatement state, SchemaIndexDescriptor index ) { return storeLayer.indexGetOwningUniquenessConstraintId( index ); } @Override - public long indexGetCommittedId( KernelStatement state, IndexDescriptor index ) + public long indexGetCommittedId( KernelStatement state, SchemaIndexDescriptor index ) throws SchemaRuleNotFoundException { return storeLayer.indexGetCommittedId( index ); } @Override - public String indexGetFailure( Statement state, IndexDescriptor descriptor ) + public String indexGetFailure( Statement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return storeLayer.indexGetFailure( descriptor.schema() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java index 1277525a2a3ba..c5935cb92de67 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -74,7 +74,7 @@ public IndexCapability getIndexCapability() } @Override - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor getDescriptor() { return getDelegate().getDescriptor(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java index c32092d724770..d30af8e005ca8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java @@ -24,7 +24,7 @@ import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -82,7 +82,7 @@ public void refresh() } @Override - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor getDescriptor() { return indexMeta.indexDescriptor(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java index 703a5876f7cab..8aedad6b59cb7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.DelegatingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -214,7 +214,7 @@ private static void barge( ReentrantReadWriteLock.ReadLock lock ) } @Override - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor getDescriptor() { lock.readLock().lock(); try diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java index 3450750dfec6b..00230c274daee 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java @@ -21,19 +21,19 @@ import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; public class IndexMeta { private final long ruleId; - private final IndexDescriptor indexDescriptor; + private final SchemaIndexDescriptor schemaIndexDescriptor; private final IndexProvider.Descriptor providerDescriptor; private final IndexCapability indexCapability; - public IndexMeta( long ruleId, IndexDescriptor indexDescriptor, IndexProvider.Descriptor providerDescriptor, IndexCapability indexCapability ) + public IndexMeta( long ruleId, SchemaIndexDescriptor schemaIndexDescriptor, IndexProvider.Descriptor providerDescriptor, IndexCapability indexCapability ) { this.ruleId = ruleId; - this.indexDescriptor = indexDescriptor; + this.schemaIndexDescriptor = schemaIndexDescriptor; this.providerDescriptor = providerDescriptor; this.indexCapability = indexCapability; } @@ -43,9 +43,9 @@ public long getIndexId() return ruleId; } - public IndexDescriptor indexDescriptor() + public SchemaIndexDescriptor indexDescriptor() { - return indexDescriptor; + return schemaIndexDescriptor; } public IndexProvider.Descriptor providerDescriptor() diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java index 00a6dfbebc340..1dff30017f2e7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -77,7 +77,7 @@ public interface IndexProxy extends LabelSchemaSupplier */ void close() throws IOException; - IndexDescriptor getDescriptor(); + SchemaIndexDescriptor getDescriptor(); @Override LabelSchemaDescriptor schema(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java index 30930d584e77c..addca12af9195 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java @@ -26,7 +26,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.logging.LogProvider; @@ -57,7 +57,7 @@ class IndexProxyCreator } IndexProxy createPopulatingIndexProxy( final long ruleId, - final IndexDescriptor descriptor, + final SchemaIndexDescriptor descriptor, final IndexProvider.Descriptor providerDescriptor, final boolean flipToTentative, final IndexingService.Monitor monitor, @@ -103,7 +103,7 @@ IndexProxy createPopulatingIndexProxy( final long ruleId, return new ContractCheckingIndexProxy( flipper, false ); } - IndexProxy createRecoveringIndexProxy( long ruleId, IndexDescriptor descriptor, + IndexProxy createRecoveringIndexProxy( long ruleId, SchemaIndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor ) { IndexMeta indexMeta = indexMetaFromProvider( ruleId, providerDescriptor, descriptor ); @@ -112,7 +112,7 @@ IndexProxy createRecoveringIndexProxy( long ruleId, IndexDescriptor descriptor, } IndexProxy createOnlineIndexProxy( long ruleId, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor ) { try @@ -135,7 +135,7 @@ IndexProxy createOnlineIndexProxy( long ruleId, } IndexProxy createFailedIndexProxy( long ruleId, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor, IndexPopulationFailure populationFailure ) { @@ -154,7 +154,7 @@ IndexProxy createFailedIndexProxy( long ruleId, return proxy; } - private String indexUserDescription( final IndexDescriptor descriptor, + private String indexUserDescription( final SchemaIndexDescriptor descriptor, final IndexProvider.Descriptor providerDescriptor ) { return format( "%s [provider: %s]", @@ -162,23 +162,23 @@ private String indexUserDescription( final IndexDescriptor descriptor, } private IndexPopulator populatorFromProvider( IndexProvider.Descriptor providerDescriptor, long ruleId, - IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { IndexProvider indexProvider = providerMap.apply( providerDescriptor ); return indexProvider.getPopulator( ruleId, descriptor, samplingConfig ); } private IndexAccessor onlineAccessorFromProvider( IndexProvider.Descriptor providerDescriptor, - long ruleId, IndexDescriptor descriptor, + long ruleId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { IndexProvider indexProvider = providerMap.apply( providerDescriptor ); return indexProvider.getOnlineAccessor( ruleId, descriptor, samplingConfig ); } - private IndexMeta indexMetaFromProvider( long ruleId, IndexProvider.Descriptor providerDescriptor, IndexDescriptor indexDescriptor ) + private IndexMeta indexMetaFromProvider( long ruleId, IndexProvider.Descriptor providerDescriptor, SchemaIndexDescriptor schemaIndexDescriptor ) { - IndexCapability indexCapability = providerMap.apply( providerDescriptor ).getCapability( indexDescriptor ); - return new IndexMeta( ruleId, indexDescriptor, providerDescriptor, indexCapability ); + IndexCapability indexCapability = providerMap.apply( providerDescriptor ).getCapability( schemaIndexDescriptor ); + return new IndexMeta( ruleId, schemaIndexDescriptor, providerDescriptor, indexCapability ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java index a649869537b95..5d75fc6fe3d91 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java @@ -31,8 +31,8 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.store.MultipleUnderlyingStorageExceptions; import org.neo4j.kernel.impl.store.UnderlyingStorageException; @@ -76,7 +76,7 @@ IndexUpdater getUpdater( LabelSchemaDescriptor descriptor ) @Override public void close() throws UnderlyingStorageException { - Set> exceptions = null; + Set> exceptions = null; for ( Map.Entry updaterEntry : updaterMap.entrySet() ) { @@ -91,7 +91,7 @@ public void close() throws UnderlyingStorageException { exceptions = new HashSet<>(); } - exceptions.add( Pair.of( IndexDescriptorFactory.forSchema( updaterEntry.getKey() ), + exceptions.add( Pair.of( SchemaIndexDescriptorFactory.forSchema( updaterEntry.getKey() ), new UnderlyingStorageException( e ) ) ); } } 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 0c8639a8f5ada..aca9fc858932d 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 @@ -51,7 +51,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexProvider.Descriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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; @@ -111,19 +111,19 @@ enum State public interface Monitor { - void populationCompleteOn( IndexDescriptor descriptor ); + void populationCompleteOn( SchemaIndexDescriptor descriptor ); void indexPopulationScanStarting(); void indexPopulationScanComplete(); - void awaitingPopulationOfRecoveredIndex( long indexId, IndexDescriptor descriptor ); + void awaitingPopulationOfRecoveredIndex( long indexId, SchemaIndexDescriptor descriptor ); } public static class MonitorAdapter implements Monitor { @Override - public void populationCompleteOn( IndexDescriptor descriptor ) + public void populationCompleteOn( SchemaIndexDescriptor descriptor ) { // Do nothing } @@ -138,7 +138,7 @@ public void indexPopulationScanComplete() } @Override - public void awaitingPopulationOfRecoveredIndex( long indexId, IndexDescriptor descriptor ) + public void awaitingPopulationOfRecoveredIndex( long indexId, SchemaIndexDescriptor descriptor ) { // Do nothing } } @@ -189,7 +189,7 @@ public void init() IndexProxy indexProxy; long indexId = indexRule.getId(); - IndexDescriptor descriptor = indexRule.getIndexDescriptor(); + SchemaIndexDescriptor descriptor = indexRule.getIndexDescriptor(); IndexProvider.Descriptor providerDescriptor = indexRule.getProviderDescriptor(); IndexProvider provider = providerMap.apply( providerDescriptor ); InternalIndexState initialState = provider.getInitialState( indexId, descriptor ); @@ -242,7 +242,7 @@ public void start() throws Exception indexMap.forEachIndexProxy( ( indexId, proxy ) -> { InternalIndexState state = proxy.getState(); - IndexDescriptor descriptor = proxy.getDescriptor(); + SchemaIndexDescriptor descriptor = proxy.getDescriptor(); indexStates.computeIfAbsent( state, internalIndexState -> new ArrayList<>() ) .add( new IndexLogRecord( indexId, descriptor ) ); log.debug( indexStateInfo( "start", indexId, state, descriptor ) ); @@ -277,7 +277,7 @@ public void start() throws Exception { IndexProxy proxy = indexProxyCreator.createPopulatingIndexProxy( indexId, - descriptor.getIndexDescriptor(), + descriptor.getSchemaIndexDescriptor(), descriptor.getProviderDescriptor(), false, // never pass through a tentative online state during recovery monitor, @@ -301,7 +301,7 @@ public void start() throws Exception rebuildingDescriptors.visitEntries( (PrimitiveLongObjectVisitor) ( indexId, descriptor ) -> { - if ( descriptor.getIndexDescriptor().type() != IndexDescriptor.Type.UNIQUE ) + if ( descriptor.getSchemaIndexDescriptor().type() != SchemaIndexDescriptor.Type.UNIQUE ) { // It's not a uniqueness constraint, so don't wait for it to be rebuilt return false; @@ -318,7 +318,7 @@ public void start() throws Exception "What? This index was seen during recovery just now, why isn't it available now?" ); } - monitor.awaitingPopulationOfRecoveredIndex( indexId, descriptor.getIndexDescriptor() ); + monitor.awaitingPopulationOfRecoveredIndex( indexId, descriptor.getSchemaIndexDescriptor() ); awaitOnline( proxy ); return false; } ); @@ -639,7 +639,7 @@ private void startIndexPopulation( IndexPopulationJob job ) populationJobController.startIndexPopulation( job ); } - private String indexStateInfo( String tag, Long indexId, InternalIndexState state, IndexDescriptor descriptor ) + private String indexStateInfo( String tag, Long indexId, InternalIndexState state, SchemaIndexDescriptor descriptor ) { return format( "IndexingService.%s: index %d on %s is %s", tag, indexId, descriptor.schema().userDescription( tokenNameLookup ), state.name() ); @@ -709,7 +709,7 @@ public IndexMap apply( IndexMap indexMap ) throws IOException indexMap.putIndexProxy( ruleId, index ); continue; } - final IndexDescriptor descriptor = rule.getIndexDescriptor(); + final SchemaIndexDescriptor descriptor = rule.getIndexDescriptor(); Descriptor providerDescriptor = rule.getProviderDescriptor(); boolean flipToTentative = rule.canSupportUniqueConstraint(); if ( state == State.RUNNING ) @@ -741,9 +741,9 @@ void startPopulation() private static final class IndexLogRecord { private final long indexId; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; - IndexLogRecord( long indexId, IndexDescriptor descriptor ) + IndexLogRecord( long indexId, SchemaIndexDescriptor descriptor ) { this.indexId = indexId; this.descriptor = descriptor; @@ -754,7 +754,7 @@ public long getIndexId() return indexId; } - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor getDescriptor() { return descriptor; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java index aa5b8ede66f4a..56eb54ae3c7c2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.UpdateCountingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -128,7 +128,7 @@ public void drop() throws IOException } @Override - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor getDescriptor() { return indexMeta.indexDescriptor(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java index d9185d4f87bfd..2b6634641d94a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -88,7 +88,7 @@ public void drop() } @Override - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor getDescriptor() { return indexMeta.indexDescriptor(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java index 1c2fc7ef71f03..92a64c7391ca5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java @@ -21,25 +21,25 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexProvider.Descriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; /** * Small class for holding a bunch of information about an index that we need to rebuild during recovery. */ public class RebuildingIndexDescriptor { - private final IndexDescriptor indexDescriptor; + private final SchemaIndexDescriptor schemaIndexDescriptor; private final Descriptor providerDescriptor; - RebuildingIndexDescriptor( IndexDescriptor indexDescriptor, IndexProvider.Descriptor providerDescriptor ) + RebuildingIndexDescriptor( SchemaIndexDescriptor schemaIndexDescriptor, IndexProvider.Descriptor providerDescriptor ) { - this.indexDescriptor = indexDescriptor; + this.schemaIndexDescriptor = schemaIndexDescriptor; this.providerDescriptor = providerDescriptor; } - public IndexDescriptor getIndexDescriptor() + public SchemaIndexDescriptor getSchemaIndexDescriptor() { - return indexDescriptor; + return schemaIndexDescriptor; } public Descriptor getProviderDescriptor() 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 6f5d3e3c3c6f4..79fe59a9b6cc1 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 @@ -25,7 +25,7 @@ import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMap; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; import org.neo4j.kernel.impl.api.index.IndexProxy; @@ -105,7 +105,7 @@ public void recoverIndexSamples() public interface RecoveryCondition { - boolean test( long indexId, IndexDescriptor descriptor ); + boolean test( long indexId, SchemaIndexDescriptor 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 fe4dd6ecd9068..baa80e4be2f18 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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, IndexDescriptor descriptor ) + public boolean test( long indexId, SchemaIndexDescriptor descriptor ) { boolean result = storeView.indexSample( indexId, register ).readSecond() == 0; if ( result ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/CountsOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/CountsOperations.java index a60fbd42eebd2..7bd390a4ed877 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/CountsOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/CountsOperations.java @@ -20,7 +20,7 @@ package org.neo4j.kernel.impl.api.operations; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.register.Register.DoubleLongRegister; @@ -38,9 +38,9 @@ public interface CountsOperations /** @see org.neo4j.kernel.api.ReadOperations#countsForRelationshipWithoutTxState(int, int, int) */ long countsForRelationshipWithoutTxState( KernelStatement statement, int startLabelId, int typeId, int endLabelId ); - DoubleLongRegister indexUpdatesAndSize( KernelStatement statement, IndexDescriptor index, + DoubleLongRegister indexUpdatesAndSize( KernelStatement statement, SchemaIndexDescriptor index, DoubleLongRegister target ) throws IndexNotFoundKernelException; - DoubleLongRegister indexSample( KernelStatement statement, IndexDescriptor index, DoubleLongRegister target ) + DoubleLongRegister indexSample( KernelStatement statement, SchemaIndexDescriptor index, DoubleLongRegister target ) throws IndexNotFoundKernelException; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java index 22a22b4a39d5d..cf6c9e8fb2eab 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.storageengine.api.Direction; @@ -56,7 +56,7 @@ public interface EntityReadOperations * @return ids of the matching nodes * @throws IndexNotFoundKernelException if no such index is found. */ - PrimitiveLongResourceIterator indexQuery( KernelStatement statement, IndexDescriptor index, IndexQuery... predicates ) + PrimitiveLongResourceIterator indexQuery( KernelStatement statement, SchemaIndexDescriptor index, IndexQuery... predicates ) throws IndexNotFoundKernelException, IndexNotApplicableKernelException; /** @@ -65,10 +65,10 @@ PrimitiveLongResourceIterator indexQuery( KernelStatement statement, IndexDescri * @throws IndexNotFoundKernelException if no such index found. * @throws IndexBrokenKernelException if we found an index that was corrupt or otherwise in a failed state. */ - long nodeGetFromUniqueIndexSeek( KernelStatement state, IndexDescriptor index, IndexQuery.ExactPredicate... predicates ) + long nodeGetFromUniqueIndexSeek( KernelStatement state, SchemaIndexDescriptor index, IndexQuery.ExactPredicate... predicates ) throws IndexNotFoundKernelException, IndexBrokenKernelException, IndexNotApplicableKernelException; - long nodesCountIndexed( KernelStatement statement, IndexDescriptor index, long nodeId, Value value ) + long nodesCountIndexed( KernelStatement statement, SchemaIndexDescriptor index, long nodeId, Value value ) throws IndexNotFoundKernelException, IndexBrokenKernelException; boolean graphHasProperty( KernelStatement state, int propertyKeyId ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java index 8cf180c56d73e..0918362a14ef2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java @@ -29,7 +29,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -38,48 +38,48 @@ public interface SchemaReadOperations /** * Returns the descriptor for the given labelId and propertyKey. */ - IndexDescriptor indexGetForSchema( KernelStatement state, LabelSchemaDescriptor descriptor ); + SchemaIndexDescriptor indexGetForSchema( KernelStatement state, LabelSchemaDescriptor descriptor ); /** * Get all indexes for a label. */ - Iterator indexesGetForLabel( KernelStatement state, int labelId ); + Iterator indexesGetForLabel( KernelStatement state, int labelId ); /** * Returns all indexes. */ - Iterator indexesGetAll( KernelStatement state ); + Iterator indexesGetAll( KernelStatement state ); /** * Retrieve the state of an index. */ - InternalIndexState indexGetState( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + InternalIndexState indexGetState( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Retrieve the index provider descriptor for an index. */ - IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Retrieve the population progress of an index. */ - PopulationProgress indexGetPopulationProgress( KernelStatement state, IndexDescriptor descriptor ) throws + PopulationProgress indexGetPopulationProgress( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Get the index size. **/ - long indexSize( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + long indexSize( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Calculate the index unique values percentage. **/ - double indexUniqueValuesPercentage( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + double indexUniqueValuesPercentage( KernelStatement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Returns the failure description of a failed index. */ - String indexGetFailure( Statement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + String indexGetFailure( Statement state, SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Get all constraints applicable to label and propertyKeys. @@ -109,11 +109,11 @@ PopulationProgress indexGetPopulationProgress( KernelStatement state, IndexDescr /** * Get the owning constraint for a constraint index. Returns null if the index does not have an owning constraint. */ - Long indexGetOwningUniquenessConstraintId( KernelStatement state, IndexDescriptor index ); + Long indexGetOwningUniquenessConstraintId( KernelStatement state, SchemaIndexDescriptor index ); /** * Get the index id (the id or the schema rule record) for a committed index * - throws exception for indexes that aren't committed. */ - long indexGetCommittedId( KernelStatement state, IndexDescriptor index ) throws SchemaRuleNotFoundException; + long indexGetCommittedId( KernelStatement state, SchemaIndexDescriptor index ) throws SchemaRuleNotFoundException; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaWriteOperations.java index e9647f42e09b2..2a07600c71ad6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaWriteOperations.java @@ -32,7 +32,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; public interface SchemaWriteOperations @@ -41,17 +41,17 @@ public interface SchemaWriteOperations * Creates an index, indexing properties with the given {@code propertyKeyId} for nodes with the given * {@code labelId}. */ - IndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) + SchemaIndexDescriptor indexCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) throws AlreadyIndexedException, AlreadyConstrainedException, RepeatedPropertyInCompositeSchemaException; - /** Drops a {@link IndexDescriptor} from the database */ - void indexDrop( KernelStatement state, IndexDescriptor descriptor ) throws DropIndexFailureException; + /** Drops a {@link SchemaIndexDescriptor} from the database */ + void indexDrop( KernelStatement state, SchemaIndexDescriptor descriptor ) throws DropIndexFailureException; /** * This should not be used, it is exposed to allow an external job to clean up constraint indexes. * That external job should become an internal job, at which point this operation should go away. */ - void uniqueIndexDrop( KernelStatement state, IndexDescriptor descriptor ) throws DropIndexFailureException; + void uniqueIndexDrop( KernelStatement state, SchemaIndexDescriptor descriptor ) throws DropIndexFailureException; NodeKeyConstraintDescriptor nodeKeyConstraintCreate( KernelStatement state, LabelSchemaDescriptor descriptor ) throws AlreadyConstrainedException, CreateConstraintFailureException, AlreadyIndexedException, 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 e988ef8a3b676..e615e6c92edf9 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; @@ -81,7 +81,7 @@ public void close() } @Override - public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) + public void initialize( SchemaIndexDescriptor 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 d87b6eb40ac65..ca0b62beedd76 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 @@ -41,9 +41,9 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor.Type; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.index.IndexProxy; import org.neo4j.kernel.impl.api.index.IndexingService; @@ -112,7 +112,7 @@ public long createUniquenessConstraintIndex( ) throws TransactionFailureException, CreateConstraintFailureException, UniquePropertyValueValidationException, AlreadyConstrainedException { UniquenessConstraintDescriptor constraint = ConstraintDescriptorFactory.uniqueForSchema( descriptor ); - IndexDescriptor index; + SchemaIndexDescriptor index; try { index = getOrCreateUniquenessConstraintIndex( state, schemaOps, descriptor ); @@ -196,9 +196,9 @@ public long createUniquenessConstraintIndex( } private boolean indexStillExists( SchemaReadOperations schemaOps, KernelStatement state, LabelSchemaDescriptor descriptor, - IndexDescriptor index ) + SchemaIndexDescriptor index ) { - IndexDescriptor existingIndex = schemaOps.indexGetForSchema( state, descriptor ); + SchemaIndexDescriptor existingIndex = schemaOps.indexGetForSchema( state, descriptor ); return existingIndex != null && existingIndex.equals( index ); } @@ -215,7 +215,7 @@ private void releaseLabelLock( Client locks, int labelId ) /** * You MUST hold a schema write lock before you call this method. */ - public void dropUniquenessConstraintIndex( IndexDescriptor descriptor ) + public void dropUniquenessConstraintIndex( SchemaIndexDescriptor descriptor ) throws TransactionFailureException { try ( KernelTransaction transaction = @@ -249,10 +249,10 @@ private void awaitConstrainIndexPopulation( UniquenessConstraintDescriptor const } } - private IndexDescriptor getOrCreateUniquenessConstraintIndex( KernelStatement state, SchemaReadOperations schemaOps, - LabelSchemaDescriptor schema ) throws SchemaKernelException + private SchemaIndexDescriptor getOrCreateUniquenessConstraintIndex( KernelStatement state, SchemaReadOperations schemaOps, + LabelSchemaDescriptor schema ) throws SchemaKernelException { - IndexDescriptor descriptor = schemaOps.indexGetForSchema( state, schema ); + SchemaIndexDescriptor descriptor = schemaOps.indexGetForSchema( state, schema ); if ( descriptor != null ) { if ( descriptor.type() == Type.UNIQUE ) @@ -276,13 +276,13 @@ private IndexDescriptor getOrCreateUniquenessConstraintIndex( KernelStatement st return createConstraintIndex( schema ); } - public IndexDescriptor createConstraintIndex( final LabelSchemaDescriptor schema ) + public SchemaIndexDescriptor createConstraintIndex( final LabelSchemaDescriptor schema ) { try ( KernelTransaction transaction = kernelSupplier.get().newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ); Statement statement = transaction.acquireStatement() ) { - IndexDescriptor index = IndexDescriptorFactory.uniqueForSchema( schema ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.uniqueForSchema( schema ); ((KernelStatement) statement).txState().indexRuleDoAdd( index ); transaction.success(); monitor.event( Thread.currentThread().getId(), Monitor.CREATED_INDEX ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java index 2f6dce8697c6e..0b5a9235936f7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java @@ -26,7 +26,7 @@ import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.cursor.Cursor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; import org.neo4j.kernel.impl.api.schema.NodeSchemaMatcher; @@ -69,11 +69,11 @@ public void onLabelChange( KernelStatement state, int labelId, NodeItem node, La PrimitiveIntSet nodePropertyIds = Primitive.intSet(); nodePropertyIds.addAll( readOps.nodeGetPropertyKeys( state, node ).iterator() ); - Iterator indexes = storeReadLayer.indexesGetForLabel( labelId ); + Iterator indexes = storeReadLayer.indexesGetForLabel( labelId ); while ( indexes.hasNext() ) { - IndexDescriptor index = indexes.next(); + SchemaIndexDescriptor index = indexes.next(); int[] indexPropertyIds = index.schema().getPropertyIds(); if ( nodeHasIndexProperties( nodePropertyIds, indexPropertyIds ) ) { @@ -104,7 +104,7 @@ private boolean noSchemaChangedInTx( KernelStatement state ) public void onPropertyAdd( KernelStatement state, NodeItem node, int propertyKeyId, Value value ) { assert noSchemaChangedInTx( state ); - Iterator indexes = + Iterator indexes = storeReadLayer.indexesGetRelatedToProperty( propertyKeyId ); nodeIndexMatcher.onMatchingSchema( state, indexes, node, propertyKeyId, ( index, propertyKeyIds ) -> @@ -119,7 +119,7 @@ public void onPropertyAdd( KernelStatement state, NodeItem node, int propertyKey public void onPropertyRemove( KernelStatement state, NodeItem node, int propertyKeyId, Value value ) { assert noSchemaChangedInTx( state ); - Iterator indexes = + Iterator indexes = storeReadLayer.indexesGetRelatedToProperty( propertyKeyId ); nodeIndexMatcher.onMatchingSchema( state, indexes, node, propertyKeyId, ( index, propertyKeyIds ) -> @@ -133,7 +133,7 @@ public void onPropertyRemove( KernelStatement state, NodeItem node, int property public void onPropertyChange( KernelStatement state, NodeItem node, int propertyKeyId, Value beforeValue, Value afterValue ) { assert noSchemaChangedInTx( state ); - Iterator indexes = storeReadLayer.indexesGetRelatedToProperty( propertyKeyId ); + Iterator indexes = storeReadLayer.indexesGetRelatedToProperty( propertyKeyId ); nodeIndexMatcher.onMatchingSchema( state, indexes, node, propertyKeyId, ( index, propertyKeyIds ) -> { 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 82992558da134..79ca6a54aeddd 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 @@ -44,7 +44,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.api.txstate.RelationshipChangeVisitorAdapter; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.RelationshipVisitor; @@ -110,7 +110,7 @@ public class TxState implements TransactionState, RelationshipVisitor.Home private PrimitiveIntObjectMap createdRelationshipTypeTokens; private GraphState graphState; - private DiffSets indexChanges; + private DiffSets indexChanges; private DiffSets constraintsChanges; private PropertyChanges propertyChangesForNodes; @@ -302,18 +302,18 @@ private static DiffSetsVisitor constraintsVisitor( final T return new ConstraintDiffSetsVisitor( visitor ); } - private static DiffSetsVisitor indexVisitor( final TxStateVisitor visitor ) + private static DiffSetsVisitor indexVisitor( final TxStateVisitor visitor ) { - return new DiffSetsVisitor() + return new DiffSetsVisitor() { @Override - public void visitAdded( IndexDescriptor index ) + public void visitAdded( SchemaIndexDescriptor index ) { visitor.visitAddedIndex( index ); } @Override - public void visitRemoved( IndexDescriptor index ) + public void visitRemoved( SchemaIndexDescriptor index ) { visitor.visitRemovedIndex( index ); } @@ -785,9 +785,9 @@ public ReadableDiffSets nodesWithAllLabelsChanged( int... labels ) } @Override - public void indexRuleDoAdd( IndexDescriptor descriptor ) + public void indexRuleDoAdd( SchemaIndexDescriptor descriptor ) { - DiffSets diff = indexChangesDiffSets(); + DiffSets diff = indexChangesDiffSets(); if ( !diff.unRemove( descriptor ) ) { diff.add( descriptor ); @@ -796,31 +796,31 @@ public void indexRuleDoAdd( IndexDescriptor descriptor ) } @Override - public void indexDoDrop( IndexDescriptor descriptor ) + public void indexDoDrop( SchemaIndexDescriptor descriptor ) { indexChangesDiffSets().remove( descriptor ); changed(); } @Override - public boolean indexDoUnRemove( IndexDescriptor descriptor ) + public boolean indexDoUnRemove( SchemaIndexDescriptor 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 ) { @@ -976,7 +976,7 @@ public boolean constraintDoUnRemove( ConstraintDescriptor constraint ) } @Override - public Iterable constraintIndexesCreatedInTx() + public Iterable constraintIndexesCreatedInTx() { if ( createdConstraintIndexesByConstraint != null && !createdConstraintIndexesByConstraint.isEmpty() ) { @@ -993,7 +993,7 @@ public Long indexCreatedForConstraint( ConstraintDescriptor constraint ) } @Override - public PrimitiveLongReadableDiffSets indexUpdatesForScan( IndexDescriptor descriptor ) + public PrimitiveLongReadableDiffSets indexUpdatesForScan( SchemaIndexDescriptor descriptor ) { if ( indexUpdates == null ) { @@ -1014,14 +1014,14 @@ public PrimitiveLongReadableDiffSets indexUpdatesForScan( IndexDescriptor descri } @Override - public PrimitiveLongReadableDiffSets indexUpdatesForSeek( IndexDescriptor descriptor, ValueTuple values ) + public PrimitiveLongReadableDiffSets indexUpdatesForSeek( SchemaIndexDescriptor descriptor, ValueTuple values ) { PrimitiveLongDiffSets indexUpdatesForSeek = getIndexUpdatesForSeek( descriptor.schema(), values, /*create=*/false ); return indexUpdatesForSeek == null ? PrimitiveLongReadableDiffSets.EMPTY : indexUpdatesForSeek; } @Override - public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByNumber( IndexDescriptor descriptor, + public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByNumber( SchemaIndexDescriptor descriptor, Number lower, boolean includeLower, Number upper, boolean includeUpper ) { @@ -1063,7 +1063,7 @@ public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByNumber( IndexDesc } @Override - public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByGeometry( IndexDescriptor descriptor, + public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByGeometry( SchemaIndexDescriptor descriptor, PointValue lower, boolean includeLower, PointValue upper, boolean includeUpper ) { @@ -1110,7 +1110,7 @@ public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByGeometry( IndexDe } @Override - public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByString( IndexDescriptor descriptor, + public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByString( SchemaIndexDescriptor descriptor, String lower, boolean includeLower, String upper, boolean includeUpper ) { @@ -1166,7 +1166,7 @@ private PrimitiveLongReadableDiffSets indexUpdatesForRangeSeek( TreeMap sortedUpdates = getSortedIndexUpdates( descriptor.schema() ); if ( sortedUpdates == null ) @@ -1306,7 +1306,7 @@ private Map createdConstraintIndexesByCon return createdConstraintIndexesByConstraint; } - private IndexDescriptor getIndexForIndexBackedConstraint( IndexBackedConstraintDescriptor constraint ) + private SchemaIndexDescriptor getIndexForIndexBackedConstraint( IndexBackedConstraintDescriptor constraint ) { return constraint.ownedIndexDescriptor(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java index 53b1b0d376e62..296b6ce9440b9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java @@ -40,7 +40,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.constraints.ConstraintSemantics; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.IndexRule; @@ -151,17 +151,17 @@ public void removeSchemaRule( long id ) } } - public IndexDescriptor indexDescriptor( LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexDescriptor( LabelSchemaDescriptor descriptor ) { return schemaCacheState.indexDescriptor( descriptor ); } - public Iterator indexDescriptorsForLabel( int labelId ) + public Iterator indexDescriptorsForLabel( int labelId ) { return schemaCacheState.indexDescriptorsForLabel( labelId ); } - public Iterator indexesByProperty( int propertyId ) + public Iterator indexesByProperty( int propertyId ) { return schemaCacheState.indexesByProperty( propertyId ); } @@ -173,11 +173,11 @@ private static class SchemaCacheState private final PrimitiveLongObjectMap indexRuleById; private final PrimitiveLongObjectMap constraintRuleById; - private final Map indexDescriptors; - private final PrimitiveIntObjectMap> indexDescriptorsByLabel; + private final Map indexDescriptors; + private final PrimitiveIntObjectMap> indexDescriptorsByLabel; private final Map,Object> dependantState; - private final PrimitiveIntObjectMap> indexByProperty; + private final PrimitiveIntObjectMap> indexByProperty; SchemaCacheState( ConstraintSemantics constraintSemantics, Iterable rules ) { @@ -239,20 +239,20 @@ Iterator constraints() return constraints.iterator(); } - IndexDescriptor indexDescriptor( LabelSchemaDescriptor descriptor ) + SchemaIndexDescriptor indexDescriptor( LabelSchemaDescriptor descriptor ) { return indexDescriptors.get( descriptor ); } - Iterator indexesByProperty( int propertyId ) + Iterator indexesByProperty( int propertyId ) { - List indexes = indexByProperty.get( propertyId ); + List indexes = indexByProperty.get( propertyId ); return (indexes == null) ? emptyIterator() : indexes.iterator(); } - Iterator indexDescriptorsForLabel( int labelId ) + Iterator indexDescriptorsForLabel( int labelId ) { - Set forLabel = indexDescriptorsByLabel.get( labelId ); + Set forLabel = indexDescriptorsByLabel.get( labelId ); return forLabel == null ? emptyIterator() : forLabel.iterator(); } @@ -274,18 +274,18 @@ else if ( rule instanceof IndexRule ) IndexRule indexRule = (IndexRule) rule; indexRuleById.put( indexRule.getId(), indexRule ); LabelSchemaDescriptor schemaDescriptor = indexRule.schema(); - IndexDescriptor indexDescriptor = indexRule.getIndexDescriptor(); - indexDescriptors.put( schemaDescriptor, indexDescriptor ); + SchemaIndexDescriptor schemaIndexDescriptor = indexRule.getIndexDescriptor(); + indexDescriptors.put( schemaDescriptor, schemaIndexDescriptor ); - Set forLabel = + Set forLabel = indexDescriptorsByLabel.computeIfAbsent( schemaDescriptor.getLabelId(), k -> new HashSet<>() ); - forLabel.add( indexDescriptor ); + forLabel.add( schemaIndexDescriptor ); for ( int propertyId : indexRule.schema().getPropertyIds() ) { - List indexesForProperty = + List indexesForProperty = indexByProperty.computeIfAbsent( propertyId, k -> new ArrayList<>() ); - indexesForProperty.add( indexDescriptor ); + indexesForProperty.add( schemaIndexDescriptor ); } } } @@ -303,7 +303,7 @@ else if ( indexRuleById.containsKey( id ) ) LabelSchemaDescriptor schema = rule.schema(); indexDescriptors.remove( schema ); - Set forLabel = indexDescriptorsByLabel.get( schema.getLabelId() ); + Set forLabel = indexDescriptorsByLabel.get( schema.getLabelId() ); forLabel.remove( rule.getIndexDescriptor() ); if ( forLabel.isEmpty() ) { @@ -312,7 +312,7 @@ else if ( indexRuleById.containsKey( id ) ) for ( int propertyId : rule.schema().getPropertyIds() ) { - List forProperty = indexByProperty.get( propertyId ); + List forProperty = indexByProperty.get( propertyId ); forProperty.remove( rule.getIndexDescriptor() ); if ( forProperty.isEmpty() ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java index bda2a97632c01..0b9c133e7b6da 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java @@ -47,7 +47,7 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.properties.PropertyKeyIdIterator; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.index.IndexingService; @@ -184,31 +184,31 @@ public PrimitiveLongResourceIterator nodesGetForLabel( StorageStatement statemen } @Override - public IndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) + public SchemaIndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) { return schemaCache.indexDescriptor( descriptor ); } @Override - public Iterator indexesGetForLabel( int labelId ) + public Iterator indexesGetForLabel( int labelId ) { return schemaCache.indexDescriptorsForLabel( labelId ); } @Override - public Iterator indexesGetAll() + public Iterator indexesGetAll() { return toIndexDescriptors( schemaCache.indexRules() ); } @Override - public Iterator indexesGetRelatedToProperty( int propertyId ) + public Iterator indexesGetRelatedToProperty( int propertyId ) { return schemaCache.indexesByProperty( propertyId ); } @Override - public Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) + public Long indexGetOwningUniquenessConstraintId( SchemaIndexDescriptor index ) { IndexRule rule = indexRule( index ); if ( rule != null ) @@ -219,7 +219,7 @@ public Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) } @Override - public long indexGetCommittedId( IndexDescriptor index ) + public long indexGetCommittedId( SchemaIndexDescriptor index ) throws SchemaRuleNotFoundException { IndexRule rule = indexRule( index ); @@ -231,19 +231,19 @@ public long indexGetCommittedId( IndexDescriptor index ) } @Override - public InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public InternalIndexState indexGetState( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return indexService.getIndexProxy( descriptor.schema() ).getState(); } @Override - public IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return indexService.getIndexProxy( descriptor.schema() ).getProviderDescriptor(); } @Override - public IndexCapability indexGetCapability( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexCapability indexGetCapability( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return indexService.getIndexProxy( descriptor.schema() ).getIndexCapability(); } @@ -588,7 +588,7 @@ public void degrees( StorageStatement statement, NodeItem nodeItem, DegreeVisito } } - private IndexRule indexRule( IndexDescriptor index ) + private IndexRule indexRule( SchemaIndexDescriptor index ) { for ( IndexRule rule : schemaCache.indexRules() ) { @@ -690,7 +690,7 @@ private Direction directionOf( long nodeId, long relationshipId, long startNode, " with startNode:" + startNode + " and endNode:" + endNode ); } - private static Iterator toIndexDescriptors( Iterable rules ) + private static Iterator toIndexDescriptors( Iterable rules ) { return Iterators.map( IndexRule::getIndexDescriptor, rules.iterator() ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java index 0a78aad23ec3e..79049f7678c1f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java @@ -66,7 +66,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -79,7 +79,7 @@ import static org.neo4j.helpers.collection.Iterators.addToCollection; import static org.neo4j.helpers.collection.Iterators.asCollection; import static org.neo4j.helpers.collection.Iterators.map; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; import static org.neo4j.kernel.impl.coreapi.schema.PropertyNameUtils.getOrCreatePropertyKeyIds; public class SchemaImpl implements Schema @@ -110,8 +110,8 @@ public Iterable getIndexes( final Label label ) { return emptyList(); } - Iterator indexes = statement.readOperations().indexesGetForLabel( labelId ); - addDefinitions( definitions, statement.readOperations(), IndexDescriptor.sortByType( indexes ) ); + Iterator indexes = statement.readOperations().indexesGetForLabel( labelId ); + addDefinitions( definitions, statement.readOperations(), SchemaIndexDescriptor.sortByType( indexes ) ); return definitions; } } @@ -122,13 +122,13 @@ public Iterable getIndexes() try ( Statement statement = statementContextSupplier.get() ) { List definitions = new ArrayList<>(); - Iterator indexes = statement.readOperations().indexesGetAll(); - addDefinitions( definitions, statement.readOperations(), IndexDescriptor.sortByType( indexes ) ); + Iterator indexes = statement.readOperations().indexesGetAll(); + addDefinitions( definitions, statement.readOperations(), SchemaIndexDescriptor.sortByType( indexes ) ); return definitions; } } - private IndexDefinition descriptorToDefinition( final ReadOperations statement, IndexDescriptor index ) + private IndexDefinition descriptorToDefinition( final ReadOperations statement, SchemaIndexDescriptor index ) { try { @@ -144,7 +144,7 @@ private IndexDefinition descriptorToDefinition( final ReadOperations statement, } private void addDefinitions( List definitions, final ReadOperations statement, - Iterator indexes ) + Iterator indexes ) { addToCollection( map( index -> descriptorToDefinition( statement, index ), indexes ), @@ -211,7 +211,7 @@ public IndexState getIndexState( final IndexDefinition index ) try ( Statement statement = statementContextSupplier.get() ) { ReadOperations readOps = statement.readOperations(); - IndexDescriptor descriptor = getIndexDescriptor( readOps, index ); + SchemaIndexDescriptor descriptor = getIndexDescriptor( readOps, index ); InternalIndexState indexState = readOps.indexGetState( descriptor ); switch ( indexState ) { @@ -239,7 +239,7 @@ public IndexPopulationProgress getIndexPopulationProgress( IndexDefinition index try ( Statement statement = statementContextSupplier.get() ) { ReadOperations readOps = statement.readOperations(); - IndexDescriptor descriptor = getIndexDescriptor( readOps, index ); + SchemaIndexDescriptor descriptor = getIndexDescriptor( readOps, index ); PopulationProgress progress = readOps.indexGetPopulationProgress( descriptor ); return new IndexPopulationProgress( progress.getCompleted(), progress.getTotal() ); } @@ -257,7 +257,7 @@ public String getIndexFailure( IndexDefinition index ) try ( Statement statement = statementContextSupplier.get() ) { ReadOperations readOps = statement.readOperations(); - IndexDescriptor descriptor = getIndexDescriptor( readOps, index ); + SchemaIndexDescriptor descriptor = getIndexDescriptor( readOps, index ); return readOps.indexGetFailure( descriptor ); } catch ( SchemaRuleNotFoundException | IndexNotFoundKernelException e ) @@ -319,7 +319,7 @@ public Iterable getConstraints( RelationshipType type ) } } - private static IndexDescriptor getIndexDescriptor( ReadOperations readOperations, IndexDefinition index ) + private static SchemaIndexDescriptor getIndexDescriptor( ReadOperations readOperations, IndexDefinition index ) throws SchemaRuleNotFoundException { int labelId = readOperations.labelGetForName( index.getLabel().name() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateLayout.java index 7a85030dcbabd..8ae468fc9f041 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateLayout.java @@ -21,16 +21,16 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.pagecache.PageCursor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; /** * {@link Layout} for dates. */ class DateLayout extends BaseLayout { - public static Layout of( IndexDescriptor descriptor ) + public static Layout of( SchemaIndexDescriptor descriptor ) { - return descriptor.type() == IndexDescriptor.Type.UNIQUE ? DateLayout.UNIQUE : DateLayout.NON_UNIQUE; + return descriptor.type() == SchemaIndexDescriptor.Type.UNIQUE ? DateLayout.UNIQUE : DateLayout.NON_UNIQUE; } private static DateLayout UNIQUE = new DateLayout( "UTda", 0, 1 ); 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 4c79a59388935..f5d0ccb192b44 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.ValueTuple; @@ -62,14 +62,14 @@ public class DeferredConflictCheckingIndexUpdater implements IndexUpdater { private final IndexUpdater actual; private final Supplier readerSupplier; - private final IndexDescriptor indexDescriptor; + private final SchemaIndexDescriptor schemaIndexDescriptor; private final Set touchedTuples = new HashSet<>(); - public DeferredConflictCheckingIndexUpdater( IndexUpdater actual, Supplier readerSupplier, IndexDescriptor indexDescriptor ) + public DeferredConflictCheckingIndexUpdater( IndexUpdater actual, Supplier readerSupplier, SchemaIndexDescriptor schemaIndexDescriptor ) { this.actual = actual; this.readerSupplier = readerSupplier; - this.indexDescriptor = indexDescriptor; + this.schemaIndexDescriptor = schemaIndexDescriptor; } @Override @@ -115,7 +115,7 @@ private IndexQuery[] queryOf( ValueTuple tuple ) IndexQuery[] predicates = new IndexQuery[tuple.size()]; for ( int i = 0; i < predicates.length; i++ ) { - predicates[i] = exact( indexDescriptor.schema().getPropertyIds()[i], tuple.valueAt( i ) ); + predicates[i] = exact( schemaIndexDescriptor.schema().getPropertyIds()[i], tuple.valueAt( i ) ); } return predicates; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationLayout.java index 93813424892ed..4c8bcff8a86cb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationLayout.java @@ -21,16 +21,16 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.pagecache.PageCursor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; /** * {@link Layout} for durations. */ class DurationLayout extends BaseLayout { - public static Layout of( IndexDescriptor descriptor ) + public static Layout of( SchemaIndexDescriptor descriptor ) { - return descriptor.type() == IndexDescriptor.Type.UNIQUE ? DurationLayout.UNIQUE : DurationLayout.NON_UNIQUE; + return descriptor.type() == SchemaIndexDescriptor.Type.UNIQUE ? DurationLayout.UNIQUE : DurationLayout.NON_UNIQUE; } private static DurationLayout UNIQUE = new DurationLayout( "UTdu", 0, 1 ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayout.java index b92c6811a400e..2f1c105a642f2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayout.java @@ -21,16 +21,16 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.pagecache.PageCursor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; /** * {@link Layout} for local date times. */ class LocalDateTimeLayout extends BaseLayout { - public static Layout of( IndexDescriptor descriptor ) + public static Layout of( SchemaIndexDescriptor descriptor ) { - return descriptor.type() == IndexDescriptor.Type.UNIQUE ? LocalDateTimeLayout.UNIQUE : LocalDateTimeLayout.NON_UNIQUE; + return descriptor.type() == SchemaIndexDescriptor.Type.UNIQUE ? LocalDateTimeLayout.UNIQUE : LocalDateTimeLayout.NON_UNIQUE; } private static LocalDateTimeLayout UNIQUE = new LocalDateTimeLayout( "UTld", 0, 1 ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayout.java index 3c35a6d6e445c..17dec55e4cea5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayout.java @@ -21,16 +21,16 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.pagecache.PageCursor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; /** * {@link Layout} for local times. */ class LocalTimeLayout extends BaseLayout { - public static Layout of( IndexDescriptor descriptor ) + public static Layout of( SchemaIndexDescriptor descriptor ) { - return descriptor.type() == IndexDescriptor.Type.UNIQUE ? LocalTimeLayout.UNIQUE : LocalTimeLayout.NON_UNIQUE; + return descriptor.type() == SchemaIndexDescriptor.Type.UNIQUE ? LocalTimeLayout.UNIQUE : LocalTimeLayout.NON_UNIQUE; } private static LocalTimeLayout UNIQUE = new LocalTimeLayout( "UTlt", 0, 1 ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java index ac4bff1c73922..b9aa4b0a8536d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure.Factory; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -62,7 +62,7 @@ protected NativeIndexProvider( Descriptor descriptor, int priority, Factory dire } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { if ( readOnly ) { @@ -74,23 +74,23 @@ public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, In return newIndexPopulator( storeFile, layout, descriptor, indexId, samplingConfig ); } - protected abstract IndexPopulator newIndexPopulator( File storeFile, Layout layout, IndexDescriptor descriptor, long indexId, - IndexSamplingConfig samplingConfig ); + protected abstract IndexPopulator newIndexPopulator( File storeFile, Layout layout, SchemaIndexDescriptor descriptor, long indexId, + IndexSamplingConfig samplingConfig ); @Override public IndexAccessor getOnlineAccessor( - long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { File storeFile = nativeIndexFileFromIndexId( indexId ); Layout layout = layout( descriptor ); return newIndexAccessor( storeFile, layout, descriptor, indexId, samplingConfig ); } - protected abstract IndexAccessor newIndexAccessor( File storeFile, Layout layout, IndexDescriptor descriptor, + protected abstract IndexAccessor newIndexAccessor( File storeFile, Layout layout, SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException; @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { try { @@ -108,7 +108,7 @@ public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) t } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { try { @@ -129,7 +129,7 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio return StoreMigrationParticipant.NOT_PARTICIPATING; } - private Layout layout( IndexDescriptor descriptor ) + private Layout layout( SchemaIndexDescriptor descriptor ) { switch ( descriptor.type() ) { 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 972487381b447..239a7ebe37191 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 @@ -31,7 +31,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.PageCursor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.index.GBPTreeFileUtil; import static org.neo4j.helpers.Format.duration; @@ -44,14 +44,14 @@ class NativeSchemaIndex layout; final GBPTreeFileUtil gbpTreeFileUtil; - final IndexDescriptor descriptor; + final SchemaIndexDescriptor descriptor; private final long indexId; private final IndexProvider.Monitor monitor; protected GBPTree tree; NativeSchemaIndex( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId ) + IndexProvider.Monitor monitor, SchemaIndexDescriptor descriptor, long indexId ) { this.pageCache = pageCache; this.storeFile = storeFile; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java index a750f2e3f642c..1be19e1290f32 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -55,7 +55,7 @@ public abstract class NativeSchemaIndexAccessor layout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException { 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 dd371030f8f04..69fdc651b7fe7 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 @@ -41,7 +41,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.DefaultNonUniqueIndexSampler; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.index.sampling.NonUniqueIndexSampler; @@ -50,8 +50,8 @@ import org.neo4j.storageengine.api.schema.IndexSample; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.GENERAL; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; /** * {@link IndexPopulator} backed by a {@link GBPTree}. @@ -79,7 +79,7 @@ abstract class NativeSchemaIndexPopulator layout, - IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) + IndexProvider.Monitor monitor, SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, indexId ); this.treeKey = layout.newKey(); 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 eef3a5207b2ed..e988f852c8eed 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexReader; @@ -48,11 +48,11 @@ abstract class NativeSchemaIndexReader,IOException>> openSeekers; - protected final IndexDescriptor descriptor; + protected final SchemaIndexDescriptor descriptor; NativeSchemaIndexReader( GBPTree tree, Layout layout, IndexSamplingConfig samplingConfig, - IndexDescriptor descriptor ) + SchemaIndexDescriptor 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 99fd0d41d244a..b7740729525cb 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 @@ -23,7 +23,7 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; @@ -50,7 +50,7 @@ protected boolean fetchNext() } @Override - public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) + public void initialize( SchemaIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) { this.progressor = progressor; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java index 35b38ffaaf0ce..def793aa0a383 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.ValueGroup; @@ -66,14 +66,15 @@ protected NumberLayoutNonUnique layoutNonUnique() } @Override - protected IndexPopulator newIndexPopulator( File storeFile, Layout layout, IndexDescriptor descriptor, long indexId, - IndexSamplingConfig samplingConfig ) + protected IndexPopulator newIndexPopulator( File storeFile, Layout layout, + SchemaIndexDescriptor descriptor, long indexId, + IndexSamplingConfig samplingConfig ) { return new NumberSchemaIndexPopulator( pageCache, fs, storeFile, layout, monitor, descriptor, indexId, samplingConfig ); } @Override - protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, IndexDescriptor descriptor, + protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException { return new NumberSchemaIndexAccessor( pageCache, fs, storeFile, layout, recoveryCleanupWorkCollector, monitor, descriptor, @@ -81,7 +82,7 @@ protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java index ce65723d2c980..c4b1c8485ea2c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java @@ -25,14 +25,14 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; class NumberSchemaIndexPopulator extends NativeSchemaIndexPopulator { NumberSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) + IndexProvider.Monitor monitor, SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, indexId, samplingConfig ); } 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 13ca6acb6ce25..9c48a3b984700 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,14 +25,14 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; import org.neo4j.internal.kernel.api.IndexQuery.NumberRangePredicate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; class NumberSchemaIndexReader extends NativeSchemaIndexReader { - NumberSchemaIndexReader( GBPTree tree, Layout layout, IndexSamplingConfig samplingConfig, IndexDescriptor descriptor ) + NumberSchemaIndexReader( GBPTree tree, Layout layout, IndexSamplingConfig samplingConfig, SchemaIndexDescriptor descriptor ) { super( tree, layout, samplingConfig, descriptor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java index d07c7c5865ece..23afe5860bd96 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.IndexUpdateApply; import org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.IndexUpdateWork; @@ -56,7 +56,7 @@ import static org.neo4j.helpers.collection.Iterators.asResourceIterator; import static org.neo4j.helpers.collection.Iterators.iterator; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.GENERAL; import static org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.BYTE_ONLINE; import static org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.BYTE_POPULATING; @@ -85,7 +85,7 @@ public class SpatialCRSSchemaIndex private WorkSync,IndexUpdateWork> additionsWorkSync; private WorkSync,IndexUpdateWork> updatesWorkSync; - public SpatialCRSSchemaIndex( IndexDescriptor descriptor, + public SpatialCRSSchemaIndex( SchemaIndexDescriptor descriptor, IndexDirectoryStructure directoryStructure, CoordinateReferenceSystem crs, long indexId, @@ -203,7 +203,7 @@ public BoundedIterable newAllEntriesReader() return new NativeAllEntriesReader<>( schemaIndex.tree, layout ); } - public IndexReader newReader( IndexSamplingConfig samplingConfig, IndexDescriptor descriptor ) + public IndexReader newReader( IndexSamplingConfig samplingConfig, SchemaIndexDescriptor descriptor ) { schemaIndex.assertOpen(); return new SpatialSchemaIndexReader<>( schemaIndex.tree, layout, samplingConfig, descriptor, configuration ); @@ -325,12 +325,12 @@ public boolean indexExists() return fs.fileExists( indexFile ); } - public String readPopulationFailure( IndexDescriptor descriptor ) throws IOException + public String readPopulationFailure( SchemaIndexDescriptor descriptor ) throws IOException { return NativeSchemaIndexes.readFailureMessage( pageCache, indexFile, layout( descriptor ) ); } - public InternalIndexState readState( IndexDescriptor descriptor ) throws IOException + public InternalIndexState readState( SchemaIndexDescriptor descriptor ) throws IOException { return NativeSchemaIndexes.readState( pageCache, indexFile, layout( descriptor ) ); } @@ -396,7 +396,7 @@ private void ensureTreeInstantiated() throws IOException } } - private SpatialLayout layout( IndexDescriptor descriptor ) + private SpatialLayout layout( SchemaIndexDescriptor descriptor ) { SpatialLayout layout; if ( isUnique( descriptor ) ) @@ -410,7 +410,7 @@ private SpatialLayout layout( IndexDescriptor descriptor ) return layout; } - private boolean isUnique( IndexDescriptor descriptor ) + private boolean isUnique( SchemaIndexDescriptor descriptor ) { switch ( descriptor.type() ) { @@ -434,7 +434,7 @@ private enum State public interface Supplier { - SpatialCRSSchemaIndex get( IndexDescriptor descriptor, + SpatialCRSSchemaIndex get( SchemaIndexDescriptor descriptor, Map indexMap, long indexId, CoordinateReferenceSystem crs ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaIndexReader.java index 1e35983e4545a..8d89a865e36f6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaIndexReader.java @@ -35,7 +35,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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 SpatialSchemaIndexReader tree, Layout layout, IndexSamplingConfig samplingConfig, IndexDescriptor descriptor, + SpatialSchemaIndexReader( GBPTree tree, Layout layout, IndexSamplingConfig samplingConfig, SchemaIndexDescriptor descriptor, SpaceFillingCurveConfiguration configuration ) { super( tree, layout, samplingConfig, descriptor ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java index 4609e0b9a0664..ebef4caca2726 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.ValueGroup; @@ -66,14 +66,15 @@ protected StringLayoutNonUnique layoutNonUnique() } @Override - protected IndexPopulator newIndexPopulator( File storeFile, Layout layout, IndexDescriptor descriptor, long indexId, - IndexSamplingConfig samplingConfig ) + protected IndexPopulator newIndexPopulator( File storeFile, Layout layout, + SchemaIndexDescriptor descriptor, long indexId, + IndexSamplingConfig samplingConfig ) { return new StringSchemaIndexPopulator( pageCache, fs, storeFile, layout, monitor, descriptor, indexId, samplingConfig ); } @Override - protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, IndexDescriptor descriptor, + protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException { return new StringSchemaIndexAccessor( pageCache, fs, storeFile, layout, recoveryCleanupWorkCollector, monitor, descriptor, @@ -81,7 +82,7 @@ protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java index 85390dc684f3f..5dc074db4b57b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java @@ -25,14 +25,14 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; public class StringSchemaIndexPopulator extends NativeSchemaIndexPopulator { StringSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) + IndexProvider.Monitor monitor, SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, indexId, samplingConfig ); } 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 ae78680fb7b49..e18c5cc48744f 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.StringRangePredicate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; @@ -33,7 +33,7 @@ class StringSchemaIndexReader extends NativeSchemaIndexReader { StringSchemaIndexReader( GBPTree tree, Layout layout, - IndexSamplingConfig samplingConfig, IndexDescriptor descriptor ) + IndexSamplingConfig samplingConfig, SchemaIndexDescriptor 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 cbfe8347efc27..ad8411fe5692a 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 @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -49,10 +49,10 @@ class TemporalIndexAccessor extends TemporalIndexCache, IOException> implements IndexAccessor { - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; TemporalIndexAccessor( long indexId, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, PageCache pageCache, FileSystemAbstraction fs, @@ -172,7 +172,7 @@ public boolean isDirty() static class PartAccessor extends NativeSchemaIndexAccessor { private final Layout layout; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; PartAccessor( PageCache pageCache, @@ -180,7 +180,7 @@ static class PartAccessor extends NativeSchemaIndex TemporalIndexFiles.FileLayout fileLayout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException { @@ -203,7 +203,7 @@ static class PartFactory implements TemporalIndexCache.Factory, private final FileSystemAbstraction fs; private final RecoveryCleanupWorkCollector recoveryCleanupWorkCollector; private final IndexProvider.Monitor monitor; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final long indexId; private final IndexSamplingConfig samplingConfig; private final TemporalIndexFiles temporalIndexFiles; @@ -212,7 +212,7 @@ static class PartFactory implements TemporalIndexCache.Factory, FileSystemAbstraction fs, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig, TemporalIndexFiles temporalIndexFiles ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexFiles.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexFiles.java index 811ebbf59542e..dd46d32eb1f8d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexFiles.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexFiles.java @@ -26,7 +26,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.index.IndexDirectoryStructure; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.values.storable.ValueGroup; class TemporalIndexFiles @@ -39,7 +39,7 @@ class TemporalIndexFiles private FileLayout zonedTime; private FileLayout duration; - TemporalIndexFiles( IndexDirectoryStructure directoryStructure, long indexId, IndexDescriptor descriptor, FileSystemAbstraction fs ) + TemporalIndexFiles( IndexDirectoryStructure directoryStructure, long indexId, SchemaIndexDescriptor descriptor, FileSystemAbstraction fs ) { this.fs = fs; File indexDirectory = directoryStructure.directoryForIndex( indexId ); 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 4246cd2e8487b..db4590de5a1f5 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 @@ -24,7 +24,7 @@ import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; class TemporalIndexPartReader extends NativeSchemaIndexReader @@ -32,7 +32,7 @@ class TemporalIndexPartReader extends NativeSchemaI TemporalIndexPartReader( GBPTree tree, Layout layout, IndexSamplingConfig samplingConfig, - IndexDescriptor descriptor ) + SchemaIndexDescriptor descriptor ) { super( tree, layout, samplingConfig, descriptor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPopulator.java index 487a6f3fdf3ea..d0c399c941180 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPopulator.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.DefaultNonUniqueIndexSampler; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.index.sampling.UniqueIndexSampler; @@ -47,7 +47,7 @@ class TemporalIndexPopulator extends TemporalIndexCache extends NativeSchemaInde List> updates = new ArrayList<>(); PartPopulator( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles.FileLayout fileLayout, - IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) + IndexProvider.Monitor monitor, SchemaIndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, fileLayout.indexFile, fileLayout.layout, monitor, descriptor, indexId, samplingConfig ); } @@ -225,12 +225,12 @@ static class PartFactory implements TemporalIndexCache.Factory, private final FileSystemAbstraction fs; private final TemporalIndexFiles temporalIndexFiles; private final long indexId; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final IndexProvider.Monitor monitor; PartFactory( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles temporalIndexFiles, long indexId, - IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, IndexProvider.Monitor monitor ) + SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, IndexProvider.Monitor monitor ) { this.pageCache = pageCache; this.fs = fs; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java index 6000b4226bdd2..94aecda592fd7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -58,7 +58,7 @@ public TemporalIndexProvider( PageCache pageCache, FileSystemAbstraction fs, } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { if ( readOnly ) { @@ -69,14 +69,14 @@ public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, In } @Override - public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + public IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { TemporalIndexFiles files = new TemporalIndexFiles( directoryStructure(), indexId, descriptor, fs ); return new TemporalIndexAccessor( indexId, descriptor, samplingConfig, pageCache, fs, recoveryCleanupWorkCollector, monitor, files ); } @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { TemporalIndexFiles temporalIndexFiles = new TemporalIndexFiles( directoryStructure(), indexId, descriptor, fs ); @@ -99,7 +99,7 @@ public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) t } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { TemporalIndexFiles temporalIndexFiles = new TemporalIndexFiles( directoryStructure(), indexId, descriptor, fs ); @@ -127,7 +127,7 @@ public InternalIndexState getInitialState( long indexId, IndexDescriptor descrip } @Override - public IndexCapability getCapability( IndexDescriptor indexDescriptor ) + public IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { return IndexCapability.NO_CAPABILITY; } 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 7eeafa7b48c0a..4b892de0c7ae3 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 @@ -31,7 +31,7 @@ import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; import org.neo4j.internal.kernel.api.IndexQuery.ExistsPredicate; import org.neo4j.internal.kernel.api.IndexQuery.GeometryRangePredicate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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; @@ -44,9 +44,9 @@ class TemporalIndexReader extends TemporalIndexCache,IOException> implements IndexReader { - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; - TemporalIndexReader( IndexDescriptor descriptor, TemporalIndexAccessor accessor ) + TemporalIndexReader( SchemaIndexDescriptor descriptor, TemporalIndexAccessor accessor ) { super( new PartFactory( accessor ) ); this.descriptor = descriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedDateTimeLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedDateTimeLayout.java index 0572b108e1a06..87c823c75e355 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedDateTimeLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedDateTimeLayout.java @@ -19,11 +19,9 @@ */ package org.neo4j.kernel.impl.index.schema; -import java.util.Comparator; - import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.pagecache.PageCursor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; /** * {@link Layout} for absolute date times. @@ -33,9 +31,9 @@ class ZonedDateTimeLayout extends BaseLayout private static final int ZONE_ID_FLAG = 0x0100_0000; private static final int ZONE_ID_MASK = 0x0000_FFFF; - public static Layout of( IndexDescriptor descriptor ) + public static Layout of( SchemaIndexDescriptor descriptor ) { - return descriptor.type() == IndexDescriptor.Type.UNIQUE ? ZonedDateTimeLayout.UNIQUE : ZonedDateTimeLayout.NON_UNIQUE; + return descriptor.type() == SchemaIndexDescriptor.Type.UNIQUE ? ZonedDateTimeLayout.UNIQUE : ZonedDateTimeLayout.NON_UNIQUE; } private static final ZonedDateTimeLayout UNIQUE = new ZonedDateTimeLayout( "UTdt", 0, 1 ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeLayout.java index 6117357b5cc32..ec59efaa84532 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeLayout.java @@ -21,16 +21,16 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.pagecache.PageCursor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; /** * {@link Layout} for absolute times. */ class ZonedTimeLayout extends BaseLayout { - public static Layout of( IndexDescriptor descriptor ) + public static Layout of( SchemaIndexDescriptor descriptor ) { - return descriptor.type() == IndexDescriptor.Type.UNIQUE ? ZonedTimeLayout.UNIQUE : ZonedTimeLayout.NON_UNIQUE; + return descriptor.type() == SchemaIndexDescriptor.Type.UNIQUE ? ZonedTimeLayout.UNIQUE : ZonedTimeLayout.NON_UNIQUE; } private static final ZonedTimeLayout UNIQUE = new ZonedTimeLayout( "UTzt", 0, 1 ); 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 e62876743c8b4..c1bf61ffb5919 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; @@ -79,7 +79,7 @@ public boolean needsValues() } @Override - public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) + public void initialize( SchemaIndexDescriptor 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/FusionIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java index 11e0d838f0e0c..052d43b6edeb2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.DropAction; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.Selector; @@ -49,7 +49,7 @@ class FusionIndexAccessor implements IndexAccessor private final IndexAccessor luceneAccessor; private final Selector selector; private final long indexId; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final DropAction dropAction; FusionIndexAccessor( IndexAccessor numberAccessor, @@ -58,7 +58,7 @@ class FusionIndexAccessor implements IndexAccessor IndexAccessor luceneAccessor, Selector selector, long indexId, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, DropAction dropAction ) { this.numberAccessor = numberAccessor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java index cd333c4bcadc4..96b1820bdb3e6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.newapi.UnionIndexCapability; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -80,7 +80,7 @@ public FusionIndexProvider( IndexProvider numberProvider, } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { return new FusionIndexPopulator( numberProvider.getPopulator( indexId, descriptor, samplingConfig ), @@ -90,7 +90,7 @@ public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, In } @Override - public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor, + public IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { return new FusionIndexAccessor( @@ -101,7 +101,7 @@ public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor } @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { StringBuilder builder = new StringBuilder(); writeFailure( "number", builder, numberProvider, indexId, descriptor ); @@ -116,7 +116,7 @@ public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) t throw new IllegalStateException( "None of the indexes were in a failed state" ); } - private void writeFailure( String indexName, StringBuilder builder, IndexProvider provider, long indexId, IndexDescriptor descriptor ) + private void writeFailure( String indexName, StringBuilder builder, IndexProvider provider, long indexId, SchemaIndexDescriptor descriptor ) { try { @@ -132,7 +132,7 @@ private void writeFailure( String indexName, StringBuilder builder, IndexProvide } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { InternalIndexState numberState = numberProvider.getInitialState( indexId, descriptor ); InternalIndexState spatialState = spatialProvider.getInitialState( indexId, descriptor ); @@ -153,12 +153,12 @@ public InternalIndexState getInitialState( long indexId, IndexDescriptor descrip } @Override - public IndexCapability getCapability( IndexDescriptor indexDescriptor ) + public IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { - IndexCapability numberCapability = numberProvider.getCapability( indexDescriptor ); - IndexCapability spatialCapability = spatialProvider.getCapability( indexDescriptor ); - IndexCapability temporalCapability = temporalProvider.getCapability( indexDescriptor ); - IndexCapability luceneCapability = luceneProvider.getCapability( indexDescriptor ); + IndexCapability numberCapability = numberProvider.getCapability( schemaIndexDescriptor ); + IndexCapability spatialCapability = spatialProvider.getCapability( schemaIndexDescriptor ); + IndexCapability temporalCapability = temporalProvider.getCapability( schemaIndexDescriptor ); + IndexCapability luceneCapability = luceneProvider.getCapability( schemaIndexDescriptor ); return new UnionIndexCapability( numberCapability, spatialCapability, temporalCapability, luceneCapability ) { @Override 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 75284d72d8824..97399ee183fe0 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 @@ -31,7 +31,7 @@ import org.neo4j.internal.kernel.api.IndexQuery.GeometryRangePredicate; import org.neo4j.internal.kernel.api.IndexQuery.NumberRangePredicate; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.schema.BridgingIndexProgressor; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.Selector; import org.neo4j.storageengine.api.schema.IndexProgressor; @@ -49,14 +49,14 @@ class FusionIndexReader implements IndexReader private final IndexReader temporalReader; private final IndexReader luceneReader; private final Selector selector; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; FusionIndexReader( IndexReader numberReader, IndexReader spatialReader, IndexReader temporalReader, IndexReader luceneReader, Selector selector, - IndexDescriptor descriptor ) + SchemaIndexDescriptor descriptor ) { this.numberReader = numberReader; this.spatialReader = spatialReader; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexAccessor.java index c967dc26bb174..ac97f494712fc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexAccessor.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.SpatialCRSSchemaIndex; @@ -49,11 +49,11 @@ class SpatialFusionIndexAccessor implements IndexAccessor { private final Map indexMap; private final long indexId; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final SpatialCRSSchemaIndex.Supplier indexFactory; - SpatialFusionIndexAccessor( Map indexMap, long indexId, IndexDescriptor descriptor, + SpatialFusionIndexAccessor( Map indexMap, long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpatialCRSSchemaIndex.Supplier indexFactory ) throws IOException { this.indexMap = indexMap; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulator.java index fb84078b5c990..e585924f54932 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulator.java @@ -30,7 +30,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.DefaultNonUniqueIndexSampler; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.index.sampling.UniqueIndexSampler; @@ -46,12 +46,12 @@ class SpatialFusionIndexPopulator implements IndexPopulator { private final long indexId; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final SpatialCRSSchemaIndex.Supplier indexSupplier; private final Map indexMap; private final IndexSamplerWrapper sampler; - SpatialFusionIndexPopulator( Map indexMap, long indexId, IndexDescriptor descriptor, + SpatialFusionIndexPopulator( Map indexMap, long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpatialCRSSchemaIndex.Supplier indexSupplier ) { this.indexMap = indexMap; @@ -144,7 +144,7 @@ private static class IndexSamplerWrapper private final DefaultNonUniqueIndexSampler generalSampler; private final UniqueIndexSampler uniqueSampler; - IndexSamplerWrapper( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + IndexSamplerWrapper( SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { switch ( descriptor.type() ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProvider.java index 8eaebfe333205..9c7e8769426d7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProvider.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.SpatialCRSSchemaIndex; @@ -98,7 +98,7 @@ private static SpaceFillingCurveConfiguration getConfiguredSpaceFillingCurveConf } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { if ( readOnly ) { @@ -108,7 +108,7 @@ public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, In } @Override - public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + public IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { return new SpatialFusionIndexAccessor( indexesFor( indexId ), indexId, descriptor, samplingConfig, this ); } @@ -119,7 +119,7 @@ Map indexesFor( long indexId ) } @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { try { @@ -142,7 +142,7 @@ public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) t } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { // loop through all files, check if file exists, then check state // if any have failed, return failed, else if any are populating return populating, else online @@ -174,7 +174,7 @@ public InternalIndexState getInitialState( long indexId, IndexDescriptor descrip } @Override - public IndexCapability getCapability( IndexDescriptor indexDescriptor ) + public IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { // Spatial indexes are not ordered, nor do they return complete values return IndexCapability.NO_CAPABILITY; @@ -189,7 +189,7 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio } @Override - public SpatialCRSSchemaIndex get( IndexDescriptor descriptor, + public SpatialCRSSchemaIndex get( SchemaIndexDescriptor descriptor, Map indexMap, long indexId, CoordinateReferenceSystem crs ) { return indexMap.computeIfAbsent( crs, @@ -202,7 +202,7 @@ public SpatialCRSSchemaIndex get( IndexDescriptor descriptor, * provider/{indexId}/spatial/{crs-tableId}-{crs-code}/index-{indexId} * If a directory is found for a crs and it is missing the index file, the index will be marked as failed. */ - private void findAndCreateSpatialIndex( Map indexMap, long indexId, IndexDescriptor descriptor ) + private void findAndCreateSpatialIndex( Map indexMap, long indexId, SchemaIndexDescriptor descriptor ) { File directoryForIndex = this.directoryStructure().directoryForIndex( indexId ); if ( directoryForIndex != null ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReader.java index 7a1fd8ed25058..8758d5f824e88 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReader.java @@ -30,7 +30,7 @@ import org.neo4j.internal.kernel.api.IndexQuery.ExistsPredicate; import org.neo4j.internal.kernel.api.IndexQuery.GeometryRangePredicate; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.index.schema.NodeValueIterator; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexReader; @@ -44,9 +44,9 @@ class SpatialFusionIndexReader implements IndexReader { private final Map readerMap; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; - SpatialFusionIndexReader( Map readerMap, IndexDescriptor descriptor ) + SpatialFusionIndexReader( Map readerMap, SchemaIndexDescriptor descriptor ) { this.readerMap = readerMap; this.descriptor = descriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdater.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdater.java index add3cfd4ae331..41707e04f0de1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdater.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdater.java @@ -26,7 +26,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.index.schema.SpatialCRSSchemaIndex; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.PointValue; @@ -40,17 +40,17 @@ class SpatialFusionIndexUpdater implements IndexUpdater private final Map currentUpdaters = new HashMap<>(); private final long indexId; private final SpatialCRSSchemaIndex.Supplier indexSupplier; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final boolean populating; static SpatialFusionIndexUpdater updaterForAccessor( Map indexMap, long indexId, - SpatialCRSSchemaIndex.Supplier indexFactory, IndexDescriptor descriptor ) + SpatialCRSSchemaIndex.Supplier indexFactory, SchemaIndexDescriptor descriptor ) { return new SpatialFusionIndexUpdater( indexMap, indexId, indexFactory, descriptor, false ); } static SpatialFusionIndexUpdater updaterForPopulator( Map indexMap, long indexId, - SpatialCRSSchemaIndex.Supplier indexFactory, IndexDescriptor descriptor ) + SpatialCRSSchemaIndex.Supplier indexFactory, SchemaIndexDescriptor descriptor ) { return new SpatialFusionIndexUpdater( indexMap, indexId, indexFactory, descriptor, true ); } @@ -58,7 +58,7 @@ static SpatialFusionIndexUpdater updaterForPopulator( Map indexMap, long indexId, SpatialCRSSchemaIndex.Supplier indexSupplier, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, boolean populating ) { this.indexMap = indexMap; 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 e285aff78921b..80a22f4d126f4 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 @@ -52,8 +52,8 @@ import org.neo4j.kernel.api.proc.BasicContext; import org.neo4j.kernel.api.proc.Context; import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState; import org.neo4j.kernel.api.txstate.TransactionCountingStateVisitor; import org.neo4j.kernel.api.txstate.TransactionState; @@ -232,10 +232,10 @@ long graphPropertiesReference() @Override IndexReader indexReader( IndexReference index ) throws IndexNotFoundKernelException { - IndexDescriptor indexDescriptor = index.isUnique() ? - IndexDescriptorFactory.uniqueForLabel( index.label(), index.properties() ) : - IndexDescriptorFactory.forLabel( index.label(), index.properties() ); - return statement.getIndexReader( indexDescriptor ); + SchemaIndexDescriptor schemaIndexDescriptor = index.isUnique() ? + SchemaIndexDescriptorFactory.uniqueForLabel( index.label(), index.properties() ) : + SchemaIndexDescriptorFactory.forLabel( index.label(), index.properties() ); + return statement.getIndexReader( schemaIndexDescriptor ); } @Override @@ -260,13 +260,14 @@ ExplicitIndex explicitRelationshipIndex( String indexName ) throws ExplicitIndex public CapableIndexReference index( int label, int... properties ) { ktx.assertOpen(); - IndexDescriptor indexDescriptor = storeReadLayer.indexGetForSchema( new LabelSchemaDescriptor( label, properties ) ); - if ( indexDescriptor == null ) + SchemaIndexDescriptor + schemaIndexDescriptor = storeReadLayer.indexGetForSchema( new LabelSchemaDescriptor( label, properties ) ); + if ( schemaIndexDescriptor == null ) { return CapableIndexReference.NO_INDEX; } - return indexGetCapability( indexDescriptor); + return indexGetCapability( schemaIndexDescriptor ); } @Override @@ -275,7 +276,7 @@ public Iterator indexesGetForLabel( int labelId ) sharedOptimisticLock( ResourceTypes.LABEL, labelId ); ktx.assertOpen(); - Iterator iterator = storeReadLayer.indexesGetForLabel( labelId ); + Iterator iterator = storeReadLayer.indexesGetForLabel( labelId ); if ( ktx.hasTxStateWithChanges() ) { iterator = ktx.txState().indexDiffSetsByLabel( labelId ).apply( iterator ); @@ -283,22 +284,23 @@ public Iterator indexesGetForLabel( int labelId ) return Iterators.map( this::indexGetCapability, iterator ); } - CapableIndexReference indexGetCapability( IndexDescriptor indexDescriptor ) + CapableIndexReference indexGetCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { - boolean unique = indexDescriptor.type() == IndexDescriptor.Type.UNIQUE; + boolean unique = schemaIndexDescriptor.type() == SchemaIndexDescriptor.Type.UNIQUE; try { - IndexCapability indexCapability = storeReadLayer.indexGetCapability( indexDescriptor ); - return new DefaultCapableIndexReference( unique, indexCapability, indexDescriptor.schema().getLabelId(), - indexDescriptor.schema().getPropertyIds() ); + IndexCapability indexCapability = storeReadLayer.indexGetCapability( schemaIndexDescriptor ); + return new DefaultCapableIndexReference( unique, indexCapability, schemaIndexDescriptor.schema() + .getLabelId(), + schemaIndexDescriptor.schema().getPropertyIds() ); } catch ( IndexNotFoundKernelException e ) { - throw new IllegalStateException( "Could not find capability for index " + indexDescriptor, e ); + throw new IllegalStateException( "Could not find capability for index " + schemaIndexDescriptor, e ); } } - InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + InternalIndexState indexGetState( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { // If index is in our state, then return populating if ( ktx.hasTxStateWithChanges() ) @@ -313,7 +315,7 @@ InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFo return storeReadLayer.indexGetState( descriptor ); } - private boolean checkIndexState( IndexDescriptor index, ReadableDiffSets diffSet ) + private boolean checkIndexState( SchemaIndexDescriptor index, ReadableDiffSets diffSet ) throws IndexNotFoundKernelException { if ( diffSet.isAdded( index ) ) @@ -528,7 +530,7 @@ void getOrCreateRelationshipIndexConfig( String indexName, Map cu explicitIndexStore.getOrCreateRelationshipIndexConfig( indexName, customConfig ); } - String indexGetFailure( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + String indexGetFailure( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return storeReadLayer.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 e1fd6b05207a7..7fe4cf43d6784 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 @@ -27,7 +27,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexProgressor.NodeValueClient; @@ -60,8 +60,8 @@ final class DefaultNodeValueIndexCursor extends IndexCursor } @Override - public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, - IndexQuery[] query ) + public void initialize( SchemaIndexDescriptor descriptor, IndexProgressor progressor, + IndexQuery[] query ) { assert query != null && query.length > 0; super.initialize( progressor ); @@ -225,7 +225,7 @@ public String toString() } } - private void prefixQuery( IndexDescriptor descriptor, IndexQuery.StringPrefixPredicate predicate ) + private void prefixQuery( SchemaIndexDescriptor descriptor, IndexQuery.StringPrefixPredicate predicate ) { needsValues = true; if ( read.hasTxStateWithChanges() ) @@ -238,7 +238,7 @@ private void prefixQuery( IndexDescriptor descriptor, IndexQuery.StringPrefixPre } } - private void stringRangeQuery( IndexDescriptor descriptor, IndexQuery.StringRangePredicate predicate ) + private void stringRangeQuery( SchemaIndexDescriptor descriptor, IndexQuery.StringRangePredicate predicate ) { needsValues = true; if ( read.hasTxStateWithChanges() ) @@ -252,7 +252,7 @@ private void stringRangeQuery( IndexDescriptor descriptor, IndexQuery.StringRang } } - private void numericRangeQuery( IndexDescriptor descriptor, IndexQuery.NumberRangePredicate predicate ) + private void numericRangeQuery( SchemaIndexDescriptor descriptor, IndexQuery.NumberRangePredicate predicate ) { needsValues = true; if ( read.hasTxStateWithChanges() ) @@ -266,7 +266,7 @@ private void numericRangeQuery( IndexDescriptor descriptor, IndexQuery.NumberRan } } - private void geometricRangeQuery( IndexDescriptor descriptor, IndexQuery.GeometryRangePredicate predicate ) + private void geometricRangeQuery( SchemaIndexDescriptor descriptor, IndexQuery.GeometryRangePredicate predicate ) { if ( read.hasTxStateWithChanges() ) { @@ -279,7 +279,7 @@ private void geometricRangeQuery( IndexDescriptor descriptor, IndexQuery.Geometr } } - private void scanQuery( IndexDescriptor descriptor ) + private void scanQuery( SchemaIndexDescriptor descriptor ) { needsValues = true; if ( read.hasTxStateWithChanges() ) @@ -291,7 +291,7 @@ private void scanQuery( IndexDescriptor descriptor ) } } - private void seekQuery( IndexDescriptor descriptor, IndexQuery[] query ) + private void seekQuery( SchemaIndexDescriptor descriptor, IndexQuery[] query ) { needsValues = false; IndexQuery.ExactPredicate[] exactPreds = assertOnlyExactPredicates( query ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdater.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdater.java index 71d309a1afa78..255d7e82a7ebd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdater.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdater.java @@ -27,7 +27,7 @@ import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.internal.kernel.api.NodeCursor; import org.neo4j.internal.kernel.api.PropertyCursor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.util.Validators; import org.neo4j.storageengine.api.StoreReadLayer; import org.neo4j.values.storable.Value; @@ -81,10 +81,10 @@ void onLabelChange( int labelId, NodeCursor node, PropertyCursor propertyCursor, } // Check all indexes of the changed label - Iterator indexes = storeReadLayer.indexesGetForLabel( labelId ); + Iterator indexes = storeReadLayer.indexesGetForLabel( labelId ); while ( indexes.hasNext() ) { - IndexDescriptor index = indexes.next(); + SchemaIndexDescriptor index = indexes.next(); int[] indexPropertyIds = index.schema().getPropertyIds(); if ( nodeHasIndexProperties( nodePropertyIds, indexPropertyIds ) ) { @@ -118,7 +118,7 @@ private boolean noSchemaChangedInTx() void onPropertyAdd( NodeCursor node, PropertyCursor propertyCursor, int propertyKeyId, Value value ) { assert noSchemaChangedInTx(); - Iterator indexes = + Iterator indexes = storeReadLayer.indexesGetRelatedToProperty( propertyKeyId ); NodeSchemaMatcher.onMatchingSchema( indexes, node, propertyCursor, propertyKeyId, ( index, propertyKeyIds ) -> @@ -134,7 +134,7 @@ void onPropertyAdd( NodeCursor node, PropertyCursor propertyCursor, int property void onPropertyRemove( NodeCursor node, PropertyCursor propertyCursor, int propertyKeyId, Value value ) { assert noSchemaChangedInTx(); - Iterator indexes = + Iterator indexes = storeReadLayer.indexesGetRelatedToProperty( propertyKeyId ); NodeSchemaMatcher.onMatchingSchema( indexes, node, propertyCursor, propertyKeyId, ( index, propertyKeyIds ) -> @@ -150,7 +150,7 @@ void onPropertyChange( NodeCursor node, PropertyCursor propertyCursor, int prope Value beforeValue, Value afterValue ) { assert noSchemaChangedInTx(); - Iterator indexes = storeReadLayer.indexesGetRelatedToProperty( propertyKeyId ); + Iterator indexes = storeReadLayer.indexesGetRelatedToProperty( propertyKeyId ); NodeSchemaMatcher.onMatchingSchema( indexes, node, propertyCursor, propertyKeyId, ( index, propertyKeyIds ) -> { 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 6341486948ea2..d55b7fc3855f9 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) + public void initialize( SchemaIndexDescriptor 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 30933a21f2c31..0c0539e4f3974 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 @@ -53,7 +53,7 @@ import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; import org.neo4j.kernel.impl.index.IndexEntityType; @@ -321,9 +321,9 @@ private void validateNoExistingNodeWithExactValues( IndexBackedConstraintDescrip { try ( DefaultNodeValueIndexCursor valueCursor = cursors.allocateNodeValueIndexCursor() ) { - IndexDescriptor indexDescriptor = constraint.ownedIndexDescriptor(); - assertIndexOnline( indexDescriptor ); - int labelId = indexDescriptor.schema().getLabelId(); + SchemaIndexDescriptor schemaIndexDescriptor = constraint.ownedIndexDescriptor(); + assertIndexOnline( schemaIndexDescriptor ); + int labelId = schemaIndexDescriptor.schema().getLabelId(); //Take a big fat lock, and check for existing node in index ktx.statementLocks().optimistic().acquireExclusive( @@ -331,7 +331,7 @@ private void validateNoExistingNodeWithExactValues( IndexBackedConstraintDescrip indexEntryResourceId( labelId, propertyValues ) ); - allStoreHolder.nodeIndexSeek( allStoreHolder.indexGetCapability( indexDescriptor ), valueCursor, + allStoreHolder.nodeIndexSeek( allStoreHolder.indexGetCapability( schemaIndexDescriptor ), valueCursor, IndexOrder.NONE, propertyValues ); if ( valueCursor.next() && valueCursor.nodeReference() != modifiedNode ) { @@ -345,7 +345,7 @@ private void validateNoExistingNodeWithExactValues( IndexBackedConstraintDescrip } } - private void assertIndexOnline( IndexDescriptor descriptor ) throws IndexNotFoundKernelException, IndexBrokenKernelException + private void assertIndexOnline( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException, IndexBrokenKernelException { switch ( allStoreHolder.indexGetState( descriptor ) ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/StoreStatement.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/StoreStatement.java index be7366eefc668..ade2844e48cda 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/StoreStatement.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/StoreStatement.java @@ -25,7 +25,7 @@ import org.neo4j.cursor.Cursor; import org.neo4j.kernel.api.AssertOpen; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.IndexReaderFactory; import org.neo4j.kernel.impl.api.store.AllIdIterator; import org.neo4j.kernel.impl.api.store.StoreIteratorRelationshipCursor; @@ -251,13 +251,13 @@ private IndexReaderFactory indexReaderFactory() } @Override - public IndexReader getIndexReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexReader getIndexReader( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return indexReaderFactory().newReader( descriptor ); } @Override - public IndexReader getFreshIndexReader( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexReader getFreshIndexReader( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return indexReaderFactory().newUnCachedReader( descriptor ); } 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 b71d8a5be8d2b..394f525f2f003 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 @@ -30,7 +30,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.IndexProviderMap; import org.neo4j.kernel.impl.constraints.ConstraintSemantics; @@ -177,7 +177,7 @@ public void visitNodeLabelChanges( long id, final Set added, final Set< } @Override - public void visitAddedIndex( IndexDescriptor index ) + public void visitAddedIndex( SchemaIndexDescriptor index ) { IndexProvider.Descriptor providerDescriptor = indexProviderMap.getDefaultProvider().getProviderDescriptor(); @@ -186,7 +186,7 @@ public void visitAddedIndex( IndexDescriptor index ) } @Override - public void visitRemovedIndex( IndexDescriptor index ) + public void visitRemovedIndex( SchemaIndexDescriptor index ) { IndexRule rule = schemaStorage.indexGetForSchema( index ); if ( rule != null ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MultipleUnderlyingStorageExceptions.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MultipleUnderlyingStorageExceptions.java index bc99b9bbd65f7..024a775970749 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MultipleUnderlyingStorageExceptions.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MultipleUnderlyingStorageExceptions.java @@ -23,31 +23,31 @@ import java.util.Set; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import static java.lang.String.format; public class MultipleUnderlyingStorageExceptions extends UnderlyingStorageException { - public final Set> exceptions; + public final Set> exceptions; - public MultipleUnderlyingStorageExceptions( Set> exceptions ) + public MultipleUnderlyingStorageExceptions( Set> exceptions ) { super( buildMessage( exceptions ) ); this.exceptions = Collections.unmodifiableSet( exceptions ); - for ( Pair exception : exceptions ) + for ( Pair exception : exceptions ) { this.addSuppressed( exception.other() ); } } - private static String buildMessage( Set> exceptions ) + private static String buildMessage( Set> exceptions ) { StringBuilder builder = new StringBuilder( ); builder.append("Errors when closing (flushing) index updaters:"); - for ( Pair pair : exceptions ) + for ( Pair pair : exceptions ) { builder.append( format( " (%s) %s", pair.first().toString(), pair.other().getMessage() ) ); } 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 59825d31aa95f..9c2e88360d92c 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.IndexRule; @@ -54,7 +54,7 @@ public SchemaStorage( RecordStore schemaStore ) * @throws IllegalStateException if more than one matching rule. * @param descriptor the target IndexDescriptor */ - public IndexRule indexGetForSchema( final IndexDescriptor descriptor ) + public IndexRule indexGetForSchema( final SchemaIndexDescriptor descriptor ) { Iterator rules = loadAllSchemaRules( descriptor::isSame, IndexRule.class, false ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java index 180b95582245a..79d355168e867 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java @@ -22,7 +22,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.SchemaRule; import static org.neo4j.internal.kernel.api.schema.SchemaUtil.idTokenNameLookup; @@ -30,32 +30,32 @@ /** * A {@link Label} can have zero or more index rules which will have data specified in the rules indexed. */ -public class IndexRule extends SchemaRule implements IndexDescriptor.Supplier +public class IndexRule extends SchemaRule implements SchemaIndexDescriptor.Supplier { private final IndexProvider.Descriptor providerDescriptor; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final Long owningConstraint; - public static IndexRule indexRule( long id, IndexDescriptor descriptor, + public static IndexRule indexRule( long id, SchemaIndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor ) { return new IndexRule( id, providerDescriptor, descriptor, null ); } - public static IndexRule constraintIndexRule( long id, IndexDescriptor descriptor, + public static IndexRule constraintIndexRule( long id, SchemaIndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor, Long owningConstraint ) { return new IndexRule( id, providerDescriptor, descriptor, owningConstraint ); } - public static IndexRule indexRule( long id, IndexDescriptor descriptor, + public static IndexRule indexRule( long id, SchemaIndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor, String name ) { return new IndexRule( id, providerDescriptor, descriptor, null, name ); } - public static IndexRule constraintIndexRule( long id, IndexDescriptor descriptor, + public static IndexRule constraintIndexRule( long id, SchemaIndexDescriptor descriptor, IndexProvider.Descriptor providerDescriptor, Long owningConstraint, String name ) { @@ -63,13 +63,13 @@ public static IndexRule constraintIndexRule( long id, IndexDescriptor descriptor } IndexRule( long id, IndexProvider.Descriptor providerDescriptor, - IndexDescriptor descriptor, Long owningConstraint ) + SchemaIndexDescriptor descriptor, Long owningConstraint ) { this( id, providerDescriptor, descriptor, owningConstraint, null ); } IndexRule( long id, IndexProvider.Descriptor providerDescriptor, - IndexDescriptor descriptor, Long owningConstraint, String name ) + SchemaIndexDescriptor descriptor, Long owningConstraint, String name ) { super( id, name ); if ( providerDescriptor == null ) @@ -89,7 +89,7 @@ public IndexProvider.Descriptor getProviderDescriptor() public boolean canSupportUniqueConstraint() { - return descriptor.type() == IndexDescriptor.Type.UNIQUE; + return descriptor.type() == SchemaIndexDescriptor.Type.UNIQUE; } /** @@ -149,7 +149,7 @@ public LabelSchemaDescriptor schema() } @Override - public IndexDescriptor getIndexDescriptor() + public SchemaIndexDescriptor getIndexDescriptor() { return descriptor; } 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 05ee70005b495..38e79dbaf8612 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 @@ -24,8 +24,8 @@ import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.storageengine.api.schema.SchemaRule.Kind; @@ -95,9 +95,9 @@ private static IndexRule readIndexRule( long id, boolean constraintIndex, int la { IndexProvider.Descriptor providerDescriptor = readIndexProviderDescriptor( serialized ); int[] propertyKeyIds = readIndexPropertyKeys( serialized ); - IndexDescriptor descriptor = constraintIndex ? - IndexDescriptorFactory.uniqueForLabel( label, propertyKeyIds ) : - IndexDescriptorFactory.forLabel( label, propertyKeyIds ); + SchemaIndexDescriptor descriptor = constraintIndex ? + SchemaIndexDescriptorFactory.uniqueForLabel( label, propertyKeyIds ) : + SchemaIndexDescriptorFactory.forLabel( label, propertyKeyIds ); long owningConstraint = constraintIndex ? readOwningConstraint( serialized ) : NO_OWNING_CONSTRAINT; return new IndexRule( id, providerDescriptor, descriptor, 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 7da25c81d52c7..861480bc52ac7 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 @@ -33,8 +33,8 @@ import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.string.UTF8; @@ -112,8 +112,8 @@ public static byte[] serialize( IndexRule indexRule ) UTF8.putEncodedStringInto( providerDescriptor.getKey(), target ); UTF8.putEncodedStringInto( providerDescriptor.getVersion(), target ); - IndexDescriptor indexDescriptor = indexRule.getIndexDescriptor(); - switch ( indexDescriptor.type() ) + SchemaIndexDescriptor schemaIndexDescriptor = indexRule.getIndexDescriptor(); + switch ( schemaIndexDescriptor.type() ) { case GENERAL: target.put( GENERAL_INDEX ); @@ -129,10 +129,10 @@ public static byte[] serialize( IndexRule indexRule ) default: throw new UnsupportedOperationException( format( "Got unknown index descriptor type '%s'.", - indexDescriptor.type() ) ); + schemaIndexDescriptor.type() ) ); } - indexDescriptor.schema().processWith( new SchemaDescriptorSerializer( target ) ); + schemaIndexDescriptor.schema().processWith( new SchemaDescriptorSerializer( target ) ); UTF8.putEncodedStringInto( indexRule.getName(), target ); return target.array(); } @@ -190,13 +190,13 @@ public static int lengthOf( IndexRule indexRule ) length += UTF8.computeRequiredByteBufferSize( providerDescriptor.getVersion() ); length += 1; // index type - IndexDescriptor indexDescriptor = indexRule.getIndexDescriptor(); - if ( indexDescriptor.type() == IndexDescriptor.Type.UNIQUE ) + SchemaIndexDescriptor schemaIndexDescriptor = indexRule.getIndexDescriptor(); + if ( schemaIndexDescriptor.type() == SchemaIndexDescriptor.Type.UNIQUE ) { length += 8; // owning constraint id } - length += indexDescriptor.schema().computeWith( schemaSizeComputer ); + length += schemaIndexDescriptor.schema().computeWith( schemaSizeComputer ); length += UTF8.computeRequiredByteBufferSize( indexRule.getName() ); return length; } @@ -238,12 +238,12 @@ private static IndexRule readIndexRule( long id, ByteBuffer source ) throws Malf case GENERAL_INDEX: schema = readLabelSchema( source ); name = readRuleName( id, IndexRule.class, source ); - return IndexRule.indexRule( id, IndexDescriptorFactory.forSchema( schema ), indexProvider, name ); + return IndexRule.indexRule( id, SchemaIndexDescriptorFactory.forSchema( schema ), indexProvider, name ); case UNIQUE_INDEX: long owningConstraint = source.getLong(); schema = readLabelSchema( source ); - IndexDescriptor descriptor = IndexDescriptorFactory.uniqueForSchema( schema ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.uniqueForSchema( schema ); name = readRuleName( id, IndexRule.class, source ); return IndexRule.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 0f6f61dfbcdfb..bea5ff7753108 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 @@ -34,11 +34,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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import static java.lang.String.format; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.GENERAL; public enum DbStructureArgumentFormatter implements ArgumentFormatter { @@ -52,8 +52,8 @@ public enum DbStructureArgumentFormatter implements ArgumentFormatter NodeKeyConstraintDescriptor.class.getCanonicalName(), LabelSchemaDescriptor.class.getCanonicalName(), SchemaDescriptorFactory.class.getCanonicalName(), - IndexDescriptor.class.getCanonicalName(), - IndexDescriptorFactory.class.getCanonicalName() + SchemaIndexDescriptor.class.getCanonicalName(), + SchemaIndexDescriptorFactory.class.getCanonicalName() ); @Override @@ -101,50 +101,54 @@ else if ( Double.isInfinite( d ) ) builder.append( 'd' ); } } - else if ( arg instanceof IndexDescriptor ) + else if ( arg instanceof SchemaIndexDescriptor ) { - IndexDescriptor descriptor = (IndexDescriptor) arg; + SchemaIndexDescriptor descriptor = (SchemaIndexDescriptor) arg; + String className = SchemaIndexDescriptorFactory.class.getSimpleName(); int labelId = descriptor.schema().getLabelId(); String methodName = descriptor.type() == GENERAL ? "forLabel" : "uniqueForLabel"; - builder.append( format( "IndexDescriptorFactory.%s( %d, %s )", methodName, - labelId, asString( descriptor.schema().getPropertyIds() ) ) ); + builder.append( format( "%s.%s( %d, %s )", + className, methodName, labelId, asString( descriptor.schema().getPropertyIds() ) ) ); } else if ( arg instanceof LabelSchemaDescriptor ) { LabelSchemaDescriptor descriptor = (LabelSchemaDescriptor) arg; + String className = SchemaDescriptorFactory.class.getSimpleName(); int labelId = descriptor.getLabelId(); - builder.append( format( "SchemaDescriptorFactory.forLabel( %d, %s )", labelId, - asString( descriptor.getPropertyIds() ) ) ); + builder.append( format( "%s.forLabel( %d, %s )", + className, labelId, asString( descriptor.getPropertyIds() ) ) ); } else if ( arg instanceof UniquenessConstraintDescriptor ) { UniquenessConstraintDescriptor constraint = (UniquenessConstraintDescriptor) arg; + String className = ConstraintDescriptorFactory.class.getSimpleName(); int labelId = constraint.schema().getLabelId(); - builder.append( format( "ConstraintDescriptorFactory.uniqueForLabel( %d, %s )", - labelId, - asString( constraint.schema().getPropertyIds() ) ) ); + builder.append( format( "%s.uniqueForLabel( %d, %s )", + className, labelId, asString( constraint.schema().getPropertyIds() ) ) ); } else if ( arg instanceof NodeExistenceConstraintDescriptor ) { NodeExistenceConstraintDescriptor constraint = (NodeExistenceConstraintDescriptor) arg; + String className = ConstraintDescriptorFactory.class.getSimpleName(); int labelId = constraint.schema().getLabelId(); - builder.append( format( "ConstraintDescriptorFactory.existsForLabel( %d, %s )", - labelId, asString( constraint.schema().getPropertyIds() ) ) ); + builder.append( format( "%s.existsForLabel( %d, %s )", + className, labelId, asString( constraint.schema().getPropertyIds() ) ) ); } else if ( arg instanceof RelExistenceConstraintDescriptor ) { RelationTypeSchemaDescriptor descriptor = ((RelExistenceConstraintDescriptor) arg).schema(); + String className = ConstraintDescriptorFactory.class.getSimpleName(); int relTypeId = descriptor.getRelTypeId(); - builder.append( format( "ConstraintDescriptorFactory.existsForReltype( %d, %s )", relTypeId, - asString( descriptor.getPropertyIds() ) ) ); + builder.append( format( "%s.existsForReltype( %d, %s )", + className, relTypeId, asString( descriptor.getPropertyIds() ) ) ); } else if ( arg instanceof NodeKeyConstraintDescriptor ) { NodeKeyConstraintDescriptor constraint = (NodeKeyConstraintDescriptor) arg; + String className = ConstraintDescriptorFactory.class.getSimpleName(); int labelId = constraint.schema().getLabelId(); - builder.append( format( "ConstraintDescriptorFactory.nodeKeyForLabel( %d, %s )", - labelId, - asString( constraint.schema().getPropertyIds() ) ) ); + builder.append( format( "%s.nodeKeyForLabel( %d, %s )", + className, labelId, asString( constraint.schema().getPropertyIds() ) ) ); } else { 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 375b4a7d627ac..5dc16fcc5572e 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import static java.lang.String.format; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; public class DbStructureCollector implements DbStructureVisitor { @@ -192,7 +192,7 @@ public void visitRelationshipType( int relTypeId, String relTypeName ) } @Override - public void visitIndex( IndexDescriptor descriptor, String userDescription, + public void visitIndex( SchemaIndexDescriptor 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 76d082b91d15a..5b5fc716bb912 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; public interface DbStructureVisitor { @@ -31,7 +31,7 @@ public interface DbStructureVisitor void visitPropertyKey( int propertyKeyId, String propertyKeyName ); void visitRelationshipType( int relTypeId, String relTypeName ); - void visitIndex( IndexDescriptor descriptor, String userDescription, double uniqueValuesPercentage, long size ); + void visitIndex( SchemaIndexDescriptor 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/kernel/impl/util/dbstructure/GraphDbStructureGuide.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java index d69f4101bf138..f7c483e18083f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java @@ -37,7 +37,7 @@ import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -135,7 +135,7 @@ private void showSchema( DbStructureVisitor visitor, ReadOperations read ) throw private void showIndices( DbStructureVisitor visitor, ReadOperations read, TokenNameLookup nameLookup ) throws IndexNotFoundKernelException { - for ( IndexDescriptor descriptor : loop( IndexDescriptor.sortByType( read.indexesGetAll() ) ) ) + for ( SchemaIndexDescriptor descriptor : loop( SchemaIndexDescriptor.sortByType( read.indexesGetAll() ) ) ) { String userDescription = descriptor.schema().userDescription( nameLookup ); double uniqueValuesPercentage = read.indexUniqueValuesSelectivity( descriptor ); diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java index e36f64bc7aaca..de8c3c5d470c9 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java @@ -26,7 +26,7 @@ import org.neo4j.io.pagecache.PageCursor; import org.neo4j.kernel.api.AssertOpen; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.locking.Lock; import org.neo4j.kernel.impl.store.InvalidRecordException; import org.neo4j.kernel.impl.store.RecordCursor; @@ -143,11 +143,11 @@ Cursor acquireSinglePropertyCursor( long propertyId, int propertyK * Reader returned from this method should not be closed. All such readers will be closed during {@link #close()} * of the current statement. * - * @param index {@link IndexDescriptor} to get reader for. + * @param index {@link SchemaIndexDescriptor} to get reader for. * @return {@link IndexReader} capable of searching entity ids given property values. * @throws IndexNotFoundKernelException if no such index exists. */ - IndexReader getIndexReader( IndexDescriptor index ) throws IndexNotFoundKernelException; + IndexReader getIndexReader( SchemaIndexDescriptor index ) throws IndexNotFoundKernelException; /** * Returns an {@link IndexReader} for searching entity ids given property values. A new reader is allocated @@ -157,11 +157,11 @@ Cursor acquireSinglePropertyCursor( long propertyId, int propertyK * NOTE: * It is caller's responsibility to close the returned reader. * - * @param index {@link IndexDescriptor} to get reader for. + * @param index {@link SchemaIndexDescriptor} to get reader for. * @return {@link IndexReader} capable of searching entity ids given property values. * @throws IndexNotFoundKernelException if no such index exists. */ - IndexReader getFreshIndexReader( IndexDescriptor index ) throws IndexNotFoundKernelException; + IndexReader getFreshIndexReader( SchemaIndexDescriptor index ) throws IndexNotFoundKernelException; /** * Access to low level record cursors diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java index a0aa823b3bd59..50ebc765a9aca 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java @@ -42,7 +42,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.store.RelationshipIterator; @@ -61,33 +61,33 @@ public interface StoreReadLayer /** * @param labelId label to list indexes for. - * @return {@link IndexDescriptor} associated with the given {@code labelId}. + * @return {@link SchemaIndexDescriptor} associated with the given {@code labelId}. */ - Iterator indexesGetForLabel( int labelId ); + Iterator indexesGetForLabel( int labelId ); /** - * @return all {@link IndexDescriptor} in storage. + * @return all {@link SchemaIndexDescriptor} in storage. */ - Iterator indexesGetAll(); + Iterator indexesGetAll(); /** * Returns all indexes (including unique) related to a property. */ - Iterator indexesGetRelatedToProperty( int propertyId ); + Iterator indexesGetRelatedToProperty( int propertyId ); /** - * @param index {@link IndexDescriptor} to get related uniqueness constraint for. + * @param index {@link SchemaIndexDescriptor} to get related uniqueness constraint for. * @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( IndexDescriptor index ); + Long indexGetOwningUniquenessConstraintId( SchemaIndexDescriptor index ); /** - * @param index {@link IndexDescriptor} to get schema rule id for. + * @param index {@link SchemaIndexDescriptor} to get schema rule id for. * @return schema rule id for matching index. * @throws SchemaRuleNotFoundException if no such index exists in storage. */ - long indexGetCommittedId( IndexDescriptor index ) + long indexGetCommittedId( SchemaIndexDescriptor index ) throws SchemaRuleNotFoundException; /** @@ -143,9 +143,9 @@ long indexGetCommittedId( IndexDescriptor index ) * Looks for a stored index by given {@code descriptor} * * @param descriptor a description of the index. - * @return {@link IndexDescriptor} for matching index, or {@code null} if not found. + * @return {@link SchemaIndexDescriptor} for matching index, or {@code null} if not found. */ - IndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ); + SchemaIndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ); /** * Returns state of a stored index. @@ -154,7 +154,7 @@ long indexGetCommittedId( IndexDescriptor index ) * @return {@link InternalIndexState} for index. * @throws IndexNotFoundKernelException if index not found. */ - InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + InternalIndexState indexGetState( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Return index provider descriptor of a stored index. @@ -163,7 +163,7 @@ long indexGetCommittedId( IndexDescriptor index ) * @return {@link IndexProvider.Descriptor} for index. * @throws IndexNotFoundKernelException if index not found. */ - IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexProvider.Descriptor indexGetProviderDescriptor( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Return capability of stored index. @@ -172,7 +172,7 @@ long indexGetCommittedId( IndexDescriptor index ) * @return {@link IndexCapability} for index. * @throws IndexNotFoundKernelException if index not found. */ - IndexCapability indexGetCapability( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexCapability indexGetCapability( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * @param descriptor {@link LabelSchemaDescriptor} 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 33dd5e14bec39..433899408b73e 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; public abstract class AbstractIndexReader implements IndexReader { - protected final IndexDescriptor descriptor; + protected final SchemaIndexDescriptor descriptor; - protected AbstractIndexReader( IndexDescriptor descriptor ) + protected AbstractIndexReader( SchemaIndexDescriptor 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 2cd984e37fa58..75de61bd75401 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.index.labelscan.LabelScanValueIndexProgressor; import org.neo4j.kernel.impl.newapi.ExplicitIndexProgressor; import org.neo4j.values.storable.Value; @@ -78,8 +78,8 @@ interface NodeValueClient * @param progressor The progressor * @param query The query of this progression */ - void initialize( IndexDescriptor descriptor, IndexProgressor progressor, - IndexQuery[] query ); + void initialize( SchemaIndexDescriptor descriptor, IndexProgressor progressor, + IndexQuery[] query ); /** * Accept the node id and values of a candidate index entry. Return true if the entry is 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 08b740407b3b0..8f362499d810d 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.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.IndexRule; @@ -138,7 +138,7 @@ public static Kind forId( byte id ) throws MalformedSchemaRuleException throw new MalformedSchemaRuleException( null, "Unknown kind id %d", id ); } - public static Kind map( IndexDescriptor descriptor ) + public static Kind map( SchemaIndexDescriptor 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 3007d41403286..8627b42ad78a0 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 @@ -29,7 +29,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.state.GraphState; import org.neo4j.kernel.impl.api.store.RelationshipIterator; @@ -121,11 +121,11 @@ public interface ReadableTransactionState // SCHEMA RELATED - ReadableDiffSets indexDiffSetsByLabel( int labelId ); + ReadableDiffSets indexDiffSetsByLabel( int labelId ); - ReadableDiffSets indexChanges(); + ReadableDiffSets indexChanges(); - Iterable constraintIndexesCreatedInTx(); + Iterable constraintIndexesCreatedInTx(); ReadableDiffSets constraintsChanges(); @@ -137,23 +137,23 @@ public interface ReadableTransactionState Long indexCreatedForConstraint( ConstraintDescriptor constraint ); - PrimitiveLongReadableDiffSets indexUpdatesForScan( IndexDescriptor index ); + PrimitiveLongReadableDiffSets indexUpdatesForScan( SchemaIndexDescriptor index ); - PrimitiveLongReadableDiffSets indexUpdatesForSeek( IndexDescriptor index, ValueTuple values ); + PrimitiveLongReadableDiffSets indexUpdatesForSeek( SchemaIndexDescriptor index, ValueTuple values ); - PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByNumber( IndexDescriptor index, + PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByNumber( SchemaIndexDescriptor index, Number lower, boolean includeLower, Number upper, boolean includeUpper ); - PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByGeometry( IndexDescriptor index, + PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByGeometry( SchemaIndexDescriptor index, PointValue lower, boolean includeLower, PointValue upper, boolean includeUpper ); - PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByString( IndexDescriptor index, + PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByString( SchemaIndexDescriptor index, String lower, boolean includeLower, String upper, boolean includeUpper ); - PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByPrefix( IndexDescriptor index, String prefix ); + PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByPrefix( SchemaIndexDescriptor 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 9be344c730b06..5601265a168d6 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 @@ -25,8 +25,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.exceptions.schema.RelationshipPropertyExistenceException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.StorageProperty; /** @@ -55,9 +54,9 @@ void visitGraphPropertyChanges( Iterator added, Iterator added, Set removed ) throws ConstraintValidationException; - void visitAddedIndex( IndexDescriptor element ); + void visitAddedIndex( SchemaIndexDescriptor element ); - void visitRemovedIndex( IndexDescriptor element ); + void visitRemovedIndex( SchemaIndexDescriptor element ); void visitAddedConstraint( ConstraintDescriptor element ) throws CreateConstraintFailureException; @@ -118,12 +117,12 @@ public void visitNodeLabelChanges( long id, Set added, Set rem } @Override - public void visitAddedIndex( IndexDescriptor index ) + public void visitAddedIndex( SchemaIndexDescriptor index ) { } @Override - public void visitRemovedIndex( IndexDescriptor index ) + public void visitRemovedIndex( SchemaIndexDescriptor index ) { } @@ -225,13 +224,13 @@ public void visitNodeLabelChanges( long id, Set added, Set rem } @Override - public void visitAddedIndex( IndexDescriptor index ) + public void visitAddedIndex( SchemaIndexDescriptor index ) { actual.visitAddedIndex( index ); } @Override - public void visitRemovedIndex( IndexDescriptor index ) + public void visitRemovedIndex( SchemaIndexDescriptor index ) { actual.visitRemovedIndex( index ); } diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java index d1bca55ba53ab..c9d7d0706791a 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java @@ -71,8 +71,8 @@ import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.extension.KernelExtensions; @@ -468,7 +468,7 @@ private void createIndexRule( int labelId, int[] propertyKeyIds ) { IndexRule schemaRule = IndexRule.indexRule( schemaStore.nextId(), - IndexDescriptorFactory.forLabel( labelId, propertyKeyIds ), + SchemaIndexDescriptorFactory.forLabel( labelId, propertyKeyIds ), schemaIndexProviders.getDefaultProvider().getProviderDescriptor() ); for ( DynamicRecord record : schemaStore.allocateFrom( schemaRule ) ) @@ -495,7 +495,7 @@ private void repopulateAllIndexes() throws IOException, IndexEntryConflictExcept for ( int i = 0; i < rules.length; i++ ) { IndexRule rule = rules[i]; - IndexDescriptor index = rule.getIndexDescriptor(); + SchemaIndexDescriptor index = rule.getIndexDescriptor(); descriptors[i] = index.schema(); IndexPopulator populator = schemaIndexProviders.apply( rule.getProviderDescriptor() ) .getPopulator( rule.getId(), index, new IndexSamplingConfig( config ) ); @@ -599,7 +599,7 @@ public ConstraintCreator createDeferredConstraint( Label label ) return new BaseNodeConstraintCreator( new BatchSchemaActions(), label ); } - private void createUniqueIndexAndOwningConstraint( IndexDescriptor indexDescriptor, + private void createUniqueIndexAndOwningConstraint( SchemaIndexDescriptor schemaIndexDescriptor, IndexBackedConstraintDescriptor constraintDescriptor ) { // TODO: Do not create duplicate index @@ -610,7 +610,7 @@ private void createUniqueIndexAndOwningConstraint( IndexDescriptor indexDescript IndexRule indexRule = IndexRule.constraintIndexRule( indexRuleId, - indexDescriptor, + schemaIndexDescriptor, this.schemaIndexProviders.getDefaultProvider().getProviderDescriptor(), constraintRuleId ); @@ -638,14 +638,14 @@ private void createUniqueIndexAndOwningConstraint( IndexDescriptor indexDescript private void createUniquenessConstraintRule( LabelSchemaDescriptor descriptor ) { createUniqueIndexAndOwningConstraint( - IndexDescriptorFactory.uniqueForSchema( descriptor ), + SchemaIndexDescriptorFactory.uniqueForSchema( descriptor ), ConstraintDescriptorFactory.uniqueForSchema( descriptor ) ); } private void createNodeKeyConstraintRule( LabelSchemaDescriptor descriptor ) { createUniqueIndexAndOwningConstraint( - IndexDescriptorFactory.uniqueForSchema( descriptor ), + SchemaIndexDescriptorFactory.uniqueForSchema( descriptor ), ConstraintDescriptorFactory.nodeKeyForSchema( descriptor ) ); } @@ -1305,10 +1305,10 @@ private static class IndexPopulatorWithSchema extends IndexPopulator.Adapter imp { private static final int batchSize = 1_000; private final IndexPopulator populator; - private final IndexDescriptor index; + private final SchemaIndexDescriptor index; private Collection> batchedUpdates = new ArrayList<>( batchSize ); - IndexPopulatorWithSchema( IndexPopulator populator, IndexDescriptor index ) + IndexPopulatorWithSchema( IndexPopulator populator, SchemaIndexDescriptor index ) { this.populator = populator; this.index = index; @@ -1320,7 +1320,7 @@ public LabelSchemaDescriptor schema() return index.schema(); } - public IndexDescriptor index() + public SchemaIndexDescriptor index() { return index; } diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java index be3c3fd6b113e..711ebd8023432 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.mockito.matcher.Neo4jMatchers; @@ -526,7 +526,7 @@ public void shouldSupportIndexSeekByPrefix() Statement statement = getStatement( (GraphDatabaseAPI) db ) ) { ReadOperations ops = statement.readOperations(); - IndexDescriptor descriptor = indexDescriptor( ops, index ); + SchemaIndexDescriptor descriptor = indexDescriptor( ops, index ); int propertyKeyId = descriptor.schema().getPropertyId(); found.addAll( ops.indexQuery( descriptor, stringPrefix( propertyKeyId, "Karl" ) ) ); } @@ -553,7 +553,7 @@ public void shouldIncludeNodesCreatedInSameTxInIndexSeekByPrefix() try ( Statement statement = getStatement( (GraphDatabaseAPI) db ) ) { ReadOperations readOperations = statement.readOperations(); - IndexDescriptor descriptor = indexDescriptor( readOperations, index ); + SchemaIndexDescriptor descriptor = indexDescriptor( readOperations, index ); int propertyKeyId = descriptor.schema().getPropertyId(); found.addAll( readOperations.indexQuery( descriptor, stringPrefix( propertyKeyId, "Carl" ) ) ); } @@ -586,7 +586,7 @@ public void shouldNotIncludeNodesDeletedInSameTxInIndexSeekByPrefix() try ( Statement statement = getStatement( (GraphDatabaseAPI) db ) ) { ReadOperations readOperations = statement.readOperations(); - IndexDescriptor descriptor = indexDescriptor( readOperations, index ); + SchemaIndexDescriptor descriptor = indexDescriptor( readOperations, index ); int propertyKeyId = descriptor.schema().getPropertyId(); found.addAll( readOperations.indexQuery( descriptor, stringPrefix( propertyKeyId, "Karl" ) ) ); } @@ -628,7 +628,7 @@ public void shouldConsiderNodesChangedInSameTxInIndexPrefixSearch() try ( Statement statement = getStatement( (GraphDatabaseAPI) db ) ) { ReadOperations readOperations = statement.readOperations(); - IndexDescriptor descriptor = indexDescriptor( readOperations, index ); + SchemaIndexDescriptor descriptor = indexDescriptor( readOperations, index ); int propertyKeyId = descriptor.schema().getPropertyId(); found.addAll( readOperations.indexQuery( descriptor, stringPrefix( propertyKeyId, prefix ) ) ); } @@ -651,7 +651,7 @@ private PrimitiveLongSet createNodes( GraphDatabaseService db, Label label, Stri return expected; } - private IndexDescriptor indexDescriptor( ReadOperations readOperations, IndexDefinition index ) + private SchemaIndexDescriptor indexDescriptor( ReadOperations readOperations, IndexDefinition index ) throws SchemaRuleNotFoundException { int labelId = readOperations.labelGetForName( index.getLabel().name() ); 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 ad91c5ffd1570..2448323b7e4c3 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 @@ -46,8 +46,8 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.ImpermanentDatabaseRule; @@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertFalse; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; @RunWith( Parameterized.class ) public class CompositeIndexingIT @@ -74,7 +74,7 @@ public class CompositeIndexingIT @Rule public Timeout globalTimeout = Timeout.seconds( 200 ); - private final IndexDescriptor index; + private final SchemaIndexDescriptor index; private GraphDatabaseAPI graphDatabaseAPI; @Before @@ -138,17 +138,17 @@ public void clean() throws Exception @Parameterized.Parameters( name = "Index: {0}" ) public static Iterable parameterValues() { - return Arrays.asList( Iterators.array( IndexDescriptorFactory.forLabel( LABEL_ID, 1 ) ), - Iterators.array( IndexDescriptorFactory.forLabel( LABEL_ID, 1, 2 ) ), - Iterators.array( IndexDescriptorFactory.forLabel( LABEL_ID, 1, 2, 3, 4 ) ), - Iterators.array( IndexDescriptorFactory.forLabel( LABEL_ID, 1, 2, 3, 4, 5, 6, 7 ) ), - Iterators.array( IndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ) ), - Iterators.array( IndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1, 2 ) ), - Iterators.array( IndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1, 2, 3, 4, 5, 6, 7 ) ) + return Arrays.asList( Iterators.array( SchemaIndexDescriptorFactory.forLabel( LABEL_ID, 1 ) ), + Iterators.array( SchemaIndexDescriptorFactory.forLabel( LABEL_ID, 1, 2 ) ), + Iterators.array( SchemaIndexDescriptorFactory.forLabel( LABEL_ID, 1, 2, 3, 4 ) ), + Iterators.array( SchemaIndexDescriptorFactory.forLabel( LABEL_ID, 1, 2, 3, 4, 5, 6, 7 ) ), + Iterators.array( SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ) ), + Iterators.array( SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1, 2 ) ), + Iterators.array( SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1, 2, 3, 4, 5, 6, 7 ) ) ); } - public CompositeIndexingIT( IndexDescriptor nodeDescriptor ) + public CompositeIndexingIT( SchemaIndexDescriptor 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 2f5bd263c91cc..bb9d556cb0db8 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,8 +23,8 @@ import org.junit.Test; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.PointValue; import org.neo4j.values.storable.Values; @@ -44,7 +44,7 @@ public abstract class CompositeIndexAccessorCompatibility extends IndexAccessorCompatibility { public CompositeIndexAccessorCompatibility( - IndexProviderCompatibilityTestSuite testSuite, IndexDescriptor descriptor ) + IndexProviderCompatibilityTestSuite testSuite, SchemaIndexDescriptor descriptor ) { super( testSuite, descriptor ); } @@ -110,7 +110,7 @@ public static class General extends CompositeIndexAccessorCompatibility { public General( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.forLabel( 1000, 100, 200 ) ); + super( testSuite, SchemaIndexDescriptorFactory.forLabel( 1000, 100, 200 ) ); } @Test @@ -152,7 +152,7 @@ public static class Unique extends CompositeIndexAccessorCompatibility { public Unique( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.uniqueForLabel( 1000, 100, 200 ) ); + super( testSuite, SchemaIndexDescriptorFactory.uniqueForLabel( 1000, 100, 200 ) ); } @Test 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 391b6d35a5852..582b3c7b62762 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 @@ -28,8 +28,8 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; 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, IndexDescriptor descriptor ) + IndexProviderCompatibilityTestSuite testSuite, SchemaIndexDescriptor descriptor ) { super( testSuite, descriptor ); } @@ -60,7 +60,7 @@ public static class General extends CompositeIndexPopulatorCompatibility { public General( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.forLabel( 1000, 100, 200 ) ); + super( testSuite, SchemaIndexDescriptorFactory.forLabel( 1000, 100, 200 ) ); } @Test @@ -100,7 +100,7 @@ public static class Unique extends CompositeIndexPopulatorCompatibility public Unique( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.uniqueForLabel( 1000, 100, 200 ) ); + super( testSuite, SchemaIndexDescriptorFactory.uniqueForLabel( 1000, 100, 200 ) ); } @Test 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 6faeefece1fb1..02eb864b68f3f 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.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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, IndexDescriptor descriptor ) + public IndexAccessorCompatibility( IndexProviderCompatibilityTestSuite testSuite, SchemaIndexDescriptor 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 0cfd57370d35a..8b4944b9cd633 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.function.ThrowingConsumer; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.test.rule.PageCacheAndDependenciesRule; import org.neo4j.test.rule.fs.DefaultFileSystemRule; import org.neo4j.test.runner.ParameterizedSuiteRunner; @@ -76,7 +76,7 @@ public abstract static class Compatibility protected File graphDbDir; protected FileSystemAbstraction fs; protected IndexProvider indexProvider; - protected IndexDescriptor descriptor; + protected SchemaIndexDescriptor descriptor; final IndexProviderCompatibilityTestSuite testSuite; final List valueSet1; final List valueSet2; @@ -90,7 +90,7 @@ public void setup() indexProvider = testSuite.createIndexProvider( pageCache, fs, graphDbDir ); } - public Compatibility( IndexProviderCompatibilityTestSuite testSuite, IndexDescriptor descriptor ) + public Compatibility( IndexProviderCompatibilityTestSuite testSuite, SchemaIndexDescriptor descriptor ) { this.testSuite = testSuite; this.descriptor = descriptor; 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 ca3805d15b0ba..a869ceb24dce3 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 @@ -26,8 +26,8 @@ import java.util.List; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import static java.util.Arrays.asList; import static java.util.Collections.EMPTY_LIST; @@ -50,7 +50,7 @@ public abstract class SimpleIndexAccessorCompatibility extends IndexAccessorCompatibility { public SimpleIndexAccessorCompatibility( IndexProviderCompatibilityTestSuite testSuite, - IndexDescriptor descriptor ) + SchemaIndexDescriptor descriptor ) { super( testSuite, descriptor ); } @@ -145,7 +145,7 @@ public static class General extends SimpleIndexAccessorCompatibility { public General( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.forLabel( 1000, 100 ) ); + super( testSuite, SchemaIndexDescriptorFactory.forLabel( 1000, 100 ) ); } @Test @@ -264,7 +264,7 @@ public static class Unique extends SimpleIndexAccessorCompatibility { public Unique( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.uniqueForLabel( 1000, 100 ) ); + super( testSuite, SchemaIndexDescriptorFactory.uniqueForLabel( 1000, 100 ) ); } @Test 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 8cacd6170be62..9c44f136828c5 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 @@ -34,8 +34,8 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -64,7 +64,7 @@ public class SimpleIndexPopulatorCompatibility extends IndexProviderCompatibilityTestSuite.Compatibility { public SimpleIndexPopulatorCompatibility( - IndexProviderCompatibilityTestSuite testSuite, IndexDescriptor descriptor ) + IndexProviderCompatibilityTestSuite testSuite, SchemaIndexDescriptor descriptor ) { super( testSuite, descriptor ); } @@ -271,7 +271,7 @@ public static class General extends SimpleIndexPopulatorCompatibility { public General( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.forLabel( 1000, 100 ) ); + super( testSuite, SchemaIndexDescriptorFactory.forLabel( 1000, 100 ) ); } @Test @@ -310,7 +310,7 @@ public static class Unique extends SimpleIndexPopulatorCompatibility { public Unique( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.uniqueForLabel( 1000, 100 ) ); + super( testSuite, SchemaIndexDescriptorFactory.uniqueForLabel( 1000, 100 ) ); } /** diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java index 468d67bbb6bd8..8bd0f389146d6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java @@ -43,7 +43,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.locking.Lock; @@ -68,7 +68,7 @@ public class UniqueConstraintCompatibility extends IndexProviderCompatibilityTes { public UniqueConstraintCompatibility( IndexProviderCompatibilityTestSuite testSuite ) { - super( testSuite, IndexDescriptorFactory.uniqueForLabel( 1, 2 ) ); + super( testSuite, SchemaIndexDescriptorFactory.uniqueForLabel( 1, 2 ) ); } /* diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptorFactoryTest.java similarity index 63% rename from community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactoryTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptorFactoryTest.java index e102e72e5c64c..8bc8dce4bbb90 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/schema/index/SchemaIndexDescriptorFactoryTest.java @@ -28,64 +28,64 @@ import static org.neo4j.kernel.api.schema.SchemaTestUtil.assertEquality; import static org.neo4j.kernel.api.schema.SchemaTestUtil.simpleNameLookup; -public class IndexDescriptorFactoryTest +public class SchemaIndexDescriptorFactoryTest { private static final int LABEL_ID = 0; @Test public void shouldCreateIndexDescriptors() { - IndexDescriptor desc; + SchemaIndexDescriptor desc; - desc = IndexDescriptorFactory.forLabel( LABEL_ID, 1 ); - assertThat( desc.type(), equalTo( IndexDescriptor.Type.GENERAL ) ); + desc = SchemaIndexDescriptorFactory.forLabel( LABEL_ID, 1 ); + assertThat( desc.type(), equalTo( SchemaIndexDescriptor.Type.GENERAL ) ); assertThat( desc.schema(), equalTo( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ) ); } @Test public void shouldCreateUniqueIndexDescriptors() { - IndexDescriptor desc; + SchemaIndexDescriptor desc; - desc = IndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ); - assertThat( desc.type(), equalTo( IndexDescriptor.Type.UNIQUE ) ); + desc = SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ); + assertThat( desc.type(), equalTo( SchemaIndexDescriptor.Type.UNIQUE ) ); assertThat( desc.schema(), equalTo( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ) ); } @Test public void shouldCreateIndexDescriptorsFromSchema() { - IndexDescriptor desc; + SchemaIndexDescriptor desc; - desc = IndexDescriptorFactory.forSchema( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ); - assertThat( desc.type(), equalTo( IndexDescriptor.Type.GENERAL ) ); + desc = SchemaIndexDescriptorFactory.forSchema( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ); + assertThat( desc.type(), equalTo( SchemaIndexDescriptor.Type.GENERAL ) ); assertThat( desc.schema(), equalTo( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ) ); - desc = IndexDescriptorFactory.uniqueForSchema( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ); - assertThat( desc.type(), equalTo( IndexDescriptor.Type.UNIQUE) ); + desc = SchemaIndexDescriptorFactory.uniqueForSchema( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ); + assertThat( desc.type(), equalTo( SchemaIndexDescriptor.Type.UNIQUE) ); assertThat( desc.schema(), equalTo( SchemaDescriptorFactory.forLabel( LABEL_ID, 1 ) ) ); } @Test public void shouldCreateEqualDescriptors() { - IndexDescriptor desc1; - IndexDescriptor desc2; - desc1 = IndexDescriptorFactory.forLabel( LABEL_ID, 1 ); - desc2 = IndexDescriptorFactory.forLabel( LABEL_ID, 1 ); + SchemaIndexDescriptor desc1; + SchemaIndexDescriptor desc2; + desc1 = SchemaIndexDescriptorFactory.forLabel( LABEL_ID, 1 ); + desc2 = SchemaIndexDescriptorFactory.forLabel( LABEL_ID, 1 ); assertEquality( desc1, desc2 ); - desc1 = IndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ); - desc2 = IndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ); + desc1 = SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ); + desc2 = SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, 1 ); assertEquality( desc1, desc2 ); } @Test public void shouldGiveNiceUserDescriptions() { - assertThat( IndexDescriptorFactory.forLabel( 1, 2 ).userDescription( simpleNameLookup ), + assertThat( SchemaIndexDescriptorFactory.forLabel( 1, 2 ).userDescription( simpleNameLookup ), equalTo( "Index( GENERAL, :Label1(property2) )" ) ); - assertThat( IndexDescriptorFactory.uniqueForLabel( 2, 4 ).userDescription( simpleNameLookup ), + assertThat( SchemaIndexDescriptorFactory.uniqueForLabel( 2, 4 ).userDescription( simpleNameLookup ), equalTo( "Index( UNIQUE, :Label2(property4) )" ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/AwaitIndexProcedureTest.java b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/AwaitIndexProcedureTest.java index d483af2e4c46b..60798561dfdfd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/AwaitIndexProcedureTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/AwaitIndexProcedureTest.java @@ -33,8 +33,8 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; @@ -60,7 +60,7 @@ public class AwaitIndexProcedureTest private final IndexProcedures procedure = new IndexProcedures( new StubKernelTransaction( operations ), null ); private final LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( 123, 456 ); private final LabelSchemaDescriptor anyDescriptor = SchemaDescriptorFactory.forLabel( 0, 0 ); - private final IndexDescriptor anyIndex = IndexDescriptorFactory.forSchema( anyDescriptor ); + private final SchemaIndexDescriptor anyIndex = SchemaIndexDescriptorFactory.forSchema( anyDescriptor ); @Test public void shouldThrowAnExceptionIfTheLabelDoesntExist() @@ -101,7 +101,7 @@ public void shouldLookUpTheIndexByLabelIdAndPropertyKeyId() when( operations.labelGetForName( anyString() ) ).thenReturn( descriptor.getLabelId() ); when( operations.propertyKeyGetForName( anyString() ) ).thenReturn( descriptor.getPropertyId() ); when( operations.indexGetForSchema( any() ) ).thenReturn( anyIndex ); - when( operations.indexGetState( any( IndexDescriptor.class ) ) ).thenReturn( ONLINE ); + when( operations.indexGetState( any( SchemaIndexDescriptor.class ) ) ).thenReturn( ONLINE ); procedure.awaitIndex( ":Person(name)", TIMEOUT, TIME_UNIT ); @@ -116,7 +116,7 @@ public void shouldThrowAnExceptionIfTheIndexHasFailed() when( operations.labelGetForName( anyString() ) ).thenReturn( 0 ); when( operations.propertyKeyGetForName( anyString() ) ).thenReturn( 0 ); when( operations.indexGetForSchema( any() ) ).thenReturn( anyIndex ); - when( operations.indexGetState( any( IndexDescriptor.class ) ) ).thenReturn( FAILED ); + when( operations.indexGetState( any( SchemaIndexDescriptor.class ) ) ).thenReturn( FAILED ); try { @@ -159,7 +159,7 @@ public void shouldBlockUntilTheIndexIsOnline() throws SchemaRuleNotFoundExceptio when( operations.indexGetForSchema( any() ) ).thenReturn( anyIndex ); AtomicReference state = new AtomicReference<>( POPULATING ); - when( operations.indexGetState( any( IndexDescriptor.class ) ) ).then( invocationOnMock -> state.get() ); + when( operations.indexGetState( any( SchemaIndexDescriptor.class ) ) ).then( invocationOnMock -> state.get() ); AtomicBoolean done = new AtomicBoolean( false ); new Thread( () -> @@ -189,7 +189,7 @@ public void shouldTimeoutIfTheIndexTakesTooLongToComeOnline() when( operations.labelGetForName( anyString() ) ).thenReturn( 0 ); when( operations.propertyKeyGetForName( anyString() ) ).thenReturn( 0 ); when( operations.indexGetForSchema( any() ) ).thenReturn( anyIndex ); - when( operations.indexGetState( any( IndexDescriptor.class ) ) ).thenReturn( POPULATING ); + when( operations.indexGetState( any( SchemaIndexDescriptor.class ) ) ).thenReturn( POPULATING ); AtomicReference exception = new AtomicReference<>(); new Thread( () -> diff --git a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java index f1d4f6bc297d3..af50b1bdf46a3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java @@ -55,8 +55,8 @@ import org.neo4j.kernel.api.proc.Key; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.factory.Edition; import org.neo4j.kernel.impl.proc.Procedures; @@ -83,8 +83,8 @@ public class BuiltInProceduresTest { - private final List indexes = new LinkedList<>(); - private final List uniqueIndexes = new LinkedList<>(); + private final List indexes = new LinkedList<>(); + private final List uniqueIndexes = new LinkedList<>(); private final List constraints = new LinkedList<>(); private final Map labels = new HashMap<>(); private final Map propKeys = new HashMap<>(); @@ -413,7 +413,7 @@ private void givenIndex( String label, String propKey ) int labelId = token( label, labels ); int propId = token( propKey, propKeys ); - IndexDescriptor index = IndexDescriptorFactory.forLabel( labelId, propId ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( labelId, propId ); indexes.add( index ); } @@ -422,7 +422,7 @@ private void givenUniqueConstraint( String label, String propKey ) int labelId = token( label, labels ); int propId = token( propKey, propKeys ); - IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( labelId, propId ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propId ); uniqueIndexes.add( index ); constraints.add( ConstraintDescriptorFactory.uniqueForLabel( labelId, propId ) ); } @@ -517,8 +517,8 @@ public void setup() throws Exception when( schemaRead.constraintsGetForLabel( anyInt() ) ).thenReturn( emptyIterator() ); when( read.countsForNode( anyInt() ) ).thenReturn( 1L ); when( read.countsForRelationship( anyInt(), anyInt(), anyInt() ) ).thenReturn( 1L ); - when( readOperations.indexGetState( any( IndexDescriptor.class ) ) ).thenReturn( InternalIndexState.ONLINE ); - when( readOperations.indexGetProviderDescriptor( any( IndexDescriptor.class ) ) ) + when( readOperations.indexGetState( any( SchemaIndexDescriptor.class ) ) ).thenReturn( InternalIndexState.ONLINE ); + when( readOperations.indexGetProviderDescriptor( any( SchemaIndexDescriptor.class ) ) ) .thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); } 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 467c93d5c753a..ae90385c15298 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 @@ -27,8 +27,8 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode; @@ -85,7 +85,7 @@ public void shouldThrowAnExceptionIfThePropertyKeyDoesntExist() public void shouldLookUpTheIndexByLabelIdAndPropertyKeyId() throws ProcedureException, SchemaRuleNotFoundException { - IndexDescriptor index = IndexDescriptorFactory.forLabel( 0, 0 ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( 0, 0 ); when( operations.labelGetForName( anyString() ) ).thenReturn( 123 ); when( operations.propertyKeyGetForName( anyString() ) ).thenReturn( 456 ); when( operations.indexGetForSchema( any() ) ).thenReturn( index ); @@ -99,7 +99,7 @@ public void shouldLookUpTheIndexByLabelIdAndPropertyKeyId() public void shouldLookUpTheCompositeIndexByLabelIdAndPropertyKeyId() throws ProcedureException, SchemaRuleNotFoundException { - IndexDescriptor index = IndexDescriptorFactory.forLabel( 0, 0, 1 ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( 0, 0, 1 ); when( operations.labelGetForName( anyString() ) ).thenReturn( 123 ); when( operations.propertyKeyGetForName( "name" ) ).thenReturn( 0 ); when( operations.propertyKeyGetForName( "lastName" ) ).thenReturn( 1 ); @@ -136,7 +136,7 @@ public void shouldThrowAnExceptionIfTheIndexDoesNotExist() public void shouldTriggerResampling() throws SchemaRuleNotFoundException, ProcedureException, IndexNotFoundKernelException { - IndexDescriptor index = IndexDescriptorFactory.forLabel( 123, 456 ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( 123, 456 ); when( operations.indexGetForSchema( any() ) ).thenReturn( index ); procedure.resampleIndex( ":Person(name)" ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java index b383b7ed7fac9..cb3c803dc50e6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java @@ -37,8 +37,8 @@ import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.operations.KeyWriteOperations; import org.neo4j.kernel.impl.api.operations.SchemaReadOperations; import org.neo4j.kernel.impl.api.operations.SchemaWriteOperations; @@ -60,8 +60,8 @@ public class DataIntegrityValidatingStatementOperationsTest public ExpectedException exception = ExpectedException.none(); LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( 0, 7 ); - IndexDescriptor index = IndexDescriptorFactory.forLabel( 0, 7 ); - IndexDescriptor uniqueIndex = IndexDescriptorFactory.uniqueForLabel( 0, 7 ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( 0, 7 ); + SchemaIndexDescriptor uniqueIndex = SchemaIndexDescriptorFactory.uniqueForLabel( 0, 7 ); private SchemaReadOperations innerRead; private SchemaWriteOperations innerWrite; private KeyWriteOperations innerKeyWrite; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java index 281af99c1859f..17126f802cf18 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.ImpermanentDatabaseRule; @@ -85,7 +85,7 @@ public void shouldInvalidateSchemaStateOnCreateIndex() throws Exception @Test public void shouldInvalidateSchemaStateOnDropIndex() throws Exception { - IndexDescriptor descriptor = createIndex(); + SchemaIndexDescriptor descriptor = createIndex(); awaitIndexOnline( descriptor, "test" ); @@ -155,19 +155,19 @@ private void dropConstraint( ConstraintDescriptor descriptor ) throws KernelExce } } - private IndexDescriptor createIndex() throws KernelException + private SchemaIndexDescriptor createIndex() throws KernelException { try ( KernelTransaction transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ); Statement statement = transaction.acquireStatement() ) { - IndexDescriptor descriptor = statement.schemaWriteOperations().indexCreate( + SchemaIndexDescriptor descriptor = statement.schemaWriteOperations().indexCreate( SchemaDescriptorFactory.forLabel( 1, 1 ) ); transaction.success(); return descriptor; } } - private void dropIndex( IndexDescriptor descriptor ) throws KernelException + private void dropIndex( SchemaIndexDescriptor descriptor ) throws KernelException { try ( KernelTransaction transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ); Statement statement = transaction.acquireStatement() ) @@ -177,7 +177,7 @@ private void dropIndex( IndexDescriptor descriptor ) throws KernelException } } - private void awaitIndexOnline( IndexDescriptor descriptor, String keyForProbing ) + private void awaitIndexOnline( SchemaIndexDescriptor descriptor, String keyForProbing ) throws IndexNotFoundKernelException, TransactionFailureException { try ( KernelTransaction transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java index 1876b9e9f232f..e439f81f81120 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java @@ -37,8 +37,8 @@ import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.api.txstate.TxStateHolder; @@ -207,11 +207,11 @@ public void shouldAcquireSchemaWriteLockBeforeAddingIndexRule() throws Exception { // given LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( 123, 456 ); - IndexDescriptor index = IndexDescriptorFactory.forLabel( 123, 456 ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( 123, 456 ); when( schemaWriteOps.indexCreate( state, descriptor ) ).thenReturn( index ); // when - IndexDescriptor result = lockingOps.indexCreate( state, descriptor ); + SchemaIndexDescriptor result = lockingOps.indexCreate( state, descriptor ); // then assertSame( index, result ); @@ -223,7 +223,7 @@ public void shouldAcquireSchemaWriteLockBeforeAddingIndexRule() throws Exception public void shouldAcquireSchemaWriteLockBeforeRemovingIndexRule() throws Exception { // given - IndexDescriptor index = IndexDescriptorFactory.forLabel( 0, 0 ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( 0, 0 ); // when lockingOps.indexDrop( state, index ); @@ -238,13 +238,13 @@ public void acquireReadLockBeforeGettingIndexRules() { // given int labelId = 1; - IndexDescriptor labelDescriptor = IndexDescriptorFactory.forLabel( labelId, 2, 3 ); + SchemaIndexDescriptor labelDescriptor = SchemaIndexDescriptorFactory.forLabel( labelId, 2, 3 ); - Iterator rules = Iterators.iterator( labelDescriptor ); + Iterator rules = Iterators.iterator( labelDescriptor ); when( schemaReadOps.indexesGetAll( state ) ).thenReturn( rules ); // when - Iterator result = lockingOps.indexesGetAll( state ); + Iterator result = lockingOps.indexesGetAll( state ); Iterators.count( result ); // then diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java index 89d1dbdf7b151..1712603f81f1e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java @@ -32,8 +32,8 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.ImpermanentDatabaseRule; @@ -100,8 +100,9 @@ public void indexGetProviderDescriptorMustReturnUndecidedIfIndexCreatedInTransac { db.schema().indexFor( LABEL1 ).on( PROP1 ).create(); ReadOperations readOperations = statement.readOperations(); - IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( labelId, propertyId ); - IndexProvider.Descriptor providerDescriptor = readOperations.indexGetProviderDescriptor( indexDescriptor ); + SchemaIndexDescriptor schemaIndexDescriptor = SchemaIndexDescriptorFactory.forLabel( labelId, propertyId ); + IndexProvider.Descriptor providerDescriptor = readOperations.indexGetProviderDescriptor( + schemaIndexDescriptor ); assertThat( providerDescriptor, is( IndexProvider.UNDECIDED ) ); tx.success(); } @@ -114,11 +115,11 @@ public void indexGetProviderDescriptorMustThrowIfIndexDoesNotExist() Statement statement = db.statement() ) { ReadOperations readOperations = statement.readOperations(); - IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( labelId, propertyId ); + SchemaIndexDescriptor schemaIndexDescriptor = SchemaIndexDescriptorFactory.forLabel( labelId, propertyId ); try { - readOperations.indexGetProviderDescriptor( indexDescriptor ); + readOperations.indexGetProviderDescriptor( schemaIndexDescriptor ); fail( "Should have failed" ); } catch ( IndexNotFoundKernelException e ) 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 a4e8d38677ed3..9462469cd3602 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 @@ -59,8 +59,8 @@ import org.neo4j.kernel.api.proc.CallableUserAggregationFunction; import org.neo4j.kernel.api.proc.CallableUserFunction; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.ClockContext; import org.neo4j.kernel.impl.api.KernelStatement; @@ -94,7 +94,7 @@ public class ConstraintIndexCreatorTest private static final int LABEL_ID = 123; private final LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( LABEL_ID, PROPERTY_KEY_ID ); - private final IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 123, 456 ); + private final SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.uniqueForLabel( 123, 456 ); private final Monitors monitors = new Monitors(); @Test @@ -170,7 +170,7 @@ public void shouldDropIndexIfPopulationFails() throws Exception } assertEquals( 2, kernel.statements.size() ); TransactionState tx1 = kernel.statements.get( 0 ).txState(); - IndexDescriptor newIndex = IndexDescriptorFactory.uniqueForLabel( 123, 456 ); + SchemaIndexDescriptor newIndex = SchemaIndexDescriptorFactory.uniqueForLabel( 123, 456 ); verify( tx1 ).indexRuleDoAdd( newIndex ); verifyNoMoreInteractions( tx1 ); verify( schemaOps ).indexGetCommittedId( state, index ); 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 15f5f4beb6a25..17af7c78151e1 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 @@ -35,8 +35,8 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.locking.LockService; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; @@ -70,8 +70,8 @@ public class BatchingMultipleIndexPopulatorTest { public static final int propertyId = 1; public static final int labelId = 1; - private final IndexDescriptor index1 = IndexDescriptorFactory.forLabel(1, 1); - private final IndexDescriptor index42 = IndexDescriptorFactory.forLabel(42, 42); + private final SchemaIndexDescriptor index1 = SchemaIndexDescriptorFactory.forLabel(1, 1); + private final SchemaIndexDescriptor index42 = SchemaIndexDescriptorFactory.forLabel(42, 42); @After public void tearDown() @@ -256,7 +256,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(); @@ -321,7 +321,7 @@ public void shouldApplyBatchesInParallel() throws Exception verify( executor, atLeast( 5 ) ).execute( any( Runnable.class ) ); } - private List> forUpdates( IndexDescriptor index, NodeUpdates... updates ) + private List> forUpdates( SchemaIndexDescriptor index, NodeUpdates... updates ) { return Iterables.asList( Iterables.concat( @@ -339,7 +339,7 @@ private NodeUpdates nodeUpdates( int nodeId, int propertyId, String propertyValu .build(); } - private static IndexPopulator addPopulator( BatchingMultipleIndexPopulator batchingPopulator, IndexDescriptor descriptor ) + private static IndexPopulator addPopulator( BatchingMultipleIndexPopulator batchingPopulator, SchemaIndexDescriptor descriptor ) { IndexPopulator populator = mock( IndexPopulator.class ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java index a1c99d9150df6..0d28e38f3359d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.storageengine.api.schema.IndexReader; @@ -89,14 +89,14 @@ public void awaitFullyPopulated() } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { populatorCallCount.incrementAndGet(); return mockedPopulator; } @Override - public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor indexConfig, + public IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor indexConfig, IndexSamplingConfig samplingConfig ) { writerCallCount.incrementAndGet(); @@ -105,13 +105,13 @@ public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor indexConfi } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { return initialIndexState; } @Override - public IndexCapability getCapability( IndexDescriptor indexDescriptor ) + public IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { return IndexCapability.NO_CAPABILITY; } @@ -122,7 +122,7 @@ public void setInitialIndexState( InternalIndexState initialIndexState ) } @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { throw new IllegalStateException(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java index db5545c8d4a68..382e3e3fc28f0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java @@ -26,8 +26,8 @@ import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.NullLogProvider; @@ -49,7 +49,7 @@ public void shouldRemoveIndexCountsWhenTheIndexItselfIsDropped() throws IOExcept { // given String userDescription = "description"; - FailedIndexProxy index = new FailedIndexProxy( indexMeta( IndexDescriptorFactory.forLabel( 1, 2 ) ), + FailedIndexProxy index = new FailedIndexProxy( indexMeta( SchemaIndexDescriptorFactory.forLabel( 1, 2 ) ), userDescription, indexPopulator, indexPopulationFailure, indexCountsRemover, NullLogProvider.getInstance() ); // when @@ -68,7 +68,7 @@ public void shouldLogReasonForDroppingIndex() throws IOException AssertableLogProvider logProvider = new AssertableLogProvider(); // when - new FailedIndexProxy( indexMeta( IndexDescriptorFactory.forLabel( 0, 0 ) ), + new FailedIndexProxy( indexMeta( SchemaIndexDescriptorFactory.forLabel( 0, 0 ) ), "foo", mock( IndexPopulator.class ), IndexPopulationFailure.failure( "it broke" ), indexCountsRemover, logProvider ).drop(); @@ -78,7 +78,7 @@ public void shouldLogReasonForDroppingIndex() throws IOException ); } - private IndexMeta indexMeta( IndexDescriptor descriptor ) + private IndexMeta indexMeta( SchemaIndexDescriptor descriptor ) { return new IndexMeta( 1, descriptor, providerDescriptor, indexCapability ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index 52d89c4c04c97..db71b4cf6a3a8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -47,7 +47,7 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; @@ -182,10 +182,10 @@ private GatheringIndexWriter newWriter() throws IOException { GatheringIndexWriter writer = new GatheringIndexWriter(); when( mockedIndexProvider.getPopulator( - anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) + anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( writer ); when( mockedIndexProvider.getOnlineAccessor( - anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) + anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( writer ); when( mockedIndexProvider.compareTo( any( IndexProvider.class ) ) ) .thenReturn( 1 ); // always pretend to have highest priority 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 0213b85bdeec7..d1178ba4f9f33 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 @@ -45,7 +45,7 @@ import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.integrationtest.KernelIntegrationTest; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -127,7 +127,7 @@ public void addIndexRuleInATransaction() throws Exception SchemaWriteOperations schemaWriteOperations = schemaWriteOperationsInNewTransaction(); // WHEN - IndexDescriptor expectedRule = schemaWriteOperations.indexCreate( descriptor ); + SchemaIndexDescriptor expectedRule = schemaWriteOperations.indexCreate( descriptor ); commit(); // THEN @@ -142,14 +142,14 @@ public void committedAndTransactionalIndexRulesShouldBeMerged() throws Exception { // GIVEN SchemaWriteOperations schemaWriteOperations = schemaWriteOperationsInNewTransaction(); - IndexDescriptor existingRule = schemaWriteOperations.indexCreate( descriptor ); + SchemaIndexDescriptor existingRule = schemaWriteOperations.indexCreate( descriptor ); commit(); // WHEN Statement statement = statementInNewTransaction( AUTH_DISABLED ); - IndexDescriptor addedRule = statement.schemaWriteOperations() - .indexCreate( SchemaDescriptorFactory.forLabel( labelId, 10 ) ); - Set indexRulesInTx = asSet( statement.readOperations().indexesGetForLabel( labelId ) ); + SchemaIndexDescriptor addedRule = statement.schemaWriteOperations() + .indexCreate( SchemaDescriptorFactory.forLabel( labelId, 10 ) ); + Set indexRulesInTx = asSet( statement.readOperations().indexesGetForLabel( labelId ) ); commit(); // THEN @@ -180,7 +180,7 @@ public void shouldBeAbleToRemoveAConstraintIndexWithoutOwner() throws Exception PropertyAccessor propertyAccessor = mock( PropertyAccessor.class ); ConstraintIndexCreator creator = new ConstraintIndexCreator( () -> kernel, indexingService, propertyAccessor, new Monitors() ); - IndexDescriptor constraintIndex = creator.createConstraintIndex( descriptor ); + SchemaIndexDescriptor constraintIndex = creator.createConstraintIndex( descriptor ); // then ReadOperations readOperations = readOperationsInNewTransaction(); assertEquals( emptySet(), asSet( readOperations.constraintsGetForLabel( labelId ) ) ); @@ -201,7 +201,7 @@ public void shouldBeAbleToRemoveAConstraintIndexWithoutOwner() throws Exception public void shouldDisallowDroppingIndexThatDoesNotExist() throws Exception { // given - IndexDescriptor index; + SchemaIndexDescriptor index; { SchemaWriteOperations statement = schemaWriteOperationsInNewTransaction(); index = statement.indexCreate( descriptor ); @@ -304,14 +304,14 @@ public void shouldListAll() throws Exception { // given SchemaWriteOperations schemaWriteOperations = schemaWriteOperationsInNewTransaction(); - IndexDescriptor index1 = schemaWriteOperations.indexCreate( descriptor ); - IndexDescriptor index2 = schemaWriteOperations.uniquePropertyConstraintCreate( descriptor2 ) + SchemaIndexDescriptor index1 = schemaWriteOperations.indexCreate( descriptor ); + SchemaIndexDescriptor index2 = schemaWriteOperations.uniquePropertyConstraintCreate( descriptor2 ) .ownedIndexDescriptor(); commit(); // then/when ReadOperations readOperations = readOperationsInNewTransaction(); - List indexes = Iterators.asList( readOperations.indexesGetAll() ); + List indexes = Iterators.asList( readOperations.indexesGetAll() ); assertThat( indexes, containsInAnyOrder( index1, index2 ) ); commit(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapReferenceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapReferenceTest.java index 01d7e9d74980c..fc03e7d88634b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapReferenceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapReferenceTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.test.Race; import static org.junit.Assert.assertNull; @@ -94,7 +94,7 @@ private IndexProxy[] mockedIndexProxies( int base, int count ) for ( int i = 0; i < count; i++ ) { existing[i] = mock( IndexProxy.class ); - when( existing[i].getDescriptor() ).thenReturn( IndexDescriptorFactory.forLabel( base + i, 1 ) ); + when( existing[i].getDescriptor() ).thenReturn( SchemaIndexDescriptorFactory.forLabel( base + i, 1 ) ); } return existing; } 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 d11ffe73aa353..1bf7dec56c405 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 @@ -53,8 +53,8 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.DatabaseSchemaState; @@ -581,7 +581,7 @@ private IndexPopulator inMemoryPopulator( boolean constraint ) throws TransactionFailureException, IllegalTokenNameException, TooManyLabelsException { IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); - IndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); + SchemaIndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); return new InMemoryIndexProvider().getPopulator( 21, descriptor, samplingConfig ); } @@ -609,7 +609,7 @@ private IndexPopulationJob newIndexPopulationJob( FailedIndexProxyFactory failur LogProvider logProvider, boolean constraint ) throws TransactionFailureException, IllegalTokenNameException, TooManyLabelsException { - IndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); + SchemaIndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); long indexId = 0; flipper.setFlipTarget( mock( IndexProxyFactory.class ) ); @@ -620,7 +620,7 @@ private IndexPopulationJob newIndexPopulationJob( FailedIndexProxyFactory failur return job; } - private IndexDescriptor indexDescriptor( Label label, String propertyKey, boolean constraint ) + private SchemaIndexDescriptor indexDescriptor( Label label, String propertyKey, boolean constraint ) throws TransactionFailureException, IllegalTokenNameException, TooManyLabelsException { try ( KernelTransaction tx = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ); @@ -628,9 +628,9 @@ private IndexDescriptor indexDescriptor( Label label, String propertyKey, boolea { int labelId = statement.tokenWriteOperations().labelGetOrCreateForName( label.name() ); int propertyKeyId = statement.tokenWriteOperations().propertyKeyGetOrCreateForName( propertyKey ); - IndexDescriptor descriptor = constraint ? - IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ) : - IndexDescriptorFactory.forLabel( labelId, propertyKeyId ); + SchemaIndexDescriptor descriptor = constraint ? + SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ) : + SchemaIndexDescriptorFactory.forLabel( labelId, propertyKeyId ); tx.success(); return descriptor; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java index ec1f1ce3bd839..e2794200958a6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java @@ -28,7 +28,7 @@ import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -80,7 +80,7 @@ public void close() } @Override - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor getDescriptor() { return null; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index 0027cf9d535d7..6e4aec1145165 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; @@ -90,7 +90,7 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndex() throws Excepti CountDownLatch latch = new CountDownLatch( 1 ); when( mockedIndexProvider - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulatorWithControlledCompletionTiming( latch ) ); createIndex( myLabel ); @@ -100,11 +100,11 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndex() throws Excepti killFuture.get(); // When - when( mockedIndexProvider.getInitialState( anyLong(), any( IndexDescriptor.class ) ) ) + when( mockedIndexProvider.getInitialState( anyLong(), any( SchemaIndexDescriptor.class ) ) ) .thenReturn( InternalIndexState.POPULATING ); latch = new CountDownLatch( 1 ); when( mockedIndexProvider - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulatorWithControlledCompletionTiming( latch ) ); startDb(); @@ -112,9 +112,9 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndex() throws Excepti assertThat( getIndexes( db, myLabel ), inTx( db, hasSize( 1 ) ) ); assertThat( getIndexes( db, myLabel ), inTx( db, haveState( db, Schema.IndexState.POPULATING ) ) ); verify( mockedIndexProvider, times( 2 ) ) - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); verify( mockedIndexProvider, times( 0 ) ).getOnlineAccessor( - anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) + anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); latch.countDown(); } @@ -127,7 +127,7 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndexWhereLogHasRotate CountDownLatch latch = new CountDownLatch( 1 ); when( mockedIndexProvider - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulatorWithControlledCompletionTiming( latch ) ); createIndex( myLabel ); rotateLogsAndCheckPoint(); @@ -138,9 +138,9 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndexWhereLogHasRotate killFuture.get(); latch = new CountDownLatch( 1 ); when( mockedIndexProvider - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulatorWithControlledCompletionTiming( latch ) ); - when( mockedIndexProvider.getInitialState( anyLong(), any( IndexDescriptor.class ) ) ) + when( mockedIndexProvider.getInitialState( anyLong(), any( SchemaIndexDescriptor.class ) ) ) .thenReturn( InternalIndexState.POPULATING ); // When @@ -150,9 +150,9 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndexWhereLogHasRotate assertThat( getIndexes( db, myLabel ), inTx( db, hasSize( 1 ) ) ); assertThat( getIndexes( db, myLabel ), inTx( db, haveState( db, Schema.IndexState.POPULATING ) ) ); verify( mockedIndexProvider, times( 2 ) ) - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); verify( mockedIndexProvider, times( 0 ) ).getOnlineAccessor( - anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) + anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); latch.countDown(); } @@ -165,13 +165,13 @@ public void shouldBeAbleToRecoverAndUpdateOnlineIndex() throws Exception IndexPopulator populator = mock( IndexPopulator.class ); when( mockedIndexProvider - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); when( populator.sampleResult() ).thenReturn( new IndexSample() ); IndexAccessor mockedAccessor = mock( IndexAccessor.class ); when( mockedAccessor.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( SwallowingIndexUpdater.INSTANCE ); when( mockedIndexProvider.getOnlineAccessor( - anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) + anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( mockedAccessor ); createIndexAndAwaitPopulation( myLabel ); // rotate logs @@ -181,11 +181,11 @@ public void shouldBeAbleToRecoverAndUpdateOnlineIndex() throws Exception // And Given killDb(); - when( mockedIndexProvider.getInitialState( anyLong(), any( IndexDescriptor.class )) ) + when( mockedIndexProvider.getInitialState( anyLong(), any( SchemaIndexDescriptor.class )) ) .thenReturn( InternalIndexState.ONLINE ); GatheringIndexWriter writer = new GatheringIndexWriter(); when( mockedIndexProvider.getOnlineAccessor( - anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) + anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( writer ); // When @@ -195,10 +195,10 @@ public void shouldBeAbleToRecoverAndUpdateOnlineIndex() throws Exception assertThat( getIndexes( db, myLabel ), inTx( db, hasSize( 1 ) ) ); assertThat( getIndexes( db, myLabel ), inTx( db, haveState( db, Schema.IndexState.ONLINE ) ) ); verify( mockedIndexProvider, times( 1 ) ) - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); int onlineAccessorInvocationCount = 2; // once when we create the index, and once when we restart the db verify( mockedIndexProvider, times( onlineAccessorInvocationCount ) ) - .getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + .getOnlineAccessor( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); assertEquals( expectedUpdates, writer.batchedUpdates ); } @@ -207,10 +207,10 @@ public void shouldKeepFailedIndexesAsFailedAfterRestart() throws Exception { // Given when( mockedIndexProvider - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( mock( IndexPopulator.class ) ); when( mockedIndexProvider.getOnlineAccessor( - anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) + anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( mock( IndexAccessor.class ) ); startDb(); createIndex( myLabel ); @@ -218,7 +218,7 @@ public void shouldKeepFailedIndexesAsFailedAfterRestart() throws Exception // And Given killDb(); - when( mockedIndexProvider.getInitialState( anyLong(), any( IndexDescriptor.class ) ) ) + when( mockedIndexProvider.getInitialState( anyLong(), any( SchemaIndexDescriptor.class ) ) ) .thenReturn( InternalIndexState.FAILED ); // When @@ -228,7 +228,7 @@ public void shouldKeepFailedIndexesAsFailedAfterRestart() throws Exception assertThat( getIndexes( db, myLabel ), inTx( db, hasSize( 1 ) ) ); assertThat( getIndexes( db, myLabel ), inTx( db, haveState( db, Schema.IndexState.FAILED ) ) ); verify( mockedIndexProvider, times( 2 ) ) - .getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + .getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); } private GraphDatabaseAPI db; 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 46225d96902df..94fee0acb2d7c 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,8 +34,8 @@ import org.neo4j.graphdb.mockfs.UncloseableDelegatingFileSystemAbstraction; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.CountsAccessor; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; @@ -98,7 +98,7 @@ public void shouldRecoverIndexCountsBySamplingThemOnStartup() awaitIndexOnline( indexAliensBySpecimen() ); // where ALIEN and SPECIMEN are both the first ids of their kind - IndexDescriptor index = IndexDescriptorFactory.forLabel( labelId( ALIEN ), pkId( SPECIMEN ) ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.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/IndexStatisticsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java index c4cf176a0cb1d..addd3d767eeb5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java @@ -52,7 +52,7 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; @@ -149,7 +149,7 @@ public void shouldProvideIndexStatisticsForDataCreatedWhenPopulationBeforeTheInd createSomePersons(); // when - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); awaitIndexesOnline(); // then @@ -162,7 +162,7 @@ public void shouldProvideIndexStatisticsForDataCreatedWhenPopulationBeforeTheInd public void shouldNotSeeDataCreatedAfterPopulation() throws KernelException { // given - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); awaitIndexesOnline(); // when @@ -180,7 +180,7 @@ public void shouldProvideIndexStatisticsForDataSeenDuringPopulationAndIgnoreData { // given createSomePersons(); - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); awaitIndexesOnline(); // when @@ -197,7 +197,7 @@ public void shouldRemoveIndexStatisticsAfterIndexIsDeleted() throws KernelExcept { // given createSomePersons(); - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); awaitIndexesOnline(); SchemaStorage storage = new SchemaStorage( neoStores().getSchemaStore() ); @@ -230,7 +230,7 @@ public void shouldProvideIndexSelectivityWhenThereAreManyDuplicates() throws Exc int created = repeatCreateNamedPeopleFor( NAMES.length * CREATION_MULTIPLIER ).length; // when - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); awaitIndexesOnline(); // then @@ -247,7 +247,7 @@ public void shouldProvideIndexStatisticsWhenIndexIsBuiltViaPopulationAndConcurre int initialNodes = repeatCreateNamedPeopleFor( NAMES.length * CREATION_MULTIPLIER ).length; // when populating while creating - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); final UpdatesTracker updatesTracker = executeCreations( index, CREATION_MULTIPLIER ); awaitIndexesOnline(); @@ -267,7 +267,7 @@ public void shouldProvideIndexStatisticsWhenIndexIsBuiltViaPopulationAndConcurre int initialNodes = nodes.length; // when populating while creating - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); UpdatesTracker updatesTracker = executeCreationsAndDeletions( nodes, index, CREATION_MULTIPLIER ); awaitIndexesOnline(); @@ -289,7 +289,7 @@ public void shouldProvideIndexStatisticsWhenIndexIsBuiltViaPopulationAndConcurre int initialNodes = nodes.length; // when populating while creating - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); UpdatesTracker updatesTracker = executeCreationsAndUpdates( nodes, index, CREATION_MULTIPLIER ); awaitIndexesOnline(); @@ -310,7 +310,7 @@ public void shouldProvideIndexStatisticsWhenIndexIsBuiltViaPopulationAndConcurre int initialNodes = nodes.length; // when populating while creating - IndexDescriptor index = createIndex( "Person", "name" ); + SchemaIndexDescriptor index = createIndex( "Person", "name" ); UpdatesTracker updatesTracker = executeCreationsDeletionsAndUpdates( nodes, index, CREATION_MULTIPLIER ); awaitIndexesOnline(); @@ -333,7 +333,7 @@ public void shouldWorkWhileHavingHeavyConcurrentUpdates() throws Exception ExecutorService executorService = Executors.newFixedThreadPool( threads ); // when populating while creating - final IndexDescriptor index = createIndex( "Person", "name" ); + final SchemaIndexDescriptor index = createIndex( "Person", "name" ); final Collection> jobs = new ArrayList<>( threads ); for ( int i = 0; i < threads; i++ ) @@ -468,7 +468,7 @@ private long[] repeatCreateNamedPeopleFor( int totalNumberOfPeople ) throws Exce return nodes; } - private void dropIndex( IndexDescriptor index ) throws KernelException + private void dropIndex( SchemaIndexDescriptor index ) throws KernelException { try ( Transaction tx = db.beginTx() ) { @@ -480,21 +480,21 @@ private void dropIndex( IndexDescriptor index ) throws KernelException } } - private long indexSize( IndexDescriptor descriptor ) throws KernelException + private long indexSize( SchemaIndexDescriptor descriptor ) throws KernelException { return ((GraphDatabaseAPI) db).getDependencyResolver() .resolveDependency( IndexingService.class ) .indexUpdatesAndSize( descriptor.schema() ).readSecond(); } - private long indexUpdates( IndexDescriptor descriptor ) throws KernelException + private long indexUpdates( SchemaIndexDescriptor descriptor ) throws KernelException { return ((GraphDatabaseAPI) db).getDependencyResolver() .resolveDependency( IndexingService.class ) .indexUpdatesAndSize( descriptor.schema() ).readFirst(); } - private double indexSelectivity( IndexDescriptor descriptor ) throws KernelException + private double indexSelectivity( SchemaIndexDescriptor descriptor ) throws KernelException { try ( Transaction tx = db.beginTx() ) { @@ -504,7 +504,7 @@ private double indexSelectivity( IndexDescriptor descriptor ) throws KernelExcep } } - private double getSelectivity( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + private double getSelectivity( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { try ( Statement statement = bridge.get() ) { @@ -544,11 +544,11 @@ private long createNode( Statement statement, String labelName, String propertyK return nodeId; } - private IndexDescriptor createIndex( String labelName, String propertyKeyName ) throws KernelException + private SchemaIndexDescriptor createIndex( String labelName, String propertyKeyName ) throws KernelException { try ( Transaction tx = db.beginTx() ) { - IndexDescriptor index; + SchemaIndexDescriptor index; try ( Statement statement = bridge.get() ) { int labelId = statement.tokenWriteOperations().labelGetOrCreateForName( labelName ); @@ -575,34 +575,34 @@ private void awaitIndexesOnline() } } - private UpdatesTracker executeCreations( IndexDescriptor index, int numberOfCreations ) throws KernelException + private UpdatesTracker executeCreations( SchemaIndexDescriptor index, int numberOfCreations ) throws KernelException { return internalExecuteCreationsDeletionsAndUpdates( null, index, numberOfCreations, false, false ); } private UpdatesTracker executeCreationsAndDeletions( long[] nodes, - IndexDescriptor index, + SchemaIndexDescriptor index, int numberOfCreations ) throws KernelException { return internalExecuteCreationsDeletionsAndUpdates( nodes, index, numberOfCreations, true, false ); } private UpdatesTracker executeCreationsAndUpdates( long[] nodes, - IndexDescriptor index, + SchemaIndexDescriptor index, int numberOfCreations ) throws KernelException { return internalExecuteCreationsDeletionsAndUpdates( nodes, index, numberOfCreations, false, true ); } private UpdatesTracker executeCreationsDeletionsAndUpdates( long[] nodes, - IndexDescriptor index, + SchemaIndexDescriptor index, int numberOfCreations ) throws KernelException { return internalExecuteCreationsDeletionsAndUpdates( nodes, index, numberOfCreations, true, true ); } private UpdatesTracker internalExecuteCreationsDeletionsAndUpdates( long[] nodes, - IndexDescriptor index, + SchemaIndexDescriptor index, int numberOfCreations, boolean allowDeletions, boolean allowUpdates ) throws KernelException @@ -656,7 +656,7 @@ private UpdatesTracker internalExecuteCreationsDeletionsAndUpdates( long[] nodes return updatesTracker; } - private void notifyIfPopulationCompleted( IndexDescriptor index, UpdatesTracker updatesTracker ) + private void notifyIfPopulationCompleted( SchemaIndexDescriptor index, UpdatesTracker updatesTracker ) { if ( isCompletedPopulation( index, updatesTracker ) ) { @@ -664,7 +664,7 @@ private void notifyIfPopulationCompleted( IndexDescriptor index, UpdatesTracker } } - private boolean isCompletedPopulation( IndexDescriptor index, UpdatesTracker updatesTracker ) + private boolean isCompletedPopulation( SchemaIndexDescriptor index, UpdatesTracker updatesTracker ) { return !updatesTracker.isPopulationCompleted() && indexOnlineMonitor.isIndexOnline( index ); @@ -721,15 +721,15 @@ private static void assertCorrectIndexSelectivity( double expected, double actua private static class IndexOnlineMonitor extends IndexingService.MonitorAdapter { - private final Set onlineIndexes = Collections.newSetFromMap( new ConcurrentHashMap<>() ); + private final Set onlineIndexes = Collections.newSetFromMap( new ConcurrentHashMap<>() ); @Override - public void populationCompleteOn( IndexDescriptor descriptor ) + public void populationCompleteOn( SchemaIndexDescriptor descriptor ) { onlineIndexes.add( descriptor ); } - public boolean isIndexOnline( IndexDescriptor descriptor ) + public boolean isIndexOnline( SchemaIndexDescriptor descriptor ) { return onlineIndexes.contains( descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMapTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMapTest.java index 839789726e40b..336cf09c8a2f4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMapTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMapTest.java @@ -22,11 +22,9 @@ import org.junit.Before; import org.junit.Test; -import java.io.IOException; - import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -43,14 +41,14 @@ public class IndexUpdaterMapTest private IndexMap indexMap; private IndexProxy indexProxy1; - private IndexDescriptor indexDescriptor1; + private SchemaIndexDescriptor schemaIndexDescriptor1; private IndexUpdater indexUpdater1; private IndexProxy indexProxy2; - private IndexDescriptor indexDescriptor2; + private SchemaIndexDescriptor schemaIndexDescriptor2; private IndexProxy indexProxy3; - private IndexDescriptor indexDescriptor3; + private SchemaIndexDescriptor schemaIndexDescriptor3; private IndexUpdaterMap updaterMap; @@ -60,21 +58,21 @@ public void before() indexMap = new IndexMap(); indexProxy1 = mock( IndexProxy.class ); - indexDescriptor1 = IndexDescriptorFactory.forLabel( 2, 3 ); + schemaIndexDescriptor1 = SchemaIndexDescriptorFactory.forLabel( 2, 3 ); indexUpdater1 = mock( IndexUpdater.class ); - when( indexProxy1.getDescriptor() ).thenReturn( indexDescriptor1 ); + when( indexProxy1.getDescriptor() ).thenReturn( schemaIndexDescriptor1 ); when( indexProxy1.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( indexUpdater1 ); indexProxy2 = mock( IndexProxy.class ); - indexDescriptor2 = IndexDescriptorFactory.forLabel( 5, 6 ); + schemaIndexDescriptor2 = SchemaIndexDescriptorFactory.forLabel( 5, 6 ); IndexUpdater indexUpdater2 = mock( IndexUpdater.class ); - when( indexProxy2.getDescriptor() ).thenReturn( indexDescriptor2 ); + when( indexProxy2.getDescriptor() ).thenReturn( schemaIndexDescriptor2 ); when( indexProxy2.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( indexUpdater2 ); indexProxy3 = mock( IndexProxy.class ); - indexDescriptor3 = IndexDescriptorFactory.forLabel( 5, 7, 8 ); + schemaIndexDescriptor3 = SchemaIndexDescriptorFactory.forLabel( 5, 7, 8 ); IndexUpdater indexUpdater3 = mock( IndexUpdater.class ); - when( indexProxy3.getDescriptor() ).thenReturn( indexDescriptor3 ); + when( indexProxy3.getDescriptor() ).thenReturn( schemaIndexDescriptor3 ); when( indexProxy3.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( indexUpdater3 ); updaterMap = new IndexUpdaterMap( indexMap, IndexUpdateMode.ONLINE ); @@ -87,7 +85,7 @@ public void shouldRetrieveUpdaterFromIndexMapForExistingIndex() indexMap.putIndexProxy( 0, indexProxy1 ); // when - IndexUpdater updater = updaterMap.getUpdater( indexDescriptor1.schema() ); + IndexUpdater updater = updaterMap.getUpdater( schemaIndexDescriptor1.schema() ); // then assertEquals( indexUpdater1, updater ); @@ -101,7 +99,7 @@ public void shouldRetrieveUpdateUsingLabelAndProperty() indexMap.putIndexProxy( 0, indexProxy1 ); // when - IndexUpdater updater = updaterMap.getUpdater( indexDescriptor1.schema() ); + IndexUpdater updater = updaterMap.getUpdater( schemaIndexDescriptor1.schema() ); // then assertThat( updater, equalTo( indexUpdater1 ) ); @@ -114,8 +112,8 @@ public void shouldRetrieveSameUpdaterFromIndexMapForExistingIndexWhenCalledTwice indexMap.putIndexProxy( 0, indexProxy1 ); // when - IndexUpdater updater1 = updaterMap.getUpdater( indexDescriptor1.schema() ); - IndexUpdater updater2 = updaterMap.getUpdater( indexDescriptor1.schema() ); + IndexUpdater updater1 = updaterMap.getUpdater( schemaIndexDescriptor1.schema() ); + IndexUpdater updater2 = updaterMap.getUpdater( schemaIndexDescriptor1.schema() ); // then assertEquals( updater1, updater2 ); @@ -126,7 +124,7 @@ public void shouldRetrieveSameUpdaterFromIndexMapForExistingIndexWhenCalledTwice public void shouldRetrieveNoUpdaterForNonExistingIndex() { // when - IndexUpdater updater = updaterMap.getUpdater( indexDescriptor1.schema() ); + IndexUpdater updater = updaterMap.getUpdater( schemaIndexDescriptor1.schema() ); // then assertNull( updater ); @@ -140,8 +138,8 @@ public void shouldCloseAllUpdaters() throws Exception indexMap.putIndexProxy( 0, indexProxy1 ); indexMap.putIndexProxy( 1, indexProxy2 ); - IndexUpdater updater1 = updaterMap.getUpdater( indexDescriptor1.schema() ); - IndexUpdater updater2 = updaterMap.getUpdater( indexDescriptor2.schema() ); + IndexUpdater updater1 = updaterMap.getUpdater( schemaIndexDescriptor1.schema() ); + IndexUpdater updater2 = updaterMap.getUpdater( schemaIndexDescriptor2.schema() ); // hen updaterMap.close(); 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 5677351d68863..ea0b420ceb7ec 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 @@ -64,8 +64,8 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -149,7 +149,7 @@ public class IndexingServiceTest private final SchemaState schemaState = mock( SchemaState.class ); private final int labelId = 7; private final int propertyKeyId = 15; - private final IndexDescriptor index = IndexDescriptorFactory.forLabel( labelId, propertyKeyId ); + private final SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( labelId, propertyKeyId ); private final IndexPopulator populator = mock( IndexPopulator.class ); private final IndexUpdater updater = mock( IndexUpdater.class ); private final IndexProvider indexProvider = mock( IndexProvider.class ); @@ -350,7 +350,7 @@ public void shouldLogIndexStateOnInit() throws Exception // given IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); - when( provider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getOnlineAccessor( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( mock( IndexAccessor.class ) ); IndexProviderMap providerMap = new DefaultIndexProviderMap( provider ); TokenNameLookup mockLookup = mock( TokenNameLookup.class ); @@ -410,7 +410,7 @@ public void shouldLogIndexStateOnStart() throws Exception .thenReturn( InternalIndexState.POPULATING ); when( provider.getInitialState( failedIndex.getId(), failedIndex.getIndexDescriptor() ) ) .thenReturn( InternalIndexState.FAILED ); - when( provider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenAnswer( + when( provider.getOnlineAccessor( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenAnswer( invocation -> mock( IndexAccessor.class ) ); indexingService.init(); @@ -557,7 +557,7 @@ public void shouldLogTriggerSamplingOnAnIndexes() throws Exception // given long indexId = 0; IndexSamplingMode mode = TRIGGER_REBUILD_ALL; - IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 1 ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 0, 1 ); IndexingService indexingService = newIndexingServiceWithMockedDependencies( populator, accessor, withData(), IndexRule.indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ) ); life.init(); @@ -643,9 +643,9 @@ public void closingOfValidatedUpdatesShouldCloseUpdaters() throws Exception IndexUpdater updater2 = mock( IndexUpdater.class ); when( accessor2.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( updater2 ); - when( indexProvider.getOnlineAccessor( eq( 1L ), any( IndexDescriptor.class ), + when( indexProvider.getOnlineAccessor( eq( 1L ), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( accessor1 ); - when( indexProvider.getOnlineAccessor( eq( 2L ), any( IndexDescriptor.class ), + when( indexProvider.getOnlineAccessor( eq( 2L ), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( accessor2 ); life.start(); @@ -783,7 +783,7 @@ public void shouldWaitForRecoveredUniquenessConstraintIndexesToBeFullyPopulated( IndexingService.Monitor monitor = new IndexingService.MonitorAdapter() { @Override - public void awaitingPopulationOfRecoveredIndex( long index, IndexDescriptor descriptor ) + public void awaitingPopulationOfRecoveredIndex( long index, SchemaIndexDescriptor 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. @@ -825,11 +825,11 @@ public void shouldCreateMultipleIndexesInOneCall() throws Exception indexing.createIndexes( indexRule1, indexRule2, indexRule3 ); // THEN - verify( indexProvider ).getPopulator( eq( 0L ), eq( IndexDescriptorFactory.forLabel( 0, 0 ) ), + verify( indexProvider ).getPopulator( eq( 0L ), eq( SchemaIndexDescriptorFactory.forLabel( 0, 0 ) ), any( IndexSamplingConfig.class ) ); - verify( indexProvider ).getPopulator( eq( 1L ), eq( IndexDescriptorFactory.forLabel( 0, 1 ) ), + verify( indexProvider ).getPopulator( eq( 1L ), eq( SchemaIndexDescriptorFactory.forLabel( 0, 1 ) ), any( IndexSamplingConfig.class ) ); - verify( indexProvider ).getPopulator( eq( 2L ), eq( IndexDescriptorFactory.forLabel( 1, 0 ) ), + verify( indexProvider ).getPopulator( eq( 2L ), eq( SchemaIndexDescriptorFactory.forLabel( 1, 0 ) ), any( IndexSamplingConfig.class ) ); waitForIndexesToComeOnline( indexing, 0, 1, 2 ); @@ -847,7 +847,7 @@ public void shouldStoreIndexFailureWhenFailingToCreateOnlineAccessorAfterPopulat when( nameLookup.propertyKeyGetName( propertyKeyId ) ).thenReturn( "propertyKey" ); when( indexProvider.getOnlineAccessor( - eq( indexId ), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + eq( indexId ), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenThrow( exception ); life.start(); @@ -884,7 +884,7 @@ public void shouldStoreIndexFailureWhenFailingToCreateOnlineAccessorAfterRecover when( indexProvider.getInitialState( indexId, indexRule.getIndexDescriptor() ) ).thenReturn( POPULATING ); when( indexProvider.getOnlineAccessor( - eq( indexId ), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + eq( indexId ), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenThrow( exception ); life.start(); @@ -912,7 +912,7 @@ public void shouldLogIndexStateOutliersOnInit() throws Exception // given IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); - when( provider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getOnlineAccessor( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( mock( IndexAccessor.class ) ); IndexProviderMap providerMap = new DefaultIndexProviderMap( provider ); TokenNameLookup mockLookup = mock( TokenNameLookup.class ); @@ -960,7 +960,7 @@ public void shouldLogIndexStateOutliersOnStart() throws Exception // given IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); - when( provider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getOnlineAccessor( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( mock( IndexAccessor.class ) ); IndexProviderMap providerMap = new DefaultIndexProviderMap( provider ); TokenNameLookup mockLookup = mock( TokenNameLookup.class ); @@ -1071,7 +1071,7 @@ public void shouldRefreshIndexesOnStart() throws Exception IndexAccessor accessor = mock( IndexAccessor.class ); IndexUpdater updater = mock( IndexUpdater.class ); when( accessor.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( updater ); - when( indexProvider.getOnlineAccessor( eq( rule.getId() ), any( IndexDescriptor.class ), + when( indexProvider.getOnlineAccessor( eq( rule.getId() ), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( accessor ); life.init(); @@ -1087,7 +1087,7 @@ public void shouldRefreshIndexesOnStart() throws Exception private IndexProxy createIndexProxyMock() { IndexProxy proxy = mock( IndexProxy.class ); - IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 2 ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 1, 2 ); when( proxy.getDescriptor() ).thenReturn( descriptor ); return proxy; } @@ -1197,12 +1197,12 @@ private IndexingService newIndexingServiceWithMockedDependencies( IndexPopulator IndexingService.Monitor monitor, IndexRule... rules ) throws IOException { - when( indexProvider.getInitialState( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( ONLINE ); + when( indexProvider.getInitialState( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( ONLINE ); when( indexProvider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); - when( indexProvider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( indexProvider.getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); data.getsProcessedByStoreScanFrom( storeView ); - when( indexProvider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( indexProvider.getOnlineAccessor( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( accessor ); when( indexProvider.storeMigrationParticipant( any( FileSystemAbstraction.class ), any( PageCache.class ) ) ) .thenReturn( StoreMigrationParticipant.NOT_PARTICIPATING ); @@ -1363,14 +1363,14 @@ public ResourceIterator snapshotFiles() private IndexRule indexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor providerDescriptor ) { - return IndexRule.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyKeyId ), + return IndexRule.indexRule( ruleId, SchemaIndexDescriptorFactory.forLabel( labelId, propertyKeyId ), providerDescriptor ); } private IndexRule constraintIndexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor providerDescriptor ) { - return IndexRule.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ), + return IndexRule.indexRule( ruleId, SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ), providerDescriptor ); } @@ -1378,7 +1378,7 @@ private IndexRule constraintIndexRule( long ruleId, int labelId, int propertyKey providerDescriptor, long constraintId ) { return IndexRule.constraintIndexRule( - ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ), providerDescriptor, constraintId ); + ruleId, SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ), providerDescriptor, constraintId ); } private IndexingService createIndexServiceWithCustomIndexMap( IndexMapReference indexMapReference ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java index 80c76fc8f5592..a3829be240b70 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java @@ -40,8 +40,8 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.MultipleIndexPopulator.IndexPopulation; import org.neo4j.logging.LogProvider; import org.neo4j.storageengine.api.schema.IndexSample; @@ -475,13 +475,13 @@ private IndexPopulation addPopulator( IndexPopulator indexPopulator, int id, private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, IndexPopulator indexPopulator, int id, FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { - return addPopulator( multipleIndexPopulator, id, IndexDescriptorFactory.forLabel( id, id ), indexPopulator, + return addPopulator( multipleIndexPopulator, id, SchemaIndexDescriptorFactory.forLabel( id, id ), indexPopulator, flippableIndexProxy, failedIndexProxyFactory ); } private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, long indexId, - IndexDescriptor descriptor, IndexPopulator indexPopulator, FlippableIndexProxy flippableIndexProxy, - FailedIndexProxyFactory failedIndexProxyFactory ) + SchemaIndexDescriptor descriptor, IndexPopulator indexPopulator, FlippableIndexProxy flippableIndexProxy, + FailedIndexProxyFactory failedIndexProxyFactory ) { return multipleIndexPopulator.addPopulator( indexPopulator, indexId, new IndexMeta( indexId, descriptor, mock( IndexProvider.Descriptor.class ), NO_CAPABILITY ), 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 152f9461d23ff..a7b3e133639f4 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 @@ -39,8 +39,8 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.locking.LockService; import org.neo4j.kernel.impl.store.InlineNodeLabels; import org.neo4j.kernel.impl.store.NeoStores; @@ -92,7 +92,7 @@ public void updateForHigherNodeIgnoredWhenUsingFullNodeStoreScan() IndexPopulator populator = createIndexPopulator(); IndexUpdater indexUpdater = mock( IndexUpdater.class ); - addPopulator( indexPopulator, populator, 1, IndexDescriptorFactory.forLabel( 1, 1 ) ); + addPopulator( indexPopulator, populator, 1, SchemaIndexDescriptorFactory.forLabel( 1, 1 ) ); indexPopulator.create(); StoreScan storeScan = indexPopulator.indexAllNodes(); @@ -115,15 +115,15 @@ private IndexPopulator createIndexPopulator() } private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, - IndexPopulator indexPopulator, long indexId, IndexDescriptor descriptor ) + IndexPopulator indexPopulator, long indexId, SchemaIndexDescriptor descriptor ) { return addPopulator( multipleIndexPopulator, indexId, descriptor, indexPopulator, mock( FlippableIndexProxy.class ), mock( FailedIndexProxyFactory.class ) ); } private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, - long indexId, IndexDescriptor descriptor, IndexPopulator indexPopulator, - FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) + long indexId, SchemaIndexDescriptor descriptor, IndexPopulator indexPopulator, + FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { return multipleIndexPopulator.addPopulator( indexPopulator, indexId, new IndexMeta( indexId, descriptor, mock( IndexProvider.Descriptor.class ), NO_CAPABILITY ), 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 82149177e1ea4..2259a475788d2 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 @@ -25,8 +25,8 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -36,7 +36,7 @@ public class OnlineIndexProxyTest { private final long indexId = 1; - private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 2 ); + private final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.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/SchemaIndexTestHelper.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/SchemaIndexTestHelper.java index 815c011051c8c..1f9cbd0c863cd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/SchemaIndexTestHelper.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/SchemaIndexTestHelper.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.spi.KernelContext; @@ -109,7 +109,7 @@ public static boolean awaitLatch( CountDownLatch latch ) } } - public static void awaitIndexOnline( ReadOperations readOperations, IndexDescriptor index ) + public static void awaitIndexOnline( ReadOperations readOperations, SchemaIndexDescriptor index ) throws IndexNotFoundKernelException { long start = System.currentTimeMillis(); 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 3e98319322fb1..07fef6d0be3d3 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 @@ -32,7 +32,7 @@ import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.helpers.collection.Iterables; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexSampler; import org.neo4j.values.storable.Value; @@ -48,7 +48,7 @@ class HashBasedIndex extends InMemoryIndexImplementation { private Map,Set> data; - HashBasedIndex( IndexDescriptor descriptor ) + HashBasedIndex( SchemaIndexDescriptor 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 93d0ec0166e1a..750819a397941 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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( IndexDescriptor descriptor ) + InMemoryIndex( SchemaIndexDescriptor 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 074ef05818343..70174362fa184 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.primitive.PrimitiveLongResourceIterator; import org.neo4j.helpers.collection.BoundedIterable; import org.neo4j.kernel.api.index.ArrayEncoder; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.AbstractIndexReader; import org.neo4j.values.storable.Value; abstract class InMemoryIndexImplementation extends AbstractIndexReader implements BoundedIterable { - InMemoryIndexImplementation( IndexDescriptor descriptor ) + InMemoryIndexImplementation( SchemaIndexDescriptor 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 078d902b723e8..9035f2adfaf00 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 @@ -29,12 +29,12 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.kernel.impl.util.CopyOnWriteHashMap; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; public class InMemoryIndexProvider extends IndexProvider { @@ -57,14 +57,14 @@ private InMemoryIndexProvider( int prio, Map indexes ) } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { InMemoryIndex index = indexes.get( indexId ); return index != null ? index.getState() : InternalIndexState.POPULATING; } @Override - public IndexCapability getCapability( IndexDescriptor indexDescriptor ) + public IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { return IndexCapability.NO_CAPABILITY; } @@ -76,7 +76,7 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { InMemoryIndex index = descriptor.type() == UNIQUE ? new UniqueInMemoryIndex( descriptor ) : new InMemoryIndex( descriptor ); @@ -85,7 +85,7 @@ public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, In } @Override - public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor, + public IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { InMemoryIndex index = indexes.get( indexId ); @@ -103,7 +103,7 @@ public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor } @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { String failure = indexes.get( indexId ).failure; if ( failure == null ) 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 2015372e4c1c0..6b4fd0c02e7e6 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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 LabelSchemaDescriptor schema; - UniqueInMemoryIndex( IndexDescriptor descriptor ) + UniqueInMemoryIndex( SchemaIndexDescriptor descriptor ) { super( descriptor ); this.schema = descriptor.schema(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UpdateCapturingIndexProvider.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UpdateCapturingIndexProvider.java index a607ca9048be2..189dc2aef604c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UpdateCapturingIndexProvider.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UpdateCapturingIndexProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -51,13 +51,13 @@ public UpdateCapturingIndexProvider( IndexProvider actual, Map matched = new ArrayList<>(); + final List matched = new ArrayList<>(); nodeSchemaMatcher.onMatchingSchema( state, iterator( index1 ), node, unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); @@ -108,7 +108,7 @@ public void shouldMatchOnSingleProperty() public void shouldMatchOnTwoProperties() { // when - final List matched = new ArrayList<>(); + final List matched = new ArrayList<>(); nodeSchemaMatcher.onMatchingSchema( state, iterator( index1_2 ), node, unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); @@ -120,7 +120,7 @@ public void shouldMatchOnTwoProperties() public void shouldNotMatchIfNodeIsMissingProperty() { // when - final List matched = new ArrayList<>(); + final List matched = new ArrayList<>(); nodeSchemaMatcher.onMatchingSchema( state, iterator( indexWithMissingProperty ), node, unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); @@ -132,7 +132,7 @@ public void shouldNotMatchIfNodeIsMissingProperty() public void shouldNotMatchIfNodeIsMissingLabel() { // when - final List matched = new ArrayList<>(); + final List matched = new ArrayList<>(); nodeSchemaMatcher.onMatchingSchema( state, iterator( indexWithMissingLabel ), node, unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); @@ -144,7 +144,7 @@ public void shouldNotMatchIfNodeIsMissingLabel() public void shouldMatchOnSpecialProperty() { // when - final List matched = new ArrayList<>(); + final List matched = new ArrayList<>(); nodeSchemaMatcher.onMatchingSchema( state, iterator( indexOnSpecialProperty ), node, specialPropId, ( schema, props ) -> matched.add( schema ) ); @@ -156,10 +156,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( state, indexes.iterator(), node, unIndexedPropId, ( schema, props ) -> matched.add( schema ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java index 24d224ee4c0dc..5efb4308820f5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java @@ -33,8 +33,8 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.AssertOpen; import org.neo4j.kernel.api.properties.PropertyKeyValue; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.ConstraintEnforcingEntityOperations; @@ -72,8 +72,8 @@ public class IndexQueryTransactionStateTest private int labelId = 2; private int propertyKeyId = 3; private Value value = Values.of( "My Value" ); - private IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( labelId, propertyKeyId ); - private List indexes = Collections.singletonList( indexDescriptor ); + private SchemaIndexDescriptor schemaIndexDescriptor = SchemaIndexDescriptorFactory.forLabel( labelId, propertyKeyId ); + private List indexes = Collections.singletonList( schemaIndexDescriptor ); private IndexQuery.ExactPredicate withValue = IndexQuery.exact( propertyKeyId, value ); private StoreReadLayer store; @@ -89,18 +89,18 @@ public void before() throws Exception state = StatementOperationsTestHelper.mockedState( txState ); store = mock( StoreReadLayer.class ); - when( store.indexGetState( indexDescriptor ) ).thenReturn( InternalIndexState.ONLINE ); + when( store.indexGetState( schemaIndexDescriptor ) ).thenReturn( InternalIndexState.ONLINE ); when( store.indexesGetForLabel( labelId ) ).then( answerAsIteratorFrom( indexes ) ); when( store.indexesGetAll() ).then( answerAsIteratorFrom( indexes ) ); when( store.indexesGetRelatedToProperty( propertyKeyId ) ).then( answerAsIteratorFrom( indexes ) ); when( store.constraintsGetForLabel( labelId ) ).thenReturn( Collections.emptyIterator() ); - when( store.indexGetForSchema( indexDescriptor.schema() ) ).thenReturn( indexDescriptor ); + when( store.indexGetForSchema( schemaIndexDescriptor.schema() ) ).thenReturn( schemaIndexDescriptor ); statement = mock( StoreStatement.class ); when( state.getStoreStatement() ).thenReturn( statement ); indexReader = mock( IndexReader.class ); - when( statement.getIndexReader( indexDescriptor ) ).thenReturn( indexReader ); - when( statement.getFreshIndexReader( indexDescriptor ) ).thenReturn( indexReader ); + when( statement.getIndexReader( schemaIndexDescriptor ) ).thenReturn( indexReader ); + when( statement.getFreshIndexReader( schemaIndexDescriptor ) ).thenReturn( indexReader ); StateHandlingStatementOperations stateHandlingOperations = new StateHandlingStatementOperations( store, @@ -123,7 +123,7 @@ public void shouldExcludeRemovedNodesFromIndexQuery() throws Exception txContext.nodeDelete( state, nodeId ); // When - PrimitiveLongIterator result = txContext.indexQuery( state, indexDescriptor, withValue ); + PrimitiveLongIterator result = txContext.indexQuery( state, schemaIndexDescriptor, withValue ); // Then assertThat( PrimitiveLongCollections.toSet( result ), equalTo( asSet( 1L, 3L ) ) ); @@ -141,7 +141,7 @@ public void shouldExcludeRemovedNodeFromUniqueIndexQuery() throws Exception txContext.nodeDelete( state, nodeId ); // When - long result = txContext.nodeGetFromUniqueIndexSeek( state, indexDescriptor, withValue ); + long result = txContext.nodeGetFromUniqueIndexSeek( state, schemaIndexDescriptor, withValue ); // Then assertNoSuchNode( result ); @@ -156,7 +156,7 @@ public void shouldExcludeChangedNodesWithMissingLabelFromIndexQuery() throws Exc state.txState().nodeDoAddProperty( 1L, propertyKeyId, Values.of( 10 ) ); // When - PrimitiveLongIterator result = txContext.indexQuery( state, indexDescriptor, withValue ); + PrimitiveLongIterator result = txContext.indexQuery( state, schemaIndexDescriptor, withValue ); // Then assertThat( PrimitiveLongCollections.toSet( result ), equalTo( asSet( 2L, 3L ) ) ); @@ -170,7 +170,7 @@ public void shouldExcludeChangedNodeWithMissingLabelFromUniqueIndexQuery() throw state.txState().nodeDoAddProperty( 1L, propertyKeyId, Values.of( 10 ) ); // When - long result = txContext.nodeGetFromUniqueIndexSeek( state, indexDescriptor, withValue ); + long result = txContext.nodeGetFromUniqueIndexSeek( state, schemaIndexDescriptor, withValue ); // Then assertNoSuchNode( result ); @@ -191,7 +191,7 @@ public void shouldIncludeCreatedNodesWithCorrectLabelAndProperty() throws Except txContext.nodeAddLabel( state, nodeId, labelId ); // When - PrimitiveLongIterator result = txContext.indexQuery( state, indexDescriptor, withValue ); + PrimitiveLongIterator result = txContext.indexQuery( state, schemaIndexDescriptor, withValue ); // Then assertThat( PrimitiveLongCollections.toSet( result ), equalTo( asSet( nodeId, 2L, 3L ) ) ); @@ -213,7 +213,7 @@ public void shouldIncludeUniqueCreatedNodeWithCorrectLabelAndProperty() throws E txContext.nodeAddLabel( state, nodeId, labelId ); // When - long result = txContext.nodeGetFromUniqueIndexSeek( state, indexDescriptor, withValue ); + long result = txContext.nodeGetFromUniqueIndexSeek( state, schemaIndexDescriptor, withValue ); // Then assertThat( result, equalTo( nodeId ) ); @@ -234,7 +234,7 @@ public void shouldIncludeExistingNodesWithCorrectPropertyAfterAddingLabel() thro txContext.nodeAddLabel( state, nodeId, labelId ); // When - PrimitiveLongIterator result = txContext.indexQuery( state, indexDescriptor, withValue ); + PrimitiveLongIterator result = txContext.indexQuery( state, schemaIndexDescriptor, withValue ); // Then assertThat( PrimitiveLongCollections.toSet( result ), equalTo( asSet( nodeId, 2L, 3L ) ) ); @@ -255,7 +255,7 @@ public void shouldIncludeExistingUniqueNodeWithCorrectPropertyAfterAddingLabel() txContext.nodeAddLabel( state, nodeId, labelId ); // When - long result = txContext.nodeGetFromUniqueIndexSeek( state, indexDescriptor, withValue ); + long result = txContext.nodeGetFromUniqueIndexSeek( state, schemaIndexDescriptor, withValue ); // Then assertThat( result, equalTo( nodeId ) ); @@ -275,7 +275,7 @@ public void shouldExcludeExistingNodesWithCorrectPropertyAfterRemovingLabel() th txContext.nodeRemoveLabel( state, nodeId, labelId ); // When - PrimitiveLongIterator result = txContext.indexQuery( state, indexDescriptor, withValue ); + PrimitiveLongIterator result = txContext.indexQuery( state, schemaIndexDescriptor, withValue ); // Then assertThat( PrimitiveLongCollections.toSet( result ), equalTo( asSet( 2L, 3L ) ) ); @@ -295,7 +295,7 @@ public void shouldExcludeExistingUniqueNodeWithCorrectPropertyAfterRemovingLabel txContext.nodeRemoveLabel( state, nodeId, labelId ); // When - long result = txContext.nodeGetFromUniqueIndexSeek( state, indexDescriptor, withValue ); + long result = txContext.nodeGetFromUniqueIndexSeek( state, schemaIndexDescriptor, withValue ); // Then assertNoSuchNode( result ); @@ -316,7 +316,7 @@ public void shouldExcludeNodesWithRemovedProperty() throws Exception txContext.nodeAddLabel( state, nodeId, labelId ); // When - PrimitiveLongIterator result = txContext.indexQuery( state, indexDescriptor, withValue ); + PrimitiveLongIterator result = txContext.indexQuery( state, schemaIndexDescriptor, withValue ); // Then assertThat( PrimitiveLongCollections.toSet( result ), equalTo( asSet( 2L, 3L ) ) ); @@ -336,7 +336,7 @@ public void shouldExcludeUniqueNodeWithRemovedProperty() throws Exception txContext.nodeRemoveProperty( state, nodeId, propertyKeyId ); // When - long result = txContext.nodeGetFromUniqueIndexSeek( state, indexDescriptor, withValue ); + long result = txContext.nodeGetFromUniqueIndexSeek( state, schemaIndexDescriptor, withValue ); // Then assertNoSuchNode( result ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdaterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdaterTest.java index fd85d2a0fdd85..f6038f49b9ac2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdaterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdaterTest.java @@ -31,8 +31,8 @@ import org.neo4j.cursor.Cursor; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.properties.PropertyKeyValue; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; @@ -72,12 +72,13 @@ public class IndexTxStateUpdaterTest private IndexTxStateUpdater indexTxUpdater; private NodeItem node; - 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 SchemaIndexDescriptor indexOn1_1 = SchemaIndexDescriptorFactory.forLabel( labelId1, propId1 ); + private SchemaIndexDescriptor indexOn2_new = SchemaIndexDescriptorFactory.forLabel( labelId2, newPropId ); + private SchemaIndexDescriptor uniqueOn1_2 = SchemaIndexDescriptorFactory.uniqueForLabel( labelId1, propId2 ); + private SchemaIndexDescriptor indexOn1_1_new = SchemaIndexDescriptorFactory.forLabel( labelId1, propId1, newPropId ); + private SchemaIndexDescriptor uniqueOn2_2_3 = SchemaIndexDescriptorFactory + .uniqueForLabel( labelId2, propId2, propId3 ); + private List indexes = Arrays.asList( indexOn1_1, indexOn2_new, uniqueOn1_2, indexOn1_1_new, uniqueOn2_2_3 ); @Before diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java index 31a5a7acb3e1f..3e1c0ca4e6974 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java @@ -33,8 +33,8 @@ import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.AssertOpen; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.StateHandlingStatementOperations; @@ -167,7 +167,7 @@ public void addedLabelsShouldBeReflectedWhenGettingNodesForLabel() throws Except labels( 2, 1, 3 ) ); // WHEN - List indexes = Collections.singletonList( IndexDescriptorFactory.forLabel( 2, 2 ) ); + List indexes = Collections.singletonList( SchemaIndexDescriptorFactory.forLabel( 2, 2 ) ); when( store.indexesGetForLabel( 2 ) ).thenReturn( indexes.iterator() ); txContext.nodeAddLabel( state, 2, 2 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java index 25742e7592bd6..8d06034d3eb52 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java @@ -34,8 +34,8 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.StateHandlingStatementOperations; @@ -57,21 +57,21 @@ public class SchemaTransactionStateTest { - private static IndexDescriptor indexCreate( StateHandlingStatementOperations txContext, KernelStatement state, - int labelId, int propertyKey ) + private static SchemaIndexDescriptor indexCreate( StateHandlingStatementOperations txContext, KernelStatement state, + int labelId, int propertyKey ) { return txContext.indexCreate( state, SchemaDescriptorFactory.forLabel( labelId, propertyKey ) ); } - private static IndexDescriptor indexGetForLabelAndPropertyKey( + private static SchemaIndexDescriptor indexGetForLabelAndPropertyKey( StateHandlingStatementOperations txContext, KernelStatement state, int labelId, int propertyKey ) { LabelSchemaDescriptor schemaDescriptor = SchemaDescriptorFactory.forLabel( labelId, propertyKey ); return txContext.indexGetForSchema( state, schemaDescriptor ); } - private static IndexDescriptor indexGetForLabelAndPropertyKey( StoreReadLayer store, int labelId, - int propertyKey ) + private static SchemaIndexDescriptor indexGetForLabelAndPropertyKey( StoreReadLayer store, int labelId, + int propertyKey ) { return store.indexGetForSchema( SchemaDescriptorFactory.forLabel( labelId, propertyKey ) ); } @@ -83,7 +83,7 @@ public void addedRuleShouldBeVisibleInTx() commitNoLabels(); // WHEN - IndexDescriptor index = indexCreate( txContext, state, labelId1, key1 ); + SchemaIndexDescriptor index = indexCreate( txContext, state, labelId1, key1 ); // THEN assertEquals( asSet( index ), Iterators.asSet( txContext.indexesGetForLabel( state, labelId1 ) ) ); @@ -102,8 +102,8 @@ public void addedRulesShouldBeVisibleInTx() commitNoLabels(); // WHEN - IndexDescriptor rule1 = indexCreate( txContext, state, labelId1, key1 ); - IndexDescriptor rule2 = indexCreate( txContext, state, labelId2, key2 ); + SchemaIndexDescriptor rule1 = indexCreate( txContext, state, labelId1, key1 ); + SchemaIndexDescriptor rule2 = indexCreate( txContext, state, labelId2, key2 ); // THEN assertEquals( asSet( rule1 ), Iterators.asSet( txContext.indexesGetForLabel( state, labelId1 ) ) ); @@ -125,8 +125,8 @@ public void addedAdditionalRuleShouldBeVisibleInTx() commitNoLabels(); // WHEN - IndexDescriptor rule1 = indexCreate( txContext, state, labelId1, key1 ); - IndexDescriptor rule2 = indexCreate( txContext, state, labelId1, key2 ); + SchemaIndexDescriptor rule1 = indexCreate( txContext, state, labelId1, key1 ); + SchemaIndexDescriptor rule2 = indexCreate( txContext, state, labelId1, key2 ); // THEN assertEquals( asSet( rule1, rule2 ), Iterators.asSet( txContext.indexesGetForLabel( state, labelId1 ) ) ); @@ -137,7 +137,7 @@ public void creatingAnIndexShouldBePopulatingStateWithinTX() throws Exception { // GIVEN commitLabels( labelId1 ); - IndexDescriptor rule = indexCreate( txContext, state, labelId1, key1 ); + SchemaIndexDescriptor rule = indexCreate( txContext, state, labelId1, key1 ); // THEN assertEquals( InternalIndexState.POPULATING, txContext.indexGetState( state, rule ) ); @@ -151,11 +151,11 @@ public void shouldReturnNonExistentRuleAddedInTransaction() indexCreate( txContext, state, labelId1, key1 ); // WHEN - IndexDescriptor index = indexGetForLabelAndPropertyKey( txContext, state, labelId1, key1 ); - Iterator labelRules = txContext.indexesGetForLabel( state, labelId1 ); + SchemaIndexDescriptor index = indexGetForLabelAndPropertyKey( txContext, state, labelId1, key1 ); + Iterator labelRules = txContext.indexesGetForLabel( state, labelId1 ); // THEN - IndexDescriptor expectedRule = IndexDescriptorFactory.forLabel( labelId1, key1 ); + SchemaIndexDescriptor expectedRule = SchemaIndexDescriptorFactory.forLabel( labelId1, key1 ); assertEquals( expectedRule, index ); assertEquals( asSet( expectedRule ), asSet( labelRules ) ); } @@ -165,19 +165,19 @@ public void shouldReturnNonExistentRuleAddedInTransactionFromLookup() { // GIVEN // -- the store already have an index on the label and a different property - IndexDescriptor existingRule1 = IndexDescriptorFactory.forLabel( labelId1, key1 ); + SchemaIndexDescriptor existingRule1 = SchemaIndexDescriptorFactory.forLabel( labelId1, key1 ); when( indexGetForLabelAndPropertyKey( store, labelId1, key1 ) ).thenReturn( existingRule1 ); // -- the store already have an index on a different label with the same property - IndexDescriptor existingRule2 = IndexDescriptorFactory.forLabel( labelId2, key2 ); + SchemaIndexDescriptor existingRule2 = SchemaIndexDescriptorFactory.forLabel( labelId2, key2 ); when( indexGetForLabelAndPropertyKey( store, labelId2, key2 ) ).thenReturn( existingRule2 ); // -- a non-existent index has been added in the transaction indexCreate( txContext, state, labelId1, key2 ); // WHEN - IndexDescriptor index = indexGetForLabelAndPropertyKey( txContext, state, labelId1, key2 ); + SchemaIndexDescriptor index = indexGetForLabelAndPropertyKey( txContext, state, labelId1, key2 ); // THEN - assertEquals( IndexDescriptorFactory.forLabel( labelId1, key2 ), index ); + assertEquals( SchemaIndexDescriptorFactory.forLabel( labelId1, key2 ), index ); } @Test @@ -185,17 +185,17 @@ public void shouldNotReturnRulesAddedInTransactionWithDifferentLabelOrPropertyFr { // GIVEN // -- the store already have an index on the label and a different property - IndexDescriptor existingIndex1 = IndexDescriptorFactory.forLabel( labelId1, key1 ); + SchemaIndexDescriptor existingIndex1 = SchemaIndexDescriptorFactory.forLabel( labelId1, key1 ); when( indexGetForLabelAndPropertyKey( store,labelId1, key1) ).thenReturn( existingIndex1 ); // -- the store already have an index on a different label with the same property - IndexDescriptor existingIndex2 = IndexDescriptorFactory.forLabel( labelId2, key2 ); + SchemaIndexDescriptor existingIndex2 = SchemaIndexDescriptorFactory.forLabel( labelId2, key2 ); when( indexGetForLabelAndPropertyKey( store, labelId2, key2 ) ).thenReturn( existingIndex2 ); // -- a non-existent rule has been added in the transaction indexCreate( txContext, state, labelId1, key2 ); // WHEN - IndexDescriptor lookupRule1 = indexGetForLabelAndPropertyKey( txContext, state, labelId1, key1 ); - IndexDescriptor lookupRule2 = indexGetForLabelAndPropertyKey( txContext, state, labelId2, key2 ); + SchemaIndexDescriptor lookupRule1 = indexGetForLabelAndPropertyKey( txContext, state, labelId1, key1 ); + SchemaIndexDescriptor lookupRule2 = indexGetForLabelAndPropertyKey( txContext, state, labelId2, key2 ); // THEN assertEquals( existingIndex1, lookupRule1 ); @@ -207,14 +207,14 @@ public void shouldNotReturnExistentRuleDroppedInTransaction() { // GIVEN // -- a rule that exists in the store - IndexDescriptor index = IndexDescriptorFactory.forLabel( labelId1, key1 ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( labelId1, key1 ); when( store.indexesGetForLabel( labelId1 ) ).thenReturn( option( index ).iterator() ); // -- that same rule dropped in the transaction txContext.indexDrop( state, index ); // WHEN assertNull( indexGetForLabelAndPropertyKey( txContext, state, labelId1, key1 ) ); - Iterator rulesByLabel = txContext.indexesGetForLabel( state, labelId1 ); + Iterator rulesByLabel = txContext.indexesGetForLabel( state, labelId1 ); // THEN assertEquals( emptySet(), asSet( rulesByLabel ) ); @@ -241,9 +241,9 @@ public void before() state = StatementOperationsTestHelper.mockedState( txState ); store = mock( StoreReadLayer.class ); - when( store.indexesGetForLabel( labelId1 ) ).then( asAnswer( Collections.emptyList() ) ); - when( store.indexesGetForLabel( labelId2 ) ).then( asAnswer( Collections.emptyList() ) ); - when( store.indexesGetAll() ).then( asAnswer( Collections.emptyList() ) ); + when( store.indexesGetForLabel( labelId1 ) ).then( asAnswer( Collections.emptyList() ) ); + when( store.indexesGetForLabel( labelId2 ) ).then( asAnswer( Collections.emptyList() ) ); + when( store.indexesGetAll() ).then( asAnswer( Collections.emptyList() ) ); txContext = new StateHandlingStatementOperations( store, mock( InternalAutoIndexing.class ), mock( ConstraintIndexCreator.class ), mock( ExplicitIndexStore.class ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java index cc2ae5cf7d77e..10f188ecd8084 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java @@ -42,8 +42,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.StateHandlingStatementOperations; @@ -94,7 +94,7 @@ public class StateHandlingStatementOperationsTest StoreReadLayer inner = mock( StoreReadLayer.class ); private final LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( 10, 66 ); - private final IndexDescriptor index = IndexDescriptorFactory.forLabel( 1, 2 ); + private final SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( 1, 2 ); @Test public void shouldNeverDelegateWrites() throws Exception @@ -104,7 +104,7 @@ public void shouldNeverDelegateWrites() throws Exception when( state.txState() ).thenReturn( new TxState() ); StoreStatement storeStatement = mock( StoreStatement.class ); when( state.getStoreStatement() ).thenReturn( storeStatement ); - when( inner.indexesGetForLabel( 0 ) ).thenReturn( iterator( IndexDescriptorFactory.forLabel( 0, 0 ) ) ); + when( inner.indexesGetForLabel( 0 ) ).thenReturn( iterator( SchemaIndexDescriptorFactory.forLabel( 0, 0 ) ) ); when( storeStatement.acquireSingleNodeCursor( anyLong() ) ).thenReturn( asNodeCursor( 0 ) ); when( inner.nodeGetProperties( eq( storeStatement ), any( NodeItem.class ), any( AssertOpen.class ) ) ). thenReturn( asPropertyCursor() ); @@ -115,7 +115,7 @@ public void shouldNeverDelegateWrites() throws Exception LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( 0, 0 ); ctx.indexCreate( state, descriptor ); ctx.nodeAddLabel( state, 0, 0 ); - ctx.indexDrop( state, IndexDescriptorFactory.forSchema( descriptor ) ); + ctx.indexDrop( state, SchemaIndexDescriptorFactory.forSchema( descriptor ) ); ctx.nodeRemoveLabel( state, 0, 0 ); // one for add and one for remove @@ -460,7 +460,7 @@ public void indexQueryClosesIndexReader() throws Exception operations.nodeGetFromUniqueIndexSeek( kernelStatement, - IndexDescriptorFactory.uniqueForLabel( 1, 1 ), + SchemaIndexDescriptorFactory.uniqueForLabel( 1, 1 ), IndexQuery.exact( 1, "foo" ) ); verify( indexReader ).close(); @@ -637,7 +637,7 @@ private IndexReader addMockedIndexReader( StorageStatement storeStatement ) throws IndexNotFoundKernelException { IndexReader indexReader = mock( IndexReader.class ); - when( storeStatement.getIndexReader( any( IndexDescriptor.class ) ) ).thenReturn( indexReader ); + when( storeStatement.getIndexReader( any( SchemaIndexDescriptor.class ) ) ).thenReturn( indexReader ); return indexReader; } 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 927772b1cea97..4adbca705f804 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,8 +27,8 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.storageengine.api.txstate.PrimitiveLongReadableDiffSets; import org.neo4j.values.storable.ValueTuple; @@ -43,10 +43,10 @@ public class TxStateCompositeIndexTest { private TransactionState state; - 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 ); + private final SchemaIndexDescriptor indexOn_1_1_2 = SchemaIndexDescriptorFactory.forLabel( 1, 1, 2 ); + private final SchemaIndexDescriptor indexOn_1_2_3 = SchemaIndexDescriptorFactory.forLabel( 1, 2, 3 ); + private final SchemaIndexDescriptor indexOn_2_2_3 = SchemaIndexDescriptorFactory.uniqueForLabel( 2, 2, 3 ); + private final SchemaIndexDescriptor indexOn_2_2_3_4 = SchemaIndexDescriptorFactory.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( IndexDescriptor index, ValueTuple[] values, long nodeIdStart ) + private void addEntries( SchemaIndexDescriptor index, ValueTuple[] values, long nodeIdStart ) { for ( int i = 0; i < values.length; i++ ) { @@ -187,7 +187,7 @@ private void addEntries( IndexDescriptor index, ValueTuple[] values, long nodeId } } - private void assertSeek( IndexDescriptor index, ValueTuple[] values, long nodeIdStart ) + private void assertSeek( SchemaIndexDescriptor 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 IndexDescriptor descriptor ) + private IndexUpdater modifyIndex( final SchemaIndexDescriptor 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 72816448d0be1..d432031295d61 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 @@ -45,8 +45,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.util.collection.CollectionsFactory; import org.neo4j.kernel.impl.util.collection.CollectionsFactorySupplier; import org.neo4j.storageengine.api.Direction; @@ -97,9 +97,9 @@ public final TestRule repeatWithDifferentRandomization() return RuleChain.outerRule( new RepeatRule() ).around( random ); } - 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 final SchemaIndexDescriptor indexOn_1_1 = SchemaIndexDescriptorFactory.forLabel( 1, 1 ); + private final SchemaIndexDescriptor indexOn_1_2 = SchemaIndexDescriptorFactory.forLabel( 1, 2 ); + private final SchemaIndexDescriptor indexOn_2_1 = SchemaIndexDescriptorFactory.forLabel( 2, 1 ); private CollectionsFactory collectionsFactory; private TxState state; @@ -1720,7 +1720,7 @@ private interface IndexUpdater void withBooleanProperties( Collection> nodesWithValues ); } - private IndexUpdater addNodesToIndex( final IndexDescriptor descriptor ) + private IndexUpdater addNodesToIndex( final SchemaIndexDescriptor 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 ace86d45c8267..05d18737f10af 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,8 +31,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.IndexRule; @@ -201,7 +201,7 @@ public void shouldResolveIndexDescriptor() // When LabelSchemaDescriptor schema = forLabel( 1, 3 ); - IndexDescriptor descriptor = cache.indexDescriptor( schema ); + SchemaIndexDescriptor descriptor = cache.indexDescriptor( schema ); // Then assertThat( descriptor.schema(), equalTo( schema ) ); @@ -214,10 +214,10 @@ public void shouldReturnNullWhenNoIndexExists() SchemaCache schemaCache = newSchemaCache(); // When - IndexDescriptor indexDescriptor = schemaCache.indexDescriptor( forLabel( 1, 1 ) ); + SchemaIndexDescriptor schemaIndexDescriptor = schemaCache.indexDescriptor( forLabel( 1, 1 ) ); // Then - assertNull( indexDescriptor ); + assertNull( schemaIndexDescriptor ); } @Test @@ -339,7 +339,7 @@ public void concurrentSchemaRuleRemove() throws Throwable private IndexRule newIndexRule( long id, int label, int propertyKey ) { - return IndexRule.indexRule( id, IndexDescriptorFactory.forLabel( label, propertyKey ), PROVIDER_DESCRIPTOR ); + return IndexRule.indexRule( id, SchemaIndexDescriptorFactory.forLabel( label, propertyKey ), PROVIDER_DESCRIPTOR ); } private ConstraintRule nodePropertyExistenceConstraintRule( long ruleId, int labelId, int propertyId ) 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 08ddbfaaff778..7ac0addaccec4 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,8 +28,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.UpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.Value; @@ -52,7 +52,7 @@ public class DeferredConflictCheckingIndexUpdaterTest { private final int labelId = 1; private final int[] propertyKeyIds = {2, 3}; - private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( labelId, propertyKeyIds ); + private final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.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/LayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java index 255e0e731abd7..24cd64d9f43ef 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 @@ -33,26 +33,26 @@ 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.test.rule.RandomRule; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; abstract class LayoutTestUtil { - 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 IndexDescriptor indexDescriptor; + final SchemaIndexDescriptor schemaIndexDescriptor; - LayoutTestUtil( IndexDescriptor indexDescriptor ) + LayoutTestUtil( SchemaIndexDescriptor schemaIndexDescriptor ) { - this.indexDescriptor = indexDescriptor; + this.schemaIndexDescriptor = schemaIndexDescriptor; } abstract Layout createLayout(); - abstract IndexEntryUpdate[] someUpdates(); + abstract IndexEntryUpdate[] someUpdates(); protected abstract double fractionDuplicates(); @@ -60,26 +60,26 @@ abstract class LayoutTestUtil> 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() && @@ -104,7 +104,7 @@ private Value existingNonUniqueValue( RandomRule randomRule ) abstract Value newUniqueValue( RandomRule 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++ ) @@ -118,14 +118,14 @@ Value[] extractValuesFromUpdates( IndexEntryUpdate[] updates ) 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] ) ); @@ -133,12 +133,12 @@ IndexEntryUpdate[] generateAddUpdatesFor( Object[] values ) return indexEntryUpdates; } - protected IndexEntryUpdate add( long nodeId, Value value ) + protected IndexEntryUpdate add( long nodeId, Value value ) { - return IndexEntryUpdate.add( nodeId, indexDescriptor, value ); + return IndexEntryUpdate.add( nodeId, schemaIndexDescriptor, value ); } - static int countUniqueValues( IndexEntryUpdate[] updates ) + static int countUniqueValues( IndexEntryUpdate[] updates ) { return Stream.of( updates ).map( update -> update.values()[0] ).collect( Collectors.toSet() ).size(); } @@ -148,7 +148,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/NativeIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTest.java index 7bb73f7b51f0f..794ec51f2ed39 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTest.java @@ -39,8 +39,8 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.LoggingMonitor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -104,7 +104,7 @@ public void shouldNotCheckConflictsWhenApplyingUpdatesInOnlineAccessor() throws provider = newProvider(); // when - IndexDescriptor descriptor = descriptorUnique(); + SchemaIndexDescriptor descriptor = descriptorUnique(); try ( IndexAccessor accessor = provider.getOnlineAccessor( indexId, descriptor, samplingConfig() ); IndexUpdater indexUpdater = accessor.newUpdater( IndexUpdateMode.ONLINE ) ) { @@ -342,14 +342,14 @@ private IndexSamplingConfig samplingConfig() return new IndexSamplingConfig( Config.defaults() ); } - private IndexDescriptor descriptor() + private SchemaIndexDescriptor descriptor() { - return IndexDescriptorFactory.forLabel( labelId, propId ); + return SchemaIndexDescriptorFactory.forLabel( labelId, propId ); } - private IndexDescriptor descriptorUnique() + private SchemaIndexDescriptor descriptorUnique() { - return IndexDescriptorFactory.uniqueForLabel( labelId, propId ); + return SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propId ); } private PageCache pageCache() 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 fcd2a95536bef..6ff387ed5dfa3 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.values.storable.Values; @@ -42,7 +42,7 @@ public void addShouldApplyDuplicateValues() throws Exception { // given populator.create(); - IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); // when populator.add( Arrays.asList( updates ) ); @@ -57,11 +57,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 ); } @@ -77,9 +77,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(); @@ -91,7 +91,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 723f480717982..7849d315fdb51 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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,15 +154,15 @@ 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 ); + updates[i] = change( update.getEntityId(), schemaIndexDescriptor, update.values()[0], newValue ); } // when @@ -177,14 +177,15 @@ 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(), + schemaIndexDescriptor, update.values() ); processAll( remove ); forceAndCloseAccessor(); @@ -198,15 +199,15 @@ 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, + IndexEntryUpdate[] batch = generateRandomUpdates( expectedData, newDataGenerator, random.nextInt( 5, 20 ), (float) round / rounds * 2 ); // apply to tree processAll( batch ); @@ -228,7 +229,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 +241,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 +256,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 +268,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 +291,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 +318,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]; PrimitiveLongIterator result = query( reader, IndexQuery.exact( 0, value ) ); @@ -334,7 +335,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 +349,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 +364,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 +379,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 +394,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 +409,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 +424,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 +452,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 +492,7 @@ public void mustHandleMultipleNestedQueries() throws Exception assertEntityIdHits( expected1, result1 ); } - private long entityIdOf( IndexEntryUpdate update ) + private long entityIdOf( IndexEntryUpdate update ) { return update.getEntityId(); } @@ -500,10 +501,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 +548,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 +564,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 +590,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 +662,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 +690,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,18 +708,18 @@ 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 ) { - Set> set = new HashSet<>( Arrays.asList( existing ) ); + Set> set = new HashSet<>( Arrays.asList( existing ) ); return set::add; } - private Object valueOf( IndexEntryUpdate update ) + private Object valueOf( IndexEntryUpdate update ) { return update.values()[0].asObject(); } @@ -728,7 +729,7 @@ private IndexProgressor.NodeValueClient filterClient( final NodeValueIterator it return new IndexProgressor.NodeValueClient() { @Override - public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) + public void initialize( SchemaIndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) { iter.initialize( descriptor, progressor, query ); } @@ -798,13 +799,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: @@ -832,12 +833,12 @@ private void applyUpdatesToExpectedData( Set> } } - private IndexEntryUpdate[] 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++ ) { @@ -845,16 +846,16 @@ private IndexEntryUpdate[] generateRandomUpdates( if ( !expectedData.isEmpty() && factor < removeFactor ) { // remove something - IndexEntryUpdate toRemove = selectRandomItem( expectedData ); - updates[i] = remove( toRemove.getEntityId(), indexDescriptor, toRemove.values() ); + IndexEntryUpdate toRemove = selectRandomItem( expectedData ); + updates[i] = remove( toRemove.getEntityId(), schemaIndexDescriptor, 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(); - updates[i] = change( toChange.getEntityId(), indexDescriptor, toChange.values(), + IndexEntryUpdate updateContainingValue = newDataGenerator.next(); + updates[i] = change( toChange.getEntityId(), schemaIndexDescriptor, toChange.values(), updateContainingValue.values() ); } else @@ -867,18 +868,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 ); } @@ -891,18 +892,18 @@ 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 ) ); + return IndexEntryUpdate.add( 0, schemaIndexDescriptor, of( 0 ) ); } // TODO: multiple query predicates... actually Lucene SimpleIndexReader only supports single predicate 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 4fd3e91818a79..1de8a6e6b5378 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 @@ -47,7 +47,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.Values; @@ -163,7 +163,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 ) ); @@ -178,11 +178,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 ); } @@ -222,7 +222,7 @@ public void shouldApplyInterleavedUpdatesFromAddAndUpdater() throws Exception // given populator.create(); @SuppressWarnings( "unchecked" ) - IndexEntryUpdate[] updates = layoutUtil.someUpdates(); + IndexEntryUpdate[] updates = layoutUtil.someUpdates(); // when applyInterleaved( updates, populator ); @@ -373,7 +373,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 ); @@ -488,7 +488,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++ ) @@ -543,13 +543,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 ) { @@ -584,11 +584,11 @@ private void applyInterleaved( IndexEntryUpdate[] updates, Nati } } - 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 f5ad139417f1c..4fce2ebb2402e 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.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RandomRule; import org.neo4j.test.rule.TestDirectory; @@ -66,7 +66,7 @@ public abstract class NativeSchemaIndexTestUtil layoutUtil; Layout layout; File indexFile; @@ -78,7 +78,7 @@ public abstract class NativeSchemaIndexTestUtil[] updates ) + void verifyUpdates( IndexEntryUpdate[] updates ) throws IOException { Hit[] expectedHits = convertToHits( updates, layout ); @@ -162,11 +162,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/NativeStringIndexingIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java index 4a405193f5ee0..c198c53de2186 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java @@ -30,8 +30,8 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -60,7 +60,7 @@ public class NativeStringIndexingIT public void shouldHandleKeySizesCloseToTheSizeLimit() throws IOException, IndexEntryConflictException, IndexNotApplicableKernelException { // given - IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 2 ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 1, 2 ); try ( StringSchemaIndexAccessor accessor = new StringSchemaIndexAccessor( storage.pageCache(), storage.fileSystem(), storage.directory().file( "index" ), new StringLayoutNonUnique(), IGNORE, EMPTY, descriptor, 0, new IndexSamplingConfig( Config.defaults() ) ) ) 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 73dda25078890..269890ca0b350 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexSample; import static org.junit.Assert.assertEquals; @@ -44,7 +44,7 @@ public void addShouldThrowOnDuplicateValues() throws Exception { // given populator.create(); - IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); + IndexEntryUpdate[] updates = layoutUtil.someUpdatesWithDuplicateValues(); // when try @@ -67,11 +67,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 ); } @@ -96,11 +96,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 ec56086511243..17cbe737a14a7 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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 353065dd64f33..32fe874140981 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 @@ -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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.test.rule.RandomRule; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; @@ -55,9 +55,9 @@ 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 7c1fd7f482ee6..ce930d67ec633 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,14 +21,14 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; class NumberNonUniqueLayoutTestUtil extends NumberLayoutTestUtil { NumberNonUniqueLayoutTestUtil() { - super( IndexDescriptorFactory.forLabel( 42, 666 ) ); + super( SchemaIndexDescriptorFactory.forLabel( 42, 666 ) ); } @Override @@ -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/NumberNonUniqueSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberNonUniqueSchemaIndexPopulatorTest.java index ab6a75016994e..e562dae5b6383 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberNonUniqueSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberNonUniqueSchemaIndexPopulatorTest.java @@ -31,7 +31,7 @@ public class NumberNonUniqueSchemaIndexPopulatorTest extends NativeNonUniqueSche NativeSchemaIndexPopulator createPopulator( PageCache pageCache, FileSystemAbstraction fs, File indexFile, Layout layout, IndexSamplingConfig samplingConfig ) { - return new NumberSchemaIndexPopulator( pageCache, fs, indexFile, layout, monitor, indexDescriptor, indexId, samplingConfig ); + return new NumberSchemaIndexPopulator( pageCache, fs, indexFile, layout, monitor, schemaIndexDescriptor, indexId, samplingConfig ); } @Override 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 ceb7ca278637a..6ae33c21ec9ba 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.SimpleNodeValueClient; @@ -44,14 +44,15 @@ public abstract class NumberSchemaIndexAccessorTest extends NativeSchemaIndexAcc @Override NumberSchemaIndexAccessor makeAccessorWithSamplingConfig( IndexSamplingConfig samplingConfig ) throws IOException { - return new NumberSchemaIndexAccessor( pageCache, fs, indexFile, layout, IMMEDIATE, monitor, indexDescriptor, indexId, samplingConfig ); + return new NumberSchemaIndexAccessor( pageCache, fs, indexFile, layout, IMMEDIATE, monitor, + schemaIndexDescriptor, indexId, samplingConfig ); } @Test 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 0a6f26376fc1e..9e8690d70a7c6 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,14 +21,14 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; public class NumberUniqueLayoutTestUtil extends NumberLayoutTestUtil { NumberUniqueLayoutTestUtil() { - super( IndexDescriptorFactory.uniqueForLabel( 42, 666 ) ); + super( SchemaIndexDescriptorFactory.uniqueForLabel( 42, 666 ) ); } @Override @@ -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/NumberUniqueSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberUniqueSchemaIndexPopulatorTest.java index 113df78e86141..554dc2074f52f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberUniqueSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberUniqueSchemaIndexPopulatorTest.java @@ -32,7 +32,7 @@ NativeSchemaIndexPopulator createPopulator( PageCache pageCache, FileSystemAbstraction fs, File indexFile, Layout layout, IndexSamplingConfig samplingConfig ) { - return new NumberSchemaIndexPopulator( pageCache, fs, indexFile, layout, monitor, indexDescriptor, indexId, samplingConfig ); + return new NumberSchemaIndexPopulator( pageCache, fs, indexFile, layout, monitor, schemaIndexDescriptor, indexId, samplingConfig ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndexTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndexTest.java index 872f87df7e6ec..a1c0db20247cb 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndexTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndexTest.java @@ -35,8 +35,8 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RandomRule; import org.neo4j.test.rule.TestDirectory; @@ -63,7 +63,7 @@ public class SpatialCRSSchemaIndexTest public final RuleChain rules = outerRule( fsRule ).around( directory ).around( pageCacheRule ).around( random ); private SpatialCRSSchemaIndex index; - private IndexDescriptor descriptor; + private SchemaIndexDescriptor descriptor; private FileSystemAbstraction fs; private File storeDir; private File indexDir; @@ -80,7 +80,7 @@ public void setup() throws IOException String crsDir = String.format("%s-%s", crs.getTable().getTableId(), crs.getCode() ); indexDir = new File( new File( new File( new File( new File( storeDir, "schema" ), "index" ), "spatial-1.0" ), "1" ), crsDir ); IndexDirectoryStructure dirStructure = IndexDirectoryStructure.directoriesByProvider( storeDir ).forProvider( SPATIAL_PROVIDER_DESCRIPTOR ); - descriptor = IndexDescriptorFactory.forLabel( 42, 1337 ); + descriptor = SchemaIndexDescriptorFactory.forLabel( 42, 1337 ); index = new SpatialCRSSchemaIndex( descriptor, dirStructure, crs, 1L, pageCacheRule.getPageCache( fs ), fs, IndexProvider.Monitor.EMPTY, RecoveryCleanupWorkCollector.IMMEDIATE, new StandardConfiguration(), 60 ); } 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 086c177a211b0..f53f8ce1be436 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.test.rule.RandomRule; import org.neo4j.values.storable.TextValue; import org.neo4j.values.storable.Value; @@ -39,9 +39,9 @@ abstract class StringLayoutTestUtil extends LayoutTestUtil { - StringLayoutTestUtil( IndexDescriptor indexDescriptor ) + StringLayoutTestUtil( SchemaIndexDescriptor schemaIndexDescriptor ) { - super( indexDescriptor ); + super( schemaIndexDescriptor ); } @Override @@ -57,19 +57,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 69360eba1c8aa..2d91188dea732 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,14 +21,14 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; class StringNonUniqueLayoutTestUtil extends StringLayoutTestUtil { StringNonUniqueLayoutTestUtil() { - super( IndexDescriptorFactory.forLabel( 42, 666 ) ); + super( SchemaIndexDescriptorFactory.forLabel( 42, 666 ) ); } @Override @@ -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/StringNonUniqueSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringNonUniqueSchemaIndexPopulatorTest.java index 2adc3b9983500..f13799dd0d684 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringNonUniqueSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringNonUniqueSchemaIndexPopulatorTest.java @@ -31,7 +31,7 @@ public class StringNonUniqueSchemaIndexPopulatorTest extends NativeNonUniqueSche NativeSchemaIndexPopulator createPopulator( PageCache pageCache, FileSystemAbstraction fs, File indexFile, Layout layout, IndexSamplingConfig samplingConfig ) { - return new StringSchemaIndexPopulator( pageCache, fs, indexFile, layout, monitor, indexDescriptor, indexId, samplingConfig ); + return new StringSchemaIndexPopulator( pageCache, fs, indexFile, layout, monitor, schemaIndexDescriptor, indexId, samplingConfig ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessorTest.java index 884fb830bf9bc..48ec490f7cede 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessorTest.java @@ -29,7 +29,8 @@ public abstract class StringSchemaIndexAccessorTest extends NativeSchemaIndexAcc @Override StringSchemaIndexAccessor makeAccessorWithSamplingConfig( IndexSamplingConfig samplingConfig ) throws IOException { - return new StringSchemaIndexAccessor( pageCache, fs, indexFile, layout, IMMEDIATE, monitor, indexDescriptor, indexId, samplingConfig ); + return new StringSchemaIndexAccessor( pageCache, fs, indexFile, layout, IMMEDIATE, monitor, + schemaIndexDescriptor, indexId, samplingConfig ); } // TODO test reader unsupported index order 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 f7cc39051385e..b5e4675570347 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,14 +21,14 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; class StringUniqueLayoutTestUtil extends StringLayoutTestUtil { StringUniqueLayoutTestUtil() { - super( IndexDescriptorFactory.uniqueForLabel( 42, 666 ) ); + super( SchemaIndexDescriptorFactory.uniqueForLabel( 42, 666 ) ); } @Override @@ -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/StringUniqueSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueSchemaIndexPopulatorTest.java index bb20591102b8d..677447d166584 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueSchemaIndexPopulatorTest.java @@ -32,7 +32,7 @@ NativeSchemaIndexPopulator createPopulator( PageCache pageCache, FileSystemAbstraction fs, File indexFile, Layout layout, IndexSamplingConfig samplingConfig ) { - return new StringSchemaIndexPopulator( pageCache, fs, indexFile, layout, monitor, indexDescriptor, indexId, samplingConfig ); + return new StringSchemaIndexPopulator( pageCache, fs, indexFile, layout, monitor, schemaIndexDescriptor, indexId, samplingConfig ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java index 1b962c3a69f1e..ab568829f7e61 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java @@ -31,7 +31,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Iterators; import org.neo4j.kernel.api.index.IndexAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.DropAction; import static org.hamcrest.CoreMatchers.is; @@ -71,7 +71,7 @@ public void setup() luceneAccessor = mock( IndexAccessor.class ); allAccessors = Arrays.asList(nativeAccessor, spatialAccessor, temporalAccessor, luceneAccessor); fusionIndexAccessor = new FusionIndexAccessor( nativeAccessor, spatialAccessor, temporalAccessor, luceneAccessor, - new FusionSelector(), indexId, mock( IndexDescriptor.class ), dropAction ); + new FusionSelector(), indexId, mock( SchemaIndexDescriptor.class ), dropAction ); } /* drop */ diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java index 423f62580f82c..3ca39260ee173 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java @@ -26,8 +26,8 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.Selector; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.test.rule.RandomRule; @@ -44,7 +44,7 @@ import static org.mockito.Mockito.when; import static org.neo4j.helpers.ArrayUtil.array; import static org.neo4j.kernel.api.index.IndexDirectoryStructure.NONE; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.forLabel; public class FusionIndexProviderTest { @@ -183,10 +183,10 @@ public void getPopulationFailureMustThrowIfNoFailure() IllegalStateException spatialThrow = new IllegalStateException( "no spatial failure" ); IllegalStateException temporalThrow = new IllegalStateException( "no temporal failure" ); IllegalStateException luceneThrow = new IllegalStateException( "no lucene failure" ); - when( nativeProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( nativeThrow ); - when( spatialProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( spatialThrow ); - when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); - when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( luceneThrow ); + when( nativeProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( nativeThrow ); + when( spatialProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( spatialThrow ); + when( temporalProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( temporalThrow ); + when( luceneProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( luceneThrow ); // then try { @@ -209,10 +209,10 @@ public void getPopulationFailureMustReportFailureWhenNativeFailure() IllegalStateException spatialThrow = new IllegalStateException( "no spatial failure" ); IllegalStateException temporalThrow = new IllegalStateException( "no temporal failure" ); IllegalStateException luceneThrow = new IllegalStateException( "no lucene failure" ); - when( nativeProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( nativeFailure ); - when( spatialProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( spatialThrow ); - when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); - when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( luceneThrow ); + when( nativeProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( nativeFailure ); + when( spatialProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( spatialThrow ); + when( temporalProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( temporalThrow ); + when( luceneProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( luceneThrow ); // then assertThat( fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( nativeFailure ) ); } @@ -228,10 +228,10 @@ public void getPopulationFailureMustReportFailureWhenSpatialFailure() throws Exc String spatialFailure = "spatial failure"; IllegalStateException temporalThrow = new IllegalStateException( "no temporal failure" ); IllegalStateException luceneThrow = new IllegalStateException( "no lucene failure" ); - when( nativeProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( nativeThrow ); - when( spatialProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( spatialFailure ); - when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); - when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( luceneThrow ); + when( nativeProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( nativeThrow ); + when( spatialProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( spatialFailure ); + when( temporalProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( temporalThrow ); + when( luceneProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( luceneThrow ); // then assertThat( fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( spatialFailure ) ); } @@ -247,10 +247,10 @@ public void getPopulationFailureMustReportFailureWhenTemporalFailure() throws Ex IllegalStateException spatialThrow = new IllegalStateException( "no spatial failure" ); String temporalFailure = "temporal failure"; IllegalStateException luceneThrow = new IllegalStateException( "no lucene failure" ); - when( nativeProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( nativeThrow ); - when( spatialProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( spatialThrow ); - when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( temporalFailure ); - when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( luceneThrow ); + when( nativeProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( nativeThrow ); + when( spatialProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( spatialThrow ); + when( temporalProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( temporalFailure ); + when( luceneProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( luceneThrow ); // then assertThat( fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( temporalFailure ) ); } @@ -266,10 +266,10 @@ public void getPopulationFailureMustReportFailureWhenLuceneFailure() IllegalStateException spatialThrow = new IllegalStateException( "no spatial failure" ); IllegalStateException temporalThrow = new IllegalStateException( "no temporal failure" ); String luceneFailure = "lucene failure"; - when( nativeProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( nativeThrow ); - when( spatialProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( spatialThrow ); - when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); - when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( luceneFailure ); + when( nativeProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( nativeThrow ); + when( spatialProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( spatialThrow ); + when( temporalProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( temporalThrow ); + when( luceneProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( luceneFailure ); // then assertThat( fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( luceneFailure ) ); } @@ -285,10 +285,10 @@ public void getPopulationFailureMustReportFailureWhenBothNativeAndLuceneFail() IllegalStateException spatialThrow = new IllegalStateException( "no spatial failure" ); IllegalStateException temporalThrow = new IllegalStateException( "no temporal failure" ); String luceneFailure = "lucene failure"; - when( nativeProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( nativeFailure ); - when( spatialProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( spatialThrow ); - when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); - when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( luceneFailure ); + when( nativeProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( nativeFailure ); + when( spatialProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( spatialThrow ); + when( temporalProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenThrow( temporalThrow ); + when( luceneProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( luceneFailure ); // then String populationFailure = fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ); assertThat( populationFailure, containsString( nativeFailure ) ); @@ -306,10 +306,10 @@ public void getPopulationFailureMustReportFailureWhenAllFail() throws Exception String spatialFailure = "spatial failure"; String temporalFailure = "temporal failure"; String luceneFailure = "lucene failure"; - when( nativeProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( nativeFailure ); - when( spatialProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( spatialFailure ); - when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( temporalFailure ); - when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( luceneFailure ); + when( nativeProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( nativeFailure ); + when( spatialProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( spatialFailure ); + when( temporalProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( temporalFailure ); + when( luceneProvider.getPopulationFailure( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( luceneFailure ); // then String populationFailure = fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ); assertThat( populationFailure, containsString( nativeFailure ) ); @@ -323,7 +323,7 @@ public void shouldReportFailedIfAnyIsFailed() { // given IndexProvider provider = fusionProvider(); - IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( 1, 1 ); + SchemaIndexDescriptor schemaIndexDescriptor = SchemaIndexDescriptorFactory.forLabel( 1, 1 ); for ( InternalIndexState state : InternalIndexState.values() ) { @@ -332,25 +332,25 @@ public void shouldReportFailedIfAnyIsFailed() setInitialState( spatialProvider, state ); setInitialState( temporalProvider, state ); setInitialState( luceneProvider, state ); - InternalIndexState failed1 = provider.getInitialState( 0, indexDescriptor ); + InternalIndexState failed1 = provider.getInitialState( 0, schemaIndexDescriptor ); setInitialState( nativeProvider, state ); setInitialState( spatialProvider, InternalIndexState.FAILED ); setInitialState( temporalProvider, state ); setInitialState( luceneProvider, state ); - InternalIndexState failed2 = provider.getInitialState( 0, indexDescriptor ); + InternalIndexState failed2 = provider.getInitialState( 0, schemaIndexDescriptor ); setInitialState( nativeProvider, state ); setInitialState( spatialProvider, state ); setInitialState( temporalProvider, InternalIndexState.FAILED ); setInitialState( luceneProvider, state ); - InternalIndexState failed3 = provider.getInitialState( 0, indexDescriptor ); + InternalIndexState failed3 = provider.getInitialState( 0, schemaIndexDescriptor ); setInitialState( nativeProvider, state ); setInitialState( spatialProvider, state ); setInitialState( temporalProvider, state ); setInitialState( luceneProvider, InternalIndexState.FAILED ); - InternalIndexState failed4 = provider.getInitialState( 0, indexDescriptor ); + InternalIndexState failed4 = provider.getInitialState( 0, schemaIndexDescriptor ); // then assertEquals( InternalIndexState.FAILED, failed1 ); @@ -365,7 +365,7 @@ public void shouldReportPopulatingIfAnyIsPopulating() { // given IndexProvider provider = fusionProvider(); - IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( 1, 1 ); + SchemaIndexDescriptor schemaIndexDescriptor = SchemaIndexDescriptorFactory.forLabel( 1, 1 ); for ( InternalIndexState state : array( InternalIndexState.ONLINE, InternalIndexState.POPULATING ) ) { @@ -374,25 +374,25 @@ public void shouldReportPopulatingIfAnyIsPopulating() setInitialState( spatialProvider, state ); setInitialState( temporalProvider, state ); setInitialState( luceneProvider, state ); - InternalIndexState failed1 = provider.getInitialState( 0, indexDescriptor ); + InternalIndexState failed1 = provider.getInitialState( 0, schemaIndexDescriptor ); setInitialState( nativeProvider, state ); setInitialState( spatialProvider, InternalIndexState.POPULATING ); setInitialState( temporalProvider, state ); setInitialState( luceneProvider, state ); - InternalIndexState failed2 = provider.getInitialState( 0, indexDescriptor ); + InternalIndexState failed2 = provider.getInitialState( 0, schemaIndexDescriptor ); setInitialState( nativeProvider, state ); setInitialState( spatialProvider, state ); setInitialState( temporalProvider, InternalIndexState.POPULATING ); setInitialState( luceneProvider, state ); - InternalIndexState failed3 = provider.getInitialState( 0, indexDescriptor ); + InternalIndexState failed3 = provider.getInitialState( 0, schemaIndexDescriptor ); setInitialState( nativeProvider, state ); setInitialState( spatialProvider, state ); setInitialState( temporalProvider, state ); setInitialState( luceneProvider, InternalIndexState.POPULATING ); - InternalIndexState failed4 = provider.getInitialState( 0, indexDescriptor ); + InternalIndexState failed4 = provider.getInitialState( 0, schemaIndexDescriptor ); // then assertEquals( InternalIndexState.POPULATING, failed1 ); @@ -410,6 +410,6 @@ private FusionIndexProvider fusionProvider() private void setInitialState( IndexProvider mockedProvider, InternalIndexState state ) { - when( mockedProvider.getInitialState( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( state ); + when( mockedProvider.getInitialState( anyLong(), any( SchemaIndexDescriptor.class ) ) ).thenReturn( state ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReaderTest.java index 1559d006097e1..a39beb99b2c04 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReaderTest.java @@ -35,7 +35,7 @@ import org.neo4j.internal.kernel.api.IndexQuery.StringRangePredicate; import org.neo4j.internal.kernel.api.IndexQuery.StringSuffixPredicate; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.PointValue; @@ -70,7 +70,7 @@ public void setup() luceneReader = mock( IndexReader.class ); allReaders = new IndexReader[]{nativeReader, spatialReader, temporalReader, luceneReader}; fusionIndexReader = new FusionIndexReader( nativeReader, spatialReader, temporalReader, luceneReader, new FusionSelector(), - IndexDescriptorFactory.forLabel( LABEL_KEY, PROP_KEY ) ); + SchemaIndexDescriptorFactory.forLabel( LABEL_KEY, PROP_KEY ) ); } /* close */ diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexAccessorTest.java index f8c7a6e75e0cf..2182180a61971 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexAccessorTest.java @@ -34,7 +34,7 @@ import org.neo4j.helpers.collection.BoundedIterable; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.index.schema.SpatialCRSSchemaIndex; import org.neo4j.values.storable.CoordinateReferenceSystem; @@ -75,7 +75,7 @@ public void setup() throws Exception indexMap.put( crs, mock( SpatialCRSSchemaIndex.class ) ); } - fusionIndexAccessor = new SpatialFusionIndexAccessor( indexMap, 0, mock( IndexDescriptor.class ), null, indexFactory ); + fusionIndexAccessor = new SpatialFusionIndexAccessor( indexMap, 0, mock( SchemaIndexDescriptor.class ), null, indexFactory ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulatorTest.java index b4237780fe119..f31a69b07d433 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulatorTest.java @@ -30,8 +30,8 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.SpatialCRSSchemaIndex; import org.neo4j.values.storable.CoordinateReferenceSystem; @@ -62,7 +62,7 @@ public class SpatialFusionIndexPopulatorTest public void setup() throws Exception { SpatialCRSSchemaIndex.Supplier indexSupplier = mock( SpatialCRSSchemaIndex.Supplier.class ); - IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 42, 1337 ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 42, 1337 ); for ( CoordinateReferenceSystem crs : asList( CoordinateReferenceSystem.WGS84, CoordinateReferenceSystem.Cartesian ) ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProviderTest.java index 9f31d9e46351e..2d7b3b6b820ce 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProviderTest.java @@ -30,8 +30,8 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.index.schema.SpatialCRSSchemaIndex; import org.neo4j.test.rule.RandomRule; @@ -54,7 +54,7 @@ public class SpatialFusionIndexProviderTest private Map indexMap; private SpatialFusionIndexProvider provider; - private IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); + private SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 1, 1 ); @Before public void setup() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReaderTest.java index 7bc5a5ea66e1b..1687aee61dfa6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReaderTest.java @@ -33,7 +33,7 @@ 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.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.PointValue; @@ -62,7 +62,8 @@ public void setup() readerMap = new HashMap<>(); readerMap.put( CoordinateReferenceSystem.WGS84, mock( IndexReader.class ) ); readerMap.put( CoordinateReferenceSystem.Cartesian, mock( IndexReader.class ) ); - fusionIndexReader = new SpatialFusionIndexReader( readerMap, IndexDescriptorFactory.forLabel( LABEL_KEY, PROP_KEY ) ); + fusionIndexReader = new SpatialFusionIndexReader( readerMap, SchemaIndexDescriptorFactory + .forLabel( LABEL_KEY, PROP_KEY ) ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdaterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdaterTest.java index 6bfe1209f34aa..1c361df3f2b7f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdaterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdaterTest.java @@ -30,7 +30,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.SpatialCRSSchemaIndex; import org.neo4j.values.storable.CoordinateReferenceSystem; @@ -59,7 +59,7 @@ public class SpatialFusionIndexUpdaterTest public void setup() throws Exception { SpatialCRSSchemaIndex.Supplier indexSupplier = mock( SpatialCRSSchemaIndex.Supplier.class ); - IndexDescriptor descriptor = mock( IndexDescriptor.class ); + SchemaIndexDescriptor descriptor = mock( SchemaIndexDescriptor.class ); IndexSamplingConfig samplingConfig = mock( IndexSamplingConfig.class ); for ( CoordinateReferenceSystem crs : asList( CoordinateReferenceSystem.WGS84, CoordinateReferenceSystem.Cartesian ) ) 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 fccac581ffd26..69e72797cb6c0 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 @@ -29,8 +29,8 @@ import org.neo4j.internal.kernel.api.helpers.StubNodeCursor; import org.neo4j.internal.kernel.api.helpers.StubPropertyCursor; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.storageengine.api.StoreReadLayer; import org.neo4j.values.storable.Value; @@ -67,12 +67,13 @@ public class IndexTxStateUpdaterTest private TransactionState txState; private IndexTxStateUpdater indexTxUpdater; - 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 SchemaIndexDescriptor indexOn1_1 = SchemaIndexDescriptorFactory.forLabel( labelId1, propId1 ); + private SchemaIndexDescriptor indexOn2_new = SchemaIndexDescriptorFactory.forLabel( labelId2, newPropId ); + private SchemaIndexDescriptor uniqueOn1_2 = SchemaIndexDescriptorFactory.uniqueForLabel( labelId1, propId2 ); + private SchemaIndexDescriptor indexOn1_1_new = SchemaIndexDescriptorFactory.forLabel( labelId1, propId1, newPropId ); + private SchemaIndexDescriptor uniqueOn2_2_3 = SchemaIndexDescriptorFactory + .uniqueForLabel( labelId2, propId2, propId3 ); + 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/NodeValueClientFilterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilterTest.java index a75466ba225fa..07f7ae45c0f19 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,8 +29,8 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.security.SecurityContext; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexProgressor.NodeValueClient; import org.neo4j.values.storable.Value; @@ -137,7 +137,7 @@ private NodeValueClientFilter initializeFilter( IndexQuery... filters ) { NodeValueClientFilter filter = new NodeValueClientFilter( this, cursors.allocateNodeCursor(), cursors.allocatePropertyCursor(), store, filters ); - filter.initialize( IndexDescriptorFactory.forLabel( 11), this, null ); + filter.initialize( SchemaIndexDescriptorFactory.forLabel( 11), this, null ); return filter; } @@ -152,7 +152,7 @@ private Event.Initialize initialize( int... keys ) } @Override - public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] queries ) + public void initialize( SchemaIndexDescriptor 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 d517d09d58b50..a3dc276197d24 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,8 +46,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.record.ConstraintRule; @@ -120,7 +120,7 @@ public void shouldReturnIndexRuleForLabelAndProperty() // Then assertNotNull( rule ); - assertRule( rule, LABEL1, PROP2, IndexDescriptor.Type.GENERAL ); + assertRule( rule, LABEL1, PROP2, SchemaIndexDescriptor.Type.GENERAL ); } @Test @@ -135,7 +135,7 @@ public void shouldReturnIndexRuleForLabelAndPropertyComposite() createSchema( db -> db.schema().indexFor( Label.label( LABEL1 ) ) .on( a ).on( b ).on( c ).on( d ).on( e ).on( f ).create() ); - IndexRule rule = storage.indexGetForSchema( IndexDescriptorFactory.forLabel( + IndexRule rule = storage.indexGetForSchema( SchemaIndexDescriptorFactory.forLabel( labelId( LABEL1 ), propId( a ), propId( b ), propId( c ), propId( d ), propId( e ), propId( f ) ) ); assertNotNull( rule ); @@ -146,7 +146,7 @@ public void shouldReturnIndexRuleForLabelAndPropertyComposite() assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( d ) ) ); assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( e ) ) ); assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( f ) ) ); - assertEquals( IndexDescriptor.Type.GENERAL, rule.getIndexDescriptor().type() ); + assertEquals( SchemaIndexDescriptor.Type.GENERAL, rule.getIndexDescriptor().type() ); } @Test @@ -163,7 +163,7 @@ public void shouldReturnIndexRuleForLabelAndVeryManyPropertiesComposite() indexCreator.create(); } ); - IndexRule rule = storage.indexGetForSchema( IndexDescriptorFactory.forLabel( + IndexRule rule = storage.indexGetForSchema( SchemaIndexDescriptorFactory.forLabel( labelId( LABEL1 ), Arrays.stream( props ).mapToInt( this::propId ).toArray() ) ); assertNotNull( rule ); @@ -172,7 +172,7 @@ public void shouldReturnIndexRuleForLabelAndVeryManyPropertiesComposite() { assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( prop ) ) ); } - assertEquals( IndexDescriptor.Type.GENERAL, rule.getIndexDescriptor().type() ); + assertEquals( SchemaIndexDescriptor.Type.GENERAL, rule.getIndexDescriptor().type() ); } @Test @@ -202,7 +202,7 @@ public void shouldListIndexRulesForLabelPropertyAndKind() // Then assertNotNull( rule ); - assertRule( rule, LABEL1, PROP1, IndexDescriptor.Type.UNIQUE ); + assertRule( rule, LABEL1, PROP1, SchemaIndexDescriptor.Type.UNIQUE ); } @Test @@ -332,7 +332,7 @@ private TokenNameLookup getDefaultTokenNameLookup() return tokenNameLookup; } - private void assertRule( IndexRule rule, String label, String propertyKey, IndexDescriptor.Type type ) + private void assertRule( IndexRule rule, String label, String propertyKey, SchemaIndexDescriptor.Type type ) { assertTrue( SchemaDescriptorPredicates.hasLabel( rule, labelId( label ) ) ); assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( propertyKey ) ) ); @@ -346,21 +346,21 @@ private void assertRule( ConstraintRule rule, String label, String propertyKey, assertEquals( type, rule.getConstraintDescriptor().type() ); } - private IndexDescriptor indexDescriptor( String label, String property ) + private SchemaIndexDescriptor indexDescriptor( String label, String property ) { - return IndexDescriptorFactory.forLabel( labelId( label ), propId( property ) ); + return SchemaIndexDescriptorFactory.forLabel( labelId( label ), propId( property ) ); } - private IndexDescriptor uniqueIndexDescriptor( String label, String property ) + private SchemaIndexDescriptor uniqueIndexDescriptor( String label, String property ) { - return IndexDescriptorFactory.uniqueForLabel( labelId( label ), propId( property ) ); + return SchemaIndexDescriptorFactory.uniqueForLabel( labelId( label ), propId( property ) ); } private IndexRule makeIndexRule( long ruleId, String label, String propertyKey ) { return IndexRule.indexRule( ruleId, - IndexDescriptorFactory.forLabel( labelId( label ), propId( propertyKey ) ), + SchemaIndexDescriptorFactory.forLabel( labelId( label ), propId( propertyKey ) ), PROVIDER_DESCRIPTOR ); } @@ -369,7 +369,7 @@ private IndexRule makeIndexRuleForConstraint( long ruleId, String label, String { return IndexRule.constraintIndexRule( ruleId, - IndexDescriptorFactory.uniqueForLabel( labelId( label ), propId( propertyKey ) ), + SchemaIndexDescriptorFactory.uniqueForLabel( labelId( label ), propId( propertyKey ) ), PROVIDER_DESCRIPTOR, constraintId ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java index 3012a1f0f390d..5495cfd4ca115 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java @@ -34,7 +34,7 @@ import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.impl.store.record.ConstraintRule; @@ -87,7 +87,7 @@ public void storeAndLoadSchemaRule() throws Exception { // GIVEN IndexRule indexRule = IndexRule.indexRule( store.nextId(), - IndexDescriptorFactory.forLabel( 1, 4 ), PROVIDER_DESCRIPTOR ); + SchemaIndexDescriptorFactory.forLabel( 1, 4 ), PROVIDER_DESCRIPTOR ); // WHEN IndexRule readIndexRule = (IndexRule) SchemaRuleSerialization.deserialize( @@ -106,7 +106,7 @@ public void storeAndLoadCompositeSchemaRule() throws Exception // GIVEN int[] propertyIds = {4, 5, 6, 7}; IndexRule indexRule = IndexRule.indexRule( store.nextId(), - IndexDescriptorFactory.forLabel( 2, propertyIds ), PROVIDER_DESCRIPTOR ); + SchemaIndexDescriptorFactory.forLabel( 2, propertyIds ), PROVIDER_DESCRIPTOR ); // WHEN IndexRule readIndexRule = (IndexRule) SchemaRuleSerialization.deserialize( @@ -124,7 +124,7 @@ public void storeAndLoad_Big_CompositeSchemaRule() throws Exception { // GIVEN IndexRule indexRule = IndexRule.indexRule( store.nextId(), - IndexDescriptorFactory.forLabel( 2, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR ); + SchemaIndexDescriptorFactory.forLabel( 2, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR ); // WHEN IndexRule readIndexRule = (IndexRule) SchemaRuleSerialization.deserialize( @@ -176,14 +176,14 @@ private long storeRule( SchemaRule rule ) private IndexRule indexRule( long ruleId, IndexProvider.Descriptor descriptor, int labelId, int... propertyIds ) { - return IndexRule.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyIds ), descriptor ); + return IndexRule.indexRule( ruleId, SchemaIndexDescriptorFactory.forLabel( labelId, propertyIds ), descriptor ); } private IndexRule uniqueIndexRule( long ruleId, long owningConstraint, IndexProvider.Descriptor descriptor, int labelId, int... propertyIds ) { return IndexRule.constraintIndexRule( ruleId, - IndexDescriptorFactory.uniqueForLabel( labelId, propertyIds ), descriptor, owningConstraint ); + SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propertyIds ), descriptor, owningConstraint ); } private ConstraintRule constraintUniqueRule( long ruleId, long ownedIndexId, int labelId, int... propertyIds ) 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 069a6f18c7c27..9c35627a8be53 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 @@ -21,14 +21,14 @@ import org.junit.Test; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import static org.hamcrest.MatcherAssert.assertThat; 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.IndexDescriptorFactory.forLabel; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.uniqueForLabel; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.forLabel; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.uniqueForLabel; import static org.neo4j.test.assertion.Assert.assertException; public class IndexRuleTest extends SchemaRuleTestBase @@ -37,7 +37,7 @@ public class IndexRuleTest extends SchemaRuleTestBase public void shouldCreateGeneralIndex() { // GIVEN - IndexDescriptor descriptor = forLabel( LABEL_ID, PROPERTY_ID_1 ); + SchemaIndexDescriptor descriptor = forLabel( LABEL_ID, PROPERTY_ID_1 ); IndexRule indexRule = IndexRule.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); // THEN @@ -54,7 +54,7 @@ public void shouldCreateGeneralIndex() public void shouldCreateUniqueIndex() { // GIVEN - IndexDescriptor descriptor = uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ); + SchemaIndexDescriptor descriptor = uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ); IndexRule indexRule = IndexRule.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); // THEN @@ -79,7 +79,7 @@ public void indexRulesAreEqualBasedOnIndexDescriptor() assertEqualityByDescriptor( uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ) ); } - private void assertEqualityByDescriptor( IndexDescriptor descriptor ) + private void assertEqualityByDescriptor( SchemaIndexDescriptor descriptor ) { IndexRule rule1 = IndexRule.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); IndexRule rule2 = IndexRule.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 0875f75f3a8bd..726f1f5566799 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 @@ -32,15 +32,15 @@ import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.junit.Assert.fail; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.forLabel; import static org.neo4j.test.assertion.Assert.assertException; public class SchemaRuleSerializationTest extends SchemaRuleTestBase @@ -49,13 +49,13 @@ public class SchemaRuleSerializationTest extends SchemaRuleTestBase forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR ); IndexRule indexUnique = IndexRule.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID ); + SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID ); IndexRule indexCompositeRegular = IndexRule.indexRule( RULE_ID, forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR ); IndexRule indexCompositeUnique = IndexRule.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), + SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, RULE_ID ); IndexRule indexBigComposite = IndexRule.indexRule( RULE_ID, @@ -138,12 +138,12 @@ public void rulesCreatedWithNameMustRetainGivenNameAfterDeserialisation() throws assertThat( serialiseAndDeserialise( IndexRule.indexRule( RULE_ID, forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); assertThat( serialiseAndDeserialise( IndexRule.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), + SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( name ) ); assertThat( serialiseAndDeserialise( IndexRule.indexRule( RULE_ID, forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); assertThat( serialiseAndDeserialise( IndexRule.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), + SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( name ) ); assertThat( serialiseAndDeserialise( IndexRule.indexRule( RULE_ID, forLabel( LABEL_ID, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); @@ -170,12 +170,12 @@ public void rulesCreatedWithNullNameMustRetainComputedNameAfterDeserialisation() assertThat( serialiseAndDeserialise( IndexRule.indexRule( RULE_ID, forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( "index_1" ) ); assertThat( serialiseAndDeserialise( IndexRule.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), + SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( "index_2" ) ); assertThat( serialiseAndDeserialise( IndexRule.indexRule( RULE_ID, forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( "index_1" ) ); assertThat( serialiseAndDeserialise( IndexRule.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), + SchemaIndexDescriptorFactory.uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( "index_2" ) ); assertThat( serialiseAndDeserialise( IndexRule.indexRule( RULE_ID, forLabel( LABEL_ID, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR, name ) ).getName(), @@ -465,7 +465,7 @@ private void assertParseIndexRule( String serialized, String name ) throws Excep { // GIVEN long ruleId = 24; - IndexDescriptor index = forLabel( 512, 4 ); + SchemaIndexDescriptor index = forLabel( 512, 4 ); IndexProvider.Descriptor indexProvider = new IndexProvider.Descriptor( "index-provider", "25.0" ); byte[] bytes = decodeBase64( serialized ); @@ -486,7 +486,7 @@ private void assertParseUniqueIndexRule( String serialized, String name ) throws // GIVEN long ruleId = 33; long constraintId = 11; - IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 61, 988 ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.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/transaction/command/Commands.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java index d5add8ad66781..ca7be6e1b9553 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java @@ -27,7 +27,7 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.store.DynamicNodeLabels; import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.PropertyType; @@ -149,7 +149,7 @@ public static SchemaRuleCommand createIndexRule( IndexProvider.Descriptor provid { SchemaRule rule = IndexRule.indexRule( id, - IndexDescriptorFactory.forSchema( descriptor ), + SchemaIndexDescriptorFactory.forSchema( descriptor ), provider ); DynamicRecord record = new DynamicRecord( id ); record.setInUse( true ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java index 7f4c0ada41c38..a7522bcc2ab67 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.BatchTransactionApplier; import org.neo4j.kernel.impl.api.BatchTransactionApplierFacade; import org.neo4j.kernel.impl.api.TransactionToApply; @@ -933,7 +933,7 @@ public static IndexRule indexRule( long id, int label, int propertyKeyId, IndexProvider.Descriptor providerDescriptor ) { //TODO: Consider testing composite indexes - return IndexRule.indexRule( id, IndexDescriptorFactory.forLabel( label, propertyKeyId ), + return IndexRule.indexRule( id, SchemaIndexDescriptorFactory.forLabel( label, propertyKeyId ), providerDescriptor ); } @@ -941,7 +941,7 @@ private static IndexRule constraintIndexRule( long id, int label, int propertyKe IndexProvider.Descriptor providerDescriptor, Long owningConstraint ) { //TODO: Consider testing composite indexes - return IndexRule.constraintIndexRule( id, IndexDescriptorFactory.uniqueForLabel( label, propertyKeyId ), + return IndexRule.constraintIndexRule( id, SchemaIndexDescriptorFactory.uniqueForLabel( label, propertyKeyId ), providerDescriptor, owningConstraint ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java index 06131243567b4..d26cba7f7ec04 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java @@ -30,7 +30,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.api.index.IndexProvider.Descriptor; import org.neo4j.kernel.api.labelscan.LabelScanWriter; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.TransactionApplier; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.api.index.IndexingService; @@ -126,7 +126,7 @@ public void shouldCreateIndexGivenCreateSchemaRuleCommand() throws Exception private IndexRule indexRule( long ruleId, int labelId, int propertyId, Descriptor descriptor ) { - return IndexRule.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor ); + return IndexRule.indexRule( ruleId, SchemaIndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java index 0b9ee7f1e340f..9f7a266a85e81 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java @@ -29,7 +29,7 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.index.IndexCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddNodeCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddRelationshipCommand; @@ -97,7 +97,7 @@ public class LogTruncationTest permutations.put( Command.SchemaRuleCommand.class, new Command[] { new Command.SchemaRuleCommand( singletonList( dynamicRecord( 1L, false, true, -1L, 1, "hello".getBytes() ) ), singletonList( dynamicRecord( 1L, true, true, -1L, 1, "hello".getBytes() ) ), - IndexRule.indexRule( 1, IndexDescriptorFactory.forLabel( 3, 4 ), + IndexRule.indexRule( 1, SchemaIndexDescriptorFactory.forLabel( 3, 4 ), new IndexProvider.Descriptor( "1", "2" ) ) ) } ); permutations .put( Command.RelationshipTypeTokenCommand.class, diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java index 687fd8cb941c7..e9aeb0c728769 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java @@ -28,7 +28,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.BatchTransactionApplier; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.api.index.IndexingService; @@ -91,7 +91,7 @@ public class SchemaRuleCommandTest labelScanStoreSynchronizer, indexUpdatesSync, mock( NodeStore.class ), new PropertyPhysicalToLogicalConverter( propertyStore ) ); private final BaseCommandReader reader = new PhysicalLogCommandReaderV3_0_2(); - private final IndexRule rule = IndexRule.indexRule( id, IndexDescriptorFactory.forLabel( labelId, propertyKey ), + private final IndexRule rule = IndexRule.indexRule( id, SchemaIndexDescriptorFactory.forLabel( labelId, propertyKey ), PROVIDER_DESCRIPTOR ); @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java index c483b0aca8db6..d7fc90465e625 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java @@ -104,7 +104,7 @@ import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.Iterables.filter; import static org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory.uniqueForLabel; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory.forLabel; import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; import static org.neo4j.kernel.impl.store.record.ConstraintRule.constraintRule; import static org.neo4j.kernel.impl.store.record.IndexRule.indexRule; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/CineastsDbStructure.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/CineastsDbStructure.java index 98d7de3ad5642..b16c05a71a842 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/CineastsDbStructure.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/CineastsDbStructure.java @@ -21,7 +21,7 @@ import org.neo4j.helpers.collection.Visitable; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; // // GENERATED FILE. DO NOT EDIT. @@ -79,11 +79,11 @@ public void accept( DbStructureVisitor visitor ) visitor.visitRelationshipType( 2, "ACTS_IN" ); visitor.visitRelationshipType( 3, "RATED" ); visitor.visitRelationshipType( 4, "ROOT" ); - visitor.visitIndex( IndexDescriptorFactory.forLabel( 0, 9 ), ":Movie(title)", 1.0d, 12462L ); - visitor.visitIndex( IndexDescriptorFactory.forLabel( 1, 5 ), ":Person(name)", 1.0d, 49845L ); - visitor.visitIndex( IndexDescriptorFactory.forLabel( 3, 5 ), ":Actor(name)", 1.0d, 44689L ); - visitor.visitIndex( IndexDescriptorFactory.forLabel( 4, 5 ), ":Director(name)", 1.0d, 6010L ); - visitor.visitIndex( IndexDescriptorFactory.uniqueForLabel( 2, 3 ), ":User(login)", 1.0d, 45L ); + visitor.visitIndex( SchemaIndexDescriptorFactory.forLabel( 0, 9 ), ":Movie(title)", 1.0d, 12462L ); + visitor.visitIndex( SchemaIndexDescriptorFactory.forLabel( 1, 5 ), ":Person(name)", 1.0d, 49845L ); + visitor.visitIndex( SchemaIndexDescriptorFactory.forLabel( 3, 5 ), ":Actor(name)", 1.0d, 44689L ); + visitor.visitIndex( SchemaIndexDescriptorFactory.forLabel( 4, 5 ), ":Director(name)", 1.0d, 6010L ); + visitor.visitIndex( SchemaIndexDescriptorFactory.uniqueForLabel( 2, 3 ), ":User(login)", 1.0d, 45L ); visitor.visitUniqueConstraint( ConstraintDescriptorFactory.uniqueForLabel( 2, 3 ), "CONSTRAINT ON ( " + "user:User ) ASSERT user.login IS UNIQUE" ); visitor.visitAllNodesCount( 63042L ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatterTest.java index eb2f70b53aa1a..ee39e82be256c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatterTest.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import static org.junit.Assert.assertEquals; @@ -64,8 +64,8 @@ public void shouldFormatDoubles() @Test public void shouldFormatIndexDescriptors() { - assertEquals( "IndexDescriptorFactory.forLabel( 23, 42 )", - formatArgument( IndexDescriptorFactory.forLabel( 23, 42 ) ) ); + assertEquals( "SchemaIndexDescriptorFactory.forLabel( 23, 42 )", + formatArgument( SchemaIndexDescriptorFactory.forLabel( 23, 42 ) ) ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollectorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollectorTest.java index f85093e1a8fbf..90e79a8f45556 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollectorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollectorTest.java @@ -24,7 +24,7 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.helpers.collection.Pair; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import static java.util.Arrays.asList; import static org.junit.Assert.assertArrayEquals; @@ -44,10 +44,10 @@ public void collectsDbStructure() collector.visitPropertyKey( 2, "income" ); collector.visitRelationshipType( 1, "LIVES_IN" ); collector.visitRelationshipType( 2, "FRIEND" ); - collector.visitIndex( IndexDescriptorFactory.uniqueForLabel( 1, 1 ), ":Person(name)", 1.0d, 1L ); + collector.visitIndex( SchemaIndexDescriptorFactory.uniqueForLabel( 1, 1 ), ":Person(name)", 1.0d, 1L ); collector.visitUniqueConstraint( ConstraintDescriptorFactory.uniqueForLabel( 2, 1 ), ":City(name)" ); collector.visitNodeKeyConstraint( ConstraintDescriptorFactory.nodeKeyForLabel( 2, 1 ), ":City(name)" ); - collector.visitIndex( IndexDescriptorFactory.forLabel( 2, 2 ), ":City(income)", 0.2d, 1L ); + collector.visitIndex( SchemaIndexDescriptorFactory.forLabel( 2, 2 ), ":City(income)", 0.2d, 1L ); collector.visitAllNodesCount( 50 ); collector.visitNodeCount( 1, "Person", 20 ); collector.visitNodeCount( 2, "City", 30 ); @@ -98,9 +98,9 @@ public void collectsCompositeDbStructure() collector.visitPropertyKey( 5, "area" ); collector.visitRelationshipType( 1, "LIVES_IN" ); collector.visitRelationshipType( 2, "FRIEND" ); - collector.visitIndex( IndexDescriptorFactory.uniqueForLabel( 1, 1, 3 ), ":Person(name, lastName)", 1.0d, 1L ); + collector.visitIndex( SchemaIndexDescriptorFactory.uniqueForLabel( 1, 1, 3 ), ":Person(name, lastName)", 1.0d, 1L ); collector.visitUniqueConstraint( ConstraintDescriptorFactory.uniqueForLabel( 2, 1, 5 ), ":City(name, area)" ); - collector.visitIndex( IndexDescriptorFactory.forLabel( 2, 2, 4 ), ":City(income, tax)", 0.2d, 1L ); + collector.visitIndex( SchemaIndexDescriptorFactory.forLabel( 2, 2, 4 ), ":City(income, tax)", 0.2d, 1L ); collector.visitAllNodesCount( 50 ); collector.visitNodeCount( 1, "Person", 20 ); collector.visitNodeCount( 2, "City", 30 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureInvocationTracingAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureInvocationTracingAcceptanceTest.java index e255f2c8b5eb2..769658052e871 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureInvocationTracingAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureInvocationTracingAcceptanceTest.java @@ -46,7 +46,7 @@ import org.neo4j.helpers.collection.Visitable; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -131,10 +131,10 @@ private void exerciseVisitor( Function visitor ) visitor.apply( null ).visitPropertyKey( 1, "age" ); visitor.apply( null ).visitRelationshipType( 0, "ACCEPTS" ); visitor.apply( null ).visitRelationshipType( 1, "REJECTS" ); - visitor.apply( null ).visitIndex( IndexDescriptorFactory.forLabel( 0, 1 ), + visitor.apply( null ).visitIndex( SchemaIndexDescriptorFactory.forLabel( 0, 1 ), ":Person(age)", 0.5d, 1L ); visitor.apply( null ) - .visitIndex( IndexDescriptorFactory.uniqueForLabel( 0, 0, 2 ), + .visitIndex( SchemaIndexDescriptorFactory.uniqueForLabel( 0, 0, 2 ), ":Person(name, lastName)", 0.5d, 1L ); visitor.apply( null ) .visitUniqueConstraint( ConstraintDescriptorFactory.uniqueForLabel( 1, 0 ), ":Party(name)" ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureLargeOptionalMatchStructure.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureLargeOptionalMatchStructure.java index 761db77d77197..2d820c3201fd2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureLargeOptionalMatchStructure.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureLargeOptionalMatchStructure.java @@ -20,7 +20,7 @@ package org.neo4j.kernel.impl.util.dbstructure; import org.neo4j.helpers.collection.Visitable; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; // // GENERATED FILE. DO NOT EDIT. @@ -76,7 +76,7 @@ public void accept( DbStructureVisitor visitor ) visitor.visitRelationshipType( 5, "REL5" ); visitor.visitRelationshipType( 6, "REL8" ); visitor.visitRelationshipType( 9, "REL6" ); - visitor.visitIndex( IndexDescriptorFactory.forLabel( 22, 0 ), ":Label2(id)", 0.3641877706337751d, 304838L ); + visitor.visitIndex( SchemaIndexDescriptorFactory.forLabel( 22, 0 ), ":Label2(id)", 0.3641877706337751d, 304838L ); visitor.visitAllNodesCount( 2668827L ); visitor.visitNodeCount( 2, "Label20", 3L ); visitor.visitNodeCount( 3, "Label4", 0L ); 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 ff3c6f2221cb0..6118389982a91 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 @@ -30,13 +30,12 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.ImpermanentDatabaseRule; @@ -135,7 +134,7 @@ public void visitsIndexes() throws Exception commitAndReOpen(); - IndexDescriptor descriptor = createSchemaIndex( labelId, pkId ); + SchemaIndexDescriptor descriptor = createSchemaIndex( labelId, pkId ); // WHEN accept( visitor ); @@ -154,7 +153,7 @@ public void visitsUniqueConstraintsAndIndices() throws Exception commitAndReOpen(); UniquenessConstraintDescriptor constraint = createUniqueConstraint( labelId, pkId ); - IndexDescriptor descriptor = IndexDescriptorFactory.uniqueForLabel( labelId, pkId ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.uniqueForLabel( labelId, pkId ); // WHEN accept( visitor ); @@ -237,7 +236,7 @@ private void createRel( long startId, int relTypeId, long endId ) throws Excepti } } - private IndexDescriptor createSchemaIndex( int labelId, int pkId ) throws Exception + private SchemaIndexDescriptor createSchemaIndex( int labelId, int pkId ) throws Exception { try ( Statement statement = statement() ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/QMULDbStructure.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/QMULDbStructure.java index 0318127ee736a..f6baada684fb8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/QMULDbStructure.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/QMULDbStructure.java @@ -20,7 +20,7 @@ package org.neo4j.kernel.impl.util.dbstructure; import org.neo4j.helpers.collection.Visitable; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; // // GENERATED FILE. DO NOT EDIT. @@ -62,7 +62,7 @@ public void accept( DbStructureVisitor visitor ) visitor.visitPropertyKey( 16, "location_lat" ); visitor.visitRelationshipType( 0, "friends" ); visitor.visitRelationshipType( 1, "FRIEND" ); - visitor.visitIndex( IndexDescriptorFactory.forLabel( 1, 2 ), ":Person(uid)", 1.0d, 135164L ); + visitor.visitIndex( SchemaIndexDescriptorFactory.forLabel( 1, 2 ), ":Person(uid)", 1.0d, 135164L ); visitor.visitAllNodesCount( 135242L ); visitor.visitNodeCount( 1, "Person", 135213L ); visitor.visitRelCount( -1, -1, -1, "MATCH ()-[]->() RETURN count(*)", 4537616L ); 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 d54f7d1b522b6..3662c4470b853 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.values.storable.Value; public class SimpleNodeValueClient implements IndexProgressor.NodeValueClient @@ -40,7 +40,7 @@ public boolean next() } @Override - public void initialize( IndexDescriptor descriptor, IndexProgressor progressor, IndexQuery[] query ) + public void initialize( SchemaIndexDescriptor 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 519e0b97da303..530c4699faf11 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 @@ -65,8 +65,8 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; @@ -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 IndexDescriptor internalIndex = IndexDescriptorFactory.forLabel( 0, 0 ); - private static final IndexDescriptor internalUniqueIndex = IndexDescriptorFactory.uniqueForLabel( 0, 0 ); + private static final SchemaIndexDescriptor internalIndex = SchemaIndexDescriptorFactory.forLabel( 0, 0 ); + private static final SchemaIndexDescriptor internalUniqueIndex = SchemaIndexDescriptorFactory.uniqueForLabel( 0, 0 ); @Parameterized.Parameters public static Collection data() @@ -911,7 +911,7 @@ public void shouldRunIndexPopulationJobAtShutdown() throws Throwable IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); - when( provider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); BatchInserter inserter = newBatchInserterWithIndexProvider( @@ -927,7 +927,7 @@ public void shouldRunIndexPopulationJobAtShutdown() throws Throwable // THEN verify( provider ).init(); verify( provider ).start(); - verify( provider ).getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + verify( provider ).getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); verify( populator ).create(); verify( populator ).add( argThat( matchesCollection( add( nodeId, internalIndex.schema(), Values.of( "Jakewins" ) ) ) ) ); @@ -946,7 +946,7 @@ public void shouldRunConstraintPopulationJobAtShutdown() throws Throwable IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); - when( provider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); BatchInserter inserter = newBatchInserterWithIndexProvider( @@ -962,7 +962,7 @@ public void shouldRunConstraintPopulationJobAtShutdown() throws Throwable // THEN verify( provider ).init(); verify( provider ).start(); - verify( provider ).getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + verify( provider ).getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); verify( populator ).create(); verify( populator ).add( argThat( matchesCollection( add( nodeId, internalUniqueIndex.schema(), Values.of( "Jakewins" ) ) ) ) ); verify( populator ).verifyDeferredConstraints( any( PropertyAccessor.class ) ); @@ -982,7 +982,7 @@ public void shouldRepopulatePreexistingIndexed() throws Throwable IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); - when( provider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); BatchInserter inserter = newBatchInserterWithIndexProvider( @@ -996,7 +996,7 @@ public void shouldRepopulatePreexistingIndexed() throws Throwable // THEN verify( provider ).init(); verify( provider ).start(); - verify( provider ).getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + verify( provider ).getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); verify( populator ).create(); verify( populator ).add( argThat( matchesCollection( add( jakewins, internalIndex.schema(), Values.of( "Jakewins" ) ), @@ -1460,7 +1460,7 @@ private long dbWithIndexAndSingleIndexedNode() throws Exception IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); - when( provider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getPopulator( anyLong(), any( SchemaIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); BatchInserter inserter = newBatchInserterWithIndexProvider( 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 6feb72cb42297..d63b0adfe3fe9 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.Value; @@ -41,9 +41,9 @@ public class LuceneIndexAccessor implements IndexAccessor { private final LuceneIndexWriter writer; private final SchemaIndex luceneIndex; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; - public LuceneIndexAccessor( SchemaIndex luceneIndex, IndexDescriptor descriptor ) + public LuceneIndexAccessor( SchemaIndex luceneIndex, SchemaIndexDescriptor 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 845adc231575e..702081a912475 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.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; public class LuceneIndexProvider extends IndexProvider { @@ -82,7 +82,7 @@ protected IndexStorageFactory buildIndexStorageFactory( FileSystemAbstraction fi } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { SchemaIndex luceneIndex = LuceneSchemaIndexBuilder.create( descriptor, config ) .withFileSystem( fileSystem ) @@ -106,7 +106,7 @@ public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, In } @Override - public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor, + public IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { SchemaIndex luceneIndex = LuceneSchemaIndexBuilder.create( descriptor, config ) @@ -124,7 +124,7 @@ public void shutdown() } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { PartitionedIndexStorage indexStorage = getIndexStorage( indexId ); String failure = indexStorage.getStoredIndexFailure(); @@ -144,7 +144,7 @@ public InternalIndexState getInitialState( long indexId, IndexDescriptor descrip } @Override - public IndexCapability getCapability( IndexDescriptor indexDescriptor ) + public IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { return IndexCapability.NO_CAPABILITY; } @@ -156,7 +156,7 @@ public StoreMigrationParticipant storeMigrationParticipant( final FileSystemAbst } @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { String failure = getIndexStorage( indexId ).getStoredIndexFailure(); if ( failure == null ) @@ -171,7 +171,7 @@ private PartitionedIndexStorage getIndexStorage( long indexId ) return indexStorageFactory.indexStorageOf( indexId, config.get( GraphDatabaseSettings.archive_failed_index ) ); } - private boolean indexIsOnline( PartitionedIndexStorage indexStorage, IndexDescriptor descriptor ) throws IOException + private boolean indexIsOnline( PartitionedIndexStorage indexStorage, SchemaIndexDescriptor 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 fdb3157937889..2c997c6c3b603 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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 IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final TaskCoordinator taskCoordinator = new TaskCoordinator( 10, TimeUnit.MILLISECONDS ); - LuceneSchemaIndex( PartitionedIndexStorage indexStorage, IndexDescriptor descriptor, + LuceneSchemaIndex( PartitionedIndexStorage indexStorage, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, IndexPartitionFactory partitionFactory ) { super( indexStorage, partitionFactory ); @@ -86,7 +86,7 @@ public IndexReader getIndexReader() throws IOException : createPartitionedReader( partitions ); } - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor 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 f500012cffb44..85d3144409ab2 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 @@ -29,7 +29,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -43,11 +43,11 @@ */ public class LuceneSchemaIndexBuilder extends AbstractLuceneIndexBuilder { - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private IndexSamplingConfig samplingConfig; private Factory writerConfigFactory = IndexWriterConfigs::standard; - private LuceneSchemaIndexBuilder( IndexDescriptor descriptor, Config config ) + private LuceneSchemaIndexBuilder( SchemaIndexDescriptor descriptor, Config config ) { super( config ); this.descriptor = descriptor; @@ -60,7 +60,7 @@ private LuceneSchemaIndexBuilder( IndexDescriptor descriptor, Config config ) * @return new LuceneSchemaIndexBuilder * @param descriptor The descriptor for this index */ - public static LuceneSchemaIndexBuilder create( IndexDescriptor descriptor, Config config ) + public static LuceneSchemaIndexBuilder create( SchemaIndexDescriptor 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 8cf2ef3952063..4355a76290786 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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, IndexDescriptor descriptor, + public ReadOnlyDatabaseSchemaIndex( PartitionedIndexStorage indexStorage, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, ReadOnlyIndexPartitionFactory readOnlyIndexPartitionFactory ) { super( new LuceneSchemaIndex( indexStorage, descriptor, samplingConfig, readOnlyIndexPartitionFactory ) ); @@ -57,7 +57,7 @@ public IndexReader getIndexReader() throws IOException } @Override - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor 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 697dc632e669f..cdd614695942b 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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; - IndexDescriptor getDescriptor(); + SchemaIndexDescriptor 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 55f4f48730644..bc409bcf62ac1 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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, IndexDescriptor descriptor, + public WritableDatabaseSchemaIndex( PartitionedIndexStorage storage, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, WritableIndexPartitionFactory writableIndexPartitionFactory ) { super( new LuceneSchemaIndex( storage, descriptor, samplingConfig, writableIndexPartitionFactory ) ); @@ -59,7 +59,7 @@ public IndexReader getIndexReader() throws IOException } @Override - public IndexDescriptor getDescriptor() + public SchemaIndexDescriptor 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 3df8ba30262a3..4b0a4888ab58a 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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, IndexDescriptor descriptor ) + public UniqueLuceneIndexPopulator( SchemaIndex index, SchemaIndexDescriptor 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 9d442d9a1404a..71ddd16671ee2 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; 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, - IndexDescriptor descriptor, + SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, TaskCoordinator taskCoordinator ) { @@ -64,7 +64,7 @@ public PartitionedIndexReader( List partitionSearchers, .collect( Collectors.toList() ) ); } - PartitionedIndexReader( IndexDescriptor descriptor, List readers ) + PartitionedIndexReader( SchemaIndexDescriptor 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 411203a789f43..fd7d08c8ab975 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.AbstractIndexReader; import org.neo4j.storageengine.api.schema.IndexProgressor; @@ -50,7 +50,7 @@ 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.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor.Type.UNIQUE; /** * Schema index reader that is able to read/sample a single partition of a partitioned Lucene index. @@ -60,12 +60,12 @@ public class SimpleIndexReader extends AbstractIndexReader { private final PartitionSearcher partitionSearcher; - private final IndexDescriptor descriptor; + private final SchemaIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final TaskCoordinator taskCoordinator; public SimpleIndexReader( PartitionSearcher partitionSearcher, - IndexDescriptor descriptor, + SchemaIndexDescriptor 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 fc9e5abe3e62c..04f368c6c77cf 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 @@ -32,8 +32,8 @@ import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.DatabaseRule; @@ -78,7 +78,7 @@ public void shouldNotAllowConcurrentViolationOfConstraint() throws Exception { int labelId = statement.readOperations().labelGetForName( label.name() ); int propertyKeyId = statement.readOperations().propertyKeyGetForName( propertyKey ); - IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ); + SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ); statement.readOperations().indexQuery( index, IndexQuery.exact( index.schema().getPropertyId(), "The value is irrelevant, we just want to perform some sort of lookup against this index" ) ); diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java index fc3d13f9fb783..ab1185f9c1898 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.factory.CommunityEditionModule; @@ -180,7 +180,7 @@ private List nodeIdsInIndex( Config config, int indexId, String value ) th } IndexSamplingConfig samplingConfig = new IndexSamplingConfig( config ); try ( IndexAccessor accessor = indexProvider.getOnlineAccessor( indexId, - IndexDescriptorFactory.forLabel( 0, 0 ), samplingConfig ); + SchemaIndexDescriptorFactory.forLabel( 0, 0 ), samplingConfig ); IndexReader reader = accessor.newReader() ) { return PrimitiveLongCollections.asList( reader.query( IndexQuery.exact( 1, value ) ) ); 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 0961c0457d86a..cbe370c2e8508 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,8 +40,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; @@ -64,7 +64,7 @@ public class LuceneSchemaIndexPopulationIT public final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); private final int affectedNodes; - private final IndexDescriptor descriptor = IndexDescriptorFactory.uniqueForLabel( 0, 0 ); + private final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.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 ddd0029dc1f4a..8e770d969bdb4 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,8 +47,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.test.Randoms; import org.neo4j.test.rule.TestDirectory; @@ -65,7 +65,8 @@ 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 IndexDescriptor descriptor = IndexDescriptorFactory.uniqueForLabel( 0, PROPERTY_KEY_ID ); + private static final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory + .uniqueForLabel( 0, PROPERTY_KEY_ID ); @Rule public TestDirectory testDir = TestDirectory.testDirectory(); 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 63dfa0a16869f..87d35ba587143 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,8 +34,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; @@ -55,7 +55,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 IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 1000, 100 ); + private final SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.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 3f3026c321ed7..aac6202b9ee1d 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,8 +45,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; @@ -68,7 +68,7 @@ public class DatabaseCompositeIndexAccessorTest { private static final int PROP_ID1 = 1; private static final int PROP_ID2 = 2; - private static final IndexDescriptor DESCRIPTOR = IndexDescriptorFactory.forLabel( 0, PROP_ID1, PROP_ID2 ); + private static final SchemaIndexDescriptor DESCRIPTOR = SchemaIndexDescriptorFactory.forLabel( 0, PROP_ID1, PROP_ID2 ); private static final Config config = Config.defaults(); @Rule public final ThreadingRule threading = new ThreadingRule(); @@ -84,9 +84,9 @@ public class DatabaseCompositeIndexAccessorTest private final Object[] values = {"value1", "values2"}; private final Object[] values2 = {40, 42}; private DirectoryFactory.InMemoryDirectoryFactory dirFactory; - private static final IndexDescriptor indexDescriptor = IndexDescriptorFactory + private static final SchemaIndexDescriptor SCHEMA_INDEX_DESCRIPTOR = SchemaIndexDescriptorFactory .forLabel( 0, PROP_ID1, PROP_ID2 ); - private static final IndexDescriptor uniqueIndexDescriptor = IndexDescriptorFactory + private static final SchemaIndexDescriptor UNIQUE_SCHEMA_INDEX_DESCRIPTOR = SchemaIndexDescriptorFactory .uniqueForLabel( 1, PROP_ID1, PROP_ID2 ); @Parameterized.Parameters( name = "{0}" ) @@ -96,7 +96,7 @@ public static Collection[]> imp return Arrays.asList( arg( dirFactory1 -> { - SchemaIndex index = LuceneSchemaIndexBuilder.create( indexDescriptor, config ) + SchemaIndex index = LuceneSchemaIndexBuilder.create( SCHEMA_INDEX_DESCRIPTOR, config ) .withFileSystem( fileSystemRule.get() ) .withDirectoryFactory( dirFactory1 ) .withIndexRootFolder( new File( dir, "1" ) ) @@ -108,7 +108,7 @@ public static Collection[]> imp } ), arg( dirFactory1 -> { - SchemaIndex index = LuceneSchemaIndexBuilder.create( uniqueIndexDescriptor, config ) + SchemaIndex index = LuceneSchemaIndexBuilder.create( UNIQUE_SCHEMA_INDEX_DESCRIPTOR, config ) .withFileSystem( fileSystemRule.get() ) .withDirectoryFactory( dirFactory1 ) .withIndexRootFolder( new File( dir, "testIndex" ) ) @@ -263,17 +263,17 @@ public void shouldStopSamplingWhenIndexIsDropped() throws Exception private IndexEntryUpdate add( long nodeId, Object... values ) { - return IndexQueryHelper.add( nodeId, indexDescriptor.schema(), values ); + return IndexQueryHelper.add( nodeId, SCHEMA_INDEX_DESCRIPTOR.schema(), values ); } private IndexEntryUpdate remove( long nodeId, Object... values ) { - return IndexQueryHelper.remove( nodeId, indexDescriptor.schema(), values ); + return IndexQueryHelper.remove( nodeId, SCHEMA_INDEX_DESCRIPTOR.schema(), values ); } private IndexEntryUpdate change( long nodeId, Object[] valuesBefore, Object[] valuesAfter ) { - return IndexQueryHelper.change( nodeId, indexDescriptor.schema(), valuesBefore, valuesAfter ); + return IndexQueryHelper.change( nodeId, SCHEMA_INDEX_DESCRIPTOR.schema(), valuesBefore, valuesAfter ); } private void updateAndCommit( List> nodePropertyUpdates ) 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 f47125b89c44b..e41184475e890 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,8 +45,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; @@ -76,7 +76,7 @@ public class DatabaseIndexAccessorTest public static final EphemeralFileSystemRule fileSystemRule = new EphemeralFileSystemRule(); @Parameterized.Parameter( 0 ) - public IndexDescriptor index; + public SchemaIndexDescriptor 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 IndexDescriptor GENERAL_INDEX = IndexDescriptorFactory.forLabel( 0, PROP_ID ); - private static final IndexDescriptor UNIQUE_INDEX = IndexDescriptorFactory.uniqueForLabel( 1, PROP_ID ); + private static final SchemaIndexDescriptor GENERAL_INDEX = SchemaIndexDescriptorFactory.forLabel( 0, PROP_ID ); + private static final SchemaIndexDescriptor UNIQUE_INDEX = SchemaIndexDescriptorFactory.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( - IndexDescriptor index, + SchemaIndexDescriptor 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 8556beaeb8037..b34b67e7e98d8 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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -37,13 +37,13 @@ public class LuceneIndexAccessorTest @Mock private SchemaIndex schemaIndex; @Mock - private IndexDescriptor indexDescriptor; + private SchemaIndexDescriptor schemaIndexDescriptor; private LuceneIndexAccessor accessor; @Before public void setUp() { - accessor = new LuceneIndexAccessor( schemaIndex, indexDescriptor ); + accessor = new LuceneIndexAccessor( schemaIndex, schemaIndexDescriptor ); } @Test diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java index 67d44d3fb7dac..0baa45fdaa8ec 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java @@ -33,8 +33,8 @@ import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -59,7 +59,7 @@ public class LuceneIndexProviderTest private File graphDbDir; private FileSystemAbstraction fs; - private static final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); + private static final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 1, 1 ); @Before public void setup() diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java index d639f64ddda4e..4e2affe3c8a84 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java @@ -37,7 +37,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.spi.KernelContext; import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; @@ -318,7 +318,7 @@ public Lifecycle newInstance( KernelContext context, LuceneIndexProviderFactory. IndexProvider.Monitor.EMPTY, dependencies.getConfig(), context.databaseInfo().operationalMode ) { @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { return InternalIndexState.POPULATING; } 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 1a34ae2575f97..782b2ecb035f5 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,8 +23,8 @@ import org.junit.Test; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.factory.OperationalMode; @@ -41,7 +41,7 @@ public class LuceneSchemaIndexBuilderTest @Rule public final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); - private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 0 ); + private final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 0, 0 ); @Test public void readOnlyIndexCreation() throws Exception diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java index 2246b1f1d982d..6e8572cc49f72 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java @@ -39,8 +39,8 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.LoggingMonitor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.OperationalMode; import org.neo4j.logging.AssertableLogProvider; @@ -76,7 +76,7 @@ public void shouldRequestIndexPopulationIfTheIndexIsCorrupt() LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When - IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 1, 1 ); InternalIndexState initialState = provider.getInitialState( faultyIndexId, descriptor ); // Then @@ -94,7 +94,7 @@ public void shouldRequestIndexPopulationFailingWithFileNotFoundException() LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When - IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 1, 1 ); InternalIndexState initialState = provider.getInitialState( faultyIndexId, descriptor ); // Then @@ -112,7 +112,7 @@ public void shouldRequestIndexPopulationWhenFailingWithEOFException() LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When - IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 1, 1 ); InternalIndexState initialState = provider.getInitialState( faultyIndexId, descriptor ); // Then 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 fb4f14f5d84da..651bf46f4b6af 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,8 +42,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.test.rule.TestDirectory; @@ -66,7 +66,7 @@ public class LuceneSchemaIndexIT @Rule public final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); - private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 0 ); + private final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.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/LuceneSchemaIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java index 87c5c394c68b5..6327608aa9461 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java @@ -44,8 +44,8 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexStoreView; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -78,7 +78,7 @@ public class LuceneSchemaIndexPopulatorTest private IndexSearcher searcher; private final long indexId = 0; private static final int propertyKeyId = 666; - private static final IndexDescriptor index = IndexDescriptorFactory.forLabel( 42, propertyKeyId ); + private static final SchemaIndexDescriptor index = SchemaIndexDescriptorFactory.forLabel( 42, propertyKeyId ); @Before public void before() throws Exception 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 d3da08aa4f253..a331f47cce78a 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,8 +32,8 @@ import org.neo4j.io.IOUtils; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.DefaultFileSystemRule; @@ -49,7 +49,7 @@ public class LuceneSchemaIndexTest private final DirectoryFactory dirFactory = new DirectoryFactory.InMemoryDirectoryFactory(); private SchemaIndex index; - private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 3, 5 ); + private final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.forLabel( 3, 5 ); @After public void closeIndex() throws Exception diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/ReadOnlyLuceneSchemaIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/ReadOnlyLuceneSchemaIndexTest.java index 5d564287cfbc9..4da4315a90429 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/ReadOnlyLuceneSchemaIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/ReadOnlyLuceneSchemaIndexTest.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.impl.index.partition.ReadOnlyIndexPartitionFactory; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.test.rule.TestDirectory; @@ -58,7 +58,7 @@ public void setUp() fileSystemRule.get(), testDirectory.directory(), false ); Config config = Config.defaults(); IndexSamplingConfig samplingConfig = new IndexSamplingConfig( config ); - luceneSchemaIndex = new ReadOnlyDatabaseSchemaIndex( indexStorage, IndexDescriptorFactory.forLabel( 0, 0 ), + luceneSchemaIndex = new ReadOnlyDatabaseSchemaIndex( indexStorage, SchemaIndexDescriptorFactory.forLabel( 0, 0 ), samplingConfig, new ReadOnlyIndexPartitionFactory() ); } 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 a3f8b6c4d394a..1c9b8d8bf7585 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,8 +40,8 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -72,7 +72,7 @@ public void setUp() File folder = testDir.directory( "folder" ); PartitionedIndexStorage indexStorage = new PartitionedIndexStorage( dirFactory, fileSystemRule.get(), folder, false ); - IndexDescriptor descriptor = IndexDescriptorFactory.forSchema( labelSchemaDescriptor ); + SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory.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 334a323a5c345..5f6cb6adb9f36 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 @@ -47,8 +47,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; @@ -84,7 +84,7 @@ public class UniqueDatabaseIndexPopulatorTest private static final int PROPERTY_KEY_ID = 2; private final DirectoryFactory directoryFactory = new DirectoryFactory.InMemoryDirectoryFactory(); - private static final IndexDescriptor descriptor = IndexDescriptorFactory + private static final SchemaIndexDescriptor descriptor = SchemaIndexDescriptorFactory .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 7a82a8e0745b7..01c31658a8686 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,8 +35,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.storageengine.api.schema.IndexSampler; @@ -51,7 +51,7 @@ public class PartitionedIndexReaderTest { - private IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( 0, 1 ); + private SchemaIndexDescriptor schemaIndexDescriptor = SchemaIndexDescriptorFactory.forLabel( 0, 1 ); @Mock private IndexSamplingConfig samplingConfig; @Mock @@ -184,7 +184,7 @@ private void verifyResult( PrimitiveLongSet results ) private PartitionedIndexReader createPartitionedReaderFromReaders() { - return new PartitionedIndexReader( indexDescriptor, getPartitionReaders() ); + return new PartitionedIndexReader( schemaIndexDescriptor, getPartitionReaders() ); } private List getPartitionReaders() @@ -194,7 +194,7 @@ private List getPartitionReaders() private PartitionedIndexReader createPartitionedReader() { - return new PartitionedIndexReader( getPartitionSearchers(), indexDescriptor, samplingConfig, taskCoordinator ); + return new PartitionedIndexReader( getPartitionSearchers(), schemaIndexDescriptor, samplingConfig, taskCoordinator ); } private List getPartitionSearchers() diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReaderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReaderTest.java index 85b543339b8c3..54ffcae8645c2 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReaderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReaderTest.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.impl.schema.sampler.NonUniqueLuceneIndexSampler; import org.neo4j.kernel.api.impl.schema.sampler.UniqueLuceneIndexSampler; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -151,13 +151,13 @@ public void nonUuniqueIndexSamplerForNonUniqueIndex() private SimpleIndexReader getNonUniqueSimpleReader() { - return new SimpleIndexReader( partitionSearcher, IndexDescriptorFactory.forLabel( 0, 0 ), samplingConfig, + return new SimpleIndexReader( partitionSearcher, SchemaIndexDescriptorFactory.forLabel( 0, 0 ), samplingConfig, taskCoordinator ); } private SimpleIndexReader getUniqueSimpleReader() { - return new SimpleIndexReader( partitionSearcher, IndexDescriptorFactory.uniqueForLabel( 0, 0 ), + return new SimpleIndexReader( partitionSearcher, SchemaIndexDescriptorFactory.uniqueForLabel( 0, 0 ), samplingConfig, taskCoordinator ); } } diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeSchemaIndexIteratorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeSchemaIndexIteratorTest.java index 2a26866184df5..0a579c6e71200 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeSchemaIndexIteratorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeSchemaIndexIteratorTest.java @@ -39,16 +39,12 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.test.rule.RandomRule; @@ -384,9 +380,9 @@ private static class StringCompositeIndexCoordinator extends IndexCoordinator } @Override - protected IndexDescriptor extractIndexDescriptor() + protected SchemaIndexDescriptor extractIndexDescriptor() { - return IndexDescriptorFactory.forLabel( indexedLabelId, stringPropId1, stringPropId2 ); + return SchemaIndexDescriptorFactory.forLabel( indexedLabelId, stringPropId1, stringPropId2 ); } @Override @@ -405,7 +401,7 @@ PrimitiveLongIterator queryRange( ReadOperations readOperations ) PrimitiveLongIterator queryExists( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { - return readOperations.indexQuery( indexDescriptor, + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.exists( stringPropId1 ), IndexQuery.exists( stringPropId2 ) ); } @@ -414,7 +410,7 @@ PrimitiveLongIterator queryExists( ReadOperations readOperations ) PrimitiveLongIterator queryExact( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { - return readOperations.indexQuery( indexDescriptor, + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.exact( stringPropId1, stringProp1Values[0] ), IndexQuery.exact( stringPropId2, stringProp2Values[0] ) ); } @@ -448,9 +444,9 @@ private static class NumberCompositeIndexCoordinator extends IndexCoordinator } @Override - protected IndexDescriptor extractIndexDescriptor() + protected SchemaIndexDescriptor extractIndexDescriptor() { - return IndexDescriptorFactory.forLabel( indexedLabelId, numberPropId1, numberPropId2 ); + return SchemaIndexDescriptorFactory.forLabel( indexedLabelId, numberPropId1, numberPropId2 ); } @Override @@ -469,7 +465,7 @@ PrimitiveLongIterator queryRange( ReadOperations readOperations ) PrimitiveLongIterator queryExists( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { - return readOperations.indexQuery( indexDescriptor, + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.exists( numberPropId1 ), IndexQuery.exists( numberPropId2 ) ); } @@ -478,7 +474,7 @@ PrimitiveLongIterator queryExists( ReadOperations readOperations ) PrimitiveLongIterator queryExact( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { - return readOperations.indexQuery( indexDescriptor, + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.exact( numberPropId1, numberProp1Values[0] ), IndexQuery.exact( numberPropId2, numberProp2Values[0] ) ); } @@ -512,9 +508,9 @@ private static class StringIndexCoordinator extends IndexCoordinator } @Override - protected IndexDescriptor extractIndexDescriptor() + protected SchemaIndexDescriptor extractIndexDescriptor() { - return IndexDescriptorFactory.forLabel( indexedLabelId, stringPropId1 ); + return SchemaIndexDescriptorFactory.forLabel( indexedLabelId, stringPropId1 ); } @Override @@ -528,7 +524,7 @@ PrimitiveLongIterator queryRange( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { // query for half the range - return readOperations.indexQuery( indexDescriptor, + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.range( numberPropId1, stringProp1Values[0], true, stringProp1Values[numberOfNodes / 2], false ) ); } @@ -536,14 +532,14 @@ PrimitiveLongIterator queryRange( ReadOperations readOperations ) PrimitiveLongIterator queryExists( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { - return readOperations.indexQuery( indexDescriptor, IndexQuery.exists( stringPropId1 ) ); + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.exists( stringPropId1 ) ); } @Override PrimitiveLongIterator queryExact( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { - return readOperations.indexQuery( indexDescriptor, IndexQuery.exact( stringPropId1, stringProp1Values[0] ) ); + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.exact( stringPropId1, stringProp1Values[0] ) ); } @Override @@ -580,9 +576,9 @@ private static class NumberIndexCoordinator extends IndexCoordinator } @Override - protected IndexDescriptor extractIndexDescriptor() + protected SchemaIndexDescriptor extractIndexDescriptor() { - return IndexDescriptorFactory.forLabel( indexedLabelId, numberPropId1 ); + return SchemaIndexDescriptorFactory.forLabel( indexedLabelId, numberPropId1 ); } @Override @@ -596,7 +592,7 @@ PrimitiveLongIterator queryRange( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { // query for half the range - return readOperations.indexQuery( indexDescriptor, + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.range( numberPropId1, numberProp1Values[0], true, numberProp1Values[numberOfNodes / 2], false ) ); } @@ -604,14 +600,14 @@ PrimitiveLongIterator queryRange( ReadOperations readOperations ) PrimitiveLongIterator queryExists( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { - return readOperations.indexQuery( indexDescriptor, IndexQuery.exists( numberPropId1 ) ); + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.exists( numberPropId1 ) ); } @Override PrimitiveLongIterator queryExact( ReadOperations readOperations ) throws IndexNotApplicableKernelException, IndexNotFoundKernelException { - return readOperations.indexQuery( indexDescriptor, IndexQuery.exact( numberPropId1, numberProp1Values[0] ) ); + return readOperations.indexQuery( schemaIndexDescriptor, IndexQuery.exact( numberPropId1, numberProp1Values[0] ) ); } @Override @@ -660,7 +656,7 @@ private abstract static class IndexCoordinator int numberPropId2; int stringPropId1; int stringPropId2; - IndexDescriptor indexDescriptor; + SchemaIndexDescriptor schemaIndexDescriptor; IndexCoordinator( Label indexLabel, String numberProp1, String numberProp2, String stringProp1, String stringProp2 ) { @@ -716,10 +712,10 @@ void init( DatabaseRule db ) stringPropId2 = readOp.propertyKeyGetForName( stringProp2 ); tx.success(); } - indexDescriptor = extractIndexDescriptor(); + schemaIndexDescriptor = extractIndexDescriptor(); } - protected abstract IndexDescriptor extractIndexDescriptor(); + protected abstract SchemaIndexDescriptor extractIndexDescriptor(); void createIndex( DatabaseRule db ) { diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java index 1f784fcde2d75..540dfec49083b 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.core.LabelTokenHolder; @@ -128,7 +128,7 @@ public void testManualIndexPopulation() throws IOException, IndexNotFoundKernelE int propertyId = propertyKeyTokenHolder.getIdByName( PROPERTY_NAME ); IndexRule rule = IndexRule.indexRule( - schemaStore.nextId(), IndexDescriptorFactory.forLabel( foodId, propertyId ), indexDescriptor ); + schemaStore.nextId(), SchemaIndexDescriptorFactory.forLabel( foodId, propertyId ), indexDescriptor ); indexingService.createIndexes( rule ); IndexProxy indexProxy = indexingService.getIndexProxy( rule.getId() ); @@ -200,7 +200,8 @@ public void failForceIndexesWhenOneOfTheIndexesIsBroken() throws Exception int indexLabel7 = labelTokenHolder.getIdByName( indexLabelPrefix + 7 ); int indexProperty7 = propertyKeyTokenHolder.getIdByName( indexPropertyPrefix + 7 ); - IndexProxy index = indexingService.getIndexProxy( IndexDescriptorFactory.forLabel( indexLabel7, indexProperty7).schema() ); + IndexProxy index = indexingService.getIndexProxy( SchemaIndexDescriptorFactory + .forLabel( indexLabel7, indexProperty7).schema() ); index.drop(); diff --git a/community/neo4j/src/test/java/migration/Start3_2DbOn3_3AndCreateFusionIndexIT.java b/community/neo4j/src/test/java/migration/Start3_2DbOn3_3AndCreateFusionIndexIT.java index 442ec80e4e0c6..37d21e590ad25 100644 --- a/community/neo4j/src/test/java/migration/Start3_2DbOn3_3AndCreateFusionIndexIT.java +++ b/community/neo4j/src/test/java/migration/Start3_2DbOn3_3AndCreateFusionIndexIT.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -170,7 +170,7 @@ private int countIndexedNodes( GraphDatabaseAPI db, Label label, String... keys propertyKeyIds[i] = read.propertyKeyGetForName( keys[i] ); } - IndexDescriptor index = read.indexGetForSchema( new LabelSchemaDescriptor( labelId, propertyKeyIds ) ); + SchemaIndexDescriptor index = read.indexGetForSchema( new LabelSchemaDescriptor( labelId, propertyKeyIds ) ); int count; StorageStatement storeStatement = ((KernelStatement)statement).getStoreStatement(); IndexReader reader = storeStatement.getIndexReader( index ); diff --git a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java index 9a05b6aca6ef2..f655b8d12917a 100644 --- a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java +++ b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java @@ -93,7 +93,7 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.query.ExecutingQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.api.txstate.TxStateHolder; import org.neo4j.kernel.impl.api.ClockContext; import org.neo4j.kernel.impl.api.RelationshipVisitor; @@ -641,7 +641,7 @@ public PrimitiveLongResourceIterator nodesGetForLabel( int labelId ) } @Override - public PrimitiveLongResourceIterator indexQuery( IndexDescriptor index, IndexQuery... predicates ) + public PrimitiveLongResourceIterator indexQuery( SchemaIndexDescriptor index, IndexQuery... predicates ) throws IndexNotFoundKernelException, IndexNotApplicableKernelException { return readOperations.indexQuery( index, predicates ); @@ -674,14 +674,14 @@ public RelationshipIterator nodeGetRelationships( long nodeId, Direction directi } @Override - public long nodeGetFromUniqueIndexSeek( IndexDescriptor index, IndexQuery.ExactPredicate... predicates ) + public long nodeGetFromUniqueIndexSeek( SchemaIndexDescriptor index, IndexQuery.ExactPredicate... predicates ) throws IndexNotFoundKernelException, IndexBrokenKernelException, IndexNotApplicableKernelException { return readOperations.nodeGetFromUniqueIndexSeek( index, predicates ); } @Override - public long nodesCountIndexed( IndexDescriptor index, long nodeId, Value value ) + public long nodesCountIndexed( SchemaIndexDescriptor index, long nodeId, Value value ) throws IndexNotFoundKernelException, IndexBrokenKernelException { return readOperations.nodesCountIndexed( index, nodeId, value ); @@ -827,56 +827,56 @@ public Cursor relationshipGetProperties( RelationshipItem relation } @Override - public IndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) throws SchemaRuleNotFoundException + public SchemaIndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) throws SchemaRuleNotFoundException { return readOperations.indexGetForSchema( descriptor ); } @Override - public Iterator indexesGetForLabel( int labelId ) + public Iterator indexesGetForLabel( int labelId ) { return readOperations.indexesGetForLabel( labelId ); } @Override - public Iterator indexesGetAll() + public Iterator indexesGetAll() { return readOperations.indexesGetAll(); } @Override - public InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public InternalIndexState indexGetState( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return readOperations.indexGetState( descriptor ); } @Override - public IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return readOperations.indexGetProviderDescriptor( descriptor ); } @Override - public PopulationProgress indexGetPopulationProgress( IndexDescriptor descriptor ) + public PopulationProgress indexGetPopulationProgress( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return readOperations.indexGetPopulationProgress( descriptor ); } @Override - public long indexSize( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public long indexSize( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return readOperations.indexSize( descriptor ); } @Override - public double indexUniqueValuesSelectivity( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public double indexUniqueValuesSelectivity( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return readOperations.indexUniqueValuesSelectivity( descriptor ); } @Override - public String indexGetFailure( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public String indexGetFailure( SchemaIndexDescriptor descriptor ) throws IndexNotFoundKernelException { return readOperations.indexGetFailure( descriptor ); } @@ -906,7 +906,7 @@ public Iterator constraintsGetAll() } @Override - public Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) + public Long indexGetOwningUniquenessConstraintId( SchemaIndexDescriptor index ) { return readOperations.indexGetOwningUniquenessConstraintId( index ); } @@ -1071,14 +1071,14 @@ public long countsForRelationshipWithoutTxState( int startLabelId, int typeId, i } @Override - public Register.DoubleLongRegister indexUpdatesAndSize( IndexDescriptor index, + public Register.DoubleLongRegister indexUpdatesAndSize( SchemaIndexDescriptor index, Register.DoubleLongRegister target ) throws IndexNotFoundKernelException { return readOperations.indexUpdatesAndSize( index, target ); } @Override - public Register.DoubleLongRegister indexSample( IndexDescriptor index, Register.DoubleLongRegister target ) + public Register.DoubleLongRegister indexSample( SchemaIndexDescriptor index, Register.DoubleLongRegister target ) throws IndexNotFoundKernelException { return readOperations.indexSample( index, target ); diff --git a/community/neo4j/src/test/java/schema/IndexPopulationFlipRaceIT.java b/community/neo4j/src/test/java/schema/IndexPopulationFlipRaceIT.java index 300c0bdd400b6..4d3e74e21dcf2 100644 --- a/community/neo4j/src/test/java/schema/IndexPopulationFlipRaceIT.java +++ b/community/neo4j/src/test/java/schema/IndexPopulationFlipRaceIT.java @@ -29,8 +29,8 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; @@ -145,8 +145,8 @@ private void verifyThatThereAreExactlyOneIndexEntryPerNodeInTheIndexes( int i, P int keyAId = statement.readOperations().propertyKeyGetForName( keyA( i ) ); int labelBId = statement.readOperations().labelGetForName( labelB( i ).name() ); int keyBId = statement.readOperations().propertyKeyGetForName( keyB( i ) ); - IndexDescriptor indexA = IndexDescriptorFactory.forLabel( labelAId, keyAId ); - IndexDescriptor indexB = IndexDescriptorFactory.forLabel( labelBId, keyBId ); + SchemaIndexDescriptor indexA = SchemaIndexDescriptorFactory.forLabel( labelAId, keyAId ); + SchemaIndexDescriptor indexB = SchemaIndexDescriptorFactory.forLabel( labelBId, keyBId ); for ( int j = 0; j < NODES_PER_INDEX; j++ ) { diff --git a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java index a3963cc2e1ec5..85e9e3d0a43ef 100644 --- a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java +++ b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java @@ -60,7 +60,7 @@ import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.IndexProxy; @@ -382,7 +382,7 @@ private void waitIndexOnline( IndexingService indexService, int propertyId, int private IndexRule[] createIndexRules( Map labelNameIdMap, int propertyId ) { return labelNameIdMap.values().stream() - .map( index -> IndexRule.indexRule( index, IndexDescriptorFactory.forLabel( index, propertyId ), indexDescriptor ) ) + .map( index -> IndexRule.indexRule( index, SchemaIndexDescriptorFactory.forLabel( index, propertyId ), indexDescriptor ) ) .toArray( IndexRule[]::new ); } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/PrepareStoreCopyFilesTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/PrepareStoreCopyFilesTest.java index 2d1d51cfe2bcb..477ef1a784734 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/PrepareStoreCopyFilesTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/PrepareStoreCopyFilesTest.java @@ -35,8 +35,6 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.impl.muninn.StandalonePageCacheFactory; import org.neo4j.kernel.NeoStoreDataSource; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.transaction.state.NeoStoreFileIndexListing; import org.neo4j.kernel.impl.transaction.state.NeoStoreFileListing; import org.neo4j.storageengine.api.StoreFileMetadata; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java index e616f5e971b08..c21b3729d3caf 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java @@ -59,7 +59,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; @@ -501,7 +501,7 @@ private static class ControlledIndexProvider extends IndexProvider } @Override - public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, + public IndexPopulator getPopulator( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { IndexPopulator populator = delegate.getPopulator( indexId, descriptor, samplingConfig ); @@ -509,22 +509,22 @@ public IndexPopulator getPopulator( long indexId, IndexDescriptor descriptor, } @Override - public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor, + public IndexAccessor getOnlineAccessor( long indexId, SchemaIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { return delegate.getOnlineAccessor(indexId, descriptor, samplingConfig ); } @Override - public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) + public InternalIndexState getInitialState( long indexId, SchemaIndexDescriptor descriptor ) { return delegate.getInitialState( indexId, descriptor ); } @Override - public IndexCapability getCapability( IndexDescriptor indexDescriptor ) + public IndexCapability getCapability( SchemaIndexDescriptor schemaIndexDescriptor ) { - return delegate.getCapability( indexDescriptor ); + return delegate.getCapability( schemaIndexDescriptor ); } @Override @@ -534,7 +534,7 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio } @Override - public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( long indexId, SchemaIndexDescriptor descriptor ) throws IllegalStateException { return delegate.getPopulationFailure( indexId, descriptor ); } 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 4043e42e38a6d..a809d45fc5464 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 @@ -32,7 +32,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.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; @@ -130,14 +130,14 @@ public void shouldUpdateCountsOnSlavesWhenCreatingAnIndexOnMaster() throws Excep { // when creating a node on the master createANode( master, LABEL, PROPERTY_VALUE, PROPERTY_NAME ); - IndexDescriptor indexDescriptor = createAnIndex( master, LABEL, PROPERTY_NAME ); - long indexId = awaitOnline( master, indexDescriptor ); + SchemaIndexDescriptor schemaIndexDescriptor = createAnIndex( master, LABEL, PROPERTY_NAME ); + long indexId = awaitOnline( master, schemaIndexDescriptor ); // and the slaves got the updates cluster.sync( master ); - long index1 = awaitOnline( slave1, indexDescriptor ); - long index2 = awaitOnline( slave2, indexDescriptor ); + long index1 = awaitOnline( slave1, schemaIndexDescriptor ); + long index2 = awaitOnline( slave2, schemaIndexDescriptor ); // then the slaves has updated counts assertOnIndexCounts( 0, 1, 1, 1, indexId, master ); @@ -150,14 +150,14 @@ public void shouldUpdateCountsOnClusterWhenCreatingANodeOnSlaveAndAnIndexOnMaste { // when creating a node on the master createANode( slave1, LABEL, PROPERTY_VALUE, PROPERTY_NAME ); - IndexDescriptor indexDescriptor = createAnIndex( master, LABEL, PROPERTY_NAME ); - long indexId = awaitOnline( master, indexDescriptor ); + SchemaIndexDescriptor schemaIndexDescriptor = createAnIndex( master, LABEL, PROPERTY_NAME ); + long indexId = awaitOnline( master, schemaIndexDescriptor ); // and the updates are propagate in the cluster cluster.sync(); - long index1 = awaitOnline( slave1, indexDescriptor ); - long index2 = awaitOnline( slave2, indexDescriptor ); + long index1 = awaitOnline( slave1, schemaIndexDescriptor ); + long index2 = awaitOnline( slave2, schemaIndexDescriptor ); // then the slaves has updated counts assertOnIndexCounts( 0, 1, 1, 1, indexId, master ); @@ -175,7 +175,7 @@ private void createANode( HighlyAvailableGraphDatabase db, Label label, String v } } - private IndexDescriptor createAnIndex( HighlyAvailableGraphDatabase db, Label label, String propertyName ) + private SchemaIndexDescriptor createAnIndex( HighlyAvailableGraphDatabase db, Label label, String propertyName ) throws KernelException { try ( Transaction tx = db.beginTx(); @@ -183,8 +183,8 @@ private IndexDescriptor createAnIndex( HighlyAvailableGraphDatabase db, Label la { int labelId = statement.tokenWriteOperations().labelGetOrCreateForName( label.name() ); int propertyKeyId = statement.tokenWriteOperations().propertyKeyGetOrCreateForName( propertyName ); - IndexDescriptor index = statement.schemaWriteOperations() - .indexCreate( SchemaDescriptorFactory.forLabel( labelId, propertyKeyId ) ); + SchemaIndexDescriptor index = statement.schemaWriteOperations() + .indexCreate( SchemaDescriptorFactory.forLabel( labelId, propertyKeyId ) ); tx.success(); return index; } @@ -245,7 +245,7 @@ private IndexingService indexingService( HighlyAvailableGraphDatabase db ) return db.getDependencyResolver().resolveDependency( IndexingService.class ); } - private long awaitOnline( HighlyAvailableGraphDatabase db, IndexDescriptor index ) + private long awaitOnline( HighlyAvailableGraphDatabase db, SchemaIndexDescriptor 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 eb92a4d83cad5..12db969139518 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 @@ -46,8 +46,8 @@ 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.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; @@ -69,7 +69,7 @@ public class UniquenessConstraintCreationIT extends AbstractConstraintCreationIT { private static final String DUPLICATED_VALUE = "apa"; - private IndexDescriptor uniqueIndex; + private SchemaIndexDescriptor uniqueIndex; @Override int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException @@ -124,7 +124,7 @@ void removeOffendingDataInRunningTx( GraphDatabaseService db ) @Override LabelSchemaDescriptor makeDescriptor( int typeId, int propertyKeyId ) { - uniqueIndex = IndexDescriptorFactory.uniqueForLabel( typeId, propertyKeyId ); + uniqueIndex = SchemaIndexDescriptorFactory.uniqueForLabel( typeId, propertyKeyId ); return SchemaDescriptorFactory.forLabel( typeId, propertyKeyId ); } @@ -251,7 +251,8 @@ public void committedConstraintRuleShouldCrossReferenceTheCorrespondingIndexRule // then SchemaStorage schema = new SchemaStorage( neoStores().getSchemaStore() ); - IndexRule indexRule = schema.indexGetForSchema( IndexDescriptorFactory.uniqueForLabel( typeId, propertyKeyId ) ); + IndexRule indexRule = schema.indexGetForSchema( SchemaIndexDescriptorFactory + .uniqueForLabel( typeId, propertyKeyId ) ); ConstraintRule constraintRule = schema.constraintsGetSingle( ConstraintDescriptorFactory.uniqueForLabel( typeId, propertyKeyId ) ); assertEquals( constraintRule.getId(), indexRule.getOwningConstraint().longValue() ); diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIT.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIT.java index 7eabb79dbf926..4ab3fc0b408b9 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIT.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIT.java @@ -54,7 +54,7 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.configuration.BoltConnector; import org.neo4j.kernel.configuration.Config; @@ -425,11 +425,11 @@ private static void checkIndexCounts( Store store, GraphDatabaseAPI db ) throws try ( KernelTransaction tx = kernel.newTransaction( KernelTransaction.Type.implicit, AnonymousContext.read() ); Statement statement = tx.acquireStatement() ) { - Iterator indexes = IndexDescriptor.sortByType( getAllIndexes( statement ) ); + Iterator indexes = SchemaIndexDescriptor.sortByType( getAllIndexes( statement ) ); DoubleLongRegister register = Registers.newDoubleLongRegister(); for ( int i = 0; indexes.hasNext(); i++ ) { - IndexDescriptor descriptor = indexes.next(); + SchemaIndexDescriptor descriptor = indexes.next(); // wait index to be online since sometimes we need to rebuild the indexes on migration awaitOnline( statement.readOperations(), descriptor ); @@ -444,7 +444,7 @@ private static void checkIndexCounts( Store store, GraphDatabaseAPI db ) throws } } - private static Iterator getAllIndexes( Statement statement ) + private static Iterator getAllIndexes( Statement statement ) { return statement.readOperations().indexesGetAll(); } @@ -549,7 +549,7 @@ private static long[] counts( long upgrade, long size, long unique, long sampleS return new long[]{upgrade, size, unique, sampleSize}; } - private static IndexDescriptor awaitOnline( ReadOperations readOperations, IndexDescriptor index ) + private static SchemaIndexDescriptor awaitOnline( ReadOperations readOperations, SchemaIndexDescriptor index ) throws KernelException { long start = System.currentTimeMillis(); 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 a1182ee790526..cfa2585bd10d6 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java @@ -33,7 +33,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.api.ReadOperations; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.CountsVisitor; import org.neo4j.kernel.impl.core.RelationshipTypeToken; @@ -120,14 +120,14 @@ 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, - List relationshipTypes, - List propertyKeys ) + private DumpCountsStore( PrintStream out, Map indexes, List labels, + List relationshipTypes, + List propertyKeys ) { this.out = out; this.indexes = indexes; @@ -165,7 +165,7 @@ public void visitRelationshipCount( int startLabelId, int typeId, int endLabelId @Override public void visitIndexStatistics( long indexId, long updates, long size ) { - IndexDescriptor index = indexes.get( indexId ); + SchemaIndexDescriptor index = indexes.get( indexId ); out.printf( "\tIndexStatistics[(%s {%s})]:\tupdates=%d, size=%d%n", label( index.schema().getLabelId() ), propertyKeys( index.schema().getPropertyIds() ), updates, size ); } @@ -173,7 +173,7 @@ public void visitIndexStatistics( long indexId, long updates, long size ) @Override public void visitIndexSample( long indexId, long unique, long size ) { - IndexDescriptor index = indexes.get( indexId ); + SchemaIndexDescriptor index = indexes.get( indexId ); out.printf( "\tIndexSample[(%s {%s})]:\tunique=%d, size=%d%n", label( index.schema().getLabelId() ), propertyKeys( index.schema().getPropertyIds() ), unique, size ); } @@ -255,9 +255,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 787dd37911c4d..a5eb30722fe1f 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java @@ -29,8 +29,8 @@ import java.util.List; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.core.RelationshipTypeToken; import org.neo4j.kernel.impl.store.LabelTokenStore; import org.neo4j.kernel.impl.store.NeoStores; @@ -70,8 +70,8 @@ public class DumpCountsStoreTest private static final String INDEX_PROPERTY = "indexProperty"; private static final long indexId = 0; - private static final IndexDescriptor descriptor = - IndexDescriptorFactory.forLabel( INDEX_LABEL_ID, INDEX_PROPERTY_KEY_ID ); + private static final SchemaIndexDescriptor descriptor = + SchemaIndexDescriptorFactory.forLabel( INDEX_LABEL_ID, INDEX_PROPERTY_KEY_ID ); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); diff --git a/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java b/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java index a31438613dafc..6488c21ff1443 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java @@ -29,7 +29,7 @@ import org.neo4j.consistency.report.InconsistencyMessageLogger; import org.neo4j.consistency.store.synthetic.IndexEntry; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; import org.neo4j.kernel.impl.store.record.IndexRule; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.PropertyRecord; @@ -66,7 +66,7 @@ public void shouldReadBasicEntities() throws Exception "Some error", "something" ); logger.error( RecordType.INDEX, new IndexEntry( indexNodeId ), "Some index error", "Something wrong with index" ); logger.error( RecordType.NODE, new NodeRecord( nodeNotInTheIndexId ), "Some index error", - IndexRule.indexRule( indexId, IndexDescriptorFactory.forLabel( 1, 2 ), + IndexRule.indexRule( indexId, SchemaIndexDescriptorFactory.forLabel( 1, 2 ), new IndexProvider.Descriptor( "key", "version" ) ).toString() ); String text = out.toString();