From 696af119227e87a8f801ea286cfe135c6aa571c8 Mon Sep 17 00:00:00 2001 From: Anton Persson Date: Tue, 20 Mar 2018 11:08:58 +0100 Subject: [PATCH] Compilation fix after rebase --- .../kernel/api/impl/schema/IndexProviderFactoryUtil.java | 6 +++--- .../kernel/api/impl/schema/LuceneIndexProviderFactory.java | 4 ++-- .../schema/NativeLuceneFusionIndexProviderFactory10.java | 4 ++-- .../schema/NativeLuceneFusionIndexProviderFactory20.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/IndexProviderFactoryUtil.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/IndexProviderFactoryUtil.java index 41c776039eae8..a355d05642543 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/IndexProviderFactoryUtil.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/IndexProviderFactoryUtil.java @@ -30,9 +30,9 @@ import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.factory.OperationalMode; import org.neo4j.kernel.impl.index.schema.NumberIndexProvider; +import org.neo4j.kernel.impl.index.schema.SpatialIndexProvider; import org.neo4j.kernel.impl.index.schema.StringIndexProvider; import org.neo4j.kernel.impl.index.schema.TemporalIndexProvider; -import org.neo4j.kernel.impl.index.schema.fusion.SpatialFusionIndexProvider; import static org.neo4j.kernel.api.impl.index.LuceneKernelExtensions.directoryFactory; @@ -55,10 +55,10 @@ static NumberIndexProvider numberProvider( PageCache pageCache, FileSystemAbstra return new NumberIndexProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); } - static SpatialFusionIndexProvider spatialProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory directoryStructure, + static SpatialIndexProvider spatialProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory directoryStructure, IndexProvider.Monitor monitor, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, boolean readOnly, Config config ) { - return new SpatialFusionIndexProvider( pageCache, fs, directoryStructure, monitor, recoveryCleanupWorkCollector, readOnly, config ); + return new SpatialIndexProvider( pageCache, fs, directoryStructure, monitor, recoveryCleanupWorkCollector, readOnly, config ); } static TemporalIndexProvider temporalProvider( PageCache pageCache, FileSystemAbstraction fs, IndexDirectoryStructure.Factory directoryStructure, diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java index 63645dd9cd05e..9b13f088a6fa0 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java @@ -32,10 +32,10 @@ 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.SpatialIndexProvider; 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.FusionSelector00; -import org.neo4j.kernel.impl.index.schema.fusion.SpatialFusionIndexProvider; import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.kernel.impl.spi.KernelContext; import org.neo4j.kernel.monitoring.Monitors; @@ -102,7 +102,7 @@ public static FusionIndexProvider newInstance( PageCache pageCache, File storeDi LuceneIndexProvider lucene = IndexProviderFactoryUtil.luceneProvider( fs, baseDirStructure, monitor, config, operationalMode ); TemporalIndexProvider temporal = IndexProviderFactoryUtil.temporalProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); - SpatialFusionIndexProvider spatial = + SpatialIndexProvider spatial = IndexProviderFactoryUtil.spatialProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly, config ); String defaultSchemaIndex = config.get( GraphDatabaseSettings.default_schema_index ); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java index 4baec2e794507..3a218a894bd86 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java @@ -33,10 +33,10 @@ import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.factory.OperationalMode; import org.neo4j.kernel.impl.index.schema.NumberIndexProvider; +import org.neo4j.kernel.impl.index.schema.SpatialIndexProvider; 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.FusionSelector10; -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; @@ -80,7 +80,7 @@ public static FusionIndexProvider create( PageCache pageCache, File storeDir, Fi NumberIndexProvider number = IndexProviderFactoryUtil.numberProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); - SpatialFusionIndexProvider spatial = + SpatialIndexProvider spatial = IndexProviderFactoryUtil.spatialProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly, config ); TemporalIndexProvider temporal = IndexProviderFactoryUtil.temporalProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java index 31b36f2f5ff96..db1d171e2b988 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java @@ -33,11 +33,11 @@ import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.factory.OperationalMode; import org.neo4j.kernel.impl.index.schema.NumberIndexProvider; +import org.neo4j.kernel.impl.index.schema.SpatialIndexProvider; import org.neo4j.kernel.impl.index.schema.StringIndexProvider; 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.FusionSelector20; -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; @@ -82,7 +82,7 @@ public static FusionIndexProvider create( PageCache pageCache, File storeDir, Fi IndexProviderFactoryUtil.stringProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); NumberIndexProvider number = IndexProviderFactoryUtil.numberProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly ); - SpatialFusionIndexProvider spatial = + SpatialIndexProvider spatial = IndexProviderFactoryUtil.spatialProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly, config ); TemporalIndexProvider temporal = IndexProviderFactoryUtil.temporalProvider( pageCache, fs, childDirectoryStructure, monitor, recoveryCleanupWorkCollector, readOnly );