From df6356dd42b1b6c382e5d68a8a1dd55fb0d3abe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Finn=C3=A9?= Date: Tue, 7 Aug 2018 11:43:43 +0200 Subject: [PATCH] Moved IndexDescriptor to o.n.storageengine.api.schema --- .../full/FullCheckIntegrationTest.java | 6 ++--- .../ConstraintIndexConcurrencyTest.java | 2 +- .../lucene/explicit/NonUniqueIndexTest.java | 2 +- .../impl/schema/LuceneIndexRecoveryIT.java | 2 +- .../impl/api/MultipleOpenCursorsTest.java | 2 +- ...ltiIndexPopulationConcurrentUpdatesIT.java | 4 ++-- .../DropBrokenUniquenessConstraintIT.java | 2 +- .../java/org/neo4j/kernel/RecoveryIT.java | 2 +- .../neo4j/kernel/api/CompositeIndexingIT.java | 4 ++-- .../CompositeIndexAccessorCompatibility.java | 2 +- .../CompositeIndexPopulatorCompatibility.java | 2 +- .../api/index/IndexAccessorCompatibility.java | 2 +- .../IndexProviderCompatibilityTestSuite.java | 4 ++-- .../SimpleIndexAccessorCompatibility.java | 2 +- .../SimpleIndexPopulatorCompatibility.java | 2 +- .../ControlledPopulationIndexProvider.java | 2 +- .../kernel/impl/api/index/IndexCRUDIT.java | 2 +- .../neo4j/kernel/impl/api/index/IndexIT.java | 4 +--- .../api/index/IndexPopulationJobTest.java | 4 ++-- .../impl/api/index/IndexRecoveryIT.java | 2 +- .../impl/api/index/IndexStatisticsIT.java | 2 +- .../impl/api/index/IndexStatisticsTest.java | 4 ++-- .../kernel/impl/store/SchemaStorageTest.java | 8 +++---- .../neo4j/locking/QueryExecutionLocksIT.java | 2 +- .../batchinsert/internal/BatchInsertTest.java | 4 ++-- .../checking/SchemaRecordCheck.java | 2 +- .../checking/full/ConsistencyCheckTasks.java | 2 +- .../consistency/checking/full/IndexCheck.java | 2 +- .../full/PropertyAndNodeIndexedCheck.java | 2 +- .../checking/index/IndexAccessors.java | 2 +- .../consistency/report/ConsistencyReport.java | 2 +- .../store/synthetic/IndexRecord.java | 2 +- .../checking/SchemaRecordCheckTest.java | 2 +- .../consistency/checking/SchemaRuleUtil.java | 4 ++-- .../report/ConsistencyReporterTest.java | 8 +++---- .../v3_1/TransactionBoundPlanContext.scala | 1 - .../v3_4/IndexDescriptorCompatibility.scala | 4 ++-- .../v3_4/TransactionBoundPlanContext.scala | 2 +- .../IndexDescriptorCompatibility.scala | 6 ++--- .../TransactionBoundPlanContext.scala | 2 +- .../api/schema/IndexProviderDescriptor.java | 6 +++++ .../storageengine/api/StorageReader.java | 5 ++--- .../api/schema/AbstractIndexReader.java | 3 +-- .../api/schema}/CapableIndexDescriptor.java | 4 ++-- .../api/schema}/IndexDescriptor.java | 2 +- .../api/schema}/IndexDescriptorFactory.java | 12 +++++----- .../api/schema/IndexProgressor.java | 7 ++---- .../storageengine/api/schema/SchemaRule.java | 1 - .../api/schema}/StoreIndexDescriptor.java | 22 +------------------ .../api/txstate/ReadableTransactionState.java | 2 +- .../api/txstate/TxStateVisitor.java | 2 +- .../neo4j/kernel/api/KernelTransaction.java | 2 +- .../index/IndexEntryConflictException.java | 2 +- .../kernel/api/index/IndexPopulator.java | 2 +- .../neo4j/kernel/api/index/IndexProvider.java | 10 ++------- .../kernel/api/index/LoggingMonitor.java | 4 ++-- .../IndexBackedConstraintDescriptor.java | 4 ++-- .../kernel/api/txstate/TransactionState.java | 2 +- .../kernel/impl/api/IndexReaderFactory.java | 2 +- .../api/KernelTransactionImplementation.java | 2 +- .../index/AbstractDelegatingIndexProxy.java | 2 +- .../index/AbstractSwallowingIndexProxy.java | 2 +- .../impl/api/index/FailedIndexProxy.java | 3 +-- .../FailedPopulatingIndexProxyFactory.java | 2 +- .../impl/api/index/FlippableIndexProxy.java | 2 +- .../neo4j/kernel/impl/api/index/IndexMap.java | 2 +- .../impl/api/index/IndexPopulationJob.java | 2 +- .../impl/api/index/IndexProviderMap.java | 15 +++++++++++++ .../kernel/impl/api/index/IndexProxy.java | 2 +- .../impl/api/index/IndexProxyCreator.java | 12 +++++----- .../impl/api/index/IndexingService.java | 4 ++-- .../api/index/IndexingServiceFactory.java | 2 +- .../api/index/MultipleIndexPopulator.java | 2 +- .../impl/api/index/OnlineIndexProxy.java | 2 +- .../impl/api/index/PopulatingIndexProxy.java | 2 +- .../impl/api/index/RecoveringIndexProxy.java | 2 +- .../sampling/IndexSamplingController.java | 4 ++-- .../IndexSamplingControllerFactory.java | 4 ++-- .../api/schema/BridgingIndexProgressor.java | 2 +- .../api/state/ConstraintIndexCreator.java | 2 +- .../neo4j/kernel/impl/api/state/TxState.java | 2 +- .../kernel/impl/api/store/SchemaCache.java | 6 ++--- .../DeferredConflictCheckingIndexUpdater.java | 2 +- .../schema/GenericNativeIndexAccessor.java | 2 +- .../schema/GenericNativeIndexPopulator.java | 2 +- .../schema/GenericNativeIndexProvider.java | 2 +- .../schema/GenericNativeIndexReader.java | 2 +- .../kernel/impl/index/schema/NativeIndex.java | 4 ++-- .../index/schema/NativeIndexAccessor.java | 2 +- .../index/schema/NativeIndexPopulator.java | 6 ++--- .../index/schema/NativeIndexProvider.java | 6 ++--- .../impl/index/schema/NativeIndexReader.java | 2 +- .../impl/index/schema/NodeValueIterator.java | 2 +- .../index/schema/NumberIndexAccessor.java | 2 +- .../index/schema/NumberIndexPopulator.java | 2 +- .../index/schema/NumberIndexProvider.java | 2 +- .../impl/index/schema/NumberIndexReader.java | 2 +- .../index/schema/SpatialIndexAccessor.java | 2 +- .../index/schema/SpatialIndexPartReader.java | 2 +- .../index/schema/SpatialIndexPopulator.java | 2 +- .../index/schema/SpatialIndexProvider.java | 2 +- .../impl/index/schema/SpatialIndexReader.java | 2 +- .../index/schema/StringIndexAccessor.java | 2 +- .../index/schema/StringIndexPopulator.java | 2 +- .../index/schema/StringIndexProvider.java | 2 +- .../impl/index/schema/StringIndexReader.java | 2 +- .../index/schema/TemporalIndexAccessor.java | 4 ++-- .../impl/index/schema/TemporalIndexFiles.java | 2 +- .../index/schema/TemporalIndexPartReader.java | 2 +- .../index/schema/TemporalIndexPopulator.java | 2 +- .../index/schema/TemporalIndexProvider.java | 2 +- .../index/schema/TemporalIndexReader.java | 2 +- .../schema/fusion/FusionIndexAccessor.java | 2 +- .../schema/fusion/FusionIndexProvider.java | 2 +- .../schema/fusion/FusionIndexReader.java | 2 +- .../kernel/impl/newapi/AllStoreHolder.java | 14 ++++++------ .../DefaultNodeExplicitIndexCursor.java | 5 +++-- .../newapi/DefaultNodeLabelIndexCursor.java | 4 ++-- .../newapi/DefaultNodeValueIndexCursor.java | 2 +- ...efaultRelationshipExplicitIndexCursor.java | 5 +++-- .../impl/newapi/IndexTxStateUpdater.java | 2 +- .../impl/newapi/NodeValueClientFilter.java | 2 +- .../neo4j/kernel/impl/newapi/Operations.java | 6 ++--- .../recordstorage/RecordStorageReader.java | 6 ++--- .../recordstorage/TransactionRecordState.java | 2 +- .../TransactionToRecordStateVisitor.java | 4 ++-- .../kernel/impl/store/SchemaStorage.java | 4 ++-- .../SchemaRuleDeserializer2_0to3_1.java | 6 ++--- .../store/record/SchemaRuleSerialization.java | 6 ++--- .../command/IndexBatchTransactionApplier.java | 2 +- .../DbStructureArgumentFormatter.java | 6 ++--- .../dbstructure/DbStructureCollector.java | 4 ++-- .../util/dbstructure/DbStructureVisitor.java | 2 +- .../dbstructure/GraphDbStructureGuide.java | 2 +- .../internal/BatchInserterImpl.java | 4 ++-- .../SchemaIndexDescriptorFactoryTest.java | 2 ++ .../index/TestIndexDescriptorFactory.java | 2 ++ .../builtinprocs/AwaitIndexProcedureTest.java | 2 +- .../builtinprocs/BuiltInProceduresTest.java | 4 ++-- .../ResampleIndexProcedureTest.java | 2 +- .../builtinprocs/StubKernelTransaction.java | 2 +- .../impl/api/BridgingIndexProgressorTest.java | 2 +- .../ConstraintIndexCreatorTest.java | 4 ++-- .../BatchingMultipleIndexPopulatorTest.java | 2 +- .../impl/api/index/FailedIndexProxyTest.java | 7 +++--- .../impl/api/index/IndexMapReferenceTest.java | 2 +- .../kernel/impl/api/index/IndexMapTest.java | 4 ++-- .../impl/api/index/IndexPopulationTest.java | 2 +- .../impl/api/index/IndexProxyAdapter.java | 3 +-- .../impl/api/index/IndexUpdaterMapTest.java | 4 ++-- .../impl/api/index/IndexingServiceTest.java | 10 ++++----- .../api/index/MultipleIndexPopulatorTest.java | 2 +- .../MultipleIndexPopulatorUpdatesTest.java | 4 ++-- .../impl/api/index/OnlineIndexProxyTest.java | 4 ++-- .../api/index/PopulatingIndexProxyTest.java | 2 +- .../sampling/IndexSamplingControllerTest.java | 6 ++--- .../sampling/OnlineIndexSamplingJobTest.java | 8 +++---- .../api/state/TxStateCompositeIndexTest.java | 2 +- .../kernel/impl/api/state/TxStateTest.java | 2 +- .../impl/api/store/SchemaCacheTest.java | 4 ++-- .../impl/index/schema/DateLayoutTestUtil.java | 2 +- .../index/schema/DateTimeLayoutTestUtil.java | 2 +- ...erredConflictCheckingIndexUpdaterTest.java | 2 +- .../index/schema/DurationLayoutTestUtil.java | 2 +- .../schema/IndexPopulationStressTest.java | 4 ++-- .../impl/index/schema/LayoutTestUtil.java | 4 ++-- .../schema/LocalDateTimeLayoutTestUtil.java | 2 +- .../index/schema/LocalTimeLayoutTestUtil.java | 2 +- .../index/schema/NativeIndexAccessorTest.java | 2 +- .../schema/NativeIndexPopulatorTest.java | 2 +- .../index/schema/NativeIndexProviderTest.java | 4 ++-- .../index/schema/NativeIndexTestUtil.java | 4 ++-- .../NativeNonUniqueIndexPopulatorTest.java | 2 +- .../NativeUniqueIndexPopulatorTest.java | 2 +- ...mberFullScanNonUniqueIndexSamplerTest.java | 2 +- .../index/schema/NumberIndexAccessorTest.java | 2 +- .../index/schema/NumberLayoutTestUtil.java | 2 +- .../schema/NumberNonUniqueLayoutTestUtil.java | 2 +- .../schema/NumberUniqueLayoutTestUtil.java | 2 +- .../schema/SpatialIndexSettingsTest.java | 4 ++-- .../index/schema/SpatialLayoutTestUtil.java | 4 ++-- .../index/schema/StringLayoutTestUtil.java | 2 +- .../schema/StringNonUniqueLayoutTestUtil.java | 2 +- .../schema/StringUniqueLayoutTestUtil.java | 2 +- .../impl/index/schema/TimeLayoutTestUtil.java | 2 +- .../index/schema/UniqueLayoutTestUtil.java | 2 +- .../fusion/FusionIndexAccessorTest.java | 4 ++-- .../fusion/FusionIndexProviderTest.java | 4 ++-- .../impl/newapi/IndexTxStateUpdaterTest.java | 2 +- .../impl/newapi/NodeSchemaMatcherTest.java | 2 +- .../newapi/NodeValueClientFilterTest.java | 2 +- .../impl/newapi/OperationsLockTest.java | 2 +- .../TransactionRecordStateTest.java | 2 +- .../kernel/impl/store/SchemaStoreTest.java | 6 ++--- .../impl/store/record/IndexRuleTest.java | 10 ++++----- .../record/SchemaRuleSerializationTest.java | 6 ++--- .../impl/store/record/SchemaRuleTestBase.java | 4 ++-- .../impl/transaction/command/Commands.java | 2 +- .../NeoStoreTransactionApplierTest.java | 4 ++-- .../NeoTransactionIndexApplierTest.java | 4 ++-- .../transaction/state/LogTruncationTest.java | 2 -- .../state/OnlineIndexUpdatesTest.java | 6 ++--- .../state/SchemaRuleCommandTest.java | 2 +- .../storageengine/api/StubStorageCursors.java | 4 ++-- .../QueryResultComparingIndexReader.java | 1 - .../api/schema/SimpleNodeValueClient.java | 1 - .../api/impl/index/AbstractDatabaseIndex.java | 2 +- .../api/impl/index/AbstractLuceneIndex.java | 2 +- .../index/AbstractLuceneIndexAccessor.java | 2 +- .../index/AbstractLuceneIndexProvider.java | 2 +- .../kernel/api/impl/index/DatabaseIndex.java | 2 +- .../index/ReadOnlyAbstractDatabaseIndex.java | 3 --- .../api/impl/schema/LuceneIndexAccessor.java | 2 +- .../api/impl/schema/LuceneIndexProvider.java | 6 ++--- .../api/impl/schema/LuceneSchemaIndex.java | 2 +- .../impl/schema/LuceneSchemaIndexBuilder.java | 2 +- .../schema/ReadOnlyDatabaseSchemaIndex.java | 2 +- .../schema/WritableDatabaseSchemaIndex.java | 6 +---- .../populator/UniqueLuceneIndexPopulator.java | 2 +- .../schema/reader/PartitionedIndexReader.java | 2 +- .../impl/schema/reader/SimpleIndexReader.java | 4 ++-- .../index/LuceneSchemaIndexPopulationIT.java | 2 +- ...neSchemaIndexUniquenessVerificationIT.java | 2 +- .../schema/AccessUniqueDatabaseIndexTest.java | 2 +- .../DatabaseCompositeIndexAccessorTest.java | 2 +- .../schema/DatabaseIndexAccessorTest.java | 2 +- .../impl/schema/LuceneIndexAccessorTest.java | 2 +- .../impl/schema/LuceneIndexProviderTest.java | 4 ++-- .../schema/LuceneSchemaIndexBuilderTest.java | 2 +- .../LuceneSchemaIndexCorruptionTest.java | 4 ++-- .../api/impl/schema/LuceneSchemaIndexIT.java | 2 +- .../LuceneSchemaIndexPopulatorTest.java | 4 ++-- .../impl/schema/LuceneSchemaIndexTest.java | 2 +- .../NonUniqueDatabaseIndexPopulatorTest.java | 4 ++-- .../UniqueDatabaseIndexPopulatorTest.java | 2 +- .../reader/PartitionedIndexReaderTest.java | 2 +- ...StartOldDbOn3_4AndCreateFusionIndexIT.java | 4 ++-- .../org/neo4j/kernel/api/SchemaIndexHaIT.java | 2 +- .../java/org/neo4j/kernel/ha/HaCountsIT.java | 2 +- .../builtinprocs/StubKernelTransaction.java | 2 +- .../UniquenessConstraintCreationIT.java | 4 ++-- .../org/neo4j/tools/dump/DumpCountsStore.java | 4 ++-- .../GraphDbStructureGuideTest.java | 2 +- .../neo4j/tools/dump/DumpCountsStoreTest.java | 4 ++-- .../dump/InconsistencyReportReaderTest.java | 2 +- 245 files changed, 380 insertions(+), 404 deletions(-) rename community/{kernel/src/main/java/org/neo4j/kernel/api/schema/index => kernel-api/src/main/java/org/neo4j/storageengine/api/schema}/CapableIndexDescriptor.java (92%) rename community/{kernel/src/main/java/org/neo4j/kernel/api/schema/index => kernel-api/src/main/java/org/neo4j/storageengine/api/schema}/IndexDescriptor.java (99%) rename community/{kernel/src/main/java/org/neo4j/kernel/api/schema/index => kernel-api/src/main/java/org/neo4j/storageengine/api/schema}/IndexDescriptorFactory.java (85%) rename community/{kernel/src/main/java/org/neo4j/kernel/api/schema/index => kernel-api/src/main/java/org/neo4j/storageengine/api/schema}/StoreIndexDescriptor.java (83%) diff --git a/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java b/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java index f57a3560810d1..e69a815a82856 100644 --- a/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java +++ b/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java @@ -74,7 +74,6 @@ import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.impl.api.index.EntityUpdates; @@ -107,6 +106,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.FormattedLog; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.string.UTF8; import org.neo4j.test.rule.SuppressOutput; import org.neo4j.values.storable.Value; @@ -134,8 +134,6 @@ import static org.neo4j.kernel.api.StatementConstants.ANY_RELATIONSHIP_TYPE; import static org.neo4j.kernel.api.labelscan.NodeLabelUpdate.labelChanges; import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forLabel; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forSchema; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.uniqueForSchema; 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; @@ -148,6 +146,8 @@ import static org.neo4j.kernel.impl.store.record.Record.NO_PREV_RELATIONSHIP; import static org.neo4j.kernel.impl.store.record.RecordLoad.FORCE; import static org.neo4j.kernel.impl.util.Bits.bits; +import static org.neo4j.storageengine.api.schema.IndexDescriptorFactory.forSchema; +import static org.neo4j.storageengine.api.schema.IndexDescriptorFactory.uniqueForSchema; import static org.neo4j.test.Property.property; import static org.neo4j.test.Property.set; diff --git a/community/community-it/index-it/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java b/community/community-it/index-it/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java index f0c78b56115f9..ef183ef483bad 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java @@ -35,10 +35,10 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.ImpermanentDatabaseRule; import org.neo4j.test.rule.concurrent.ThreadingRule; diff --git a/community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java b/community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java index d1ca790232b70..b9456f9bfdcc5 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java @@ -66,7 +66,7 @@ import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.LUCENE10; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.NATIVE10; import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forLabel; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forSchema; +import static org.neo4j.storageengine.api.schema.IndexDescriptorFactory.forSchema; public class NonUniqueIndexTest { diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java index 5ecc1bdd34aeb..600366ae247e3 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java @@ -37,7 +37,6 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.extension.ExtensionType; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.spi.KernelContext; @@ -46,6 +45,7 @@ import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.Lifecycle; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/api/MultipleOpenCursorsTest.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/api/MultipleOpenCursorsTest.java index 8bc24fd2beb0b..9dae88a1da18d 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/api/MultipleOpenCursorsTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/api/MultipleOpenCursorsTest.java @@ -48,8 +48,8 @@ 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.TestIndexDescriptorFactory; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.test.rule.RandomRule; diff --git a/community/community-it/index-it/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java b/community/community-it/index-it/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java index 549a0ac13cdfc..193e2a5121aac 100644 --- a/community/community-it/index-it/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java +++ b/community/community-it/index-it/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java @@ -63,8 +63,6 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.EntityUpdates; @@ -88,7 +86,9 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.scheduler.JobScheduler; import org.neo4j.storageengine.api.EntityType; +import org.neo4j.storageengine.api.schema.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.values.storable.Values; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/schema/DropBrokenUniquenessConstraintIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/schema/DropBrokenUniquenessConstraintIT.java index 347d5a6b8a847..b8a019eed381f 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/schema/DropBrokenUniquenessConstraintIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/schema/DropBrokenUniquenessConstraintIT.java @@ -26,12 +26,12 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryIT.java index 0ff33f755b5d4..f7a1d186b5b11 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryIT.java @@ -72,7 +72,6 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -105,6 +104,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.StorageEngine; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.AdversarialPageCacheGraphDatabaseFactory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.TestGraphDatabaseFactoryState; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java index bf01e7f0f8bb1..3e1782ac9071a 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java @@ -43,10 +43,10 @@ import org.neo4j.internal.kernel.api.Write; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.test.rule.ImpermanentDatabaseRule; import org.neo4j.values.storable.Values; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.storageengine.api.schema.IndexDescriptor.Type.UNIQUE; @RunWith( Parameterized.class ) public class CompositeIndexingIT diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java index 8f5d5891a8b72..50bf161c384c8 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java @@ -29,8 +29,8 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.values.storable.ArrayValue; import org.neo4j.values.storable.BooleanValue; import org.neo4j.values.storable.CoordinateReferenceSystem; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java index cd8036c89ff15..a0adc84f71c2d 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java @@ -28,10 +28,10 @@ import org.neo4j.collection.PrimitiveLongCollections; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.QueryResultComparingIndexReader; import org.neo4j.values.storable.Value; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java index 7bb45b77153cd..2800cb1852ef0 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java @@ -30,10 +30,10 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; public abstract class IndexAccessorCompatibility extends IndexProviderCompatibilityTestSuite.Compatibility diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java index 489a7a18b7ef3..1b8c5d6ea3189 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java @@ -39,8 +39,8 @@ 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.StoreIndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.rule.PageCacheAndDependenciesRule; import org.neo4j.test.rule.fs.DefaultFileSystemRule; import org.neo4j.test.runner.ParameterizedSuiteRunner; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java index dfd15b78ceff4..a7622150045d2 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java @@ -30,8 +30,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.TestIndexDescriptorFactory; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.values.storable.BooleanValue; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.DateTimeValue; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java index e583bb820aa93..5dfb2a893ab18 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java @@ -35,12 +35,12 @@ import org.neo4j.internal.kernel.api.exceptions.schema.IndexNotApplicableKernelException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.NodeValueIterator; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.QueryResultComparingIndexReader; import org.neo4j.values.storable.Value; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java index df4eafbce1766..7e45d7a7f269f 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java @@ -31,11 +31,11 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.DoubleLatch; import static org.mockito.Mockito.mock; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index d12f574a8177b..dc76a38e4b083 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -47,13 +47,13 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.IndexSample; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.values.storable.Values; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java index 10943773d4fde..3d1adacb64208 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java @@ -23,7 +23,6 @@ import org.junit.Before; import org.junit.Test; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Set; @@ -50,14 +49,13 @@ import org.neo4j.kernel.api.schema.MultiTokenSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constraints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.integrationtest.KernelIntegrationTest; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.storageengine.api.EntityType; +import org.neo4j.storageengine.api.schema.IndexDescriptor; -import static java.util.Arrays.asList; import static java.util.Collections.emptySet; import static java.util.Collections.singletonList; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index 7e5fab82e5d44..672bfbc678d5a 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -55,8 +55,6 @@ import org.neo4j.kernel.api.index.NodePropertyAccessor; 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.configuration.Config; import org.neo4j.kernel.impl.api.DatabaseSchemaState; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -67,6 +65,8 @@ import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.EntityType; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.test.DoubleLatch; import org.neo4j.test.OtherThreadExecutor; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index 275439841be18..12cdbfd94ab3b 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -48,7 +48,6 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; @@ -59,6 +58,7 @@ import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.IndexSample; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.values.storable.Values; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java index e78d0564064e4..7e9973d53ccc3 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java @@ -34,7 +34,6 @@ import org.neo4j.graphdb.mockfs.UncloseableDelegatingFileSystemAbstraction; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory; import org.neo4j.kernel.impl.api.CountsAccessor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingController; @@ -46,6 +45,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.register.Register.DoubleLongRegister; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java index 2b0a63f06ab4d..e941bf9d53619 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java @@ -53,8 +53,6 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; @@ -64,6 +62,8 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.register.Register.DoubleLongRegister; import org.neo4j.register.Registers; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.util.FeatureToggles; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java index 27cc522ec3dd4..a080c030b88dd 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java @@ -46,12 +46,12 @@ import org.neo4j.kernel.api.exceptions.schema.DuplicateSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.record.ConstraintRule; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.GraphDatabaseServiceCleaner; import org.neo4j.test.mockito.matcher.KernelExceptionUserMessageMatcher; import org.neo4j.test.rule.DatabaseRule; @@ -67,8 +67,8 @@ import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.kernel.api.index.IndexProvider.EMPTY; import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forLabel; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forSchema; -import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.uniqueForSchema; +import static org.neo4j.storageengine.api.schema.IndexDescriptorFactory.forSchema; +import static org.neo4j.storageengine.api.schema.IndexDescriptorFactory.uniqueForSchema; public class SchemaStorageTest { diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java index a73b10d3ab89c..85ad24db40831 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java @@ -64,7 +64,6 @@ import org.neo4j.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.query.ExecutingQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.TxStateHolder; import org.neo4j.kernel.impl.api.ClockContext; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; @@ -79,6 +78,7 @@ import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo; import org.neo4j.kernel.impl.query.statistic.StatisticProvider; import org.neo4j.storageengine.api.lock.ResourceType; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.values.virtual.VirtualValues; diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java index b92f6ec5f2e0b..cd9435047e6ba 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java @@ -65,8 +65,6 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.NodePropertyAccessor; import org.neo4j.kernel.api.labelscan.LabelScanStore; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.MyRelTypes; @@ -86,9 +84,11 @@ import org.neo4j.kernel.impl.store.record.RecordLoad; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.monitoring.Monitors; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.storageengine.api.schema.LabelScanReader; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.TestDirectory; diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java index 6d48e3cef4e95..c346dbf37435b 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java @@ -30,7 +30,6 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaProcessor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.SchemaRuleAccess; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; @@ -38,6 +37,7 @@ import org.neo4j.kernel.impl.store.record.PropertyKeyTokenRecord; import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; /** * Note that this class builds up an in-memory representation of the complete schema store by being used in diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java index 19bd01f65d13a..0204281edcdd3 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java @@ -42,13 +42,13 @@ import org.neo4j.helpers.collection.BoundedIterable; import org.neo4j.helpers.progress.ProgressMonitorFactory; import org.neo4j.kernel.api.labelscan.LabelScanStore; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.index.labelscan.NativeLabelScanStore; import org.neo4j.kernel.impl.store.RecordStore; import org.neo4j.kernel.impl.store.Scanner; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.StoreAccess; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static java.lang.String.format; import static org.neo4j.consistency.checking.full.MultiPassStore.ARRAYS; diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/IndexCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/IndexCheck.java index c3c1eba1798d3..4b9f6b0af43b7 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/IndexCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/IndexCheck.java @@ -26,7 +26,7 @@ import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.store.RecordAccess; import org.neo4j.consistency.store.synthetic.IndexEntry; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; public class IndexCheck implements RecordCheck { diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java index b7c58cf21fd22..33a3924da1b7c 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java @@ -41,13 +41,13 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.exceptions.schema.IndexNotApplicableKernelException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.LookupFilter; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.PropertyBlock; import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.kernel.impl.store.record.Record; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java index 0b47fd19c50a2..420667247556a 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java @@ -32,12 +32,12 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexProviderMap; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.store.RecordStore; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.record.DynamicRecord; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; public class IndexAccessors implements Closeable { diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java b/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java index 1d66f41e6ce0b..66db2576b2469 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java @@ -31,7 +31,6 @@ import org.neo4j.consistency.store.synthetic.LabelScanDocument; import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NeoStoreRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; @@ -42,6 +41,7 @@ import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; public interface ConsistencyReport { diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/store/synthetic/IndexRecord.java b/community/consistency-check/src/main/java/org/neo4j/consistency/store/synthetic/IndexRecord.java index c7fc00bd24a4b..400a1484b6aed 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/store/synthetic/IndexRecord.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/store/synthetic/IndexRecord.java @@ -20,7 +20,7 @@ package org.neo4j.consistency.store.synthetic; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; public class IndexRecord extends AbstractBaseRecord { diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java index b8ecd0ee214fd..8ffcf5f3f413a 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java @@ -26,13 +26,13 @@ import org.neo4j.consistency.store.RecordAccessStub; import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.PropertyKeyTokenRecord; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; 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 bc02e9b802027..276937cb95b47 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,9 +21,9 @@ import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.ConstraintRule; +import org.neo4j.storageengine.api.schema.IndexDescriptorFactory; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forLabel; 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 102f5e47cd70f..0a3ca4bde5c08 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 @@ -52,11 +52,9 @@ import org.neo4j.consistency.store.synthetic.CountsEntry; import org.neo4j.consistency.store.synthetic.IndexEntry; import org.neo4j.consistency.store.synthetic.LabelScanDocument; +import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; @@ -68,7 +66,9 @@ import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord; import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord; +import org.neo4j.storageengine.api.schema.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static java.lang.String.format; import static org.hamcrest.Matchers.containsString; @@ -390,7 +390,7 @@ private Object parameter( Class type ) } if ( type == StoreIndexDescriptor.class ) { - return IndexDescriptorFactory.forSchema( forLabel( 2, 3 ), IndexProvider.UNDECIDED ).withId( 1 ); + return IndexDescriptorFactory.forSchema( forLabel( 2, 3 ), IndexProviderDescriptor.UNDECIDED ).withId( 1 ); } if ( type == SchemaRule.class ) { 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 335134a6b8ad9..10057984b016c 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundPlanContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundPlanContext.scala @@ -36,7 +36,6 @@ import org.neo4j.internal.kernel.api.procs.{DefaultParameterValue, Neo4jTypes} import org.neo4j.internal.kernel.api.{IndexReference, InternalIndexState, procs} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptor -import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} import org.neo4j.procedure.Mode import scala.collection.JavaConverters._ diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/IndexDescriptorCompatibility.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/IndexDescriptorCompatibility.scala index 35bc1bfbf0ae7..0c88f65da7ac1 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/IndexDescriptorCompatibility.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/IndexDescriptorCompatibility.scala @@ -23,10 +23,10 @@ import org.neo4j.cypher.internal.planner.v3_4.spi.{IndexLimitation, SlowContains import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor import org.neo4j.internal.kernel.api.{IndexLimitation => KernelIndexLimitation} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory -import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.storageengine.api.schema.IndexDescriptor trait IndexDescriptorCompatibility { - def kernelToCypher(index: KernelIndexDescriptor): CypherIndexDescriptor = + def kernelToCypher(index: IndexDescriptor): CypherIndexDescriptor = CypherIndexDescriptor(index.schema().keyId, index.schema().getPropertyIds) def kernelToCypher(limitation: KernelIndexLimitation): IndexLimitation = { diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/TransactionBoundPlanContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/TransactionBoundPlanContext.scala index 19e249803b577..c7b18dc32e49c 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/TransactionBoundPlanContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/TransactionBoundPlanContext.scala @@ -33,8 +33,8 @@ import org.neo4j.internal.kernel.api.procs.{DefaultParameterValue, Neo4jTypes} import org.neo4j.internal.kernel.api.{IndexReference, InternalIndexState, procs} import org.neo4j.kernel.api.KernelTransaction import org.neo4j.kernel.api.schema.SchemaDescriptorFactory -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor import org.neo4j.procedure.Mode +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor 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 6076bfc375448..3ac905d80f316 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 @@ -20,13 +20,13 @@ package org.neo4j.cypher.internal.runtime.interpreted import org.neo4j.cypher.internal.planner.v3_5.spi.{IndexLimitation, SlowContains, IndexDescriptor => CypherIndexDescriptor} -import org.neo4j.internal.kernel.api.{IndexLimitation => KernelIndexLimitation} import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor +import org.neo4j.internal.kernel.api.{IndexLimitation => KernelIndexLimitation} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory -import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} +import org.neo4j.storageengine.api.schema.IndexDescriptor trait IndexDescriptorCompatibility { - def kernelToCypher(index: KernelIndexDescriptor): CypherIndexDescriptor = + def kernelToCypher(index: IndexDescriptor): CypherIndexDescriptor = CypherIndexDescriptor(index.schema().keyId, index.schema().getPropertyIds) def kernelToCypher(limitation: KernelIndexLimitation): IndexLimitation = { 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 f3332e779c06a..fa07a4c24e1f5 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 @@ -29,8 +29,8 @@ import org.neo4j.internal.kernel.api.procs.Neo4jTypes.AnyType import org.neo4j.internal.kernel.api.procs.{DefaultParameterValue, Neo4jTypes} import org.neo4j.internal.kernel.api.{IndexReference, InternalIndexState, procs} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor import org.neo4j.procedure.Mode +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor import org.opencypher.v9_0.frontend.phases.InternalNotificationLogger import org.opencypher.v9_0.util.CypherExecutionException import org.opencypher.v9_0.util.symbols._ diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/IndexProviderDescriptor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/IndexProviderDescriptor.java index e7d18fe4b4d59..23144f163ab11 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/IndexProviderDescriptor.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/IndexProviderDescriptor.java @@ -21,6 +21,12 @@ public class IndexProviderDescriptor { + /** + * Indicate that {@link IndexProviderDescriptor} has not yet been decided. + * Specifically before transaction that create a new index has committed. + */ + public static final IndexProviderDescriptor UNDECIDED = new IndexProviderDescriptor( "Undecided", "0" ); + private final String key; private final String version; diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/StorageReader.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/StorageReader.java index 3f684a46a74f3..77ac9042075b8 100644 --- a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/StorageReader.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/StorageReader.java @@ -29,10 +29,9 @@ import org.neo4j.internal.kernel.api.exceptions.schema.IndexNotFoundKernelException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.register.Register.DoubleLongRegister; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.LabelScanReader; import org.neo4j.storageengine.api.schema.PopulationProgress; diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/AbstractIndexReader.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/AbstractIndexReader.java index f4ca53cfed2c1..eed1b2fa6dde3 100644 --- a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/AbstractIndexReader.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/AbstractIndexReader.java @@ -21,8 +21,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.IndexDescriptor; +import org.neo4j.internal.kernel.api.exceptions.schema.IndexNotApplicableKernelException; public abstract class AbstractIndexReader implements IndexReader { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/CapableIndexDescriptor.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/CapableIndexDescriptor.java similarity index 92% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/CapableIndexDescriptor.java rename to community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/CapableIndexDescriptor.java index 87011f8491837..92ac69830d45b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/CapableIndexDescriptor.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/CapableIndexDescriptor.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema.index; +package org.neo4j.storageengine.api.schema; import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.IndexLimitation; @@ -32,7 +32,7 @@ public class CapableIndexDescriptor extends StoreIndexDescriptor { private final IndexCapability indexCapability; - CapableIndexDescriptor( StoreIndexDescriptor indexDescriptor, IndexCapability indexCapability ) + public CapableIndexDescriptor( StoreIndexDescriptor indexDescriptor, IndexCapability indexCapability ) { super( indexDescriptor ); this.indexCapability = indexCapability; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexDescriptor.java similarity index 99% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java rename to community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexDescriptor.java index 1bc435f8b23b5..09ff947f8d6f7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexDescriptor.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema.index; +package org.neo4j.storageengine.api.schema; import java.util.Optional; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexDescriptorFactory.java similarity index 85% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java rename to community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexDescriptorFactory.java index 2cda0365a4dbf..d315948fd6c88 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexDescriptorFactory.java @@ -17,16 +17,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema.index; +package org.neo4j.storageengine.api.schema; import java.util.Optional; import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.index.IndexProvider; -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.internal.kernel.api.schema.IndexProviderDescriptor.UNDECIDED; +import static org.neo4j.storageengine.api.schema.IndexDescriptor.Type.GENERAL; +import static org.neo4j.storageengine.api.schema.IndexDescriptor.Type.UNIQUE; public class IndexDescriptorFactory { @@ -36,7 +36,7 @@ private IndexDescriptorFactory() public static IndexDescriptor forSchema( SchemaDescriptor schema ) { - return forSchema( schema, IndexProvider.UNDECIDED ); + return forSchema( schema, UNDECIDED ); } public static IndexDescriptor forSchema( SchemaDescriptor schema, @@ -54,7 +54,7 @@ public static IndexDescriptor forSchema( SchemaDescriptor schema, public static IndexDescriptor uniqueForSchema( SchemaDescriptor schema ) { - return uniqueForSchema( schema, IndexProvider.UNDECIDED ); + return uniqueForSchema( schema, UNDECIDED ); } public static IndexDescriptor uniqueForSchema( SchemaDescriptor schema, diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexProgressor.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexProgressor.java index 7880ff4543540..44c0fefa329e3 100644 --- a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexProgressor.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/IndexProgressor.java @@ -21,9 +21,6 @@ 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.impl.index.labelscan.LabelScanValueIndexProgressor; -import org.neo4j.kernel.impl.newapi.ExplicitIndexProgressor; import org.neo4j.values.storable.Value; /** @@ -104,7 +101,7 @@ interface NodeLabelClient * @param providesLabels true if the progression can provide label information * @param label the label to scan for */ - void scan( LabelScanValueIndexProgressor progressor, boolean providesLabels, int label ); + void scan( IndexProgressor progressor, boolean providesLabels, int label ); void unionScan( IndexProgressor progressor, boolean providesLabels, int... labels ); @@ -130,7 +127,7 @@ interface ExplicitClient * @param progressor the progressor * @param expectedSize expected number of entries this progressor will feed the client. */ - void initialize( ExplicitIndexProgressor progressor, int expectedSize ); + void initialize( IndexProgressor progressor, int expectedSize ); /** * Accept the entity id and a score. Return true if the entry is accepted, false otherwise diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java index c99abb11ac4b7..917fad1f415a1 100644 --- a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java @@ -26,7 +26,6 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptorSupplier; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; /** * Represents a stored schema rule. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/StoreIndexDescriptor.java similarity index 83% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java rename to community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/StoreIndexDescriptor.java index ba1a23149f36c..9003c93a7e147 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/StoreIndexDescriptor.java @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema.index; +package org.neo4j.storageengine.api.schema; import org.neo4j.internal.kernel.api.IndexCapability; -import org.neo4j.kernel.impl.api.index.IndexProviderMap; -import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; -import org.neo4j.storageengine.api.schema.SchemaRule; import static org.neo4j.internal.kernel.api.schema.SchemaUtil.idTokenNameLookup; @@ -30,9 +27,6 @@ * Describes an index which is committed to the database. * * Adds an index id, a name, and optionally an owning constraint id to the general IndexDescriptor. - * - * Can be upgraded to a {@link CapableIndexDescriptor} by adding {@link IndexCapability} to this index, - * using {@link StoreIndexDescriptor#withoutCapabilities()} or {@link StoreIndexDescriptor#withCapabilities(IndexProviderMap)} */ public class StoreIndexDescriptor extends IndexDescriptor implements SchemaRule { @@ -84,8 +78,6 @@ protected StoreIndexDescriptor( StoreIndexDescriptor indexDescriptor ) * creates the unique index, and then waits for the index to become fully populated and online before creating * the actual constraint. During unique index population the owning constraint will be null. * - * See {@link ConstraintIndexCreator}. - * * @return the id of the owning constraint, or null if this has not been set yet. * @throws IllegalStateException if this IndexRule cannot support uniqueness constraints (ei. the index is not * unique) @@ -136,18 +128,6 @@ public CapableIndexDescriptor withoutCapabilities() return new CapableIndexDescriptor( this, IndexCapability.NO_CAPABILITY ); } - /** - * Create a {@link CapableIndexDescriptor} from this index descriptor, with the capabilities that correspond - * to this indexes index provider, according to the given {@link IndexProviderMap}. - * - * @return a CapableIndexDescriptor. - */ - public CapableIndexDescriptor withCapabilities( IndexProviderMap indexProviderMap ) - { - IndexCapability capability = indexProviderMap.lookup( providerDescriptor ).getCapability(); - return new CapableIndexDescriptor( this, capability ); - } - // ** Misc /** diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java index a50b0b8cdbf69..f8623ab93839e 100644 --- a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java @@ -26,9 +26,9 @@ import org.neo4j.internal.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.state.GraphState; import org.neo4j.storageengine.api.RelationshipVisitor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; import org.neo4j.values.storable.ValueTuple; diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java index 9cc2aa4da4b25..54e5b13140b20 100644 --- a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java @@ -28,8 +28,8 @@ import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.internal.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.StorageProperty; +import org.neo4j.storageengine.api.schema.IndexDescriptor; /** * A visitor for visiting the changes that have been made in a transaction. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java b/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java index 486b4424d19ca..46cc22c359e72 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java @@ -32,8 +32,8 @@ import org.neo4j.internal.kernel.api.security.AuthSubject; import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.internal.kernel.api.security.SecurityContext; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.ClockContext; +import org.neo4j.storageengine.api.schema.IndexDescriptor; /** * Extends the outwards-facing {@link org.neo4j.internal.kernel.api.Transaction} with additional functionality 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 c17384d0c91e0..4a931ed550af1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java @@ -23,7 +23,7 @@ import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueTuple; 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 dea5df793bf15..3ab2cb5e1190a 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,10 +24,10 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.UpdateMode; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexSample; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; /** * Used for initial population of an index. 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 cca7d52097996..d07d90c46a6eb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java @@ -27,12 +27,12 @@ import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.kernel.lifecycle.LifecycleAdapter; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; /** * Contract for implementing an index in Neo4j. @@ -190,12 +190,6 @@ public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws Ill } }; - /** - * Indicate that {@link IndexProviderDescriptor} has not yet been decided. - * Specifically before transaction that create a new index has committed. - */ - public static final IndexProviderDescriptor UNDECIDED = new IndexProviderDescriptor( "Undecided", "0" ); - protected final int priority; private final IndexProviderDescriptor providerDescriptor; private final IndexDirectoryStructure.Factory directoryStructureFactory; 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 e566bff174981..6ac91410ccd05 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 @@ -24,9 +24,9 @@ import java.io.File; import java.util.StringJoiner; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.logging.Log; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static org.neo4j.helpers.Format.duration; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constraints/IndexBackedConstraintDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constraints/IndexBackedConstraintDescriptor.java index f47e33cd99aa9..400c7a9fd810e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constraints/IndexBackedConstraintDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constraints/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.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptorFactory; public abstract class IndexBackedConstraintDescriptor extends ConstraintDescriptor implements LabelSchemaSupplier { 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 e970583ef7393..89f34c9c7b601 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java @@ -22,7 +22,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constraints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.txstate.ReadableTransactionState; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueTuple; 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 a42097aa3e93c..97583df89255e 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,9 +23,9 @@ import java.util.Map; import org.neo4j.internal.kernel.api.exceptions.schema.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexProxy; import org.neo4j.kernel.impl.api.index.IndexingService; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; public interface IndexReaderFactory 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 d8df71fbf524d..208f9d415cb1e 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 @@ -65,7 +65,6 @@ import org.neo4j.kernel.api.exceptions.ConstraintViolationTransactionFailureException; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.explicitindex.AutoIndexing; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.api.txstate.TxStateHolder; @@ -100,6 +99,7 @@ import org.neo4j.storageengine.api.StorageCommand; import org.neo4j.storageengine.api.StorageEngine; import org.neo4j.storageengine.api.StorageReader; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.txstate.TxStateVisitor; import static java.lang.String.format; 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 69fb5e34bf536..da7bd9a771683 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 @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.values.storable.Value; 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 bf187b29c8125..a3f385be2bcc7 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 @@ -21,8 +21,8 @@ import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java index 924045403c975..48089fd8be644 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java @@ -20,15 +20,14 @@ package org.neo4j.kernel.impl.api.index; import java.io.File; -import java.io.IOException; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.values.storable.Value; import static org.neo4j.helpers.collection.Iterators.emptyResourceIterator; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedPopulatingIndexProxyFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedPopulatingIndexProxyFactory.java index f38b76d28bd3f..ed1bab32066b5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedPopulatingIndexProxyFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedPopulatingIndexProxyFactory.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.impl.api.index; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; import org.neo4j.logging.LogProvider; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import static org.neo4j.kernel.impl.api.index.IndexPopulationFailure.failure; 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 ea592ee72aa1e..6959a9b1e9286 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 @@ -39,8 +39,8 @@ import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.DelegatingIndexUpdater; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java index 72aa7bc46e8b4..fff09dcc403e0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java @@ -40,8 +40,8 @@ import java.util.Set; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.storageengine.api.EntityType; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; /** * Bundles various mappings to IndexProxy. Used by IndexingService via IndexMapReference. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationJob.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationJob.java index dc01e7850a58e..2a52e111e0da3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationJob.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationJob.java @@ -26,7 +26,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.PopulationProgress; import static java.lang.Thread.currentThread; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProviderMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProviderMap.java index 0be9a06a740e6..8825aaad354d8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProviderMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProviderMap.java @@ -21,8 +21,11 @@ import java.util.function.Consumer; +import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.kernel.api.index.IndexProvider; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; /** * Contains mapping from {@link IndexProviderDescriptor} or provider name to {@link IndexProvider}. @@ -62,6 +65,18 @@ public interface IndexProviderMap */ void accept( Consumer visitor ); + /** + * Create a {@link CapableIndexDescriptor} from the given index descriptor, which includes the capabilities + * that correspond to those of the index provider of the given {@code descriptor}, found in this {@link IndexProviderMap}. + * + * @return a CapableIndexDescriptor. + */ + default CapableIndexDescriptor withCapabilities( StoreIndexDescriptor descriptor ) + { + IndexCapability capability = lookup( descriptor.providerDescriptor() ).getCapability(); + return new CapableIndexDescriptor( descriptor, capability ); + } + IndexProviderMap EMPTY = new IndexProviderMap() { @Override 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 0d6bce3cfaa99..f0b8ccdc0106d 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 @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.values.storable.Value; 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 91ac083c50c23..2df72f321cf8a 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 @@ -25,10 +25,10 @@ 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.CapableIndexDescriptor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.logging.LogProvider; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static java.lang.String.format; @@ -63,7 +63,7 @@ IndexProxy createPopulatingIndexProxy( final StoreIndexDescriptor descriptor, fi final String indexUserDescription = indexUserDescription( descriptor ); IndexPopulator populator = populatorFromProvider( descriptor, samplingConfig ); - CapableIndexDescriptor capableIndexDescriptor = descriptor.withCapabilities( providerMap ); + CapableIndexDescriptor capableIndexDescriptor = providerMap.withCapabilities( descriptor ); FailedIndexProxyFactory failureDelegateFactory = new FailedPopulatingIndexProxyFactory( capableIndexDescriptor, populator, @@ -95,7 +95,7 @@ IndexProxy createPopulatingIndexProxy( final StoreIndexDescriptor descriptor, fi IndexProxy createRecoveringIndexProxy( StoreIndexDescriptor descriptor ) { - CapableIndexDescriptor capableIndexDescriptor = descriptor.withCapabilities( providerMap ); + CapableIndexDescriptor capableIndexDescriptor = providerMap.withCapabilities( descriptor ); IndexProxy proxy = new RecoveringIndexProxy( capableIndexDescriptor ); return new ContractCheckingIndexProxy( proxy, true ); } @@ -105,7 +105,7 @@ IndexProxy createOnlineIndexProxy( StoreIndexDescriptor descriptor ) try { IndexAccessor onlineAccessor = onlineAccessorFromProvider( descriptor, samplingConfig ); - CapableIndexDescriptor capableIndexDescriptor = descriptor.withCapabilities( providerMap ); + CapableIndexDescriptor capableIndexDescriptor = providerMap.withCapabilities( descriptor ); IndexProxy proxy; proxy = new OnlineIndexProxy( capableIndexDescriptor, onlineAccessor, storeView, false ); proxy = new ContractCheckingIndexProxy( proxy, true ); @@ -123,7 +123,7 @@ IndexProxy createOnlineIndexProxy( StoreIndexDescriptor descriptor ) IndexProxy createFailedIndexProxy( StoreIndexDescriptor descriptor, IndexPopulationFailure populationFailure ) { IndexPopulator indexPopulator = populatorFromProvider( descriptor, samplingConfig ); - CapableIndexDescriptor capableIndexDescriptor = descriptor.withCapabilities( providerMap ); + CapableIndexDescriptor capableIndexDescriptor = providerMap.withCapabilities( descriptor ); String indexUserDescription = indexUserDescription( descriptor ); IndexProxy proxy; proxy = new FailedIndexProxy( capableIndexDescriptor, 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 b1fcfaa0d9c6e..e030cec4a0750 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 @@ -58,8 +58,6 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; 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; @@ -72,6 +70,8 @@ import org.neo4j.register.Registers; import org.neo4j.scheduler.JobScheduler; import org.neo4j.storageengine.api.EntityType; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.Value; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingServiceFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingServiceFactory.java index ec8306a4f17d5..b4a488cb38223 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingServiceFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingServiceFactory.java @@ -20,7 +20,6 @@ package org.neo4j.kernel.impl.api.index; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -28,6 +27,7 @@ import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingControllerFactory; import org.neo4j.logging.LogProvider; import org.neo4j.scheduler.JobScheduler; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; /** * Factory to create {@link IndexingService} diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java index 62db749de57d1..d6885b1bce84e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java @@ -47,11 +47,11 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.storageengine.api.EntityType; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.util.FeatureToggles; 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 196d6d97e5834..574e9970dd2d3 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 @@ -29,8 +29,8 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.UpdateCountingIndexUpdater; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.values.storable.Value; 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 1b2f1832c3ac6..32c9e5d7020bf 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 @@ -27,7 +27,7 @@ import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RecoveringIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RecoveringIndexProxy.java index 908c71b8b7a14..81e5d1a89914c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RecoveringIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RecoveringIndexProxy.java @@ -23,7 +23,7 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.values.storable.Value; 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 a709c34c8e708..b35182f3078ce 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java @@ -26,13 +26,13 @@ import org.neo4j.collection.PrimitiveLongCollections; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMap; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; import org.neo4j.kernel.impl.api.index.IndexProxy; import org.neo4j.scheduler.Group; -import org.neo4j.scheduler.JobScheduler; import org.neo4j.scheduler.JobHandle; +import org.neo4j.scheduler.JobScheduler; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static java.util.concurrent.TimeUnit.SECONDS; import static org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode.BACKGROUND_REBUILD_UPDATED; 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 3b150544ad8ae..4e67f982a7777 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,13 +22,13 @@ import java.util.function.Predicate; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; import org.neo4j.kernel.impl.api.index.IndexStoreView; -import org.neo4j.scheduler.JobScheduler; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.register.Register.DoubleLongRegister; +import org.neo4j.scheduler.JobScheduler; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static org.neo4j.register.Registers.newDoubleLongRegister; 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 b366c011474bb..5b3fc676386d2 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.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; 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 ae609050bb839..3df0ec3d5f199 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java @@ -45,13 +45,13 @@ import org.neo4j.kernel.api.index.NodePropertyAccessor; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constraints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; import org.neo4j.kernel.impl.api.index.IndexProxy; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.locking.Locks.Client; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import static org.neo4j.internal.kernel.api.Transaction.Type.implicit; import static org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException.Phase.VERIFICATION; 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 86f93f4939e98..5f60d7555f361 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 @@ -39,7 +39,6 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constraints.IndexBackedConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.util.collection.CollectionsFactory; import org.neo4j.kernel.impl.util.collection.OnHeapCollectionsFactory; @@ -48,6 +47,7 @@ import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSetsImpl; import org.neo4j.storageengine.api.Direction; import org.neo4j.storageengine.api.RelationshipVisitor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.txstate.DiffSetsVisitor; import org.neo4j.storageengine.api.txstate.LongDiffSets; import org.neo4j.storageengine.api.txstate.NodeState; 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 8ed8675da9085..38d4de7cbb331 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,12 +40,12 @@ 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.CapableIndexDescriptor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexProviderMap; import org.neo4j.kernel.impl.constraints.ConstraintSemantics; import org.neo4j.kernel.impl.store.record.ConstraintRule; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static java.util.Collections.emptyIterator; @@ -302,7 +302,7 @@ void addSchemaRule( SchemaRule rule ) } else if ( rule instanceof StoreIndexDescriptor ) { - CapableIndexDescriptor index = ((StoreIndexDescriptor) rule).withCapabilities( indexProviderMap ); + CapableIndexDescriptor index = indexProviderMap.withCapabilities( (StoreIndexDescriptor) rule ); indexDescriptorById.put( index.getId(), index ); SchemaDescriptor schemaDescriptor = index.schema(); indexDescriptors.put( schemaDescriptor, index ); 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 aaa8647c35f12..bd280be4d0f7e 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 @@ -29,7 +29,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.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.values.storable.ValueTuple; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexAccessor.java index 42405f7d1768d..a2de3a256e242 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexAccessor.java @@ -28,10 +28,10 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.util.Validator; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.Value; class GenericNativeIndexAccessor extends NativeIndexAccessor diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexPopulator.java index bf5fdbd7a5c91..5e264e33284eb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexPopulator.java @@ -25,9 +25,9 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; class GenericNativeIndexPopulator extends NativeIndexPopulator { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProvider.java index ec6c68922efa9..870887be40105 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProvider.java @@ -34,8 +34,8 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.ValueCategory; /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexReader.java index d4f6bc16d453e..520f2f0e08064 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexReader.java @@ -26,8 +26,8 @@ import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; import org.neo4j.internal.kernel.api.IndexQuery.RangePredicate; import org.neo4j.internal.kernel.api.IndexQuery.StringPrefixPredicate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; import org.neo4j.values.storable.Values; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndex.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndex.java index cc564ede2f9cd..41410a4ab4a34 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndex.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndex.java @@ -32,8 +32,8 @@ 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.StoreIndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_READER; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessor.java index a2220eb66ffe2..ab16ee17f3e23 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessor.java @@ -33,10 +33,10 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static org.neo4j.helpers.collection.Iterators.asResourceIterator; import static org.neo4j.helpers.collection.Iterators.iterator; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexPopulator.java index 2a9284eb46b97..bcea30693b816 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexPopulator.java @@ -45,19 +45,19 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; 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; import org.neo4j.kernel.impl.api.index.sampling.UniqueIndexSampler; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.util.concurrent.Work; import org.neo4j.util.concurrent.WorkSync; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; +import static org.neo4j.storageengine.api.schema.IndexDescriptor.Type.GENERAL; +import static org.neo4j.storageengine.api.schema.IndexDescriptor.Type.UNIQUE; /** * {@link IndexPopulator} backed by a {@link GBPTree}. 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 f6dbfbf41a6e3..33a5fe59e0643 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 @@ -34,9 +34,9 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; /** * Base class for native indexes on top of {@link GBPTree}. @@ -52,8 +52,8 @@ abstract class NativeIndexProvider,VALUE extends protected final RecoveryCleanupWorkCollector recoveryCleanupWorkCollector; protected final boolean readOnly; - protected NativeIndexProvider( IndexProviderDescriptor descriptor, int priority, Factory directoryStructureFactory, PageCache pageCache, FileSystemAbstraction fs, - Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, boolean readOnly ) + protected NativeIndexProvider( IndexProviderDescriptor descriptor, int priority, Factory directoryStructureFactory, PageCache pageCache, + FileSystemAbstraction fs, Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, boolean readOnly ) { super( descriptor, priority, directoryStructureFactory ); this.pageCache = pageCache; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexReader.java index b85008eec8215..b5d6f560de64b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexReader.java @@ -33,8 +33,8 @@ 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.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSampler; 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 72446ceebdf9a..0dc8d486c4774 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java @@ -24,7 +24,7 @@ import org.neo4j.collection.PrimitiveLongCollections; import org.neo4j.collection.PrimitiveLongResourceIterator; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexAccessor.java index 23da297674e53..e056fca6b27e5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexAccessor.java @@ -27,9 +27,9 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; public class NumberIndexAccessor extends NativeIndexAccessor { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexPopulator.java index 12e51f4e4a25f..1ff38b4e9eb15 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexPopulator.java @@ -25,9 +25,9 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; class NumberIndexPopulator extends NativeIndexPopulator { 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 bf3de3a0ae6cd..58762b50d3e7d 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 @@ -34,8 +34,8 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.ValueCategory; /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexReader.java index 49ce3dbc822d2..86469a6739256 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexReader.java @@ -25,8 +25,8 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; import org.neo4j.internal.kernel.api.IndexQuery.RangePredicate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; import org.neo4j.values.storable.Values; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java index 54cad84438a98..07de4a7fdc92c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java @@ -40,10 +40,10 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.CoordinateReferenceSystem; import static org.neo4j.helpers.collection.Iterators.concatResourceIterators; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPartReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPartReader.java index 258754bae52d9..acefa89b0ffb7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPartReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPartReader.java @@ -34,9 +34,9 @@ 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.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.schema.BridgingIndexProgressor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java index 378ffc1dc3491..be8c8fcc7b493 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java @@ -35,11 +35,11 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.config.SpaceFillingCurveSettings; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.PointValue; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java index 0ec85c5f8b882..46f5bf3e78c51 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java @@ -37,12 +37,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.StoreIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.config.ConfiguredSpaceFillingCurveSettingsCache; import org.neo4j.kernel.impl.index.schema.config.SpatialIndexSettings; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.ValueCategory; public class SpatialIndexProvider extends IndexProvider diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java index 481de808571d1..316900bb7faac 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java @@ -27,9 +27,9 @@ import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExistsPredicate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.schema.BridgingIndexProgressor; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexSampler; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSampler; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexAccessor.java index 991ae07397352..22ec9fa3cd25f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexAccessor.java @@ -29,10 +29,10 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.util.Validator; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.Value; /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexPopulator.java index 1525f915a5b2e..64b998cc6dbab 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexPopulator.java @@ -25,9 +25,9 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; public class StringIndexPopulator extends NativeIndexPopulator { 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 842a0944e5fc3..6c411c71cedc2 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 @@ -35,8 +35,8 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.ValueCategory; /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexReader.java index 612b42afd9986..6928ca64a7cf3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexReader.java @@ -25,8 +25,8 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; import org.neo4j.internal.kernel.api.IndexQuery.RangePredicate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; import org.neo4j.values.storable.Values; 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 9104d0fe2447a..71a1b6f58bc01 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,11 +39,11 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import static org.neo4j.helpers.collection.Iterators.concatResourceIterators; import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexBase.forAll; 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 0cc2d4e436d1b..3748512a182a2 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 @@ -27,7 +27,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.StoreIndexDescriptor; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.ValueGroup; class TemporalIndexFiles 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 27cb844929a51..350a8ec060b73 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPartReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPartReader.java @@ -23,8 +23,8 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; import org.neo4j.values.storable.Values; 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 4b0fe0cf47970..90338c81093c8 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 @@ -33,10 +33,10 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; 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 b64d8bfcb4132..d9e4fe29670da 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 @@ -34,9 +34,9 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.ValueCategory; public class TemporalIndexProvider extends IndexProvider 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 163e05957ee57..fb01ec1827545 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 @@ -27,9 +27,9 @@ import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExistsPredicate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.schema.BridgingIndexProgressor; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexSampler; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSampler; 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 c47299dd87798..68fdc21b6ab14 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 @@ -30,10 +30,10 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyAccessor; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.DropAction; import org.neo4j.storageengine.api.schema.IndexReader; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.Value; import static org.neo4j.helpers.collection.Iterators.concatResourceIterators; 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 9e163fdad6ca0..44f2732c07ace 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 @@ -39,10 +39,10 @@ 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.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.newapi.UnionIndexCapability; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.values.storable.ValueCategory; import static org.neo4j.internal.kernel.api.InternalIndexState.FAILED; 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 2dffca8bd2a2b..b6996a306825e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java @@ -27,8 +27,8 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExistsPredicate; import org.neo4j.internal.kernel.api.exceptions.schema.IndexNotApplicableKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.schema.BridgingIndexProgressor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSampler; 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 0b82dd78733fb..611d0dd2c80bf 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 @@ -42,6 +42,7 @@ import org.neo4j.internal.kernel.api.procs.QualifiedName; import org.neo4j.internal.kernel.api.procs.UserAggregator; import org.neo4j.internal.kernel.api.procs.UserFunctionHandle; +import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; @@ -51,15 +52,10 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.IndexProvider; 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.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.txstate.TransactionCountingStateVisitor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.ClockContext; @@ -76,10 +72,14 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.register.Register; import org.neo4j.storageengine.api.StorageReader; +import org.neo4j.storageengine.api.schema.CapableIndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptor; +import org.neo4j.storageengine.api.schema.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.LabelScanReader; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.storageengine.api.schema.SchemaRule; +import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; import org.neo4j.storageengine.api.txstate.ReadableDiffSets; import org.neo4j.values.AnyValue; import org.neo4j.values.ValueMapper; @@ -397,13 +397,13 @@ public IndexReference indexReferenceUnchecked( int label, int... properties ) { return IndexDescriptorFactory.forSchema( SchemaDescriptorFactory.forLabel( label, properties ), Optional.empty(), - IndexProvider.UNDECIDED ); + IndexProviderDescriptor.UNDECIDED ); } @Override public IndexReference indexReferenceUnchecked( SchemaDescriptor schema ) { - return IndexDescriptorFactory.forSchema( schema, Optional.empty(), IndexProvider.UNDECIDED ); + return IndexDescriptorFactory.forSchema( schema, Optional.empty(), IndexProviderDescriptor.UNDECIDED ); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeExplicitIndexCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeExplicitIndexCursor.java index 1f630d043c9d2..81802fe532c3c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeExplicitIndexCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeExplicitIndexCursor.java @@ -20,11 +20,12 @@ package org.neo4j.kernel.impl.newapi; import org.neo4j.internal.kernel.api.NodeCursor; +import org.neo4j.storageengine.api.schema.IndexProgressor; import org.neo4j.storageengine.api.schema.IndexProgressor.ExplicitClient; import static org.neo4j.kernel.impl.store.record.AbstractBaseRecord.NO_ID; -class DefaultNodeExplicitIndexCursor extends IndexCursor +class DefaultNodeExplicitIndexCursor extends IndexCursor implements org.neo4j.internal.kernel.api.NodeExplicitIndexCursor, ExplicitClient { private Read read; @@ -41,7 +42,7 @@ class DefaultNodeExplicitIndexCursor extends IndexCursor +class DefaultNodeLabelIndexCursor extends IndexCursor implements NodeLabelIndexCursor, NodeLabelClient { private Read read; @@ -52,7 +52,7 @@ class DefaultNodeLabelIndexCursor extends IndexCursor +class DefaultRelationshipExplicitIndexCursor extends IndexCursor implements RelationshipExplicitIndexCursor, ExplicitClient { private Read read; @@ -45,7 +46,7 @@ class DefaultRelationshipExplicitIndexCursor extends IndexCursor