Skip to content

Commit

Permalink
Remove label scan store selection strategies
Browse files Browse the repository at this point in the history
Since there is only one label scan store provider left
there is no need to select at all.

Remove
 - NamedLabelScanStoreSelectionStrategy
 - DeleteStoresFromOtherLabelScanStoreProviders
  • Loading branch information
burqen committed Jul 24, 2017
1 parent 13c014f commit c941044
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 229 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
import org.neo4j.kernel.extension.KernelExtensionFactory;
import org.neo4j.kernel.extension.KernelExtensions;
import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy;
import org.neo4j.kernel.extension.dependency.NamedLabelScanStoreSelectionStrategy;
import org.neo4j.kernel.impl.api.index.IndexStoreView;
import org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider;
import org.neo4j.kernel.impl.locking.LockService;
Expand Down Expand Up @@ -247,8 +246,7 @@ public Result runFullConsistencyCheck( final File storeDir, Config config, Progr
KernelExtensions extensions = life.add( new KernelExtensions(
kernelContext, (Iterable) load( KernelExtensionFactory.class ), dependencies, ignore() ) );
life.start();
LabelScanStore labelScanStore = life.add( extensions.resolveDependency( LabelScanStoreProvider.class,
new NamedLabelScanStoreSelectionStrategy( config ) ).getLabelScanStore() );
LabelScanStore labelScanStore = life.add( extensions.resolveDependency( LabelScanStoreProvider.class ).getLabelScanStore() );
SchemaIndexProvider indexes = life.add( extensions.resolveDependency( SchemaIndexProvider.class,
HighestSelectionStrategy.getInstance() ) );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.extension.KernelExtensionFactory;
import org.neo4j.kernel.extension.KernelExtensions;
import org.neo4j.kernel.extension.dependency.NamedLabelScanStoreSelectionStrategy;
import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess;
import org.neo4j.kernel.impl.api.TransactionToApply;
import org.neo4j.kernel.impl.api.index.IndexStoreView;
Expand Down Expand Up @@ -207,8 +206,7 @@ private LabelScanStore startLabelScanStore( Config config, Dependencies dependen
KernelExtensions extensions = life.add( new KernelExtensions(
kernelContext, (Iterable) load( KernelExtensionFactory.class ), dependencies, ignore() ) );
life.start();
LabelScanStore labelScanStore = extensions.resolveDependency( LabelScanStoreProvider.class,
new NamedLabelScanStoreSelectionStrategy( config ) ).getLabelScanStore();
LabelScanStore labelScanStore = extensions.resolveDependency( LabelScanStoreProvider.class ).getLabelScanStore();
life.shutdown();

// Start the selected LSS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@
import org.neo4j.kernel.api.labelscan.LabelScanStore;
import org.neo4j.kernel.api.legacyindex.AutoIndexing;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.extension.dependency.DeleteStoresFromOtherLabelScanStoreProviders;
import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy;
import org.neo4j.kernel.extension.dependency.NamedLabelScanStoreSelectionStrategy;
import org.neo4j.kernel.guard.Guard;
import org.neo4j.kernel.impl.api.CommitProcessFactory;
import org.neo4j.kernel.impl.api.ConstraintEnforcingEntityOperations;
Expand Down Expand Up @@ -410,10 +408,7 @@ public void start() throws IOException
HighestSelectionStrategy.getInstance() );
dependencies.satisfyDependency( schemaIndexProvider );

labelScanStoreProvider = dependencyResolver.resolveDependency( LabelScanStoreProvider.class,
new NamedLabelScanStoreSelectionStrategy( config ) );
dependencyResolver.resolveDependency( LabelScanStoreProvider.class,
new DeleteStoresFromOtherLabelScanStoreProviders( labelScanStoreProvider ) );
labelScanStoreProvider = dependencyResolver.resolveDependency( LabelScanStoreProvider.class );

IndexConfigStore indexConfigStore = new IndexConfigStore( storeDir, fs );
dependencies.satisfyDependency( lockService );
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
import org.neo4j.kernel.extension.KernelExtensions;
import org.neo4j.kernel.extension.UnsatisfiedDependencyStrategies;
import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy;
import org.neo4j.kernel.extension.dependency.NamedLabelScanStoreSelectionStrategy;
import org.neo4j.kernel.impl.api.index.NodeUpdates;
import org.neo4j.kernel.impl.api.index.SchemaIndexProviderMap;
import org.neo4j.kernel.impl.api.index.StoreScan;
Expand Down Expand Up @@ -298,8 +297,7 @@ public BatchInserterImpl( final File storeDir, final FileSystemAbstraction fileS
SchemaIndexProvider provider = extensions.resolveDependency( SchemaIndexProvider.class,
HighestSelectionStrategy.getInstance() );
schemaIndexProviders = new DefaultSchemaIndexProviderMap( provider );
labelScanStore = life.add( extensions.resolveDependency( LabelScanStoreProvider.class,
new NamedLabelScanStoreSelectionStrategy( config ) ).getLabelScanStore() );
labelScanStore = life.add( extensions.resolveDependency( LabelScanStoreProvider.class ).getLabelScanStore() );
actions = new BatchSchemaActions();

// Record access
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.neo4j.kernel.extension.KernelExtensionFactory;
import org.neo4j.kernel.extension.KernelExtensions;
import org.neo4j.kernel.extension.UnsatisfiedDependencyStrategies;
import org.neo4j.kernel.extension.dependency.NamedLabelScanStoreSelectionStrategy;
import org.neo4j.kernel.impl.api.index.IndexStoreView;
import org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider;
import org.neo4j.kernel.impl.factory.DatabaseInfo;
Expand Down Expand Up @@ -175,8 +174,7 @@ private BatchingNeoStores( FileSystemAbstraction fileSystem, PageCache pageCache
kernelContext, (Iterable) Service.load( KernelExtensionFactory.class ),
dependencies, UnsatisfiedDependencyStrategies.ignore() ) );
life.start();
labelScanStore = life.add( extensions.resolveDependency( LabelScanStoreProvider.class,
new NamedLabelScanStoreSelectionStrategy( neo4jConfig ) ).getLabelScanStore() );
labelScanStore = life.add( extensions.resolveDependency( LabelScanStoreProvider.class ).getLabelScanStore() );
}

public static BatchingNeoStores batchingNeoStores( FileSystemAbstraction fileSystem, File storeDir,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.neo4j.kernel.configuration.Settings;
import org.neo4j.kernel.extension.KernelExtensions;
import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy;
import org.neo4j.kernel.extension.dependency.NamedLabelScanStoreSelectionStrategy;
import org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider;
import org.neo4j.kernel.impl.factory.DatabaseInfo;
import org.neo4j.kernel.impl.logging.StoreLogService;
Expand Down Expand Up @@ -126,8 +125,7 @@ public void run( final FileSystemAbstraction fs, final File storeDirectory, Conf

SchemaIndexProvider schemaIndexProvider = kernelExtensions.resolveDependency( SchemaIndexProvider.class,
HighestSelectionStrategy.getInstance() );
LabelScanStoreProvider labelScanStoreProvider = kernelExtensions.resolveDependency(
LabelScanStoreProvider.class, new NamedLabelScanStoreSelectionStrategy( config ) );
LabelScanStoreProvider labelScanStoreProvider = kernelExtensions.resolveDependency( LabelScanStoreProvider.class );
long startTime = System.currentTimeMillis();
DatabaseMigrator migrator = new DatabaseMigrator( progressMonitor, fs, config, logService,
schemaIndexProvider, labelScanStoreProvider, legacyIndexProvider.getIndexProviders(),
Expand Down

0 comments on commit c941044

Please sign in to comment.