diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java index 99689bae1a420..b7528bd6fda31 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java @@ -65,7 +65,7 @@ import static java.lang.String.format; import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.instantiateKernelExtensions; -import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadSchemaIndexProviders; +import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadIndexProviders; import static org.neo4j.io.file.Files.createOrOpenAsOuputStream; import static org.neo4j.kernel.configuration.Settings.TRUE; import static org.neo4j.kernel.impl.factory.DatabaseInfo.COMMUNITY; @@ -239,7 +239,7 @@ fileSystem, config, new SimpleLogService( logProvider, logProvider ), pageCache, { life.start(); - SchemaIndexProviderMap indexes = loadSchemaIndexProviders( extensions ); + SchemaIndexProviderMap indexes = loadIndexProviders( extensions ); LabelScanStore labelScanStore = new NativeLabelScanStore( pageCache, storeDir, FullStoreChangeStream.EMPTY, true, monitors, 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 f2980d8ef747d..4eca2bffd47b3 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 @@ -30,7 +30,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.index.IndexAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.impl.api.index.SchemaIndexProviderMap; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.store.RecordStore; @@ -88,7 +88,7 @@ public IndexAccessors( SchemaIndexProviderMap providers, } } - private SchemaIndexProvider provider( SchemaIndexProviderMap providers, IndexRule indexRule ) + private IndexProvider provider( SchemaIndexProviderMap providers, IndexRule indexRule ) { return providers.apply( indexRule.getProviderDescriptor() ); } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/internal/SchemaIndexExtensionLoader.java b/community/consistency-check/src/main/java/org/neo4j/consistency/internal/SchemaIndexExtensionLoader.java index 0ba421590c8e3..3b1dc477d02cd 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/internal/SchemaIndexExtensionLoader.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/internal/SchemaIndexExtensionLoader.java @@ -25,7 +25,7 @@ import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.extension.KernelExtensions; @@ -41,15 +41,15 @@ import org.neo4j.kernel.monitoring.Monitors; /** - * Utility for loading {@link SchemaIndexProvider} instances from {@link KernelExtensions}. + * Utility for loading {@link IndexProvider} instances from {@link KernelExtensions}. */ public class SchemaIndexExtensionLoader { - public static SchemaIndexProviderMap loadSchemaIndexProviders( KernelExtensions extensions ) + public static SchemaIndexProviderMap loadIndexProviders( KernelExtensions extensions ) { - AllByPrioritySelectionStrategy indexProviderSelection = new AllByPrioritySelectionStrategy<>(); - SchemaIndexProvider defaultIndexProvider = - extensions.resolveDependency( SchemaIndexProvider.class, indexProviderSelection ); + AllByPrioritySelectionStrategy indexProviderSelection = new AllByPrioritySelectionStrategy<>(); + IndexProvider defaultIndexProvider = + extensions.resolveDependency( IndexProvider.class, indexProviderSelection ); return new DefaultSchemaIndexProviderMap( defaultIndexProvider, indexProviderSelection.lowerPrioritizedCandidates() ); } diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java index 69add4d8d2d2f..649d4fc533b64 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java @@ -93,7 +93,7 @@ import static java.lang.System.currentTimeMillis; import static org.neo4j.consistency.ConsistencyCheckService.defaultConsistencyCheckThreadsNumber; import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.instantiateKernelExtensions; -import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadSchemaIndexProviders; +import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadIndexProviders; public abstract class GraphStoreFixture extends ConfigurablePageCacheRule implements TestRule { @@ -217,7 +217,7 @@ private SchemaIndexProviderMap createIndexes( PageCache pageCache, FileSystemAbs LogService logService = new SimpleLogService( logProvider, logProvider ); KernelExtensions extensions = life.add( instantiateKernelExtensions( storeDir, fileSystem, config, logService, pageCache, RecoveryCleanupWorkCollector.IGNORE, DatabaseInfo.COMMUNITY, monitors ) ); - return loadSchemaIndexProviders( extensions ); + return loadIndexProviders( extensions ); } public File directory() diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/IndexConsistencyIT.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/IndexConsistencyIT.java index 72b06071cac37..2842fe0b84739 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/IndexConsistencyIT.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/IndexConsistencyIT.java @@ -39,7 +39,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider; import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; import org.neo4j.logging.AssertableLogProvider; @@ -81,7 +81,7 @@ public void reportNotCleanNativeIndex() throws IOException, ConsistencyCheckInco someData(); resolveComponent( CheckPointer.class ).forceCheckPoint( new SimpleTriggerInfo( "forcedCheckpoint" ) ); File indexesCopy = new File( storeDir, "indexesCopy" ); - File indexSources = resolveComponent( FusionSchemaIndexProvider.class ).directoryStructure().rootDirectory(); + File indexSources = resolveComponent( FusionIndexProvider.class ).directoryStructure().rootDirectory(); copyRecursively( indexSources, indexesCopy, SOURCE_COPY_FILE_FILTER ); try ( Transaction tx = db.beginTx() ) @@ -107,7 +107,7 @@ public void reportNotCleanNativeIndexWithCorrectData() throws IOException, Consi someData(); resolveComponent( CheckPointer.class ).forceCheckPoint( new SimpleTriggerInfo( "forcedCheckpoint" ) ); File indexesCopy = new File( storeDir, "indexesCopy" ); - File indexSources = resolveComponent( FusionSchemaIndexProvider.class ).directoryStructure().rootDirectory(); + File indexSources = resolveComponent( FusionIndexProvider.class ).directoryStructure().rootDirectory(); copyRecursively( indexSources, indexesCopy, SOURCE_COPY_FILE_FILTER ); db.shutdownAndKeepStore(); 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 b815ef5c7c5b0..156b1ce17c71b 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 @@ -25,7 +25,7 @@ import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.store.RecordAccessStub; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; @@ -87,7 +87,7 @@ public void shouldReportInvalidLabelReferences() throws Exception int schemaRuleId = 0; DynamicRecord record = inUse( dynamicRecord( schemaRuleId ) ); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule = indexRule( schemaRuleId, labelId, propertyKeyId, providerDescriptor ); when( checker().ruleAccess.loadSingleSchemaRule( schemaRuleId ) ).thenReturn( rule ); @@ -108,7 +108,7 @@ public void shouldReportInvalidPropertyReferenceFromIndexRule() throws Exception int schemaRuleId = 0; DynamicRecord record = inUse( dynamicRecord( schemaRuleId ) ); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule = indexRule( schemaRuleId, labelId, propertyKeyId, providerDescriptor ); when( checker().ruleAccess.loadSingleSchemaRule( schemaRuleId ) ).thenReturn( rule ); @@ -155,7 +155,7 @@ public void shouldReportUniquenessConstraintNotReferencingBack() throws Exceptio DynamicRecord record1 = inUse( dynamicRecord( ruleId1 ) ); DynamicRecord record2 = inUse( dynamicRecord( ruleId2 ) ); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId2 ); ConstraintRule rule2 = uniquenessConstraintRule( ruleId2, labelId, propertyKeyId, ruleId2 ); @@ -185,7 +185,7 @@ public void shouldNotReportConstraintIndexRuleWithoutBackReference() throws Exce DynamicRecord record = inUse( dynamicRecord( ruleId ) ); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule = constraintIndexRule( ruleId, labelId, propertyKeyId, providerDescriptor ); @@ -264,7 +264,7 @@ public void shouldReportConstraintIndexNotReferencingBack() throws Exception DynamicRecord record1 = inUse( dynamicRecord( ruleId1 ) ); DynamicRecord record2 = inUse( dynamicRecord( ruleId2) ); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); ConstraintRule rule2 = uniquenessConstraintRule( ruleId2, labelId, propertyKeyId, ruleId1 ); @@ -296,7 +296,7 @@ public void shouldReportTwoConstraintIndexesReferencingSameConstraint() throws E DynamicRecord record1 = inUse( dynamicRecord( ruleId1 ) ); DynamicRecord record2 = inUse( dynamicRecord( ruleId2 ) ); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); IndexRule rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); @@ -323,7 +323,7 @@ public void shouldReportUnreferencedConstraintIndex() throws Exception DynamicRecord record = inUse( dynamicRecord( ruleId ) ); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule = constraintIndexRule( ruleId, labelId, propertyKeyId, providerDescriptor, (long) ruleId ); @@ -351,7 +351,7 @@ public void shouldReportTwoIndexRulesWithDuplicateContent() throws Exception DynamicRecord record1 = inUse( dynamicRecord( ruleId1 ) ); DynamicRecord record2 = inUse( dynamicRecord( ruleId2 ) ); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); IndexRule rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, providerDescriptor, (long) ruleId2 ); 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 98bbce5d16d82..6493ae99be8af 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 @@ -19,7 +19,7 @@ */ package org.neo4j.consistency.checking; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.store.record.ConstraintRule; @@ -49,21 +49,21 @@ public static ConstraintRule relPropertyExistenceConstraintRule( long ruleId, in ConstraintDescriptorFactory.existsForRelType( labelId, propertyId ) ); } - public static IndexRule indexRule( long ruleId, int labelId, int propertyId, SchemaIndexProvider.Descriptor + public static IndexRule indexRule( long ruleId, int labelId, int propertyId, IndexProvider.Descriptor descriptor ) { return IndexRule.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor ); } public static IndexRule constraintIndexRule( long ruleId, int labelId, int propertyId, - SchemaIndexProvider.Descriptor descriptor, long constraintId ) + IndexProvider.Descriptor descriptor, long constraintId ) { return IndexRule.constraintIndexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), descriptor, constraintId ); } public static IndexRule constraintIndexRule( long ruleId, int labelId, int propertyId, - SchemaIndexProvider.Descriptor descriptor ) + IndexProvider.Descriptor descriptor ) { return IndexRule.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), descriptor ); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java index 206fe6c52319c..16d252472397a 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java @@ -69,7 +69,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; @@ -154,7 +154,7 @@ public class FullCheckIntegrationTest { - private static final SchemaIndexProvider.Descriptor DESCRIPTOR = new SchemaIndexProvider.Descriptor( "lucene", "1.0" ); + private static final IndexProvider.Descriptor DESCRIPTOR = new IndexProvider.Descriptor( "lucene", "1.0" ); private static final String PROP1 = "key1"; private static final String PROP2 = "key2"; private static final Object VALUE1 = "value1"; 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 0c98563515a0c..641cc7c685891 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 @@ -53,7 +53,7 @@ import org.neo4j.consistency.store.synthetic.IndexEntry; import org.neo4j.consistency.store.synthetic.LabelScanDocument; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +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.impl.store.record.AbstractBaseRecord; @@ -390,7 +390,7 @@ private Object parameter( Class type ) if ( type == IndexRule.class ) { return IndexRule.indexRule( 1, IndexDescriptorFactory.forLabel( 2, 3 ), - new SchemaIndexProvider.Descriptor( "provider", "version" ) ); + new IndexProvider.Descriptor( "provider", "version" ) ); } if ( type == SchemaRule.class ) { diff --git a/community/jmx/src/test/java/org/neo4j/jmx/impl/StoreSizeBeanTest.java b/community/jmx/src/test/java/org/neo4j/jmx/impl/StoreSizeBeanTest.java index 8b2d6c20a05db..960449efd0c12 100644 --- a/community/jmx/src/test/java/org/neo4j/jmx/impl/StoreSizeBeanTest.java +++ b/community/jmx/src/test/java/org/neo4j/jmx/impl/StoreSizeBeanTest.java @@ -36,8 +36,8 @@ import org.neo4j.jmx.StoreSize; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.api.index.IndexDirectoryStructure; -import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor; +import org.neo4j.kernel.api.index.IndexProvider; +import org.neo4j.kernel.api.index.IndexProvider.Descriptor; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.ExplicitIndexProviderLookup; @@ -82,8 +82,8 @@ public class StoreSizeBeanTest private final File storeDir = new File( "" ); private final LogFiles logFiles = LogFilesBuilder.logFilesBasedOnlyBuilder( storeDir, fs ).build(); private final ExplicitIndexProviderLookup explicitIndexProviderLookup = mock( ExplicitIndexProviderLookup.class ); - private final SchemaIndexProvider schemaIndexProvider = mockedSchemaIndexProvider( "providah1" ); - private final SchemaIndexProvider schemaIndexProvider2 = mockedSchemaIndexProvider( "providah" ); + private final IndexProvider indexProvider = mockedIndexProvider( "providah1" ); + private final IndexProvider indexProvider2 = mockedIndexProvider( "providah" ); private final LabelScanStore labelScanStore = mock( LabelScanStore.class ); private StoreSize storeSizeBean; private File storeDirAbsolute; @@ -98,8 +98,8 @@ public void setUp() DataSourceManager dataSourceManager = new DataSourceManager(); GraphDatabaseAPI db = mock( GraphDatabaseAPI.class ); NeoStoreDataSource dataSource = mock( NeoStoreDataSource.class ); - SchemaIndexProviderMap schemaIndexProviderMap = new DefaultSchemaIndexProviderMap( schemaIndexProvider, - Collections.singleton( schemaIndexProvider2 ) ); + SchemaIndexProviderMap schemaIndexProviderMap = new DefaultSchemaIndexProviderMap( indexProvider, + Collections.singleton( indexProvider2 ) ); // Setup all dependencies Dependencies dependencies = new Dependencies(); @@ -122,9 +122,9 @@ public void setUp() storeSizeBean = (StoreSize) new StoreSizeBean().createMBean( data ); } - private SchemaIndexProvider mockedSchemaIndexProvider( String name ) + private IndexProvider mockedIndexProvider( String name ) { - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( new Descriptor( name, "1" ) ); return provider; } @@ -261,14 +261,14 @@ public void shouldCountAllIndexFiles() throws Exception createFileOfSize( schemaIndex, 2 ); IndexDirectoryStructure directoryStructure = mock( IndexDirectoryStructure.class ); when( directoryStructure.rootDirectory() ).thenReturn( schemaIndex ); - when( schemaIndexProvider.directoryStructure() ).thenReturn( directoryStructure ); + when( indexProvider.directoryStructure() ).thenReturn( directoryStructure ); } { File schemaIndex = new File( storeDir, "schemaIndex2" ); createFileOfSize( schemaIndex, 3 ); IndexDirectoryStructure directoryStructure = mock( IndexDirectoryStructure.class ); when( directoryStructure.rootDirectory() ).thenReturn( schemaIndex ); - when( schemaIndexProvider2.directoryStructure() ).thenReturn( directoryStructure ); + when( indexProvider2.directoryStructure() ).thenReturn( directoryStructure ); } // Label scan store diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java index c22b0e0763314..cedf4a8bb89f7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.dependency.AllByPrioritySelectionStrategy; @@ -127,7 +127,6 @@ import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; import org.neo4j.kernel.impl.transaction.log.rotation.LogRotationImpl; import org.neo4j.kernel.impl.transaction.state.DefaultSchemaIndexProviderMap; -import org.neo4j.kernel.impl.transaction.state.NeoStoreFileIndexListing; import org.neo4j.kernel.impl.transaction.state.NeoStoreFileListing; import org.neo4j.kernel.impl.util.Dependencies; import org.neo4j.kernel.impl.util.SynchronizedArrayIdOrderingQueue; @@ -386,10 +385,10 @@ public void start() throws IOException life.add( recoveryCleanupWorkCollector ); - AllByPrioritySelectionStrategy indexProviderSelection = + AllByPrioritySelectionStrategy indexProviderSelection = new AllByPrioritySelectionStrategy<>(); - SchemaIndexProvider defaultIndexProvider = - dependencyResolver.resolveDependency( SchemaIndexProvider.class, indexProviderSelection ); + IndexProvider defaultIndexProvider = + dependencyResolver.resolveDependency( IndexProvider.class, indexProviderSelection ); schemaIndexProviderMap = new DefaultSchemaIndexProviderMap( defaultIndexProvider, diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java index 8398b287f0621..b3793fd4bef18 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java @@ -49,7 +49,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; @@ -240,7 +240,7 @@ IndexDescriptor indexGetForSchema( LabelSchemaDescriptor descriptor ) InternalIndexState indexGetState( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** Retrieve provider descriptor for an index. */ - SchemaIndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** Retrieve the population progress of an index. */ PopulationProgress indexGetPopulationProgress( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexDirectoryStructure.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexDirectoryStructure.java index a4cd1904c65f4..81cd7d8e4fd8a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexDirectoryStructure.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexDirectoryStructure.java @@ -21,27 +21,27 @@ import java.io.File; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor; +import org.neo4j.kernel.api.index.IndexProvider.Descriptor; import static org.neo4j.io.fs.FileUtils.path; /** - * Dictates how directory structure looks for a {@link SchemaIndexProvider} and its indexes. Generally there's a + * Dictates how directory structure looks for a {@link IndexProvider} and its indexes. Generally there's a * {@link #rootDirectory() root directory} which contains all index directories in some shape and form. * For getting a directory (which must be a sub-directory to the root directory) for a particular index there's the * {@link #directoryForIndex(long)} method. * - * These instances are created from a {@link Factory} which typically gets passed into a {@link SchemaIndexProvider} constructor, + * These instances are created from a {@link Factory} which typically gets passed into a {@link IndexProvider} constructor, * which then creates a {@link IndexDirectoryStructure} given its {@link Descriptor}. */ public abstract class IndexDirectoryStructure { /** - * Creates an {@link IndexDirectoryStructure} for a {@link Descriptor} for a {@link SchemaIndexProvider}. + * Creates an {@link IndexDirectoryStructure} for a {@link Descriptor} for a {@link IndexProvider}. */ public interface Factory { - IndexDirectoryStructure forProvider( SchemaIndexProvider.Descriptor descriptor ); + IndexDirectoryStructure forProvider( IndexProvider.Descriptor descriptor ); } private static class SubDirectoryByIndexId extends IndexDirectoryStructure @@ -119,7 +119,7 @@ public static Factory given( IndexDirectoryStructure directoryStructure ) } /** - * Useful when combining multiple {@link SchemaIndexProvider} into one. + * Useful when combining multiple {@link IndexProvider} into one. * * @param parentStructure {@link IndexDirectoryStructure} of the parent. * @return {@link Factory} creating {@link IndexDirectoryStructure} looking something like: 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 f690cb3ccb0f9..b46362081d614 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 @@ -110,19 +110,19 @@ void add( Collection> updates ) * Close this populator and releases any resources related to it. * If {@code populationCompletedSuccessfully} is {@code true} then it must mark this index * as {@link InternalIndexState#ONLINE} so that future invocations of its parent - * {@link SchemaIndexProvider#getInitialState(long, IndexDescriptor)} also returns {@link InternalIndexState#ONLINE}. + * {@link IndexProvider#getInitialState(long, IndexDescriptor)} also returns {@link InternalIndexState#ONLINE}. * * @param populationCompletedSuccessfully {@code true} if the index population was successful, where the index should * be marked as {@link InternalIndexState#ONLINE}, otherwise {@code false} where index should be marked as * {@link InternalIndexState#FAILED} and the failure, previously handed to this populator using {@link #markAsFailed(String)} - * should be stored and made available for later requests from {@link SchemaIndexProvider#getPopulationFailure(long, IndexDescriptor)}. + * should be stored and made available for later requests from {@link IndexProvider#getPopulationFailure(long, IndexDescriptor)}. * @throws IOException on I/O error. */ void close( boolean populationCompletedSuccessfully ) throws IOException; /** * Called then a population failed. The failure string should be stored for future retrieval by - * {@link SchemaIndexProvider#getPopulationFailure(long, IndexDescriptor)}. Called before {@link #close(boolean)} + * {@link IndexProvider#getPopulationFailure(long, IndexDescriptor)}. Called before {@link #close(boolean)} * if there was a failure during population. * * @param failure the description of the failure. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java similarity index 94% rename from community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java index 3a8844504cb7a..5a2dfffad66c5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java @@ -41,7 +41,7 @@ *

Populating the index

* * When an index rule is added, the {@link IndexingService} is notified. It will, in turn, ask - * your {@link SchemaIndexProvider} for a\ + * your {@link IndexProvider} for a * {@link #getPopulator(long, IndexDescriptor, IndexSamplingConfig) batch index writer}. * * A background index job is triggered, and all existing data that applies to the new rule, as well as new data @@ -90,7 +90,7 @@ * {@link #getOnlineAccessor(long, IndexDescriptor, IndexSamplingConfig) online accessor} to * write to the index. */ -public abstract class SchemaIndexProvider extends LifecycleAdapter implements Comparable +public abstract class IndexProvider extends LifecycleAdapter implements Comparable { public interface Monitor { @@ -114,8 +114,8 @@ public void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Ma void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Map data ); } - public static final SchemaIndexProvider NO_INDEX_PROVIDER = - new SchemaIndexProvider( new Descriptor( "no-index-provider", "1.0" ), -1, IndexDirectoryStructure.NONE ) + public static final IndexProvider NO_INDEX_PROVIDER = + new IndexProvider( new Descriptor( "no-index-provider", "1.0" ), -1, IndexDirectoryStructure.NONE ) { private final IndexAccessor singleWriter = new IndexAccessor.Adapter(); private final IndexPopulator singlePopulator = new IndexPopulator.Adapter(); @@ -171,13 +171,13 @@ public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) t private final IndexDirectoryStructure.Factory directoryStructureFactory; private final IndexDirectoryStructure directoryStructure; - protected SchemaIndexProvider( SchemaIndexProvider copySource ) + protected IndexProvider( IndexProvider copySource ) { this( copySource.providerDescriptor, copySource.priority, copySource.directoryStructureFactory ); } - protected SchemaIndexProvider( Descriptor descriptor, int priority, - IndexDirectoryStructure.Factory directoryStructureFactory ) + protected IndexProvider( Descriptor descriptor, int priority, + IndexDirectoryStructure.Factory directoryStructureFactory ) { this.directoryStructureFactory = directoryStructureFactory; assert descriptor != null; @@ -233,7 +233,7 @@ public Descriptor getProviderDescriptor() } @Override - public int compareTo( SchemaIndexProvider o ) + public int compareTo( IndexProvider o ) { return this.priority - o.priority; } @@ -250,7 +250,7 @@ public boolean equals( Object o ) return false; } - SchemaIndexProvider other = (SchemaIndexProvider) o; + IndexProvider other = (IndexProvider) o; return priority == other.priority && providerDescriptor.equals( other.providerDescriptor ); 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 6a08adf606a2c..fb15c7c211d0d 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 @@ -26,7 +26,7 @@ import static java.lang.String.format; -public class LoggingMonitor implements SchemaIndexProvider.Monitor +public class LoggingMonitor implements IndexProvider.Monitor { private final Log log; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java index 538f8acede0e6..3896416cd1a12 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java @@ -54,7 +54,7 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.TokenAccess; import org.neo4j.kernel.impl.api.index.IndexingService; @@ -584,7 +584,7 @@ public Stream relationshipManualIndexRemove( @Name( "indexName" ) return Stream.of( new BooleanResult( Boolean.TRUE ) ); } - private Map indexProviderDescriptorMap( SchemaIndexProvider.Descriptor providerDescriptor ) + private Map indexProviderDescriptorMap( IndexProvider.Descriptor providerDescriptor ) { return MapUtil.stringMap( "key", providerDescriptor.getKey(), diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java index 73192c78e3973..7d88adc4e9c57 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; @@ -194,7 +194,7 @@ public InternalIndexState indexGetState( KernelStatement state, IndexDescriptor } @Override - public SchemaIndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException { sharedLabelLock( state, descriptor.schema().getLabelId() ); state.assertOpen(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java index 3f5c9adfaab80..c255353fe0ceb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java @@ -80,7 +80,7 @@ import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +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.query.ExecutingQuery; @@ -595,7 +595,7 @@ public InternalIndexState indexGetState( IndexDescriptor descriptor ) throws Ind } @Override - public SchemaIndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { statement.assertOpen(); return schemaRead().indexGetProviderDescriptor( statement, descriptor ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java index d9394eae5002f..2cd26d13ee7c9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java @@ -58,7 +58,7 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.properties.PropertyKeyIdIterator; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; @@ -757,14 +757,14 @@ public InternalIndexState indexGetState( KernelStatement state, IndexDescriptor } @Override - public SchemaIndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException { if ( state.hasTxStateWithChanges() ) { if ( checkIndexState( descriptor, state.txState().indexDiffSetsByLabel( descriptor.schema().getLabelId() ) ) ) { - return SchemaIndexProvider.UNDECIDED; + return IndexProvider.UNDECIDED; } } return storeLayer.indexGetProviderDescriptor( descriptor ); 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 d652209060235..1277525a2a3ba 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 @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -86,7 +86,7 @@ public LabelSchemaDescriptor schema() } @Override - public SchemaIndexProvider.Descriptor getProviderDescriptor() + public IndexProvider.Descriptor getProviderDescriptor() { return getDelegate().getProviderDescriptor(); } 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 2322ca999e78f..c32092d724770 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 @@ -23,7 +23,7 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; @@ -94,7 +94,7 @@ public LabelSchemaDescriptor schema() } @Override - public SchemaIndexProvider.Descriptor getProviderDescriptor() + public IndexProvider.Descriptor getProviderDescriptor() { return indexMeta.providerDescriptor(); } 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 7a149721abb39..703a5876f7cab 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 @@ -41,7 +41,7 @@ import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.DelegatingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; @@ -242,7 +242,7 @@ public LabelSchemaDescriptor schema() } @Override - public SchemaIndexProvider.Descriptor getProviderDescriptor() + public IndexProvider.Descriptor getProviderDescriptor() { lock.readLock().lock(); try diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java index c2436e46b11d3..3450750dfec6b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java @@ -20,17 +20,17 @@ package org.neo4j.kernel.impl.api.index; import org.neo4j.internal.kernel.api.IndexCapability; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; public class IndexMeta { private final long ruleId; private final IndexDescriptor indexDescriptor; - private final SchemaIndexProvider.Descriptor providerDescriptor; + private final IndexProvider.Descriptor providerDescriptor; private final IndexCapability indexCapability; - public IndexMeta( long ruleId, IndexDescriptor indexDescriptor, SchemaIndexProvider.Descriptor providerDescriptor, IndexCapability indexCapability ) + public IndexMeta( long ruleId, IndexDescriptor indexDescriptor, IndexProvider.Descriptor providerDescriptor, IndexCapability indexCapability ) { this.ruleId = ruleId; this.indexDescriptor = indexDescriptor; @@ -48,7 +48,7 @@ public IndexDescriptor indexDescriptor() return indexDescriptor; } - public SchemaIndexProvider.Descriptor providerDescriptor() + public IndexProvider.Descriptor providerDescriptor() { return providerDescriptor; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java index 8cf6f317445c0..00a6dfbebc340 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 @@ -37,7 +37,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -82,7 +82,7 @@ public interface IndexProxy extends LabelSchemaSupplier @Override LabelSchemaDescriptor schema(); - SchemaIndexProvider.Descriptor getProviderDescriptor(); + IndexProvider.Descriptor getProviderDescriptor(); InternalIndexState getState(); 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 c7f3ec6277c6b..77cd49b7c7a81 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,7 +25,7 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.logging.LogProvider; @@ -58,7 +58,7 @@ class IndexProxyCreator IndexProxy createPopulatingIndexProxy( final long ruleId, final IndexDescriptor descriptor, - final SchemaIndexProvider.Descriptor providerDescriptor, + final IndexProvider.Descriptor providerDescriptor, final boolean flipToTentative, final IndexingService.Monitor monitor, final IndexPopulationJob populationJob ) @@ -104,7 +104,7 @@ IndexProxy createPopulatingIndexProxy( final long ruleId, } IndexProxy createRecoveringIndexProxy( long ruleId, IndexDescriptor descriptor, - SchemaIndexProvider.Descriptor providerDescriptor ) + IndexProvider.Descriptor providerDescriptor ) { IndexMeta indexMeta = indexMetaFromProvider( ruleId, providerDescriptor, descriptor ); IndexProxy proxy = new RecoveringIndexProxy( indexMeta ); @@ -113,7 +113,7 @@ IndexProxy createRecoveringIndexProxy( long ruleId, IndexDescriptor descriptor, IndexProxy createOnlineIndexProxy( long ruleId, IndexDescriptor descriptor, - SchemaIndexProvider.Descriptor providerDescriptor ) + IndexProvider.Descriptor providerDescriptor ) { try { @@ -136,7 +136,7 @@ IndexProxy createOnlineIndexProxy( long ruleId, IndexProxy createFailedIndexProxy( long ruleId, IndexDescriptor descriptor, - SchemaIndexProvider.Descriptor providerDescriptor, + IndexProvider.Descriptor providerDescriptor, IndexPopulationFailure populationFailure ) { IndexPopulator indexPopulator = populatorFromProvider( providerDescriptor, ruleId, descriptor, samplingConfig ); @@ -155,28 +155,28 @@ IndexProxy createFailedIndexProxy( long ruleId, } private String indexUserDescription( final IndexDescriptor descriptor, - final SchemaIndexProvider.Descriptor providerDescriptor ) + final IndexProvider.Descriptor providerDescriptor ) { return format( "%s [provider: %s]", descriptor.schema().userDescription( tokenNameLookup ), providerDescriptor.toString() ); } - private IndexPopulator populatorFromProvider( SchemaIndexProvider.Descriptor providerDescriptor, long ruleId, + private IndexPopulator populatorFromProvider( IndexProvider.Descriptor providerDescriptor, long ruleId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { - SchemaIndexProvider indexProvider = providerMap.apply( providerDescriptor ); + IndexProvider indexProvider = providerMap.apply( providerDescriptor ); return indexProvider.getPopulator( ruleId, descriptor, samplingConfig ); } - private IndexAccessor onlineAccessorFromProvider( SchemaIndexProvider.Descriptor providerDescriptor, + private IndexAccessor onlineAccessorFromProvider( IndexProvider.Descriptor providerDescriptor, long ruleId, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { - SchemaIndexProvider indexProvider = providerMap.apply( providerDescriptor ); + IndexProvider indexProvider = providerMap.apply( providerDescriptor ); return indexProvider.getOnlineAccessor( ruleId, descriptor, samplingConfig ); } - private IndexMeta indexMetaFromProvider( long ruleId, SchemaIndexProvider.Descriptor providerDescriptor, IndexDescriptor indexDescriptor ) + private IndexMeta indexMetaFromProvider( long ruleId, IndexProvider.Descriptor providerDescriptor, IndexDescriptor indexDescriptor ) { IndexCapability indexCapability = providerMap.apply( providerDescriptor ).getCapability( indexDescriptor ); return new IndexMeta( ruleId, indexDescriptor, providerDescriptor, indexCapability ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java index e327dec4553ac..577c665133cbb 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 @@ -49,8 +49,8 @@ import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor; +import org.neo4j.kernel.api.index.IndexProvider; +import org.neo4j.kernel.api.index.IndexProvider.Descriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingController; @@ -190,8 +190,8 @@ public void init() long indexId = indexRule.getId(); IndexDescriptor descriptor = indexRule.getIndexDescriptor(); - SchemaIndexProvider.Descriptor providerDescriptor = indexRule.getProviderDescriptor(); - SchemaIndexProvider provider = providerMap.apply( providerDescriptor ); + IndexProvider.Descriptor providerDescriptor = indexRule.getProviderDescriptor(); + IndexProvider provider = providerMap.apply( providerDescriptor ); InternalIndexState initialState = provider.getInitialState( indexId, descriptor ); indexStates.computeIfAbsent( initialState, internalIndexState -> new ArrayList<>() ) .add( new IndexLogRecord( indexId, descriptor ) ); 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 1510e164d1dee..0bc9f01a9674d 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,7 @@ package org.neo4j.kernel.impl.api.index; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -52,7 +52,7 @@ public static IndexingService createIndexingService( Config config, if ( providerMap == null || providerMap.getDefaultProvider() == null ) { throw new IllegalStateException( "You cannot run the database without an index provider, " + - "please make sure that a valid provider (subclass of " + SchemaIndexProvider.class.getName() + + "please make sure that a valid provider (subclass of " + IndexProvider.class.getName() + ") is on your classpath." ); } 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 5087080f688b4..aa5b8ede66f4a 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 @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.UpdateCountingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; @@ -140,7 +140,7 @@ public LabelSchemaDescriptor schema() } @Override - public SchemaIndexProvider.Descriptor getProviderDescriptor() + public IndexProvider.Descriptor getProviderDescriptor() { return indexMeta.providerDescriptor(); } 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 b096c5204d8f0..d9185d4f87bfd 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 @@ -29,7 +29,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -100,7 +100,7 @@ public LabelSchemaDescriptor schema() } @Override - public SchemaIndexProvider.Descriptor getProviderDescriptor() + public IndexProvider.Descriptor getProviderDescriptor() { return indexMeta.providerDescriptor(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java index d37eea36d44fe..1c2fc7ef71f03 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.impl.api.index; -import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor; +import org.neo4j.kernel.api.index.IndexProvider; +import org.neo4j.kernel.api.index.IndexProvider.Descriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; /** @@ -31,7 +31,7 @@ public class RebuildingIndexDescriptor private final IndexDescriptor indexDescriptor; private final Descriptor providerDescriptor; - RebuildingIndexDescriptor( IndexDescriptor indexDescriptor, SchemaIndexProvider.Descriptor providerDescriptor ) + RebuildingIndexDescriptor( IndexDescriptor indexDescriptor, IndexProvider.Descriptor providerDescriptor ) { this.indexDescriptor = indexDescriptor; this.providerDescriptor = providerDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/SchemaIndexProviderMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/SchemaIndexProviderMap.java index 3a2c03e9c65ea..5327de1714fbe 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/SchemaIndexProviderMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/SchemaIndexProviderMap.java @@ -22,14 +22,14 @@ import java.util.function.Consumer; import java.util.function.Function; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; -public interface SchemaIndexProviderMap extends Function +public interface SchemaIndexProviderMap extends Function { @Override - SchemaIndexProvider apply( SchemaIndexProvider.Descriptor descriptor ) throws IndexProviderNotFoundException; + IndexProvider apply( IndexProvider.Descriptor descriptor ) throws IndexProviderNotFoundException; - SchemaIndexProvider getDefaultProvider(); + IndexProvider getDefaultProvider(); - void accept( Consumer visitor ); + void accept( Consumer visitor ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java index f6b9bb0f10026..8cf180c56d73e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java @@ -28,7 +28,7 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -58,7 +58,7 @@ public interface SchemaReadOperations /** * Retrieve the index provider descriptor for an index. */ - SchemaIndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexProvider.Descriptor indexGetProviderDescriptor( KernelStatement state, IndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Retrieve the population progress of an index. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java index 87f41f6e1f782..bda2a97632c01 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.properties.PropertyKeyIdIterator; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; @@ -237,7 +237,7 @@ public InternalIndexState indexGetState( IndexDescriptor descriptor ) throws Ind } @Override - public SchemaIndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { return indexService.getIndexProxy( descriptor.schema() ).getProviderDescriptor(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java similarity index 92% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexProvider.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java index ed60c9569618d..ac4bff1c73922 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure.Factory; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -42,7 +42,7 @@ * @param type of {@link NativeSchemaKey} * @param type of {@link NativeSchemaValue} */ -abstract class NativeSchemaIndexProvider extends SchemaIndexProvider +abstract class NativeIndexProvider extends IndexProvider { protected final PageCache pageCache; protected final FileSystemAbstraction fs; @@ -50,8 +50,8 @@ abstract class NativeSchemaIndexProvider tree; NativeSchemaIndex( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - SchemaIndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId ) + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId ) { this.pageCache = pageCache; this.storeFile = storeFile; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java index 140c853250e3a..a750f2e3f642c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java @@ -32,7 +32,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -54,7 +54,7 @@ public abstract class NativeSchemaIndexAccessor layout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - SchemaIndexProvider.Monitor monitor, + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java index 6bbf0a4cd333b..dd371030f8f04 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.DefaultNonUniqueIndexSampler; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -79,7 +79,7 @@ abstract class NativeSchemaIndexPopulator layout, - SchemaIndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, indexId ); this.treeKey = layout.newKey(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java similarity index 92% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexProvider.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java index ea2d3e4e94c81..35b38ffaaf0ce 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java @@ -40,15 +40,15 @@ /** * Schema index provider for native indexes backed by e.g. {@link GBPTree}. */ -public class NumberSchemaIndexProvider extends NativeSchemaIndexProvider +public class NumberIndexProvider extends NativeIndexProvider { public static final String KEY = "native"; public static final Descriptor NATIVE_PROVIDER_DESCRIPTOR = new Descriptor( KEY, "1.0" ); static final IndexCapability CAPABILITY = new NumberIndexCapability(); - public NumberSchemaIndexProvider( PageCache pageCache, FileSystemAbstraction fs, - IndexDirectoryStructure.Factory directoryStructure, Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - boolean readOnly ) + public NumberIndexProvider( PageCache pageCache, FileSystemAbstraction fs, + IndexDirectoryStructure.Factory directoryStructure, Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, + boolean readOnly ) { super( NATIVE_PROVIDER_DESCRIPTOR, 0, directoryStructure, pageCache, fs, monitor, recoveryCleanupWorkCollector, readOnly ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessor.java index 361e80e88af9e..3dba6758ce49a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessor.java @@ -26,7 +26,7 @@ import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -39,7 +39,7 @@ public class NumberSchemaIndexAccessor extends NativeSchemaIndexAccessor layout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - SchemaIndexProvider.Monitor monitor, + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java index ec5150a549b2b..ce65723d2c980 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java @@ -24,7 +24,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -32,7 +32,7 @@ class NumberSchemaIndexPopulator extends NativeSchemaIndexPopulator { NumberSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - SchemaIndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, indexId, samplingConfig ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexReader.java index f2bc9091d599a..13ca6acb6ce25 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexReader.java @@ -45,7 +45,7 @@ void validateQuery( IndexOrder indexOrder, IndexQuery[] predicates ) throw new UnsupportedOperationException(); } - CapabilityValidator.validateQuery( NumberSchemaIndexProvider.CAPABILITY, indexOrder, predicates ); + CapabilityValidator.validateQuery( NumberIndexProvider.CAPABILITY, indexOrder, predicates ); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java index acaa9e072961b..d07c7c5865ece 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.IndexUpdateApply; @@ -91,7 +91,7 @@ public SpatialCRSSchemaIndex( IndexDescriptor descriptor, long indexId, PageCache pageCache, FileSystemAbstraction fs, - SchemaIndexProvider.Monitor monitor, + IndexProvider.Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, SpaceFillingCurveConfiguration configuration, int maxBits ) @@ -103,8 +103,8 @@ public SpatialCRSSchemaIndex( IndexDescriptor descriptor, this.configuration = configuration; // Depends on crs - SchemaIndexProvider.Descriptor crsDescriptor = - new SchemaIndexProvider.Descriptor( Integer.toString( crs.getTable().getTableId() ), Integer.toString( crs.getCode() ) ); + IndexProvider.Descriptor crsDescriptor = + new IndexProvider.Descriptor( Integer.toString( crs.getTable().getTableId() ), Integer.toString( crs.getCode() ) ); IndexDirectoryStructure indexDir = IndexDirectoryStructure.directoriesBySubProvider( directoryStructure ).forProvider( crsDescriptor ); indexFile = new File( indexDir.directoryForIndex( indexId ), "index-" + indexId ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java similarity index 92% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexProvider.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java index 00be91fc7d49a..4609e0b9a0664 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java @@ -40,15 +40,15 @@ /** * Schema index provider for native indexes backed by e.g. {@link GBPTree}. */ -public class StringSchemaIndexProvider extends NativeSchemaIndexProvider +public class StringIndexProvider extends NativeIndexProvider { public static final String KEY = "string"; static final IndexCapability CAPABILITY = new StringIndexCapability(); private static final Descriptor STRING_PROVIDER_DESCRIPTOR = new Descriptor( KEY, "1.0" ); - StringSchemaIndexProvider( PageCache pageCache, FileSystemAbstraction fs, - IndexDirectoryStructure.Factory directoryStructure, Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - boolean readOnly ) + StringIndexProvider( PageCache pageCache, FileSystemAbstraction fs, + IndexDirectoryStructure.Factory directoryStructure, Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, + boolean readOnly ) { super( STRING_PROVIDER_DESCRIPTOR, 0, directoryStructure, pageCache, fs, monitor, recoveryCleanupWorkCollector, readOnly ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessor.java index df4b2f7ad16e0..06df4fac6cef1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessor.java @@ -27,7 +27,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -43,7 +43,7 @@ public class StringSchemaIndexAccessor extends NativeSchemaIndexAccessor layout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - SchemaIndexProvider.Monitor monitor, + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java index 6eb970aa33c8b..85390dc684f3f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java @@ -24,7 +24,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -32,7 +32,7 @@ public class StringSchemaIndexPopulator extends NativeSchemaIndexPopulator { StringSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - SchemaIndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, indexId, samplingConfig ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexReader.java index 7bcb5791f6d95..ae78680fb7b49 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexReader.java @@ -46,7 +46,7 @@ void validateQuery( IndexOrder indexOrder, IndexQuery[] predicates ) throw new UnsupportedOperationException(); } - CapabilityValidator.validateQuery( StringSchemaIndexProvider.CAPABILITY, indexOrder, predicates ); + CapabilityValidator.validateQuery( StringIndexProvider.CAPABILITY, indexOrder, predicates ); } @Override 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 77edf8eb0ea76..cbfe8347efc27 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 @@ -38,7 +38,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -57,7 +57,7 @@ class TemporalIndexAccessor extends TemporalIndexCache extends NativeSchemaIndex FileSystemAbstraction fs, TemporalIndexFiles.FileLayout fileLayout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - SchemaIndexProvider.Monitor monitor, + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) throws IOException @@ -202,7 +202,7 @@ static class PartFactory implements TemporalIndexCache.Factory, private final PageCache pageCache; private final FileSystemAbstraction fs; private final RecoveryCleanupWorkCollector recoveryCleanupWorkCollector; - private final SchemaIndexProvider.Monitor monitor; + private final IndexProvider.Monitor monitor; private final IndexDescriptor descriptor; private final long indexId; private final IndexSamplingConfig samplingConfig; @@ -211,7 +211,7 @@ static class PartFactory implements TemporalIndexCache.Factory, PartFactory( PageCache pageCache, FileSystemAbstraction fs, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - SchemaIndexProvider.Monitor monitor, + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig, 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 f62e4da45edd3..487a6f3fdf3ea 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 @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.DefaultNonUniqueIndexSampler; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -52,7 +52,7 @@ class TemporalIndexPopulator extends TemporalIndexCache extends NativeSchemaInde List> updates = new ArrayList<>(); PartPopulator( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles.FileLayout fileLayout, - SchemaIndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) + IndexProvider.Monitor monitor, IndexDescriptor descriptor, long indexId, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, fileLayout.indexFile, fileLayout.layout, monitor, descriptor, indexId, samplingConfig ); } @@ -227,10 +227,10 @@ static class PartFactory implements TemporalIndexCache.Factory, private final long indexId; private final IndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; - private final SchemaIndexProvider.Monitor monitor; + private final IndexProvider.Monitor monitor; PartFactory( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles temporalIndexFiles, long indexId, - IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SchemaIndexProvider.Monitor monitor ) + IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, IndexProvider.Monitor monitor ) { this.pageCache = pageCache; this.fs = fs; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalSchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java similarity index 93% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalSchemaIndexProvider.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java index fe0b70f170d2b..6000b4226bdd2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalSchemaIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java @@ -29,12 +29,12 @@ 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.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; -public class TemporalSchemaIndexProvider extends SchemaIndexProvider +public class TemporalIndexProvider extends IndexProvider { public static final String KEY = "temporal"; public static final Descriptor TEMPORAL_PROVIDER_DESCRIPTOR = new Descriptor( KEY, "1.0" ); @@ -45,9 +45,9 @@ public class TemporalSchemaIndexProvider extends SchemaIndexProvider private final RecoveryCleanupWorkCollector recoveryCleanupWorkCollector; private final boolean readOnly; - public TemporalSchemaIndexProvider( PageCache pageCache, FileSystemAbstraction fs, - IndexDirectoryStructure.Factory directoryStructure, Monitor monitor, - RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, boolean readOnly ) + public TemporalIndexProvider( PageCache pageCache, FileSystemAbstraction fs, + IndexDirectoryStructure.Factory directoryStructure, Monitor monitor, + RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, boolean readOnly ) { super( TEMPORAL_PROVIDER_DESCRIPTOR, 0, directoryStructure ); this.pageCache = pageCache; 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 c2fee9b0a84d0..11e0d838f0e0c 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 @@ -33,8 +33,8 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.DropAction; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.Selector; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.DropAction; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.Selector; import org.neo4j.storageengine.api.schema.IndexReader; import static java.util.Arrays.asList; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulator.java index 1463020651372..2a79e34b13f3f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulator.java @@ -28,12 +28,12 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.DropAction; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.Selector; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.DropAction; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.Selector; import org.neo4j.storageengine.api.schema.IndexSample; import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexUtils.forAll; -import static org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.combineSamples; +import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.combineSamples; class FusionIndexPopulator implements IndexPopulator { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java similarity index 90% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSchemaIndexProvider.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java index 55aed260e5181..cd333c4bcadc4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSchemaIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.newapi.UnionIndexCapability; @@ -43,32 +43,32 @@ import static org.neo4j.internal.kernel.api.InternalIndexState.POPULATING; /** - * This {@link SchemaIndexProvider index provider} act as one logical index but is backed by four physical + * This {@link IndexProvider index provider} act as one logical index but is backed by four physical * indexes, the number, spatial, temporal native indexes, and the general purpose lucene index. */ -public class FusionSchemaIndexProvider extends SchemaIndexProvider +public class FusionIndexProvider extends IndexProvider { interface Selector { T select( T numberInstance, T spatialInstance, T temporalInstance, T luceneInstance, Value... values ); } - private final SchemaIndexProvider numberProvider; - private final SchemaIndexProvider spatialProvider; - private final SchemaIndexProvider temporalProvider; - private final SchemaIndexProvider luceneProvider; + private final IndexProvider numberProvider; + private final IndexProvider spatialProvider; + private final IndexProvider temporalProvider; + private final IndexProvider luceneProvider; private final Selector selector; private final DropAction dropAction; - public FusionSchemaIndexProvider( SchemaIndexProvider numberProvider, - SchemaIndexProvider spatialProvider, - SchemaIndexProvider temporalProvider, - SchemaIndexProvider luceneProvider, - Selector selector, - Descriptor descriptor, - int priority, - IndexDirectoryStructure.Factory directoryStructure, - FileSystemAbstraction fs ) + public FusionIndexProvider( IndexProvider numberProvider, + IndexProvider spatialProvider, + IndexProvider temporalProvider, + IndexProvider luceneProvider, + Selector selector, + Descriptor descriptor, + int priority, + IndexDirectoryStructure.Factory directoryStructure, + FileSystemAbstraction fs ) { super( descriptor, priority, directoryStructure ); this.numberProvider = numberProvider; @@ -116,7 +116,7 @@ public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) t throw new IllegalStateException( "None of the indexes were in a failed state" ); } - private void writeFailure( String indexName, StringBuilder builder, SchemaIndexProvider provider, long indexId, IndexDescriptor descriptor ) + private void writeFailure( String indexName, StringBuilder builder, IndexProvider provider, long indexId, IndexDescriptor descriptor ) { try { 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 005a550c3757d..75284d72d8824 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 @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.schema.BridgingIndexProgressor; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.Selector; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.Selector; 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/FusionIndexSampler.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexSampler.java index e8953424b9301..dcc6e1a22da6b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexSampler.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexSampler.java @@ -23,7 +23,7 @@ import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.storageengine.api.schema.IndexSampler; -import static org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.combineSamples; +import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.combineSamples; public class FusionIndexSampler implements IndexSampler { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexUpdater.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexUpdater.java index f35f5182efc44..b3b1c53eaa2d7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexUpdater.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexUpdater.java @@ -25,7 +25,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.impl.index.schema.fusion.FusionSchemaIndexProvider.Selector; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.Selector; import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexUtils.forAll; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector.java index 2e1522aabd7ca..1145cd426fb3f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSelector.java @@ -23,7 +23,7 @@ import org.neo4j.values.storable.ValueGroup; import org.neo4j.values.storable.Values; -public class FusionSelector implements FusionSchemaIndexProvider.Selector +public class FusionSelector implements FusionIndexProvider.Selector { @Override public T select( T numberInstance, T spatialInstance, T temporalInstance, T luceneInstance, Value... values ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionSchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProvider.java similarity index 94% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionSchemaIndexProvider.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProvider.java index 1f29d548899e6..8eaebfe333205 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionSchemaIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProvider.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -50,7 +50,7 @@ /** * Schema index provider for native indexes backed by e.g. {@link GBPTree}. */ -public class SpatialFusionSchemaIndexProvider extends SchemaIndexProvider implements SpatialCRSSchemaIndex.Supplier +public class SpatialFusionIndexProvider extends IndexProvider implements SpatialCRSSchemaIndex.Supplier { public static final String KEY = "spatial"; public static final Descriptor SPATIAL_PROVIDER_DESCRIPTOR = new Descriptor( KEY, "1.0" ); @@ -66,9 +66,10 @@ public class SpatialFusionSchemaIndexProvider extends SchemaIndexProvider implem private Map> indexes = new HashMap<>(); - public SpatialFusionSchemaIndexProvider( PageCache pageCache, FileSystemAbstraction fs, - IndexDirectoryStructure.Factory directoryStructure, Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, boolean readOnly, - Config config ) + public SpatialFusionIndexProvider( PageCache pageCache, FileSystemAbstraction fs, + IndexDirectoryStructure.Factory directoryStructure, Monitor monitor, + RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, boolean readOnly, + Config config ) { super( SPATIAL_PROVIDER_DESCRIPTOR, 0, directoryStructure ); this.pageCache = pageCache; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java index 176e9da81a047..6b6f7b6083cf1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java @@ -22,12 +22,11 @@ import java.util.Iterator; import java.util.Set; -import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DuplicateSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; @@ -180,7 +179,7 @@ public void visitNodeLabelChanges( long id, final Set added, final Set< @Override public void visitAddedIndex( IndexDescriptor index ) { - SchemaIndexProvider.Descriptor providerDescriptor = + IndexProvider.Descriptor providerDescriptor = schemaIndexProviderMap.getDefaultProvider().getProviderDescriptor(); IndexRule rule = IndexRule.indexRule( schemaStorage.newRuleId(), index, providerDescriptor ); recordState.createSchemaRule( rule ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java index c983ce37348b7..180b95582245a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java @@ -21,7 +21,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -32,43 +32,43 @@ */ public class IndexRule extends SchemaRule implements IndexDescriptor.Supplier { - private final SchemaIndexProvider.Descriptor providerDescriptor; + private final IndexProvider.Descriptor providerDescriptor; private final IndexDescriptor descriptor; private final Long owningConstraint; public static IndexRule indexRule( long id, IndexDescriptor descriptor, - SchemaIndexProvider.Descriptor providerDescriptor ) + IndexProvider.Descriptor providerDescriptor ) { return new IndexRule( id, providerDescriptor, descriptor, null ); } public static IndexRule constraintIndexRule( long id, IndexDescriptor descriptor, - SchemaIndexProvider.Descriptor providerDescriptor, + IndexProvider.Descriptor providerDescriptor, Long owningConstraint ) { return new IndexRule( id, providerDescriptor, descriptor, owningConstraint ); } public static IndexRule indexRule( long id, IndexDescriptor descriptor, - SchemaIndexProvider.Descriptor providerDescriptor, String name ) + IndexProvider.Descriptor providerDescriptor, String name ) { return new IndexRule( id, providerDescriptor, descriptor, null, name ); } public static IndexRule constraintIndexRule( long id, IndexDescriptor descriptor, - SchemaIndexProvider.Descriptor providerDescriptor, + IndexProvider.Descriptor providerDescriptor, Long owningConstraint, String name ) { return new IndexRule( id, providerDescriptor, descriptor, owningConstraint, name ); } - IndexRule( long id, SchemaIndexProvider.Descriptor providerDescriptor, + IndexRule( long id, IndexProvider.Descriptor providerDescriptor, IndexDescriptor descriptor, Long owningConstraint ) { this( id, providerDescriptor, descriptor, owningConstraint, null ); } - IndexRule( long id, SchemaIndexProvider.Descriptor providerDescriptor, + IndexRule( long id, IndexProvider.Descriptor providerDescriptor, IndexDescriptor descriptor, Long owningConstraint, String name ) { super( id, name ); @@ -82,7 +82,7 @@ public static IndexRule constraintIndexRule( long id, IndexDescriptor descriptor this.providerDescriptor = providerDescriptor; } - public SchemaIndexProvider.Descriptor getProviderDescriptor() + public IndexProvider.Descriptor getProviderDescriptor() { return providerDescriptor; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java index 8a085a1659735..05ee70005b495 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java @@ -22,7 +22,7 @@ import java.nio.ByteBuffer; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; @@ -93,7 +93,7 @@ private static SchemaRule newRule( Kind kind, long id, int labelId, ByteBuffer b private static IndexRule readIndexRule( long id, boolean constraintIndex, int label, ByteBuffer serialized ) { - SchemaIndexProvider.Descriptor providerDescriptor = readIndexProviderDescriptor( serialized ); + IndexProvider.Descriptor providerDescriptor = readIndexProviderDescriptor( serialized ); int[] propertyKeyIds = readIndexPropertyKeys( serialized ); IndexDescriptor descriptor = constraintIndex ? IndexDescriptorFactory.uniqueForLabel( label, propertyKeyIds ) : @@ -102,11 +102,11 @@ private static IndexRule readIndexRule( long id, boolean constraintIndex, int la return new IndexRule( id, providerDescriptor, descriptor, owningConstraint ); } - private static SchemaIndexProvider.Descriptor readIndexProviderDescriptor( ByteBuffer serialized ) + private static IndexProvider.Descriptor readIndexProviderDescriptor( ByteBuffer serialized ) { String providerKey = getDecodedStringFrom( serialized ); String providerVersion = getDecodedStringFrom( serialized ); - return new SchemaIndexProvider.Descriptor( providerKey, providerVersion ); + return new IndexProvider.Descriptor( providerKey, providerVersion ); } private static int[] readIndexPropertyKeys( ByteBuffer serialized ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java index 57d003aa35702..7da25c81d52c7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java @@ -28,7 +28,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaProcessor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; @@ -108,7 +108,7 @@ public static byte[] serialize( IndexRule indexRule ) target.putInt( LEGACY_LABEL_OR_REL_TYPE_ID ); target.put( INDEX_RULE ); - SchemaIndexProvider.Descriptor providerDescriptor = indexRule.getProviderDescriptor(); + IndexProvider.Descriptor providerDescriptor = indexRule.getProviderDescriptor(); UTF8.putEncodedStringInto( providerDescriptor.getKey(), target ); UTF8.putEncodedStringInto( providerDescriptor.getVersion(), target ); @@ -185,7 +185,7 @@ public static int lengthOf( IndexRule indexRule ) int length = 4; // legacy label or relType id length += 1; // schema rule type - SchemaIndexProvider.Descriptor providerDescriptor = indexRule.getProviderDescriptor(); + IndexProvider.Descriptor providerDescriptor = indexRule.getProviderDescriptor(); length += UTF8.computeRequiredByteBufferSize( providerDescriptor.getKey() ); length += UTF8.computeRequiredByteBufferSize( providerDescriptor.getVersion() ); @@ -229,7 +229,7 @@ public static int lengthOf( ConstraintRule constraintRule ) private static IndexRule readIndexRule( long id, ByteBuffer source ) throws MalformedSchemaRuleException { - SchemaIndexProvider.Descriptor indexProvider = readIndexProviderDescriptor( source ); + IndexProvider.Descriptor indexProvider = readIndexProviderDescriptor( source ); LabelSchemaDescriptor schema; byte indexRuleType = source.get(); String name; @@ -264,11 +264,11 @@ private static LabelSchemaDescriptor readLabelSchema( ByteBuffer source ) throws return (LabelSchemaDescriptor)schemaDescriptor; } - private static SchemaIndexProvider.Descriptor readIndexProviderDescriptor( ByteBuffer source ) + private static IndexProvider.Descriptor readIndexProviderDescriptor( ByteBuffer source ) { String providerKey = getDecodedStringFrom( source ); String providerVersion = getDecodedStringFrom( source ); - return new SchemaIndexProvider.Descriptor( providerKey, providerVersion ); + return new IndexProvider.Descriptor( providerKey, providerVersion ); } // READ CONSTRAINT diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigrator.java index e609075431a86..4a2823042e4c6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigrator.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.impl.store.format.CapabilityType; import org.neo4j.kernel.impl.store.format.RecordFormatSelector; import org.neo4j.kernel.impl.store.format.RecordFormats; @@ -40,13 +40,13 @@ public class SchemaIndexMigrator extends AbstractStoreMigrationParticipant private final FileSystemAbstraction fileSystem; private boolean deleteObsoleteIndexes; private File schemaIndexDirectory; - private final SchemaIndexProvider schemaIndexProvider; + private final IndexProvider indexProvider; - public SchemaIndexMigrator( FileSystemAbstraction fileSystem, SchemaIndexProvider schemaIndexProvider ) + public SchemaIndexMigrator( FileSystemAbstraction fileSystem, IndexProvider indexProvider ) { super( "Indexes" ); this.fileSystem = fileSystem; - this.schemaIndexProvider = schemaIndexProvider; + this.indexProvider = indexProvider; } @Override @@ -57,7 +57,7 @@ public void migrate( File storeDir, File migrationDir, ProgressReporter progress RecordFormats to = RecordFormatSelector.selectForVersion( versionToMigrateTo ); if ( !from.hasSameCapabilities( to, CapabilityType.INDEX ) ) { - schemaIndexDirectory = schemaIndexProvider.directoryStructure().rootDirectory(); + schemaIndexDirectory = indexProvider.directoryStructure().rootDirectory(); if ( schemaIndexDirectory != null ) { deleteObsoleteIndexes = true; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DefaultSchemaIndexProviderMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DefaultSchemaIndexProviderMap.java index aab2bf29407ef..4a8b948432fe0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DefaultSchemaIndexProviderMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DefaultSchemaIndexProviderMap.java @@ -25,30 +25,30 @@ import java.util.Objects; import java.util.function.Consumer; -import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor; +import org.neo4j.kernel.api.index.IndexProvider; +import org.neo4j.kernel.api.index.IndexProvider.Descriptor; import org.neo4j.kernel.impl.api.index.SchemaIndexProviderMap; public class DefaultSchemaIndexProviderMap implements SchemaIndexProviderMap { - private final SchemaIndexProvider defaultIndexProvider; - private final Map indexProviders = new HashMap<>(); + private final IndexProvider defaultIndexProvider; + private final Map indexProviders = new HashMap<>(); - public DefaultSchemaIndexProviderMap( SchemaIndexProvider defaultIndexProvider ) + public DefaultSchemaIndexProviderMap( IndexProvider defaultIndexProvider ) { this( defaultIndexProvider, Collections.emptyList() ); } - public DefaultSchemaIndexProviderMap( SchemaIndexProvider defaultIndexProvider, - Iterable additionalIndexProviders ) + public DefaultSchemaIndexProviderMap( IndexProvider defaultIndexProvider, + Iterable additionalIndexProviders ) { this.defaultIndexProvider = defaultIndexProvider; indexProviders.put( defaultIndexProvider.getProviderDescriptor(), defaultIndexProvider ); - for ( SchemaIndexProvider provider : additionalIndexProviders ) + for ( IndexProvider provider : additionalIndexProviders ) { Descriptor providerDescriptor = provider.getProviderDescriptor(); Objects.requireNonNull( providerDescriptor ); - SchemaIndexProvider existing = indexProviders.putIfAbsent( providerDescriptor, provider ); + IndexProvider existing = indexProviders.putIfAbsent( providerDescriptor, provider ); if ( existing != null ) { throw new IllegalArgumentException( "Tried to load multiple schema index providers with the same provider descriptor " + @@ -58,15 +58,15 @@ public DefaultSchemaIndexProviderMap( SchemaIndexProvider defaultIndexProvider, } @Override - public SchemaIndexProvider getDefaultProvider() + public IndexProvider getDefaultProvider() { return defaultIndexProvider; } @Override - public SchemaIndexProvider apply( SchemaIndexProvider.Descriptor descriptor ) + public IndexProvider apply( IndexProvider.Descriptor descriptor ) { - SchemaIndexProvider provider = indexProviders.get( descriptor ); + IndexProvider provider = indexProviders.get( descriptor ); if ( provider != null ) { return provider; @@ -78,7 +78,7 @@ public SchemaIndexProvider apply( SchemaIndexProvider.Descriptor descriptor ) } @Override - public void accept( Consumer visitor ) + public void accept( Consumer visitor ) { indexProviders.values().forEach( visitor ); } diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java index d68adfca185e7..a0aa823b3bd59 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; import org.neo4j.kernel.impl.api.RelationshipVisitor; @@ -160,10 +160,10 @@ long indexGetCommittedId( IndexDescriptor index ) * Return index provider descriptor of a stored index. * * @param descriptor {@link LabelSchemaDescriptor} to get provider descriptor for. - * @return {@link SchemaIndexProvider.Descriptor} for index. + * @return {@link IndexProvider.Descriptor} for index. * @throws IndexNotFoundKernelException if index not found. */ - SchemaIndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; + IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException; /** * Return capability of stored index. diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java index 93dabb93c5ccd..93548c528cf36 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java @@ -63,7 +63,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; @@ -297,7 +297,7 @@ public BatchInserterImpl( final File storeDir, final FileSystemAbstraction fileS new SimpleKernelContext( storeDir, DatabaseInfo.UNKNOWN, deps ), kernelExtensions, deps, UnsatisfiedDependencyStrategies.ignore() ) ); - SchemaIndexProvider provider = extensions.resolveDependency( SchemaIndexProvider.class, + IndexProvider provider = extensions.resolveDependency( IndexProvider.class, HighestSelectionStrategy.INSTANCE ); schemaIndexProviders = new DefaultSchemaIndexProviderMap( provider ); labelScanStore = new NativeLabelScanStore( pageCache, storeDir, FullStoreChangeStream.EMPTY, false, new Monitors(), @@ -584,7 +584,7 @@ private IndexRule[] getIndexesNeedingPopulation() List indexesNeedingPopulation = new ArrayList<>(); for ( IndexRule rule : schemaCache.indexRules() ) { - SchemaIndexProvider provider = schemaIndexProviders.apply( rule.getProviderDescriptor() ); + IndexProvider provider = schemaIndexProviders.apply( rule.getProviderDescriptor() ); if ( provider.getInitialState( rule.getId(), rule.getIndexDescriptor() ) != InternalIndexState.FAILED ) { indexesNeedingPopulation.add( rule ); diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/SchemaIndexWaitingAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/SchemaIndexWaitingAcceptanceTest.java index 70d5f4144002b..4c8e0869347cf 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/SchemaIndexWaitingAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/SchemaIndexWaitingAcceptanceTest.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.kernel.extension.KernelExtensionFactory; -import org.neo4j.kernel.impl.api.index.ControlledPopulationSchemaIndexProvider; +import org.neo4j.kernel.impl.api.index.ControlledPopulationIndexProvider; import org.neo4j.test.DoubleLatch; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.ImpermanentDatabaseRule; @@ -41,7 +41,7 @@ public class SchemaIndexWaitingAcceptanceTest { - private final ControlledPopulationSchemaIndexProvider provider = new ControlledPopulationSchemaIndexProvider(); + private final ControlledPopulationIndexProvider provider = new ControlledPopulationIndexProvider(); @Rule public ImpermanentDatabaseRule rule = new ImpermanentDatabaseRule() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java index 904b2a3bb4ad4..2f5bd263c91cc 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java @@ -37,7 +37,7 @@ import static org.neo4j.kernel.api.index.IndexQueryHelper.exact; @Ignore( "Not a test. This is a compatibility suite that provides test cases for verifying" + - " SchemaIndexProvider implementations. Each index provider that is to be tested by this suite" + + " IndexProvider implementations. Each index provider that is to be tested by this suite" + " must create their own test class extending IndexProviderCompatibilityTestSuite." + " The @Ignore annotation doesn't prevent these tests to run, it rather removes some annoying" + " errors or warnings in some IDEs about test classes needing a public zero-arg constructor." ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java index eb3bb0d4dcff9..391b6d35a5852 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java @@ -43,7 +43,7 @@ import static org.neo4j.kernel.api.index.IndexQueryHelper.add; @Ignore( "Not a test. This is a compatibility suite that provides test cases for verifying" + - " SchemaIndexProvider implementations. Each index provider that is to be tested by this suite" + + " IndexProvider implementations. Each index provider that is to be tested by this suite" + " must create their own test class extending IndexProviderCompatibilityTestSuite." + " The @Ignore annotation doesn't prevent these tests to run, it rather removes some annoying" + " errors or warnings in some IDEs about test classes needing a public zero-arg constructor." ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/InMemoryIndexIndexProviderApprovalTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/InMemoryIndexProviderApprovalTest.java similarity index 84% rename from community/kernel/src/test/java/org/neo4j/kernel/api/index/InMemoryIndexIndexProviderApprovalTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/api/index/InMemoryIndexProviderApprovalTest.java index e1c1ff939afb0..6f83b70cb4d3d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/InMemoryIndexIndexProviderApprovalTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/InMemoryIndexProviderApprovalTest.java @@ -19,9 +19,9 @@ */ package org.neo4j.kernel.api.index; -public class InMemoryIndexIndexProviderApprovalTest extends SchemaIndexProviderApprovalTest +public class InMemoryIndexProviderApprovalTest extends IndexProviderApprovalTest { - public InMemoryIndexIndexProviderApprovalTest( TestValue value ) + public InMemoryIndexProviderApprovalTest( TestValue value ) { super( value ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexDirectoryStructureTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexDirectoryStructureTest.java index 5505b69c3e91c..5ea0172d53a81 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexDirectoryStructureTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexDirectoryStructureTest.java @@ -23,7 +23,7 @@ import java.io.File; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor; +import org.neo4j.kernel.api.index.IndexProvider.Descriptor; import static org.junit.Assert.assertEquals; import static org.neo4j.io.fs.FileUtils.path; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderApprovalTest.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderApprovalTest.java index cde21cd184f40..bc24165507cc0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderApprovalTest.java @@ -57,7 +57,7 @@ * class in the index provider module, all value types will be checked against the index provider. */ @RunWith( value = Parameterized.class ) -public abstract class SchemaIndexProviderApprovalTest +public abstract class IndexProviderApprovalTest { // These are the values that will be checked. public enum TestValue @@ -121,7 +121,7 @@ public enum TestValue private final TestValue currentValue; - public SchemaIndexProviderApprovalTest( TestValue value ) + public IndexProviderApprovalTest( TestValue value ) { currentValue = value; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java index e9f6b6cf25e35..0cfd57370d35a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java @@ -62,7 +62,7 @@ } ) public abstract class IndexProviderCompatibilityTestSuite { - protected abstract SchemaIndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ); + protected abstract IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ); public abstract boolean supportsSpatial(); @@ -75,7 +75,7 @@ public abstract static class Compatibility protected File graphDbDir; protected FileSystemAbstraction fs; - protected SchemaIndexProvider indexProvider; + protected IndexProvider indexProvider; protected IndexDescriptor descriptor; final IndexProviderCompatibilityTestSuite testSuite; final List valueSet1; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java index 2a0c47ebfb03a..ca3805d15b0ba 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java @@ -43,7 +43,7 @@ import static org.neo4j.kernel.api.index.IndexQueryHelper.add; @Ignore( "Not a test. This is a compatibility suite that provides test cases for verifying" + - " SchemaIndexProvider implementations. Each index provider that is to be tested by this suite" + + " IndexProvider implementations. Each index provider that is to be tested by this suite" + " must create their own test class extending IndexProviderCompatibilityTestSuite." + " The @Ignore annotation doesn't prevent these tests to run, it rather removes some annoying" + " errors or warnings in some IDEs about test classes needing a public zero-arg constructor." ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java index 7c61b8a8a1423..8cacd6170be62 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java @@ -57,7 +57,7 @@ import static org.neo4j.kernel.api.index.IndexEntryUpdate.add; @Ignore( "Not a test. This is a compatibility suite that provides test cases for verifying" + - " SchemaIndexProvider implementations. Each index provider that is to be tested by this suite" + + " IndexProvider implementations. Each index provider that is to be tested by this suite" + " must create their own test class extending IndexProviderCompatibilityTestSuite." + " The @Ignore annotation doesn't prevent these tests to run, it rather removes some annoying" + " errors or warnings in some IDEs about test classes needing a public zero-arg constructor." ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java index bcec398724c13..37ca56f2dd5aa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java @@ -60,7 +60,7 @@ import static org.neo4j.kernel.impl.locking.LockService.LockType; @Ignore( "Not a test. This is a compatibility suite that provides test cases for verifying" + - " SchemaIndexProvider implementations. Each index provider that is to be tested by this suite" + + " IndexProvider implementations. Each index provider that is to be tested by this suite" + " must create their own test class extending IndexProviderCompatibilityTestSuite." + " The @Ignore annotation doesn't prevent these tests to run, it rather removes some annoying" + " errors or warnings in some IDEs about test classes needing a public zero-arg constructor." ) @@ -77,7 +77,7 @@ public UniqueConstraintCompatibility( IndexProviderCompatibilityTestSuite testSu * * We have two supported providers: * - InMemoryIndexProvider - * - LuceneSchemaIndexProvider + * - LuceneIndexProvider * * An index can be in a number of states, two of which are interesting: * - ONLINE: the index is in active duty @@ -992,7 +992,7 @@ private static void awaitUninterruptibly( CountDownLatch latch ) private static class PredefinedSchemaIndexProviderFactory extends KernelExtensionFactory { - private final SchemaIndexProvider indexProvider; + private final IndexProvider indexProvider; @Override public Lifecycle newInstance( KernelContext context, NoDeps noDeps ) @@ -1004,7 +1004,7 @@ interface NoDeps { } - PredefinedSchemaIndexProviderFactory( SchemaIndexProvider indexProvider ) + PredefinedSchemaIndexProviderFactory( IndexProvider indexProvider ) { super( indexProvider.getClass().getSimpleName() ); this.indexProvider = indexProvider; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java index cfc3b41b717f9..f1d4f6bc297d3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/BuiltInProceduresTest.java @@ -50,7 +50,7 @@ import org.neo4j.kernel.api.ResourceTracker; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StubResourceManager; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.proc.BasicContext; import org.neo4j.kernel.api.proc.Key; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; @@ -114,7 +114,7 @@ public void shouldListAllIndexes() throws Throwable getIndexProviderDescriptorMap( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ) ) ) ); } - private Map getIndexProviderDescriptorMap( SchemaIndexProvider.Descriptor providerDescriptor ) + private Map getIndexProviderDescriptorMap( IndexProvider.Descriptor providerDescriptor ) { return MapUtil.stringMap( "key", providerDescriptor.getKey(), "version", providerDescriptor.getVersion() ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java index 46f6c74e1b330..89d1dbdf7b151 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; @@ -101,8 +101,8 @@ public void indexGetProviderDescriptorMustReturnUndecidedIfIndexCreatedInTransac db.schema().indexFor( LABEL1 ).on( PROP1 ).create(); ReadOperations readOperations = statement.readOperations(); IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( labelId, propertyId ); - SchemaIndexProvider.Descriptor providerDescriptor = readOperations.indexGetProviderDescriptor( indexDescriptor ); - assertThat( providerDescriptor, is( SchemaIndexProvider.UNDECIDED ) ); + IndexProvider.Descriptor providerDescriptor = readOperations.indexGetProviderDescriptor( indexDescriptor ); + assertThat( providerDescriptor, is( IndexProvider.UNDECIDED ) ); tx.success(); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java index e8bdcb7741ec6..15f5f4beb6a25 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.locking.LockService; @@ -350,7 +350,7 @@ private static IndexPopulator addPopulator( BatchingMultipleIndexPopulator batch batchingPopulator.addPopulator( populator, descriptor.schema().getLabelId(), - new IndexMeta( 1, descriptor, new SchemaIndexProvider.Descriptor( "foo", "1" ), NO_CAPABILITY ), + new IndexMeta( 1, descriptor, new IndexProvider.Descriptor( "foo", "1" ), NO_CAPABILITY ), flipper, failedIndexProxyFactory, "testIndex" ); return populator; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationSchemaIndexProvider.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java similarity index 92% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationSchemaIndexProvider.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java index 0073b88f213f9..a1c99d9150df6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationSchemaIndexProvider.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -43,7 +43,7 @@ import static org.neo4j.internal.kernel.api.InternalIndexState.POPULATING; import static org.neo4j.test.DoubleLatch.awaitLatch; -public class ControlledPopulationSchemaIndexProvider extends SchemaIndexProvider +public class ControlledPopulationIndexProvider extends IndexProvider { private IndexPopulator mockedPopulator = new IndexPopulator.Adapter(); private final IndexAccessor mockedWriter = mock( IndexAccessor.class ); @@ -52,10 +52,10 @@ public class ControlledPopulationSchemaIndexProvider extends SchemaIndexProvider final AtomicInteger populatorCallCount = new AtomicInteger(); final AtomicInteger writerCallCount = new AtomicInteger(); - public static final SchemaIndexProvider.Descriptor PROVIDER_DESCRIPTOR = new SchemaIndexProvider.Descriptor( + public static final IndexProvider.Descriptor PROVIDER_DESCRIPTOR = new IndexProvider.Descriptor( "controlled-population", "1.0" ); - public ControlledPopulationSchemaIndexProvider() + public ControlledPopulationIndexProvider() { super( PROVIDER_DESCRIPTOR, 10, IndexDirectoryStructure.NONE ); setInitialIndexState( initialIndexState ); @@ -128,7 +128,7 @@ public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) t } @Override - public int compareTo( SchemaIndexProvider o ) + public int compareTo( IndexProvider o ) { return 1; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java index f696ae34d6232..db5545c8d4a68 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java @@ -25,7 +25,7 @@ import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.logging.AssertableLogProvider; @@ -38,7 +38,7 @@ public class FailedIndexProxyTest { - private final SchemaIndexProvider.Descriptor providerDescriptor = mock( SchemaIndexProvider.Descriptor.class ); + private final IndexProvider.Descriptor providerDescriptor = mock( IndexProvider.Descriptor.class ); private final IndexCapability indexCapability = mock( IndexCapability.class ); private final IndexPopulator indexPopulator = mock( IndexPopulator.class ); private final IndexPopulationFailure indexPopulationFailure = mock( IndexPopulationFailure.class ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index 7015797eb9a7e..afa65eb6dff64 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -40,13 +40,12 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; @@ -68,7 +67,7 @@ import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper.singleInstanceSchemaIndexProviderFactory; -import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; +import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; import static org.neo4j.test.mockito.matcher.Neo4jMatchers.createIndex; public class IndexCRUDIT @@ -145,7 +144,7 @@ public void addingALabelToPreExistingNodeShouldGetIndexed() throws Exception private GraphDatabaseAPI db; @Rule public EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); - private final SchemaIndexProvider mockedIndexProvider = mock( SchemaIndexProvider.class ); + private final IndexProvider mockedIndexProvider = mock( IndexProvider.class ); private final KernelExtensionFactory mockedIndexProviderFactory = singleInstanceSchemaIndexProviderFactory( "none", mockedIndexProvider ); private ThreadToStatementContextBridge ctxSupplier; @@ -188,7 +187,7 @@ private GatheringIndexWriter newWriter() throws IOException when( mockedIndexProvider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( writer ); - when( mockedIndexProvider.compareTo( any( SchemaIndexProvider.class ) ) ) + when( mockedIndexProvider.compareTo( any( IndexProvider.class ) ) ) .thenReturn( 1 ); // always pretend to have highest priority return writer; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index 70255ce22a21f..d11ffe73aa353 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -97,7 +97,7 @@ import static org.neo4j.internal.kernel.api.security.LoginContext.AUTH_DISABLED; import static org.neo4j.kernel.api.index.IndexEntryUpdate.add; import static org.neo4j.kernel.impl.api.index.IndexingService.NO_MONITOR; -import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; +import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; import static org.neo4j.logging.AssertableLogProvider.inLog; public class IndexPopulationJobTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java index 2915d45cb86f3..ec1f1ce3bd839 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java @@ -27,7 +27,7 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; @@ -92,7 +92,7 @@ public LabelSchemaDescriptor schema() } @Override - public SchemaIndexProvider.Descriptor getProviderDescriptor() + public IndexProvider.Descriptor getProviderDescriptor() { return null; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index 0d6fb4c91a7b3..19c76142fb29e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -42,12 +42,11 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; @@ -235,9 +234,9 @@ public void shouldKeepFailedIndexesAsFailedAfterRestart() throws Exception private GraphDatabaseAPI db; @Rule public EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); - private final SchemaIndexProvider mockedIndexProvider = mock( SchemaIndexProvider.class ); + private final IndexProvider mockedIndexProvider = mock( IndexProvider.class ); private final KernelExtensionFactory mockedIndexProviderFactory = - singleInstanceSchemaIndexProviderFactory( TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR.getKey(), + singleInstanceSchemaIndexProviderFactory( TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR.getKey(), mockedIndexProvider ); private final String key = "number_of_bananas_owned"; private final Label myLabel = label( "MyLabel" ); @@ -246,8 +245,8 @@ public void shouldKeepFailedIndexesAsFailedAfterRestart() throws Exception public void setUp() { when( mockedIndexProvider.getProviderDescriptor() ) - .thenReturn( TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR ); - when( mockedIndexProvider.compareTo( any( SchemaIndexProvider.class ) ) ) + .thenReturn( TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR ); + when( mockedIndexProvider.compareTo( any( IndexProvider.class ) ) ) .thenReturn( 1 ); // always pretend to have highest priority when( mockedIndexProvider.storeMigrationParticipant( any( FileSystemAbstraction.class ), any( PageCache.class ) ) ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java index 0c132a95eb803..5defbdfd4f2de 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java @@ -59,7 +59,7 @@ public class IndexRestartIT private GraphDatabaseService db; private TestGraphDatabaseFactory factory; - private final ControlledPopulationSchemaIndexProvider provider = new ControlledPopulationSchemaIndexProvider(); + private final ControlledPopulationIndexProvider provider = new ControlledPopulationIndexProvider(); private final Label myLabel = label( "MyLabel" ); @Before diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java index 94706883b46fd..581e471e1b7c6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java @@ -62,7 +62,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; @@ -132,7 +132,7 @@ import static org.neo4j.internal.kernel.api.InternalIndexState.ONLINE; import static org.neo4j.internal.kernel.api.InternalIndexState.POPULATING; import static org.neo4j.kernel.impl.api.index.IndexUpdateMode.RECOVERY; -import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; +import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; import static org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode.TRIGGER_REBUILD_ALL; import static org.neo4j.logging.AssertableLogProvider.inLog; import static org.neo4j.register.Registers.newDoubleLongRegister; @@ -152,7 +152,7 @@ public class IndexingServiceTest private final IndexDescriptor index = IndexDescriptorFactory.forLabel( labelId, propertyKeyId ); private final IndexPopulator populator = mock( IndexPopulator.class ); private final IndexUpdater updater = mock( IndexUpdater.class ); - private final SchemaIndexProvider indexProvider = mock( SchemaIndexProvider.class ); + private final IndexProvider indexProvider = mock( IndexProvider.class ); private final IndexAccessor accessor = mock( IndexAccessor.class, RETURNS_MOCKS ); private final IndexStoreView storeView = mock( IndexStoreView.class ); private final TokenNameLookup nameLookup = mock( TokenNameLookup.class ); @@ -348,7 +348,7 @@ public void shouldBringConstraintIndexOnlineWhenExplicitlyToldTo() throws Except public void shouldLogIndexStateOnInit() throws Exception { // given - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); when( provider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( mock( IndexAccessor.class ) ); @@ -390,7 +390,7 @@ public void shouldLogIndexStateOnInit() throws Exception public void shouldLogIndexStateOnStart() throws Exception { // given - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); SchemaIndexProviderMap providerMap = new DefaultSchemaIndexProviderMap( provider ); TokenNameLookup mockLookup = mock( TokenNameLookup.class ); @@ -440,7 +440,7 @@ public void shouldFailToStartIfMissingIndexProvider() throws Exception { // GIVEN an indexing service that has a schema index provider X String otherProviderKey = "something-completely-different"; - SchemaIndexProvider.Descriptor otherDescriptor = new SchemaIndexProvider.Descriptor( + IndexProvider.Descriptor otherDescriptor = new IndexProvider.Descriptor( otherProviderKey, "no-version" ); IndexRule rule = indexRule( 1, 2, 3, otherDescriptor ); IndexingService indexing = newIndexingServiceWithMockedDependencies( @@ -910,7 +910,7 @@ public void shouldStoreIndexFailureWhenFailingToCreateOnlineAccessorAfterRecover public void shouldLogIndexStateOutliersOnInit() throws Exception { // given - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); when( provider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( mock( IndexAccessor.class ) ); @@ -958,7 +958,7 @@ public void shouldLogIndexStateOutliersOnInit() throws Exception public void shouldLogIndexStateOutliersOnStart() throws Exception { // given - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); when( provider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( mock( IndexAccessor.class ) ); @@ -1360,21 +1360,21 @@ public ResourceIterator snapshotFiles() } } - private IndexRule indexRule( long ruleId, int labelId, int propertyKeyId, SchemaIndexProvider.Descriptor + private IndexRule indexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor providerDescriptor ) { return IndexRule.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyKeyId ), providerDescriptor ); } - private IndexRule constraintIndexRule( long ruleId, int labelId, int propertyKeyId, SchemaIndexProvider.Descriptor + private IndexRule constraintIndexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor providerDescriptor ) { return IndexRule.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ), providerDescriptor ); } - private IndexRule constraintIndexRule( long ruleId, int labelId, int propertyKeyId, SchemaIndexProvider.Descriptor + private IndexRule constraintIndexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor providerDescriptor, long constraintId ) { return IndexRule.constraintIndexRule( diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java index e667f9304ff09..80c76fc8f5592 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; @@ -484,7 +484,7 @@ private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopula FailedIndexProxyFactory failedIndexProxyFactory ) { return multipleIndexPopulator.addPopulator( indexPopulator, indexId, - new IndexMeta( indexId, descriptor, mock( SchemaIndexProvider.Descriptor.class ), NO_CAPABILITY ), + new IndexMeta( indexId, descriptor, mock( IndexProvider.Descriptor.class ), NO_CAPABILITY ), flippableIndexProxy, failedIndexProxyFactory, "userIndexDescription" ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java index edfaf2046835f..152f9461d23ff 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; @@ -126,7 +126,7 @@ private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopula FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { return multipleIndexPopulator.addPopulator( indexPopulator, indexId, - new IndexMeta( indexId, descriptor, mock( SchemaIndexProvider.Descriptor.class ), NO_CAPABILITY ), + new IndexMeta( indexId, descriptor, mock( IndexProvider.Descriptor.class ), NO_CAPABILITY ), flippableIndexProxy, failedIndexProxyFactory, "userIndexDescription" ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java index cba4c2cb2f4ad..82149177e1ea4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.neo4j.kernel.api.index.IndexAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; @@ -37,7 +37,7 @@ public class OnlineIndexProxyTest { private final long indexId = 1; private final IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 2 ); - private final SchemaIndexProvider.Descriptor providerDescriptor = mock( SchemaIndexProvider.Descriptor.class ); + private final IndexProvider.Descriptor providerDescriptor = mock( IndexProvider.Descriptor.class ); private final IndexAccessor accessor = mock( IndexAccessor.class ); private final IndexStoreView storeView = mock( IndexStoreView.class ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/SchemaIndexTestHelper.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/SchemaIndexTestHelper.java index ce2d04aa74bb5..737fecee8d278 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/SchemaIndexTestHelper.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/SchemaIndexTestHelper.java @@ -28,7 +28,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; @@ -45,7 +45,7 @@ private SchemaIndexTestHelper() } public static KernelExtensionFactory singleInstanceSchemaIndexProviderFactory( - String key, final SchemaIndexProvider provider ) + String key, final IndexProvider provider ) { return new SingleInstanceSchemaIndexProviderFactory( key, provider ); } @@ -58,9 +58,9 @@ public interface SingleInstanceSchemaIndexProviderFactoryDependencies private static class SingleInstanceSchemaIndexProviderFactory extends KernelExtensionFactory { - private final SchemaIndexProvider provider; + private final IndexProvider provider; - private SingleInstanceSchemaIndexProviderFactory( String key, SchemaIndexProvider provider ) + private SingleInstanceSchemaIndexProviderFactory( String key, IndexProvider provider ) { super( key ); this.provider = provider; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/TestSchemaIndexProviderDescriptor.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/TestIndexProviderDescriptor.java similarity index 74% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/TestSchemaIndexProviderDescriptor.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/TestIndexProviderDescriptor.java index c4e8662676157..1397d34ea843f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/TestSchemaIndexProviderDescriptor.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/TestIndexProviderDescriptor.java @@ -19,14 +19,14 @@ */ package org.neo4j.kernel.impl.api.index; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; -public class TestSchemaIndexProviderDescriptor +public class TestIndexProviderDescriptor { - public static final SchemaIndexProvider.Descriptor PROVIDER_DESCRIPTOR = - new SchemaIndexProvider.Descriptor( "quantum-dex", "25.0" ); + public static final IndexProvider.Descriptor PROVIDER_DESCRIPTOR = + new IndexProvider.Descriptor( "quantum-dex", "25.0" ); - private TestSchemaIndexProviderDescriptor() + private TestIndexProviderDescriptor() { } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java index 0a7061fa0bdd8..078d902b723e8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java @@ -28,7 +28,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -36,7 +36,7 @@ import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; -public class InMemoryIndexProvider extends SchemaIndexProvider +public class InMemoryIndexProvider extends IndexProvider { private final Map indexes; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProviderFactory.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProviderFactory.java index 1f0db9907dd11..315ded62df11c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProviderFactory.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProviderFactory.java @@ -20,7 +20,7 @@ package org.neo4j.kernel.impl.api.index.inmemory; import org.neo4j.helpers.Service; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.spi.KernelContext; import org.neo4j.kernel.lifecycle.Lifecycle; @@ -33,10 +33,10 @@ public class InMemoryIndexProviderFactory extends KernelExtensionFactory indexes = new ConcurrentHashMap<>(); private final Map>> initialUpdates; - public UpdateCapturingIndexProvider( SchemaIndexProvider actual, Map>> initialUpdates ) + public UpdateCapturingIndexProvider( IndexProvider actual, Map>> initialUpdates ) { super( actual ); this.actual = actual; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java index 88bf7dcb456d1..ace86d45c8267 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java @@ -48,7 +48,7 @@ import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forLabel; import static org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory.uniqueForLabel; -import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; +import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; import static org.neo4j.kernel.impl.store.record.ConstraintRule.constraintRule; public class SchemaCacheTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTest.java similarity index 93% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexProviderTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTest.java index 54ba57fb5a6ff..7bb73f7b51f0f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTest.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.LoggingMonitor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; @@ -55,7 +55,7 @@ import static org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector.IMMEDIATE; import static org.neo4j.kernel.api.index.IndexDirectoryStructure.directoriesByProvider; -public abstract class NativeSchemaIndexProviderTest +public abstract class NativeIndexProviderTest { @Rule public PageCacheAndDependenciesRule rules = new PageCacheAndDependenciesRule(); @@ -63,9 +63,9 @@ public abstract class NativeSchemaIndexProviderTest private static final int indexId = 1; private static final int labelId = 1; private static final int propId = 1; - private SchemaIndexProvider provider; + private IndexProvider provider; private final AssertableLogProvider logging = new AssertableLogProvider(); - private final SchemaIndexProvider.Monitor monitor = new LoggingMonitor( logging.getLog( "test" ) ); + private final IndexProvider.Monitor monitor = new LoggingMonitor( logging.getLog( "test" ) ); @Before public void setup() throws IOException @@ -150,7 +150,7 @@ public void getPopulationFailureMustThrowEvenIfFailureOnOtherIndex() throws IOEx // given provider = newProvider(); - int nonFailedIndexId = NativeSchemaIndexProviderTest.indexId; + int nonFailedIndexId = NativeIndexProviderTest.indexId; IndexPopulator nonFailedPopulator = provider.getPopulator( nonFailedIndexId, descriptor(), samplingConfig() ); nonFailedPopulator.create(); nonFailedPopulator.close( true ); @@ -321,18 +321,18 @@ public void shouldReportInitialStateAsOnlineIfPopulationCompletedSuccessfully() protected abstract Value someValue(); - abstract SchemaIndexProvider newProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, - SchemaIndexProvider.Monitor monitor, RecoveryCleanupWorkCollector collector ); + abstract IndexProvider newProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, + IndexProvider.Monitor monitor, RecoveryCleanupWorkCollector collector ); - abstract SchemaIndexProvider newReadOnlyProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, - SchemaIndexProvider.Monitor monitor, RecoveryCleanupWorkCollector collector ); + abstract IndexProvider newReadOnlyProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, + IndexProvider.Monitor monitor, RecoveryCleanupWorkCollector collector ); - private SchemaIndexProvider newProvider() + private IndexProvider newProvider() { return newProvider( pageCache(), fs(), directoriesByProvider( baseDir() ), monitor, IMMEDIATE ); } - private SchemaIndexProvider newReadOnlyProvider() + private IndexProvider newReadOnlyProvider() { return newReadOnlyProvider( pageCache(), fs(), directoriesByProvider( baseDir() ), monitor, IMMEDIATE ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexTestUtil.java index a3bcafab8b21b..f5ad139417f1c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexTestUtil.java @@ -38,7 +38,7 @@ import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RandomRule; @@ -71,7 +71,7 @@ public abstract class NativeSchemaIndexTestUtil layout; File indexFile; PageCache pageCache; - SchemaIndexProvider.Monitor monitor = SchemaIndexProvider.Monitor.EMPTY; + IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; long indexId = 1; @Before diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java index ef28ce2eb0866..4a405193f5ee0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java @@ -44,7 +44,7 @@ import static org.neo4j.collection.primitive.PrimitiveLongCollections.single; import static org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector.IGNORE; import static org.neo4j.internal.kernel.api.IndexQuery.exact; -import static org.neo4j.kernel.api.index.SchemaIndexProvider.Monitor.EMPTY; +import static org.neo4j.kernel.api.index.IndexProvider.Monitor.EMPTY; import static org.neo4j.test.Randoms.CSA_LETTERS_AND_DIGITS; import static org.neo4j.values.storable.Values.stringValue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberIndexProviderTest.java similarity index 62% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexProviderTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberIndexProviderTest.java index 2434694665d8f..46eba1e262400 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberIndexProviderTest.java @@ -23,25 +23,25 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexDirectoryStructure; -import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Monitor; +import org.neo4j.kernel.api.index.IndexProvider; +import org.neo4j.kernel.api.index.IndexProvider.Monitor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; -public class NumberSchemaIndexProviderTest extends NativeSchemaIndexProviderTest +public class NumberIndexProviderTest extends NativeIndexProviderTest { @Override - SchemaIndexProvider newProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, - Monitor monitor, RecoveryCleanupWorkCollector collector ) + IndexProvider newProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, + Monitor monitor, RecoveryCleanupWorkCollector collector ) { - return new NumberSchemaIndexProvider( pageCache, fs, dir, monitor, collector, false ); + return new NumberIndexProvider( pageCache, fs, dir, monitor, collector, false ); } @Override - SchemaIndexProvider newReadOnlyProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, - Monitor monitor, RecoveryCleanupWorkCollector collector ) + IndexProvider newReadOnlyProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, + Monitor monitor, RecoveryCleanupWorkCollector collector ) { - return new NumberSchemaIndexProvider( pageCache, fs, dir, monitor, collector, true ); + return new NumberIndexProvider( pageCache, fs, dir, monitor, collector, true ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessorTest.java index b209142dfbda8..ceb7ca278637a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessorTest.java @@ -60,7 +60,7 @@ public void respectIndexOrder() throws Exception IndexQuery.NumberRangePredicate supportedQuery = IndexQuery.range( 0, Double.NEGATIVE_INFINITY, true, Double.POSITIVE_INFINITY, true ); - for ( IndexOrder supportedOrder : NumberSchemaIndexProvider.CAPABILITY.orderCapability( ValueGroup.NUMBER ) ) + for ( IndexOrder supportedOrder : NumberIndexProvider.CAPABILITY.orderCapability( ValueGroup.NUMBER ) ) { if ( supportedOrder == IndexOrder.ASCENDING ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndexTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndexTest.java index 56a2880573ea0..872f87df7e6ec 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndexTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndexTest.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.test.rule.PageCacheRule; @@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.rules.RuleChain.outerRule; -import static org.neo4j.kernel.impl.index.schema.fusion.SpatialFusionSchemaIndexProvider.SPATIAL_PROVIDER_DESCRIPTOR; +import static org.neo4j.kernel.impl.index.schema.fusion.SpatialFusionIndexProvider.SPATIAL_PROVIDER_DESCRIPTOR; import static org.neo4j.test.rule.PageCacheRule.config; public class SpatialCRSSchemaIndexTest @@ -82,7 +82,7 @@ public void setup() throws IOException IndexDirectoryStructure dirStructure = IndexDirectoryStructure.directoriesByProvider( storeDir ).forProvider( SPATIAL_PROVIDER_DESCRIPTOR ); descriptor = IndexDescriptorFactory.forLabel( 42, 1337 ); index = new SpatialCRSSchemaIndex( descriptor, dirStructure, crs, 1L, pageCacheRule.getPageCache( fs ), fs, - SchemaIndexProvider.Monitor.EMPTY, RecoveryCleanupWorkCollector.IMMEDIATE, new StandardConfiguration(), 60 ); + IndexProvider.Monitor.EMPTY, RecoveryCleanupWorkCollector.IMMEDIATE, new StandardConfiguration(), 60 ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringIndexProviderTest.java similarity index 62% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexProviderTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringIndexProviderTest.java index 03c689174c7f9..16589f12ac134 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringIndexProviderTest.java @@ -23,25 +23,25 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexDirectoryStructure; -import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Monitor; +import org.neo4j.kernel.api.index.IndexProvider; +import org.neo4j.kernel.api.index.IndexProvider.Monitor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; -public class StringSchemaIndexProviderTest extends NativeSchemaIndexProviderTest +public class StringIndexProviderTest extends NativeIndexProviderTest { @Override - SchemaIndexProvider newProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, - Monitor monitor, RecoveryCleanupWorkCollector collector ) + IndexProvider newProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, + Monitor monitor, RecoveryCleanupWorkCollector collector ) { - return new StringSchemaIndexProvider( pageCache, fs, dir, monitor, collector, false ); + return new StringIndexProvider( pageCache, fs, dir, monitor, collector, false ); } @Override - SchemaIndexProvider newReadOnlyProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, - Monitor monitor, RecoveryCleanupWorkCollector collector ) + IndexProvider newReadOnlyProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory dir, + Monitor monitor, RecoveryCleanupWorkCollector collector ) { - return new StringSchemaIndexProvider( pageCache, fs, dir, monitor, collector, true ); + return new StringIndexProvider( pageCache, fs, dir, monitor, collector, true ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java index e3fe98b040678..1b962c3a69f1e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java @@ -32,7 +32,7 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.DropAction; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.DropAction; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.sameInstance; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulatorTest.java index 0514889db21bf..2d897a4302964 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulatorTest.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.DropAction; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.DropAction; import org.neo4j.values.storable.Value; import static org.hamcrest.Matchers.sameInstance; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSchemaIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java similarity index 82% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSchemaIndexProviderTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java index 02a1e0992cd56..423f62580f82c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionSchemaIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java @@ -25,10 +25,10 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.Selector; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.Selector; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.test.rule.RandomRule; import org.neo4j.values.storable.Value; @@ -46,26 +46,26 @@ import static org.neo4j.kernel.api.index.IndexDirectoryStructure.NONE; import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; -public class FusionSchemaIndexProviderTest +public class FusionIndexProviderTest { - private static final SchemaIndexProvider.Descriptor DESCRIPTOR = new SchemaIndexProvider.Descriptor( "test-fusion", "1" ); + private static final IndexProvider.Descriptor DESCRIPTOR = new IndexProvider.Descriptor( "test-fusion", "1" ); - private SchemaIndexProvider nativeProvider; - private SchemaIndexProvider spatialProvider; - private SchemaIndexProvider temporalProvider; - private SchemaIndexProvider luceneProvider; + private IndexProvider nativeProvider; + private IndexProvider spatialProvider; + private IndexProvider temporalProvider; + private IndexProvider luceneProvider; @Before public void setup() { - nativeProvider = mock( SchemaIndexProvider.class ); - spatialProvider = mock( SchemaIndexProvider.class ); - temporalProvider = mock( SchemaIndexProvider.class ); - luceneProvider = mock( SchemaIndexProvider.class ); - when( nativeProvider.getProviderDescriptor() ).thenReturn( new SchemaIndexProvider.Descriptor( "native", "1" ) ); - when( spatialProvider.getProviderDescriptor() ).thenReturn( new SchemaIndexProvider.Descriptor( "spatial", "1" ) ); - when( temporalProvider.getProviderDescriptor() ).thenReturn( new SchemaIndexProvider.Descriptor( "temporal", "1" ) ); - when( luceneProvider.getProviderDescriptor() ).thenReturn( new SchemaIndexProvider.Descriptor( "lucene", "1" ) ); + nativeProvider = mock( IndexProvider.class ); + spatialProvider = mock( IndexProvider.class ); + temporalProvider = mock( IndexProvider.class ); + luceneProvider = mock( IndexProvider.class ); + when( nativeProvider.getProviderDescriptor() ).thenReturn( new IndexProvider.Descriptor( "native", "1" ) ); + when( spatialProvider.getProviderDescriptor() ).thenReturn( new IndexProvider.Descriptor( "spatial", "1" ) ); + when( temporalProvider.getProviderDescriptor() ).thenReturn( new IndexProvider.Descriptor( "temporal", "1" ) ); + when( luceneProvider.getProviderDescriptor() ).thenReturn( new IndexProvider.Descriptor( "lucene", "1" ) ); } @Rule @@ -86,7 +86,7 @@ public void mustSelectCorrectTargetForAllGivenValueCombinations() for ( Value numberValue : numberValues ) { // when - SchemaIndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, numberValue ); + IndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, numberValue ); // then assertSame( nativeProvider, selected ); @@ -96,7 +96,7 @@ public void mustSelectCorrectTargetForAllGivenValueCombinations() for ( Value spatialValue : spatialValues ) { // when - SchemaIndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, spatialValue ); + IndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, spatialValue ); // then assertSame( spatialProvider, selected ); @@ -106,7 +106,7 @@ public void mustSelectCorrectTargetForAllGivenValueCombinations() for ( Value temporalValue : temporalValues ) { // when - SchemaIndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, temporalValue ); + IndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, temporalValue ); // then assertSame( temporalProvider, selected ); @@ -116,7 +116,7 @@ public void mustSelectCorrectTargetForAllGivenValueCombinations() for ( Value otherValue : otherValues ) { // when - SchemaIndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, otherValue ); + IndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, otherValue ); // then assertSame( luceneProvider, selected ); @@ -128,7 +128,8 @@ public void mustSelectCorrectTargetForAllGivenValueCombinations() for ( Value secondValue : allValues ) { // when - SchemaIndexProvider selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, firstValue, secondValue ); + IndexProvider + selected = selector.select( nativeProvider, spatialProvider, temporalProvider, luceneProvider, firstValue, secondValue ); // then assertSame( luceneProvider, selected ); @@ -161,7 +162,8 @@ public void mustCombineSamples() IndexSample luceneSample = new IndexSample( luceneIndexSize, luceneUniqueValues, luceneSampleSize ); // when - IndexSample fusionSample = FusionSchemaIndexProvider.combineSamples( nativeSample, spatialSample, temporalSample, luceneSample ); + IndexSample fusionSample = FusionIndexProvider + .combineSamples( nativeSample, spatialSample, temporalSample, luceneSample ); // then assertEquals( nativeIndexSize + spatialIndexSize + temporalIndexSize + luceneIndexSize, fusionSample.indexSize() ); @@ -173,7 +175,7 @@ public void mustCombineSamples() public void getPopulationFailureMustThrowIfNoFailure() { // given - FusionSchemaIndexProvider fusionSchemaIndexProvider = fusionProvider(); + FusionIndexProvider fusionIndexProvider = fusionProvider(); // when // ... no failure @@ -188,7 +190,7 @@ public void getPopulationFailureMustThrowIfNoFailure() // then try { - fusionSchemaIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ); + fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ); fail( "Should have failed" ); } catch ( IllegalStateException e ) @@ -199,7 +201,7 @@ public void getPopulationFailureMustThrowIfNoFailure() @Test public void getPopulationFailureMustReportFailureWhenNativeFailure() { - FusionSchemaIndexProvider fusionSchemaIndexProvider = fusionProvider(); + FusionIndexProvider fusionIndexProvider = fusionProvider(); // when // ... native failure @@ -212,13 +214,13 @@ public void getPopulationFailureMustReportFailureWhenNativeFailure() when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( luceneThrow ); // then - assertThat( fusionSchemaIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( nativeFailure ) ); + assertThat( fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( nativeFailure ) ); } @Test public void getPopulationFailureMustReportFailureWhenSpatialFailure() throws Exception { - FusionSchemaIndexProvider fusionSchemaIndexProvider = fusionProvider(); + FusionIndexProvider fusionIndexProvider = fusionProvider(); // when // ... spatial failure @@ -231,13 +233,13 @@ public void getPopulationFailureMustReportFailureWhenSpatialFailure() throws Exc when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( luceneThrow ); // then - assertThat( fusionSchemaIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( spatialFailure ) ); + assertThat( fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( spatialFailure ) ); } @Test public void getPopulationFailureMustReportFailureWhenTemporalFailure() throws Exception { - FusionSchemaIndexProvider fusionSchemaIndexProvider = fusionProvider(); + FusionIndexProvider fusionIndexProvider = fusionProvider(); // when // ... spatial failure @@ -250,13 +252,13 @@ public void getPopulationFailureMustReportFailureWhenTemporalFailure() throws Ex when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( temporalFailure ); when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( luceneThrow ); // then - assertThat( fusionSchemaIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( temporalFailure ) ); + assertThat( fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( temporalFailure ) ); } @Test public void getPopulationFailureMustReportFailureWhenLuceneFailure() { - FusionSchemaIndexProvider fusionSchemaIndexProvider = fusionProvider(); + FusionIndexProvider fusionIndexProvider = fusionProvider(); // when // ... lucene failure @@ -269,13 +271,13 @@ public void getPopulationFailureMustReportFailureWhenLuceneFailure() when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( luceneFailure ); // then - assertThat( fusionSchemaIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( luceneFailure ) ); + assertThat( fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ), containsString( luceneFailure ) ); } @Test public void getPopulationFailureMustReportFailureWhenBothNativeAndLuceneFail() { - FusionSchemaIndexProvider fusionSchemaIndexProvider = fusionProvider(); + FusionIndexProvider fusionIndexProvider = fusionProvider(); // when // ... native and lucene failure @@ -288,7 +290,7 @@ public void getPopulationFailureMustReportFailureWhenBothNativeAndLuceneFail() when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenThrow( temporalThrow ); when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( luceneFailure ); // then - String populationFailure = fusionSchemaIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ); + String populationFailure = fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ); assertThat( populationFailure, containsString( nativeFailure ) ); assertThat( populationFailure, containsString( luceneFailure ) ); } @@ -296,7 +298,7 @@ public void getPopulationFailureMustReportFailureWhenBothNativeAndLuceneFail() @Test public void getPopulationFailureMustReportFailureWhenAllFail() throws Exception { - FusionSchemaIndexProvider fusionSchemaIndexProvider = fusionProvider(); + FusionIndexProvider fusionIndexProvider = fusionProvider(); // when // ... native and lucene failure @@ -309,7 +311,7 @@ public void getPopulationFailureMustReportFailureWhenAllFail() throws Exception when( temporalProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( temporalFailure ); when( luceneProvider.getPopulationFailure( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( luceneFailure ); // then - String populationFailure = fusionSchemaIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ); + String populationFailure = fusionIndexProvider.getPopulationFailure( 0, forLabel( 0, 0 ) ); assertThat( populationFailure, containsString( nativeFailure ) ); assertThat( populationFailure, containsString( spatialFailure ) ); assertThat( populationFailure, containsString( temporalFailure ) ); @@ -320,7 +322,7 @@ public void getPopulationFailureMustReportFailureWhenAllFail() throws Exception public void shouldReportFailedIfAnyIsFailed() { // given - SchemaIndexProvider provider = fusionProvider(); + IndexProvider provider = fusionProvider(); IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( 1, 1 ); for ( InternalIndexState state : InternalIndexState.values() ) @@ -362,7 +364,7 @@ public void shouldReportFailedIfAnyIsFailed() public void shouldReportPopulatingIfAnyIsPopulating() { // given - SchemaIndexProvider provider = fusionProvider(); + IndexProvider provider = fusionProvider(); IndexDescriptor indexDescriptor = IndexDescriptorFactory.forLabel( 1, 1 ); for ( InternalIndexState state : array( InternalIndexState.ONLINE, InternalIndexState.POPULATING ) ) @@ -400,13 +402,13 @@ public void shouldReportPopulatingIfAnyIsPopulating() } } - private FusionSchemaIndexProvider fusionProvider() + private FusionIndexProvider fusionProvider() { - return new FusionSchemaIndexProvider( nativeProvider, spatialProvider, temporalProvider, luceneProvider, new FusionSelector(), DESCRIPTOR, 10, NONE, + return new FusionIndexProvider( nativeProvider, spatialProvider, temporalProvider, luceneProvider, new FusionSelector(), DESCRIPTOR, 10, NONE, mock( FileSystemAbstraction.class ) ); } - private void setInitialState( SchemaIndexProvider mockedProvider, InternalIndexState state ) + private void setInitialState( IndexProvider mockedProvider, InternalIndexState state ) { when( mockedProvider.getInitialState( anyLong(), any( IndexDescriptor.class ) ) ).thenReturn( state ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionSchemaIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProviderTest.java similarity index 94% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionSchemaIndexProviderTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProviderTest.java index d1c2b9f70d63b..9f31d9e46351e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionSchemaIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexProviderTest.java @@ -29,7 +29,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; @@ -47,23 +47,23 @@ import static org.neo4j.helpers.ArrayUtil.array; import static org.neo4j.kernel.api.index.IndexDirectoryStructure.NONE; -public class SpatialFusionSchemaIndexProviderTest +public class SpatialFusionIndexProviderTest { @Rule public RandomRule random = new RandomRule(); private Map indexMap; - private SpatialFusionSchemaIndexProvider provider; + private SpatialFusionIndexProvider provider; private IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); @Before public void setup() { - provider = new SpatialFusionSchemaIndexProvider( + provider = new SpatialFusionIndexProvider( mock( PageCache.class ), mock( FileSystemAbstraction.class ), NONE, - SchemaIndexProvider.Monitor.EMPTY, + IndexProvider.Monitor.EMPTY, null, false, Config.defaults() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java index de82ae251e216..3012a1f0f390d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java @@ -32,7 +32,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; @@ -49,7 +49,7 @@ import static java.nio.ByteBuffer.wrap; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterators.asCollection; -import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; +import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; public class SchemaStoreTest { @@ -173,14 +173,14 @@ private long storeRule( SchemaRule rule ) return Iterables.first( records ).getId(); } - private IndexRule indexRule( long ruleId, SchemaIndexProvider.Descriptor descriptor, + private IndexRule indexRule( long ruleId, IndexProvider.Descriptor descriptor, int labelId, int... propertyIds ) { return IndexRule.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyIds ), descriptor ); } private IndexRule uniqueIndexRule( long ruleId, long owningConstraint, - SchemaIndexProvider.Descriptor descriptor, int labelId, int... propertyIds ) + IndexProvider.Descriptor descriptor, int labelId, int... propertyIds ) { return IndexRule.constraintIndexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyIds ), descriptor, owningConstraint ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java index fc4782b089d6c..0875f75f3a8bd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java @@ -28,7 +28,7 @@ import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; @@ -466,7 +466,7 @@ private void assertParseIndexRule( String serialized, String name ) throws Excep // GIVEN long ruleId = 24; IndexDescriptor index = forLabel( 512, 4 ); - SchemaIndexProvider.Descriptor indexProvider = new SchemaIndexProvider.Descriptor( "index-provider", "25.0" ); + IndexProvider.Descriptor indexProvider = new IndexProvider.Descriptor( "index-provider", "25.0" ); byte[] bytes = decodeBase64( serialized ); // WHEN @@ -487,7 +487,7 @@ private void assertParseUniqueIndexRule( String serialized, String name ) throws long ruleId = 33; long constraintId = 11; IndexDescriptor index = IndexDescriptorFactory.uniqueForLabel( 61, 988 ); - SchemaIndexProvider.Descriptor indexProvider = new SchemaIndexProvider.Descriptor( "index-provider", "25.0" ); + IndexProvider.Descriptor indexProvider = new IndexProvider.Descriptor( "index-provider", "25.0" ); byte[] bytes = decodeBase64( serialized ); // WHEN diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleTestBase.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleTestBase.java index 60e14f4bb0fbc..f46605ffdf4cf 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleTestBase.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleTestBase.java @@ -19,7 +19,7 @@ */ package org.neo4j.kernel.impl.store.record; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -32,10 +32,10 @@ abstract class SchemaRuleTestBase protected static final int PROPERTY_ID_1 = 30; protected static final int PROPERTY_ID_2 = 31; - protected static final SchemaIndexProvider.Descriptor PROVIDER_DESCRIPTOR = - new SchemaIndexProvider.Descriptor( "index-provider", "1.0" ); - protected static final SchemaIndexProvider.Descriptor PROVIDER_DESCRIPTOR_2 = - new SchemaIndexProvider.Descriptor( "index-provider-2", "2.0" ); + protected static final IndexProvider.Descriptor PROVIDER_DESCRIPTOR = + new IndexProvider.Descriptor( "index-provider", "1.0" ); + protected static final IndexProvider.Descriptor PROVIDER_DESCRIPTOR_2 = + new IndexProvider.Descriptor( "index-provider-2", "2.0" ); protected void assertEquality( Object o1, Object o2 ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigratorTest.java index a41702055e76b..6f838c43f592f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/SchemaIndexMigratorTest.java @@ -26,7 +26,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.index.IndexDirectoryStructure; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.impl.store.format.standard.StandardV2_3; import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; import org.neo4j.kernel.impl.util.monitoring.ProgressReporter; @@ -39,11 +39,11 @@ public class SchemaIndexMigratorTest { private final FileSystemAbstraction fs = mock( FileSystemAbstraction.class ); private final ProgressReporter progressReporter = mock( ProgressReporter.class ); - private final SchemaIndexProvider schemaIndexProvider = mock( SchemaIndexProvider.class ); + private final IndexProvider indexProvider = mock( IndexProvider.class ); private final File storeDir = new File( "store" ); private final File migrationDir = new File( "migrationDir" ); - private final SchemaIndexMigrator migrator = new SchemaIndexMigrator( fs, schemaIndexProvider ); + private final SchemaIndexMigrator migrator = new SchemaIndexMigrator( fs, indexProvider ); @Test public void schemaAndLabelIndexesRemovedAfterSuccessfulMigration() throws IOException @@ -51,9 +51,9 @@ public void schemaAndLabelIndexesRemovedAfterSuccessfulMigration() throws IOExce IndexDirectoryStructure directoryStructure = mock( IndexDirectoryStructure.class ); File indexProviderRootDirectory = new File( storeDir, "just-some-directory" ); when( directoryStructure.rootDirectory() ).thenReturn( indexProviderRootDirectory ); - when( schemaIndexProvider.directoryStructure() ).thenReturn( directoryStructure ); - when( schemaIndexProvider.getProviderDescriptor() ) - .thenReturn( new SchemaIndexProvider.Descriptor( "key", "version" ) ); + when( indexProvider.directoryStructure() ).thenReturn( directoryStructure ); + when( indexProvider.getProviderDescriptor() ) + .thenReturn( new IndexProvider.Descriptor( "key", "version" ) ); migrator.migrate( storeDir, migrationDir, progressReporter, StandardV2_3.STORE_VERSION, StandardV3_0.STORE_VERSION ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java index 86251772d6451..d5add8ad66781 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java @@ -26,7 +26,7 @@ import java.util.List; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.store.DynamicNodeLabels; import org.neo4j.kernel.impl.store.PropertyStore; @@ -144,7 +144,7 @@ public static RelationshipGroupCommand createRelationshipGroup( long id, int typ return new RelationshipGroupCommand( before, after ); } - public static SchemaRuleCommand createIndexRule( SchemaIndexProvider.Descriptor provider, + public static SchemaRuleCommand createIndexRule( IndexProvider.Descriptor provider, long id, LabelSchemaDescriptor descriptor ) { SchemaRule rule = IndexRule.indexRule( diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/HighIdTransactionApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/HighIdTransactionApplierTest.java index 109583bafdf05..f29f6ec90d249 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/HighIdTransactionApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/HighIdTransactionApplierTest.java @@ -34,7 +34,7 @@ import org.neo4j.test.rule.NeoStoresRule; import static org.junit.Assert.assertEquals; -import static org.neo4j.kernel.api.index.SchemaIndexProvider.NO_INDEX_PROVIDER; +import static org.neo4j.kernel.api.index.IndexProvider.NO_INDEX_PROVIDER; public class HighIdTransactionApplierTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java index 34e52554a8ad6..7f4c0ada41c38 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java @@ -22,7 +22,6 @@ import org.junit.Before; import org.junit.Test; -import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.function.Supplier; @@ -31,7 +30,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexActivationFailedKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; @@ -562,7 +561,7 @@ public void shouldApplyCreateIndexRuleSchemaRuleCommandToTheStore() throws Excep final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); record.setCreated(); final Collection recordsAfter = singletonList( record ); - final IndexRule rule = indexRule( 0, 1, 2, new SchemaIndexProvider.Descriptor( "K", "X.Y" ) ); + final IndexRule rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -585,7 +584,7 @@ public void shouldApplyCreateIndexRuleSchemaRuleCommandToTheStoreInRecovery() th final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); record.setCreated(); final Collection recordsAfter = singletonList( record ); - final IndexRule rule = indexRule( 0, 1, 2, new SchemaIndexProvider.Descriptor( "K", "X.Y" ) ); + final IndexRule rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -609,7 +608,7 @@ public void shouldApplyUpdateIndexRuleSchemaRuleCommandToTheStore() throws Excep final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); final Collection recordsAfter = singletonList( record ); final IndexRule rule = - constraintIndexRule( 0, 1, 2, new SchemaIndexProvider.Descriptor( "K", "X.Y" ), 42L ); + constraintIndexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ), 42L ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -632,7 +631,7 @@ public void shouldApplyUpdateIndexRuleSchemaRuleCommandToTheStoreInRecovery() th final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); final Collection recordsAfter = singletonList( record ); final IndexRule rule = - constraintIndexRule( 0, 1, 2, new SchemaIndexProvider.Descriptor( "K", "X.Y" ), 42L ); + constraintIndexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ), 42L ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -660,7 +659,7 @@ public void shouldApplyUpdateIndexRuleSchemaRuleCommandToTheStoreThrowingIndexPr final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); final Collection recordsAfter = singletonList( record ); final IndexRule rule = - constraintIndexRule( 0, 1, 2, new SchemaIndexProvider.Descriptor( "K", "X.Y" ), 42L ); + constraintIndexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ), 42L ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -687,7 +686,7 @@ public void shouldApplyDeleteIndexRuleSchemaRuleCommandToTheStore() throws Excep final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); record.setInUse( false ); final Collection recordsAfter = singletonList( record ); - final IndexRule rule = indexRule( 0, 1, 2, new SchemaIndexProvider.Descriptor( "K", "X.Y" ) ); + final IndexRule rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -710,7 +709,7 @@ public void shouldApplyDeleteIndexRuleSchemaRuleCommandToTheStoreInRecovery() th final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); record.setInUse( false ); final Collection recordsAfter = singletonList( record ); - final IndexRule rule = indexRule( 0, 1, 2, new SchemaIndexProvider.Descriptor( "K", "X.Y" ) ); + final IndexRule rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -931,7 +930,7 @@ private BatchTransactionApplier newIndexApplier() // SCHEMA RULE COMMAND public static IndexRule indexRule( long id, int label, int propertyKeyId, - SchemaIndexProvider.Descriptor providerDescriptor ) + IndexProvider.Descriptor providerDescriptor ) { //TODO: Consider testing composite indexes return IndexRule.indexRule( id, IndexDescriptorFactory.forLabel( label, propertyKeyId ), @@ -939,7 +938,7 @@ public static IndexRule indexRule( long id, int label, int propertyKeyId, } private static IndexRule constraintIndexRule( long id, int label, int propertyKeyId, - SchemaIndexProvider.Descriptor providerDescriptor, Long owningConstraint ) + IndexProvider.Descriptor providerDescriptor, Long owningConstraint ) { //TODO: Consider testing composite indexes return IndexRule.constraintIndexRule( id, IndexDescriptorFactory.uniqueForLabel( label, propertyKeyId ), diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java index 0ae95ec4f0000..06131243567b4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java @@ -28,7 +28,7 @@ import org.neo4j.concurrent.WorkSync; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor; +import org.neo4j.kernel.api.index.IndexProvider.Descriptor; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.TransactionApplier; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/DefaultSchemaIndexProviderMapTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/DefaultSchemaIndexProviderMapTest.java index 7a7892c515f23..63137e334e6d1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/DefaultSchemaIndexProviderMapTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/DefaultSchemaIndexProviderMapTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.impl.api.index.SchemaIndexProviderMap; import static org.junit.Assert.fail; @@ -36,10 +36,10 @@ public class DefaultSchemaIndexProviderMapTest public void shouldNotSupportMultipleProvidersWithSameDescriptor() { // given - SchemaIndexProvider.Descriptor descriptor = new SchemaIndexProvider.Descriptor( "provider", "1.2" ); - SchemaIndexProvider provider1 = mock( SchemaIndexProvider.class ); + IndexProvider.Descriptor descriptor = new IndexProvider.Descriptor( "provider", "1.2" ); + IndexProvider provider1 = mock( IndexProvider.class ); when( provider1.getProviderDescriptor() ).thenReturn( descriptor ); - SchemaIndexProvider provider2 = mock( SchemaIndexProvider.class ); + IndexProvider provider2 = mock( IndexProvider.class ); when( provider2.getProviderDescriptor() ).thenReturn( descriptor ); // when @@ -58,14 +58,14 @@ public void shouldNotSupportMultipleProvidersWithSameDescriptor() public void shouldThrowOnLookupOnUnknownProvider() { // given - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); - when( provider.getProviderDescriptor() ).thenReturn( new SchemaIndexProvider.Descriptor( "provider", "1.2" ) ); + IndexProvider provider = mock( IndexProvider.class ); + when( provider.getProviderDescriptor() ).thenReturn( new IndexProvider.Descriptor( "provider", "1.2" ) ); // when SchemaIndexProviderMap map = new DefaultSchemaIndexProviderMap( provider ); try { - new DefaultSchemaIndexProviderMap( provider ).apply( new SchemaIndexProvider.Descriptor( "provider2", "1.2" ) ); + new DefaultSchemaIndexProviderMap( provider ).apply( new IndexProvider.Descriptor( "provider2", "1.2" ) ); fail( "Should have failed" ); } catch ( IllegalArgumentException e ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java index 7987b98239b93..0b9ee7f1e340f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java @@ -28,7 +28,7 @@ import java.util.Map; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.index.IndexCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddNodeCommand; @@ -98,7 +98,7 @@ public class LogTruncationTest singletonList( dynamicRecord( 1L, false, true, -1L, 1, "hello".getBytes() ) ), singletonList( dynamicRecord( 1L, true, true, -1L, 1, "hello".getBytes() ) ), IndexRule.indexRule( 1, IndexDescriptorFactory.forLabel( 3, 4 ), - new SchemaIndexProvider.Descriptor( "1", "2" ) ) ) } ); + new IndexProvider.Descriptor( "1", "2" ) ) ) } ); permutations .put( Command.RelationshipTypeTokenCommand.class, new Command[] { new Command.RelationshipTypeTokenCommand( diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java index 25c34870a5691..687fd8cb941c7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java @@ -66,7 +66,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; +import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; public class SchemaRuleCommandTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java index b70807f9e6a44..c483b0aca8db6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java @@ -105,7 +105,7 @@ import static org.neo4j.helpers.collection.Iterables.filter; import static org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory.uniqueForLabel; import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; -import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; +import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; import static org.neo4j.kernel.impl.store.record.ConstraintRule.constraintRule; import static org.neo4j.kernel.impl.store.record.IndexRule.indexRule; import static org.neo4j.kernel.impl.store.record.RecordLoad.FORCE; diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java index cc20b61799949..49209bffa35a5 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java @@ -30,7 +30,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.AvailabilityGuard; import org.neo4j.kernel.NeoStoreDataSource; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.SchemaWriteGuard; import org.neo4j.kernel.impl.api.explicitindex.InternalAutoIndexing; @@ -178,9 +178,9 @@ private DependencyResolver dependencyResolverForNoIndexProvider() @Override public T resolveDependency( Class type, SelectionStrategy selector ) throws IllegalArgumentException { - if ( SchemaIndexProvider.class.isAssignableFrom( type ) ) + if ( IndexProvider.class.isAssignableFrom( type ) ) { - return type.cast( SchemaIndexProvider.NO_INDEX_PROVIDER ); + return type.cast( IndexProvider.NO_INDEX_PROVIDER ); } throw new IllegalArgumentException( type.toString() ); } diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java index 27e2db976d256..1bd4d5f2b87c8 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java @@ -28,7 +28,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.BatchTransactionApplierFacade; import org.neo4j.kernel.impl.api.ExplicitIndexProviderLookup; @@ -95,9 +95,9 @@ public Builder getWith( FileSystemAbstraction fs, PageCache pageCache ) } private RecordStorageEngine get( FileSystemAbstraction fs, PageCache pageCache, - SchemaIndexProvider schemaIndexProvider, DatabaseHealth databaseHealth, File storeDirectory, - Function transactionApplierTransformer, - Monitors monitors ) + IndexProvider indexProvider, DatabaseHealth databaseHealth, File storeDirectory, + Function transactionApplierTransformer, + Monitors monitors ) { if ( !fs.fileExists( storeDirectory ) && !fs.mkdir( storeDirectory ) ) { @@ -117,7 +117,7 @@ private RecordStorageEngine get( FileSystemAbstraction fs, PageCache pageCache, NullLogProvider.getInstance(), mock( PropertyKeyTokenHolder.class ), mock( LabelTokenHolder.class ), mock( RelationshipTypeTokenHolder.class ), mock( SchemaState.class ), new StandardConstraintSemantics(), scheduler, mock( TokenNameLookup.class ), new ReentrantLockService(), - schemaIndexProvider, IndexingService.NO_MONITOR, databaseHealth, explicitIndexProviderLookup, indexConfigStore, + indexProvider, IndexingService.NO_MONITOR, databaseHealth, explicitIndexProviderLookup, indexConfigStore, new SynchronizedArrayIdOrderingQueue( 20 ), idGeneratorFactory, new BufferedIdController( bufferingIdGeneratorFactory, scheduler ), transactionApplierTransformer, monitors, RecoveryCleanupWorkCollector.IMMEDIATE, OperationalMode.single ) ); @@ -140,7 +140,7 @@ public class Builder private File storeDirectory = new File( "/graph.db" ); private Function transactionApplierTransformer = applierFacade -> applierFacade; - private SchemaIndexProvider schemaIndexProvider = SchemaIndexProvider.NO_INDEX_PROVIDER; + private IndexProvider indexProvider = IndexProvider.NO_INDEX_PROVIDER; private Monitors monitors = new Monitors(); public Builder( FileSystemAbstraction fs, PageCache pageCache ) @@ -156,9 +156,9 @@ public Builder transactionApplierTransformer( return this; } - public Builder indexProvider( SchemaIndexProvider schemaIndexProvider ) + public Builder indexProvider( IndexProvider indexProvider ) { - this.schemaIndexProvider = schemaIndexProvider; + this.indexProvider = indexProvider; return this; } @@ -184,7 +184,7 @@ public Builder monitors( Monitors monitors ) public RecordStorageEngine build() { - return get( fs, pageCache, schemaIndexProvider, databaseHealth, storeDirectory, + return get( fs, pageCache, indexProvider, databaseHealth, storeDirectory, transactionApplierTransformer, monitors ); } } @@ -198,7 +198,7 @@ private static class ExtendedRecordStorageEngine extends RecordStorageEngine LogProvider logProvider, PropertyKeyTokenHolder propertyKeyTokenHolder, LabelTokenHolder labelTokens, RelationshipTypeTokenHolder relationshipTypeTokens, SchemaState schemaState, ConstraintSemantics constraintSemantics, JobScheduler scheduler, TokenNameLookup tokenNameLookup, - LockService lockService, SchemaIndexProvider indexProvider, + LockService lockService, IndexProvider indexProvider, IndexingService.Monitor indexingServiceMonitor, DatabaseHealth databaseHealth, ExplicitIndexProviderLookup explicitIndexProviderLookup, IndexConfigStore indexConfigStore, IdOrderingQueue explicitIndexTransactionOrdering, diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java index 0d641db2cb6d1..3d99e6d320b31 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java @@ -63,7 +63,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; @@ -908,7 +908,7 @@ public void shouldRunIndexPopulationJobAtShutdown() throws Throwable { // GIVEN IndexPopulator populator = mock( IndexPopulator.class ); - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); when( provider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) @@ -943,7 +943,7 @@ public void shouldRunConstraintPopulationJobAtShutdown() throws Throwable { // GIVEN IndexPopulator populator = mock( IndexPopulator.class ); - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); when( provider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) @@ -979,7 +979,7 @@ public void shouldRepopulatePreexistingIndexed() throws Throwable long jakewins = dbWithIndexAndSingleIndexedNode(); IndexPopulator populator = mock( IndexPopulator.class ); - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); when( provider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) @@ -1457,7 +1457,7 @@ private void createRelationships( BatchInserter inserter, long node, Relationshi private long dbWithIndexAndSingleIndexedNode() throws Exception { IndexPopulator populator = mock( IndexPopulator.class ); - SchemaIndexProvider provider = mock( SchemaIndexProvider.class ); + IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); when( provider.getPopulator( anyLong(), any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProvider.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java similarity index 94% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProvider.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java index 666725a4114f7..e3a1be8ae678f 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProvider.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -46,7 +46,7 @@ import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; -public class LuceneSchemaIndexProvider extends SchemaIndexProvider +public class LuceneIndexProvider extends IndexProvider { static final int PRIORITY = 1; @@ -56,9 +56,9 @@ public class LuceneSchemaIndexProvider extends SchemaIndexProvider private final FileSystemAbstraction fileSystem; private final Monitor monitor; - public LuceneSchemaIndexProvider( FileSystemAbstraction fileSystem, DirectoryFactory directoryFactory, - IndexDirectoryStructure.Factory directoryStructureFactory, Monitor monitor, Config config, - OperationalMode operationalMode ) + public LuceneIndexProvider( FileSystemAbstraction fileSystem, DirectoryFactory directoryFactory, + IndexDirectoryStructure.Factory directoryStructureFactory, Monitor monitor, Config config, + OperationalMode operationalMode ) { super( LuceneSchemaIndexProviderFactory.PROVIDER_DESCRIPTOR, PRIORITY, directoryStructureFactory ); this.monitor = monitor; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java index 3d91c239a1ad0..9fe35461e03fb 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java @@ -26,7 +26,7 @@ import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.LoggingMonitor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; @@ -45,8 +45,8 @@ public class LuceneSchemaIndexProviderFactory extends { public static final String KEY = "lucene"; - public static final SchemaIndexProvider.Descriptor PROVIDER_DESCRIPTOR = - new SchemaIndexProvider.Descriptor( KEY, "1.0" ); + public static final IndexProvider.Descriptor PROVIDER_DESCRIPTOR = + new IndexProvider.Descriptor( KEY, "1.0" ); public interface Dependencies { @@ -65,32 +65,32 @@ public LuceneSchemaIndexProviderFactory() } @Override - public LuceneSchemaIndexProvider newInstance( KernelContext context, Dependencies dependencies ) + public LuceneIndexProvider newInstance( KernelContext context, Dependencies dependencies ) { FileSystemAbstraction fileSystemAbstraction = dependencies.fileSystem(); File storeDir = context.storeDir(); Config config = dependencies.getConfig(); - Log log = dependencies.getLogService().getInternalLogProvider().getLog( LuceneSchemaIndexProvider.class ); + Log log = dependencies.getLogService().getInternalLogProvider().getLog( LuceneIndexProvider.class ); Monitors monitors = dependencies.monitors(); monitors.addMonitorListener( new LoggingMonitor( log ), KEY ); - SchemaIndexProvider.Monitor monitor = monitors.newMonitor( SchemaIndexProvider.Monitor.class, KEY ); + IndexProvider.Monitor monitor = monitors.newMonitor( IndexProvider.Monitor.class, KEY ); OperationalMode operationalMode = context.databaseInfo().operationalMode; return create( fileSystemAbstraction, storeDir, monitor, config, operationalMode ); } - public static LuceneSchemaIndexProvider create( FileSystemAbstraction fileSystemAbstraction, File storeDir, - SchemaIndexProvider.Monitor monitor, Config config, OperationalMode operationalMode ) + public static LuceneIndexProvider create( FileSystemAbstraction fileSystemAbstraction, File storeDir, + IndexProvider.Monitor monitor, Config config, OperationalMode operationalMode ) { return create( fileSystemAbstraction, directoriesByProviderKey( storeDir ), monitor, config, operationalMode ); } - public static LuceneSchemaIndexProvider create( FileSystemAbstraction fileSystemAbstraction, - IndexDirectoryStructure.Factory directoryStructure, SchemaIndexProvider.Monitor monitor, Config config, - OperationalMode operationalMode ) + public static LuceneIndexProvider create( FileSystemAbstraction fileSystemAbstraction, + IndexDirectoryStructure.Factory directoryStructure, IndexProvider.Monitor monitor, Config config, + OperationalMode operationalMode ) { boolean ephemeral = config.get( GraphDatabaseFacadeFactory.Configuration.ephemeral ); DirectoryFactory directoryFactory = directoryFactory( ephemeral, fileSystemAbstraction ); - return new LuceneSchemaIndexProvider( fileSystemAbstraction, directoryFactory, directoryStructure, monitor, config, + return new LuceneIndexProvider( fileSystemAbstraction, directoryFactory, directoryStructure, monitor, config, operationalMode ); } } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionSchemaIndexProviderFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionSchemaIndexProviderFactory.java index 82ffe506957eb..0f4d26522b9a9 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionSchemaIndexProviderFactory.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionSchemaIndexProviderFactory.java @@ -28,15 +28,15 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.LoggingMonitor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.factory.OperationalMode; -import org.neo4j.kernel.impl.index.schema.NumberSchemaIndexProvider; -import org.neo4j.kernel.impl.index.schema.TemporalSchemaIndexProvider; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider; +import org.neo4j.kernel.impl.index.schema.NumberIndexProvider; +import org.neo4j.kernel.impl.index.schema.TemporalIndexProvider; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider; import org.neo4j.kernel.impl.index.schema.fusion.FusionSelector; -import org.neo4j.kernel.impl.index.schema.fusion.SpatialFusionSchemaIndexProvider; +import org.neo4j.kernel.impl.index.schema.fusion.SpatialFusionIndexProvider; import org.neo4j.kernel.impl.spi.KernelContext; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.Log; @@ -48,10 +48,10 @@ public class NativeLuceneFusionSchemaIndexProviderFactory extends KernelExtensionFactory { - public static final String KEY = LuceneSchemaIndexProviderFactory.KEY + "+" + NumberSchemaIndexProvider.KEY; - private static final int PRIORITY = LuceneSchemaIndexProvider.PRIORITY + 1; + public static final String KEY = LuceneSchemaIndexProviderFactory.KEY + "+" + NumberIndexProvider.KEY; + private static final int PRIORITY = LuceneIndexProvider.PRIORITY + 1; - public static final SchemaIndexProvider.Descriptor DESCRIPTOR = new SchemaIndexProvider.Descriptor( KEY, "1.0" ); + public static final IndexProvider.Descriptor DESCRIPTOR = new IndexProvider.Descriptor( KEY, "1.0" ); public interface Dependencies extends LuceneSchemaIndexProviderFactory.Dependencies { @@ -66,38 +66,39 @@ public NativeLuceneFusionSchemaIndexProviderFactory() } @Override - public FusionSchemaIndexProvider newInstance( KernelContext context, Dependencies dependencies ) + public FusionIndexProvider newInstance( KernelContext context, Dependencies dependencies ) { PageCache pageCache = dependencies.pageCache(); File storeDir = context.storeDir(); FileSystemAbstraction fs = dependencies.fileSystem(); - Log log = dependencies.getLogService().getInternalLogProvider().getLog( FusionSchemaIndexProvider.class ); + Log log = dependencies.getLogService().getInternalLogProvider().getLog( FusionIndexProvider.class ); Monitors monitors = dependencies.monitors(); monitors.addMonitorListener( new LoggingMonitor( log ), KEY ); - SchemaIndexProvider.Monitor monitor = monitors.newMonitor( SchemaIndexProvider.Monitor.class, KEY ); + IndexProvider.Monitor monitor = monitors.newMonitor( IndexProvider.Monitor.class, KEY ); Config config = dependencies.getConfig(); OperationalMode operationalMode = context.databaseInfo().operationalMode; RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = dependencies.recoveryCleanupWorkCollector(); return newInstance( pageCache, storeDir, fs, monitor, config, operationalMode, recoveryCleanupWorkCollector ); } - public static FusionSchemaIndexProvider newInstance( PageCache pageCache, File storeDir, FileSystemAbstraction fs, - SchemaIndexProvider.Monitor monitor, Config config, OperationalMode operationalMode, - RecoveryCleanupWorkCollector recoveryCleanupWorkCollector ) + public static FusionIndexProvider newInstance( PageCache pageCache, File storeDir, FileSystemAbstraction fs, + IndexProvider.Monitor monitor, Config config, OperationalMode operationalMode, + RecoveryCleanupWorkCollector recoveryCleanupWorkCollector ) { IndexDirectoryStructure.Factory childDirectoryStructure = subProviderDirectoryStructure( storeDir ); boolean readOnly = isReadOnly( config, operationalMode ); - NumberSchemaIndexProvider nativeProvider = - new NumberSchemaIndexProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); - SpatialFusionSchemaIndexProvider spatialProvider = - new SpatialFusionSchemaIndexProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly, config ); - TemporalSchemaIndexProvider temporalProvider = - new TemporalSchemaIndexProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); - LuceneSchemaIndexProvider luceneProvider = LuceneSchemaIndexProviderFactory.create( fs, childDirectoryStructure, monitor, config, + NumberIndexProvider nativeProvider = + new NumberIndexProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); + SpatialFusionIndexProvider spatialProvider = + new SpatialFusionIndexProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly, config ); + TemporalIndexProvider temporalProvider = + new TemporalIndexProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); + LuceneIndexProvider + luceneProvider = LuceneSchemaIndexProviderFactory.create( fs, childDirectoryStructure, monitor, config, operationalMode ); boolean useNativeIndex = config.get( GraphDatabaseSettings.enable_native_schema_index ); int priority = useNativeIndex ? PRIORITY : 0; - return new FusionSchemaIndexProvider( nativeProvider, + return new FusionIndexProvider( nativeProvider, spatialProvider, temporalProvider, luceneProvider, new FusionSelector(), DESCRIPTOR, priority, directoriesByProvider( storeDir ), fs ); } diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java index 315ee3ea3fa14..a80bbd76c82c0 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionSchemaIndexProviderFactory; import org.neo4j.kernel.api.index.IndexAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; @@ -164,11 +164,11 @@ private List nodeIdsInIndex( Config config, int indexId, String value ) th { FileSystemAbstraction fs = resources.fileSystem(); File storeDir = resources.directory().graphDbDir(); - SchemaIndexProvider.Monitor monitor = SchemaIndexProvider.Monitor.EMPTY; + IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; OperationalMode operationalMode = OperationalMode.single; PageCache pageCache = resources.pageCache(); Boolean useFusionIndex = config.get( GraphDatabaseSettings.enable_native_schema_index ); - SchemaIndexProvider indexProvider; + IndexProvider indexProvider; if ( useFusionIndex ) { indexProvider = NativeLuceneFusionSchemaIndexProviderFactory diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIndexProviderApprovalTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIndexProviderApprovalTest.java index 1da67b625e8f8..98bfebcad1f43 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIndexProviderApprovalTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIndexProviderApprovalTest.java @@ -19,9 +19,9 @@ */ package org.neo4j.kernel.api.impl.index; -import org.neo4j.kernel.api.index.SchemaIndexProviderApprovalTest; +import org.neo4j.kernel.api.index.IndexProviderApprovalTest; -public class DatabaseIndexIndexProviderApprovalTest extends SchemaIndexProviderApprovalTest +public class DatabaseIndexIndexProviderApprovalTest extends IndexProviderApprovalTest { public DatabaseIndexIndexProviderApprovalTest( TestValue value ) { diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java index 43c15bd09201f..49e6242c0a64e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java @@ -31,9 +31,9 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.collection.Iterators; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Settings; -import org.neo4j.kernel.impl.index.schema.NumberSchemaIndexProvider; +import org.neo4j.kernel.impl.index.schema.NumberIndexProvider; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; @@ -68,7 +68,7 @@ public void mustRebuildFusionIndexIfNativePartIsMissing() initializeIndexWithDataAndShutdown(); // when - SchemaIndexProvider.Descriptor descriptor = NumberSchemaIndexProvider.NATIVE_PROVIDER_DESCRIPTOR; + IndexProvider.Descriptor descriptor = NumberIndexProvider.NATIVE_PROVIDER_DESCRIPTOR; deleteIndexFilesFor( descriptor ); // then @@ -83,7 +83,7 @@ public void mustRebuildFusionIndexIfLucenePartIsMissing() initializeIndexWithDataAndShutdown(); // when - SchemaIndexProvider.Descriptor descriptor = LuceneSchemaIndexProviderFactory.PROVIDER_DESCRIPTOR; + IndexProvider.Descriptor descriptor = LuceneSchemaIndexProviderFactory.PROVIDER_DESCRIPTOR; deleteIndexFilesFor( descriptor ); // then @@ -98,8 +98,8 @@ public void mustRebuildFusionIndexIfCompletelyMissing() initializeIndexWithDataAndShutdown(); // when - SchemaIndexProvider.Descriptor luceneDescriptor = LuceneSchemaIndexProviderFactory.PROVIDER_DESCRIPTOR; - SchemaIndexProvider.Descriptor nativeDescriptor = NumberSchemaIndexProvider.NATIVE_PROVIDER_DESCRIPTOR; + IndexProvider.Descriptor luceneDescriptor = LuceneSchemaIndexProviderFactory.PROVIDER_DESCRIPTOR; + IndexProvider.Descriptor nativeDescriptor = NumberIndexProvider.NATIVE_PROVIDER_DESCRIPTOR; deleteIndexFilesFor( luceneDescriptor ); deleteIndexFilesFor( nativeDescriptor ); @@ -120,7 +120,7 @@ private void verifyContent() } } - private void deleteIndexFilesFor( SchemaIndexProvider.Descriptor descriptor ) + private void deleteIndexFilesFor( IndexProvider.Descriptor descriptor ) { File rootDirectory = subProviderDirectoryStructure( storeDir ).forProvider( descriptor ).rootDirectory(); File[] files = fs.listFiles( rootDirectory ); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionSchemaIndexProviderCompatibilitySuiteTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProviderCompatibilitySuiteTest.java similarity index 84% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionSchemaIndexProviderCompatibilitySuiteTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProviderCompatibilitySuiteTest.java index 5e633f6967033..56bbcdc3f2f16 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionSchemaIndexProviderCompatibilitySuiteTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProviderCompatibilitySuiteTest.java @@ -26,19 +26,19 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexProviderCompatibilityTestSuite; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.factory.OperationalMode; import static org.neo4j.helpers.collection.MapUtil.stringMap; -public class FusionSchemaIndexProviderCompatibilitySuiteTest extends IndexProviderCompatibilityTestSuite +public class FusionIndexProviderCompatibilitySuiteTest extends IndexProviderCompatibilityTestSuite { @Override - protected SchemaIndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ) + protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ) { - SchemaIndexProvider.Monitor monitor = SchemaIndexProvider.Monitor.EMPTY; + IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; Config config = Config.defaults( stringMap( GraphDatabaseSettings.enable_native_schema_index.name(), Settings.TRUE ) ); return NativeLuceneFusionSchemaIndexProviderFactory .newInstance( pageCache, graphDbDir, fs, monitor, config, OperationalMode.single, diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderCompatibilitySuiteTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderCompatibilitySuiteTest.java similarity index 84% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderCompatibilitySuiteTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderCompatibilitySuiteTest.java index f8b3fc296d95e..41e50fe815da3 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderCompatibilitySuiteTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderCompatibilitySuiteTest.java @@ -26,20 +26,20 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexProviderCompatibilityTestSuite; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.factory.OperationalMode; import static org.neo4j.helpers.collection.MapUtil.stringMap; -public class LuceneSchemaIndexProviderCompatibilitySuiteTest extends IndexProviderCompatibilityTestSuite +public class LuceneIndexProviderCompatibilitySuiteTest extends IndexProviderCompatibilityTestSuite { @Override - protected LuceneSchemaIndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ) + protected LuceneIndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ) { DirectoryFactory.InMemoryDirectoryFactory directoryFactory = new DirectoryFactory.InMemoryDirectoryFactory(); - SchemaIndexProvider.Monitor monitor = SchemaIndexProvider.Monitor.EMPTY; + IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; Config config = Config.defaults( stringMap( GraphDatabaseSettings.enable_native_schema_index.name(), Settings.FALSE ) ); OperationalMode mode = OperationalMode.single; return LuceneSchemaIndexProviderFactory.create( fs, graphDbDir, monitor, config, mode ); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java similarity index 80% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java index 1578c352a3523..67d44d3fb7dac 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java @@ -32,7 +32,7 @@ import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; @@ -43,12 +43,12 @@ import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.DefaultFileSystemRule; -import static org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider.defaultDirectoryStructure; +import static org.neo4j.kernel.api.impl.schema.LuceneIndexProvider.defaultDirectoryStructure; /** - * Additional tests for stuff not already covered by {@link LuceneSchemaIndexProviderCompatibilitySuiteTest} + * Additional tests for stuff not already covered by {@link LuceneIndexProviderCompatibilitySuiteTest} */ -public class LuceneSchemaIndexProviderTest +public class LuceneIndexProviderTest { @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -72,7 +72,7 @@ public void setup() public void shouldFailToInvokePopulatorInReadOnlyMode() { Config readOnlyConfig = Config.defaults( GraphDatabaseSettings.read_only, Settings.TRUE ); - LuceneSchemaIndexProvider readOnlyIndexProvider = getLuceneSchemaIndexProvider( readOnlyConfig, + LuceneIndexProvider readOnlyIndexProvider = getLuceneIndexProvider( readOnlyConfig, new DirectoryFactory.InMemoryDirectoryFactory(), fs, graphDbDir ); expectedException.expect( UnsupportedOperationException.class ); @@ -87,7 +87,7 @@ public void shouldCreateReadOnlyAccessorInReadOnlyMode() throws Exception createEmptySchemaIndex( directoryFactory ); Config readOnlyConfig = Config.defaults( GraphDatabaseSettings.read_only, Settings.TRUE ); - LuceneSchemaIndexProvider readOnlyIndexProvider = getLuceneSchemaIndexProvider( readOnlyConfig, + LuceneIndexProvider readOnlyIndexProvider = getLuceneIndexProvider( readOnlyConfig, directoryFactory, fs, graphDbDir ); IndexAccessor onlineAccessor = getIndexAccessor( readOnlyConfig, readOnlyIndexProvider ); @@ -99,7 +99,7 @@ public void shouldCreateReadOnlyAccessorInReadOnlyMode() throws Exception public void indexUpdateNotAllowedInReadOnlyMode() throws Exception { Config readOnlyConfig = Config.defaults( GraphDatabaseSettings.read_only, Settings.TRUE ); - LuceneSchemaIndexProvider readOnlyIndexProvider = getLuceneSchemaIndexProvider( readOnlyConfig, + LuceneIndexProvider readOnlyIndexProvider = getLuceneIndexProvider( readOnlyConfig, new DirectoryFactory.InMemoryDirectoryFactory(), fs, graphDbDir ); expectedException.expect( UnsupportedOperationException.class ); @@ -112,7 +112,7 @@ public void indexForceMustBeAllowedInReadOnlyMode() throws Exception // IndexAccessor.force is used in check-pointing, and must be allowed in read-only mode as it would otherwise // prevent backups from working. Config readOnlyConfig = Config.defaults( GraphDatabaseSettings.read_only, Settings.TRUE ); - LuceneSchemaIndexProvider readOnlyIndexProvider = getLuceneSchemaIndexProvider( readOnlyConfig, + LuceneIndexProvider readOnlyIndexProvider = getLuceneIndexProvider( readOnlyConfig, new DirectoryFactory.InMemoryDirectoryFactory(), fs, graphDbDir ); // We assert that 'force' does not throw an exception @@ -122,22 +122,22 @@ public void indexForceMustBeAllowedInReadOnlyMode() throws Exception private void createEmptySchemaIndex( DirectoryFactory directoryFactory ) throws IOException { Config config = Config.defaults(); - LuceneSchemaIndexProvider indexProvider = getLuceneSchemaIndexProvider( config, directoryFactory, fs, + LuceneIndexProvider indexProvider = getLuceneIndexProvider( config, directoryFactory, fs, graphDbDir ); IndexAccessor onlineAccessor = getIndexAccessor( config, indexProvider ); onlineAccessor.close(); } - private IndexAccessor getIndexAccessor( Config readOnlyConfig, LuceneSchemaIndexProvider indexProvider ) + private IndexAccessor getIndexAccessor( Config readOnlyConfig, LuceneIndexProvider indexProvider ) throws IOException { return indexProvider.getOnlineAccessor( 1L, descriptor, new IndexSamplingConfig( readOnlyConfig ) ); } - private LuceneSchemaIndexProvider getLuceneSchemaIndexProvider( Config config, DirectoryFactory directoryFactory, - FileSystemAbstraction fs, File graphDbDir ) + private LuceneIndexProvider getLuceneIndexProvider( Config config, DirectoryFactory directoryFactory, + FileSystemAbstraction fs, File graphDbDir ) { - return new LuceneSchemaIndexProvider( fs, directoryFactory, defaultDirectoryStructure( graphDbDir ), - SchemaIndexProvider.Monitor.EMPTY, config, OperationalMode.single ); + return new LuceneIndexProvider( fs, directoryFactory, defaultDirectoryStructure( graphDbDir ), + IndexProvider.Monitor.EMPTY, config, OperationalMode.single ); } } diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java index d652b80f945f6..2d9f128f9e636 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java @@ -36,7 +36,7 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.spi.KernelContext; @@ -52,7 +52,7 @@ import static org.junit.Assert.assertNotNull; import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.collection.Iterators.asUniqueSet; -import static org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider.defaultDirectoryStructure; +import static org.neo4j.kernel.api.impl.schema.LuceneIndexProvider.defaultDirectoryStructure; public class LuceneIndexRecoveryIT { @@ -314,8 +314,8 @@ private KernelExtensionFactory cr @Override public Lifecycle newInstance( KernelContext context, LuceneSchemaIndexProviderFactory.Dependencies dependencies ) { - return new LuceneSchemaIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( context.storeDir() ), - SchemaIndexProvider.Monitor.EMPTY, dependencies.getConfig(), context.databaseInfo().operationalMode ) + return new LuceneIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( context.storeDir() ), + IndexProvider.Monitor.EMPTY, dependencies.getConfig(), context.databaseInfo().operationalMode ) { @Override public InternalIndexState getInitialState( long indexId, IndexDescriptor descriptor ) @@ -337,11 +337,11 @@ private KernelExtensionFactory cr @Override public Lifecycle newInstance( KernelContext context, LuceneSchemaIndexProviderFactory.Dependencies dependencies ) { - return new LuceneSchemaIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( context.storeDir() ), - SchemaIndexProvider.Monitor.EMPTY, dependencies.getConfig(), context.databaseInfo().operationalMode ) + return new LuceneIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( context.storeDir() ), + IndexProvider.Monitor.EMPTY, dependencies.getConfig(), context.databaseInfo().operationalMode ) { @Override - public int compareTo( SchemaIndexProvider o ) + public int compareTo( IndexProvider o ) { return 1; } diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java index e5e81ea59973e..2246b1f1d982d 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.LoggingMonitor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; @@ -54,7 +54,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider.defaultDirectoryStructure; +import static org.neo4j.kernel.api.impl.schema.LuceneIndexProvider.defaultDirectoryStructure; import static org.neo4j.logging.AssertableLogProvider.inLog; public class LuceneSchemaIndexCorruptionTest @@ -64,7 +64,7 @@ public class LuceneSchemaIndexCorruptionTest @Rule public final EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); private final AssertableLogProvider logProvider = new AssertableLogProvider(); - private final SchemaIndexProvider.Monitor monitor = new LoggingMonitor( logProvider.getLog( "test" ) ); + private final IndexProvider.Monitor monitor = new LoggingMonitor( logProvider.getLog( "test" ) ); @Test public void shouldRequestIndexPopulationIfTheIndexIsCorrupt() @@ -73,7 +73,7 @@ public void shouldRequestIndexPopulationIfTheIndexIsCorrupt() long faultyIndexId = 1; CorruptIndexException error = new CorruptIndexException( "It's broken.", "" ); - LuceneSchemaIndexProvider provider = newFaultySchemaIndexProvider( faultyIndexId, error ); + LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); @@ -91,7 +91,7 @@ public void shouldRequestIndexPopulationFailingWithFileNotFoundException() long faultyIndexId = 1; FileNotFoundException error = new FileNotFoundException( "/some/path/somewhere" ); - LuceneSchemaIndexProvider provider = newFaultySchemaIndexProvider( faultyIndexId, error ); + LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); @@ -109,7 +109,7 @@ public void shouldRequestIndexPopulationWhenFailingWithEOFException() long faultyIndexId = 1; EOFException error = new EOFException( "/some/path/somewhere" ); - LuceneSchemaIndexProvider provider = newFaultySchemaIndexProvider( faultyIndexId, error ); + LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When IndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 1, 1 ); @@ -120,12 +120,12 @@ public void shouldRequestIndexPopulationWhenFailingWithEOFException() logProvider.assertAtLeastOnce( loggedException( error ) ); } - private LuceneSchemaIndexProvider newFaultySchemaIndexProvider( long faultyIndexId, Exception error ) + private LuceneIndexProvider newFaultyIndexProvider( long faultyIndexId, Exception error ) { DirectoryFactory directoryFactory = mock( DirectoryFactory.class ); File indexRootFolder = testDirectory.graphDbDir(); AtomicReference reference = new AtomicReference<>(); - return new LuceneSchemaIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( indexRootFolder ), monitor, + return new LuceneIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( indexRootFolder ), monitor, Config.defaults(), OperationalMode.single ) { @Override diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java index b3ddcc30e6a02..87c5c394c68b5 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.index.IndexQueryHelper; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; @@ -61,7 +61,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.neo4j.helpers.collection.Iterators.asSet; -import static org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider.defaultDirectoryStructure; +import static org.neo4j.kernel.api.impl.schema.LuceneIndexProvider.defaultDirectoryStructure; public class LuceneSchemaIndexPopulatorTest { @@ -71,7 +71,7 @@ public class LuceneSchemaIndexPopulatorTest public TestDirectory testDir = TestDirectory.testDirectory(); private IndexStoreView indexStoreView; - private LuceneSchemaIndexProvider provider; + private LuceneIndexProvider provider; private Directory directory; private IndexPopulator indexPopulator; private IndexReader reader; @@ -86,8 +86,8 @@ public void before() throws Exception directory = new RAMDirectory(); DirectoryFactory directoryFactory = new DirectoryFactory.Single( new DirectoryFactory.UncloseableDirectory( directory ) ); - provider = new LuceneSchemaIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( testDir.directory( "folder" ) ), - SchemaIndexProvider.Monitor.EMPTY, Config.defaults(), OperationalMode.single ); + provider = new LuceneIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( testDir.directory( "folder" ) ), + IndexProvider.Monitor.EMPTY, Config.defaults(), OperationalMode.single ); indexStoreView = mock( IndexStoreView.class ); IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); indexPopulator = provider.getPopulator( indexId, index, samplingConfig ); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java index 83c78dbcf1a2f..04be70494cebf 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.api.impl.index.storage.layout.IndexFolderLayout; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.impl.api.index.SchemaIndexProviderMap; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.EmbeddedDatabaseRule; @@ -81,9 +81,9 @@ public void shouldNotLeaveLuceneIndexFilesHangingAroundIfConstraintCreationFails assertEquals( 0, Iterables.count( db.schema().getIndexes() ) ); } - SchemaIndexProvider schemaIndexProvider = + IndexProvider indexProvider = db.getDependencyResolver().resolveDependency( SchemaIndexProviderMap.class ).getDefaultProvider(); - File indexDir = schemaIndexProvider.directoryStructure().directoryForIndex( indexId ); + File indexDir = indexProvider.directoryStructure().directoryForIndex( indexId ); assertFalse( new IndexFolderLayout( indexDir ).getIndexFolder().exists() ); } diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java index d5ceeaa817482..75d2e0210209c 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionSchemaIndexProviderFactory; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.extension.KernelExtensionFactory; @@ -90,7 +90,7 @@ public static Collection parameters() public KernelExtensionFactory kernelExtensionFactory; @Parameterized.Parameter( 1 ) - public SchemaIndexProvider.Descriptor indexDescriptor; + public IndexProvider.Descriptor indexDescriptor; @Before public void setUp() diff --git a/community/neo4j/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTest.java b/community/neo4j/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTest.java index e9d2908d3bfcc..05a72c9ccb5db 100644 --- a/community/neo4j/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTest.java +++ b/community/neo4j/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTest.java @@ -39,7 +39,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; import org.neo4j.kernel.impl.logging.NullLogService; @@ -107,7 +107,7 @@ public class StoreUpgraderTest private File dbDirectory; private final FileSystemAbstraction fileSystem = fileSystemRule.get(); private final RecordFormats formats; - private final SchemaIndexProvider schemaIndexProvider = new InMemoryIndexProvider(); + private final IndexProvider indexProvider = new InMemoryIndexProvider(); private final Config allowMigrateConfig = Config.defaults( GraphDatabaseSettings.allow_upgrade, "true" ); @@ -390,7 +390,7 @@ private StoreUpgrader newUpgrader( UpgradableDatabase upgradableDatabase, PageCa NullLogService instance = NullLogService.getInstance(); StoreMigrator defaultMigrator = new StoreMigrator( fileSystem, pageCache, getTuningConfig(), instance ); CountsMigrator countsMigrator = new CountsMigrator( fileSystem, pageCache, getTuningConfig() ); - SchemaIndexMigrator indexMigrator = new SchemaIndexMigrator( fileSystem, schemaIndexProvider ); + SchemaIndexMigrator indexMigrator = new SchemaIndexMigrator( fileSystem, indexProvider ); StoreUpgrader upgrader = new StoreUpgrader( upgradableDatabase, progressMonitor, config, fileSystem, pageCache, NullLogProvider.getInstance() ); diff --git a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java index 653f39311a097..9a05b6aca6ef2 100644 --- a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java +++ b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java @@ -91,7 +91,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.query.ExecutingQuery; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.TxStateHolder; @@ -851,7 +851,7 @@ public InternalIndexState indexGetState( IndexDescriptor descriptor ) throws Ind } @Override - public SchemaIndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException + public IndexProvider.Descriptor indexGetProviderDescriptor( IndexDescriptor descriptor ) throws IndexNotFoundKernelException { return readOperations.indexGetProviderDescriptor( descriptor ); } diff --git a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java index 6056edadf965b..f45f505df034b 100644 --- a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java +++ b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java @@ -56,7 +56,7 @@ import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionSchemaIndexProviderFactory; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; @@ -115,7 +115,7 @@ public class MultiIndexPopulationConcurrentUpdatesIT private IndexRule[] rules; @Parameterized.Parameters( name = "{0}" ) - public static Collection parameters() + public static Collection parameters() { return asList( LuceneSchemaIndexProviderFactory.PROVIDER_DESCRIPTOR, NativeLuceneFusionSchemaIndexProviderFactory.DESCRIPTOR, @@ -123,7 +123,7 @@ public static Collection parameters() } @Parameterized.Parameter( 0 ) - public SchemaIndexProvider.Descriptor indexDescriptor; + public IndexProvider.Descriptor indexDescriptor; private IndexingService indexService; private int propertyId; diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java index 65c81848225e5..321ca5781b374 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java @@ -37,7 +37,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; import org.neo4j.kernel.impl.logging.LogService; @@ -88,7 +88,7 @@ public class StoreUpgraderInterruptionTestIT public String version; private AssertableLogProvider logProvider = new AssertableLogProvider( true ); private SimpleLogService logService = new SimpleLogService( logProvider ); - private final SchemaIndexProvider schemaIndexProvider = new InMemoryIndexProvider(); + private final IndexProvider indexProvider = new InMemoryIndexProvider(); private static final Config CONFIG = Config.defaults( GraphDatabaseSettings.pagecache_memory, "8m" ); @Parameters( name = "{0}" ) @@ -167,7 +167,7 @@ private UpgradableDatabase getUpgradableDatabase( StoreVersionCheck check ) thro private SchemaIndexMigrator createIndexMigrator() { - return new SchemaIndexMigrator( fs, schemaIndexProvider ); + return new SchemaIndexMigrator( fs, indexProvider ); } @Test diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java index cb60e6beb754b..d0b04468a316a 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java @@ -58,7 +58,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; @@ -69,7 +69,7 @@ import org.neo4j.kernel.impl.factory.OperationalMode; import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; -import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider; +import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider; import org.neo4j.kernel.impl.spi.KernelContext; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.kernel.lifecycle.Lifecycle; @@ -486,15 +486,15 @@ public IndexSample sampleResult() } } - private static final SchemaIndexProvider.Descriptor CONTROLLED_PROVIDER_DESCRIPTOR = - new SchemaIndexProvider.Descriptor( "controlled", "1.0" ); + private static final IndexProvider.Descriptor CONTROLLED_PROVIDER_DESCRIPTOR = + new IndexProvider.Descriptor( "controlled", "1.0" ); - private static class ControlledSchemaIndexProvider extends SchemaIndexProvider + private static class ControlledIndexProvider extends IndexProvider { - private final SchemaIndexProvider delegate; + private final IndexProvider delegate; private final DoubleLatch latch = new DoubleLatch(); - ControlledSchemaIndexProvider( SchemaIndexProvider delegate ) + ControlledIndexProvider( IndexProvider delegate ) { super( CONTROLLED_PROVIDER_DESCRIPTOR, 100 /*we want it to always win*/, given( delegate.directoryStructure() ) ); this.delegate = delegate; @@ -550,10 +550,10 @@ interface IndexProviderDependencies private static class ControllingIndexProviderFactory extends KernelExtensionFactory { - private final Map perDbIndexProvider; + private final Map perDbIndexProvider; private final Predicate injectLatchPredicate; - ControllingIndexProviderFactory( Map perDbIndexProvider, + ControllingIndexProviderFactory( Map perDbIndexProvider, Predicate injectLatchPredicate ) { super( CONTROLLED_PROVIDER_DESCRIPTOR.getKey() ); @@ -567,17 +567,17 @@ public Lifecycle newInstance( KernelContext context, SchemaIndexHaIT.IndexProvid PageCache pageCache = deps.pageCache(); File storeDir = context.storeDir(); DefaultFileSystemAbstraction fs = fileSystemRule.get(); - SchemaIndexProvider.Monitor monitor = SchemaIndexProvider.Monitor.EMPTY; + IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; Config config = deps.config(); OperationalMode operationalMode = context.databaseInfo().operationalMode; RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = deps.recoveryCleanupWorkCollector(); - FusionSchemaIndexProvider fusionSchemaIndexProvider = NativeLuceneFusionSchemaIndexProviderFactory + FusionIndexProvider fusionSchemaIndexProvider = NativeLuceneFusionSchemaIndexProviderFactory .newInstance( pageCache, storeDir, fs, monitor, config, operationalMode, recoveryCleanupWorkCollector ); if ( injectLatchPredicate.test( deps.db() ) ) { - ControlledSchemaIndexProvider provider = new ControlledSchemaIndexProvider( fusionSchemaIndexProvider ); + ControlledIndexProvider provider = new ControlledIndexProvider( fusionSchemaIndexProvider ); perDbIndexProvider.put( deps.db(), provider ); return provider; } @@ -590,7 +590,7 @@ public Lifecycle newInstance( KernelContext context, SchemaIndexHaIT.IndexProvid private static class ControlledGraphDatabaseFactory extends TestHighlyAvailableGraphDatabaseFactory { - final Map perDbIndexProvider = new ConcurrentHashMap<>(); + final Map perDbIndexProvider = new ConcurrentHashMap<>(); private final KernelExtensionFactory factory; ControlledGraphDatabaseFactory() @@ -613,7 +613,7 @@ public GraphDatabaseBuilder newEmbeddedDatabaseBuilder( File file ) void awaitPopulationStarted( GraphDatabaseService db ) { - ControlledSchemaIndexProvider provider = (ControlledSchemaIndexProvider) perDbIndexProvider.get( db ); + ControlledIndexProvider provider = (ControlledIndexProvider) perDbIndexProvider.get( db ); if ( provider != null ) { provider.latch.waitForAllToStart(); @@ -622,7 +622,7 @@ void awaitPopulationStarted( GraphDatabaseService db ) void triggerFinish( GraphDatabaseService db ) { - ControlledSchemaIndexProvider provider = (ControlledSchemaIndexProvider) perDbIndexProvider.get( db ); + ControlledIndexProvider provider = (ControlledIndexProvider) perDbIndexProvider.get( db ); if ( provider != null ) { provider.latch.finish(); diff --git a/tools/src/main/java/org/neo4j/tools/migration/StoreMigration.java b/tools/src/main/java/org/neo4j/tools/migration/StoreMigration.java index 310cc5d5cd0a1..e5288f0fe4700 100644 --- a/tools/src/main/java/org/neo4j/tools/migration/StoreMigration.java +++ b/tools/src/main/java/org/neo4j/tools/migration/StoreMigration.java @@ -31,7 +31,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.GraphDatabaseDependencies; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.extension.KernelExtensions; @@ -138,8 +138,8 @@ public void run( final FileSystemAbstraction fs, final File storeDirectory, Conf // Add the kernel store migrator life.start(); - AllByPrioritySelectionStrategy indexProviderSelection = new AllByPrioritySelectionStrategy<>(); - SchemaIndexProvider defaultIndexProvider = kernelExtensions.resolveDependency( SchemaIndexProvider.class, + AllByPrioritySelectionStrategy indexProviderSelection = new AllByPrioritySelectionStrategy<>(); + IndexProvider defaultIndexProvider = kernelExtensions.resolveDependency( IndexProvider.class, indexProviderSelection ); SchemaIndexProviderMap schemaIndexProviderMap = new DefaultSchemaIndexProviderMap( defaultIndexProvider, indexProviderSelection.lowerPrioritizedCandidates() ); diff --git a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java index d0d3dbf497db3..787dd37911c4d 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java @@ -28,7 +28,7 @@ import java.util.Collections; import java.util.List; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.core.RelationshipTypeToken; @@ -153,7 +153,7 @@ private DumpCountsStore getCountStore() private SchemaStorage createSchemaStorage() { SchemaStorage schemaStorage = mock(SchemaStorage.class); - SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" ); + IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); IndexRule rule = IndexRule.indexRule( indexId, descriptor, providerDescriptor ); ArrayList rules = new ArrayList<>(); rules.add( rule ); diff --git a/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java b/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java index 8e760e74892d0..a31438613dafc 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java @@ -28,7 +28,7 @@ import org.neo4j.consistency.RecordType; import org.neo4j.consistency.report.InconsistencyMessageLogger; import org.neo4j.consistency.store.synthetic.IndexEntry; -import org.neo4j.kernel.api.index.SchemaIndexProvider; +import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.store.record.IndexRule; import org.neo4j.kernel.impl.store.record.NodeRecord; @@ -67,7 +67,7 @@ public void shouldReadBasicEntities() throws Exception logger.error( RecordType.INDEX, new IndexEntry( indexNodeId ), "Some index error", "Something wrong with index" ); logger.error( RecordType.NODE, new NodeRecord( nodeNotInTheIndexId ), "Some index error", IndexRule.indexRule( indexId, IndexDescriptorFactory.forLabel( 1, 2 ), - new SchemaIndexProvider.Descriptor( "key", "version" ) ).toString() ); + new IndexProvider.Descriptor( "key", "version" ) ).toString() ); String text = out.toString(); // WHEN