Skip to content

Commit

Permalink
NeoStoreDatasource dependencies lifecycle.
Browse files Browse the repository at this point in the history 
Simplify possible possible parent-child relationships in dependency
resolver. Now its not possible to setup parent dependency resolver over
supplier.
Use platform dependency resolver as parent of neo store datasource
resolver.
  • Loading branch information
@MishaDemianenko
MishaDemianenko committed Jun 21, 2018
1 parent 575525c commit cc73c11
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 202 deletions.
68 changes: 32 additions & 36 deletions community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
View file
Expand Up @@ -154,6 +154,7 @@
import org.neo4j.storageengine.api.StoreFileMetadata;
import org.neo4j.time.SystemNanoClock;
import org.neo4j.util.FeatureToggles;
import org.neo4j.util.VisibleForTesting;

import static org.neo4j.helpers.Exceptions.throwIfUnchecked;

Expand Down Expand Up @@ -255,7 +256,7 @@ boolean applicable( DiagnosticsPhase phase )
private final StoreCopyCheckPointMutex storeCopyCheckPointMutex;
private final CollectionsFactorySupplier collectionsFactorySupplier;

private Dependencies dependencies;
private Dependencies dataSourceDependencies;
private LifeSupport life;
private IndexProviderMap indexProviderMap;
private File storeDir;
Expand Down Expand Up @@ -362,7 +363,7 @@ public void init()
@Override
public void start() throws IOException
{
dependencies = new Dependencies();
dataSourceDependencies = new Dependencies( dependencyResolver );
life = new LifeSupport();

life.add( recoveryCleanupWorkCollector );
Expand All @@ -375,11 +376,11 @@ public void start() throws IOException
indexProviderMap =
new DefaultIndexProviderMap( defaultIndexProvider,
indexProviderSelection.lowerPrioritizedCandidates() );
dependencies.satisfyDependency( indexProviderMap );
dataSourceDependencies.satisfyDependency( indexProviderMap );

IndexConfigStore indexConfigStore = new IndexConfigStore( storeDir, fs );
dependencies.satisfyDependency( lockService );
dependencies.satisfyDependency( indexConfigStore );
dataSourceDependencies.satisfyDependency( lockService );
dataSourceDependencies.satisfyDependency( indexConfigStore );
life.add( indexConfigStore );

life.add( Lifecycles.multiple( indexProviders.values() ) );
Expand All @@ -391,7 +392,7 @@ public void start() throws IOException
.withLogEntryReader( logEntryReader )
.withLogFileMonitor( physicalLogMonitor )
.withConfig( config )
.withDependencies( dependencies ).build();
.withDependencies( dataSourceDependencies ).build();

LogTailScanner tailScanner = new LogTailScanner( logFiles, logEntryReader, monitors, failOnCorruptedLogFiles );
monitors.addMonitorListener(
Expand All @@ -410,11 +411,9 @@ public void start() throws IOException
{
DatabaseSchemaState databaseSchemaState = new DatabaseSchemaState( logProvider );

SynchronizedArrayIdOrderingQueue explicitIndexTransactionOrdering =
new SynchronizedArrayIdOrderingQueue( 20 );
SynchronizedArrayIdOrderingQueue explicitIndexTransactionOrdering = new SynchronizedArrayIdOrderingQueue( 20 );

Supplier<KernelTransactionsSnapshot> transactionsSnapshotSupplier =
() -> kernelModule.kernelTransactions().get();
Supplier<KernelTransactionsSnapshot> transactionsSnapshotSupplier = () -> kernelModule.kernelTransactions().get();
idController.initialize( transactionsSnapshotSupplier );

storageEngine = buildStorageEngine(
Expand All @@ -423,14 +422,14 @@ public void start() throws IOException
versionContextSupplier );
life.add( logFiles );

TransactionIdStore transactionIdStore = dependencies.resolveDependency( TransactionIdStore.class );
TransactionIdStore transactionIdStore = dataSourceDependencies.resolveDependency( TransactionIdStore.class );

versionContextSupplier.init( transactionIdStore::getLastClosedTransactionId );

LogVersionRepository logVersionRepository = dependencies.resolveDependency( LogVersionRepository.class );
LogVersionRepository logVersionRepository = dataSourceDependencies.resolveDependency( LogVersionRepository.class );
NeoStoreTransactionLogModule transactionLogModule = buildTransactionLogs( logFiles, config, logProvider,
scheduler, storageEngine, logEntryReader, explicitIndexTransactionOrdering, transactionIdStore );
transactionLogModule.satisfyDependencies( dependencies );
transactionLogModule.satisfyDependencies( dataSourceDependencies );

buildRecovery( fs,
transactionIdStore,
Expand All @@ -442,32 +441,32 @@ public void start() throws IOException
);

// At the time of writing this comes from the storage engine (IndexStoreView)
NodePropertyAccessor nodePropertyAccessor = dependencies.resolveDependency( NodePropertyAccessor.class );
NodePropertyAccessor nodePropertyAccessor = dataSourceDependencies.resolveDependency( NodePropertyAccessor.class );

final NeoStoreKernelModule kernelModule = buildKernel(
logFiles,
transactionLogModule.transactionAppender(),
dependencies.resolveDependency( IndexingService.class ),
dataSourceDependencies.resolveDependency( IndexingService.class ),
databaseSchemaState,
dependencies.resolveDependency( LabelScanStore.class ),
dataSourceDependencies.resolveDependency( LabelScanStore.class ),
storageEngine,
indexConfigStore,
transactionIdStore,
availabilityGuard,
clock, nodePropertyAccessor );

kernelModule.satisfyDependencies( dependencies );
kernelModule.satisfyDependencies( dataSourceDependencies );

// Do these assignments last so that we can ensure no cyclical dependencies exist
this.storageEngine = storageEngine;
this.transactionLogModule = transactionLogModule;
this.kernelModule = kernelModule;

dependencies.satisfyDependency( this );
dependencies.satisfyDependency( databaseSchemaState );
dependencies.satisfyDependency( logEntryReader );
dependencies.satisfyDependency( storageEngine );
dependencies.satisfyDependency( explicitIndexProviderLookup );
dataSourceDependencies.satisfyDependency( this );
dataSourceDependencies.satisfyDependency( databaseSchemaState );
dataSourceDependencies.satisfyDependency( logEntryReader );
dataSourceDependencies.satisfyDependency( storageEngine );
dataSourceDependencies.satisfyDependency( explicitIndexProviderLookup );
}
catch ( Throwable e )
{
Expand Down Expand Up @@ -562,7 +561,7 @@ private StorageEngine buildStorageEngine(
// We pretend that the storage engine abstract hides all details within it. Whereas that's mostly
// true it's not entirely true for the time being. As long as we need this call below, which
// makes available one or more internal things to the outside world, there are leaks to plug.
storageEngine.satisfyDependencies( dependencies );
storageEngine.satisfyDependencies( dataSourceDependencies );

return life.add( storageEngine );
}
Expand Down Expand Up @@ -649,10 +648,8 @@ private NeoStoreKernelModule buildKernel( LogFiles logFiles, TransactionAppender
ExplicitIndexStore explicitIndexStore = new ExplicitIndexStore( config,
indexConfigStore, kernelProvider, explicitIndexProviderLookup );

StatementOperationParts statementOperationParts = dependencies.satisfyDependency(
buildStatementOperations(
cpuClockRef,
heapAllocationRef ) );
StatementOperationParts statementOperationParts = dataSourceDependencies.satisfyDependency(
buildStatementOperations( cpuClockRef, heapAllocationRef ) );

TransactionHooks hooks = new TransactionHooks();

Expand All @@ -674,7 +671,7 @@ private NeoStoreKernelModule buildKernel( LogFiles logFiles, TransactionAppender

final NeoStoreFileListing fileListing = new NeoStoreFileListing( storeDir, logFiles, labelScanStore,
indexingService, explicitIndexProviderLookup, storageEngine );
dependencies.satisfyDependency( fileListing );
dataSourceDependencies.satisfyDependency( fileListing );

return new NeoStoreKernelModule( transactionCommitProcess, kernel, kernelTransactions, fileListing );
}
Expand Down Expand Up @@ -721,7 +718,7 @@ private void buildTransactionMonitor( KernelTransactions kernelTransactions, Clo
{
KernelTransactionTimeoutMonitor kernelTransactionTimeoutMonitor =
new KernelTransactionTimeoutMonitor( kernelTransactions, clock, logService );
dependencies.satisfyDependency( kernelTransactionTimeoutMonitor );
dataSourceDependencies.satisfyDependency( kernelTransactionTimeoutMonitor );
KernelTransactionMonitorScheduler transactionMonitorScheduler =
new KernelTransactionMonitorScheduler( kernelTransactionTimeoutMonitor, scheduler,
config.get( GraphDatabaseSettings.transaction_monitor_check_interval ).toMillis() );
Expand Down Expand Up @@ -803,14 +800,12 @@ public InwardKernel getKernel()

public ResourceIterator<StoreFileMetadata> listStoreFiles( boolean includeLogs ) throws IOException
{
if ( includeLogs )
NeoStoreFileListing.StoreFileListingBuilder fileListingBuilder = getNeoStoreFileListing().builder();
if ( !includeLogs )
{
return getNeoStoreFileListing().builder().build();
}
else
{
return getNeoStoreFileListing().builder().excludeLogFiles().build();
fileListingBuilder.excludeLogFiles();
}
return fileListingBuilder.build();
}

public NeoStoreFileListing getNeoStoreFileListing()
Expand All @@ -826,7 +821,7 @@ public void registerDiagnosticsWith( DiagnosticsManager manager )

public DependencyResolver getDependencyResolver()
{
return dependencies;
return dataSourceDependencies;
}

private StatementOperationParts buildStatementOperations( AtomicReference<CpuClock> cpuClockRef,
Expand Down Expand Up @@ -888,6 +883,7 @@ public StoreCopyCheckPointMutex getStoreCopyCheckPointMutex()
}

// For test purposes only, not thread safe
@VisibleForTesting
public LifeSupport getLife()
{
return life;
Expand Down
29 changes: 8 additions & 21 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/StatementOperationParts.java
View file
Expand Up @@ -19,41 +19,28 @@
*/
package org.neo4j.kernel.impl.api;

import java.util.Objects;

import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations;

import static org.apache.commons.lang3.ObjectUtils.firstNonNull;

public class StatementOperationParts
{
private final QueryRegistrationOperations queryRegistrationOperations;

public StatementOperationParts(
QueryRegistrationOperations queryRegistrationOperations )
public StatementOperationParts( QueryRegistrationOperations queryRegistrationOperations )
{
this.queryRegistrationOperations = queryRegistrationOperations;
}

public QueryRegistrationOperations queryRegistrationOperations()
QueryRegistrationOperations queryRegistrationOperations()
{
return checkNotNull( queryRegistrationOperations, QueryRegistrationOperations.class );
return Objects.requireNonNull( queryRegistrationOperations, "No part of type " + QueryRegistrationOperations.class.getSimpleName() + " assigned" );
}

public StatementOperationParts override( QueryRegistrationOperations queryRegistrationOperations )
{
return new StatementOperationParts(
eitherOr( queryRegistrationOperations, this.queryRegistrationOperations, QueryRegistrationOperations.class ) );
}

private <T> T checkNotNull( T object, Class<T> cls )
{
if ( object == null )
{
throw new IllegalStateException( "No part of type " + cls.getSimpleName() + " assigned" );
}
return object;
}

private <T> T eitherOr( T first, T other,
@SuppressWarnings( "UnusedParameters"/*used as type flag*/ ) Class<T> cls )
{
return first != null ? first : other;
return new StatementOperationParts( firstNonNull( queryRegistrationOperations, this.queryRegistrationOperations ) );
}
}
22 changes: 0 additions & 22 deletions ...unity/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DataSourceManager.java
View file
Expand Up @@ -21,7 +21,6 @@

import java.util.function.Supplier;

import org.neo4j.graphdb.DependencyResolver;
import org.neo4j.helpers.Listeners;
import org.neo4j.internal.kernel.api.Kernel;
import org.neo4j.kernel.NeoStoreDataSource;
Expand Down Expand Up @@ -132,25 +131,4 @@ public Kernel get()
{
return dataSource.getKernel();
}

public static class DependencyResolverSupplier implements Supplier<DependencyResolver>
{
private DataSourceManager dataSourceManager;

public DependencyResolverSupplier( DataSourceManager dataSourceManager )
{
this.dataSourceManager = dataSourceManager;
}

@Override
public DependencyResolver get()
{
NeoStoreDataSource dataSource = dataSourceManager.getDataSource();
if ( dataSource == null )
{
return null;
}
return dataSource.getDependencyResolver();
}
}
}
51 changes: 14 additions & 37 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/util/Dependencies.java
View file
Expand Up @@ -19,19 +19,20 @@
*/
package org.neo4j.kernel.impl.util;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.collections.api.RichIterable;
import org.eclipse.collections.api.multimap.list.MutableListMultimap;
import org.eclipse.collections.impl.factory.Multimaps;

import java.util.Objects;
import java.util.function.Supplier;

import org.neo4j.graphdb.DependencyResolver;

@SuppressWarnings( "unchecked" )
public class Dependencies extends DependencyResolver.Adapter implements DependencySatisfier
{
private final Supplier<DependencyResolver> parent;
private final Map<Class<?>, List<?>> typeDependencies = new HashMap<>();
private final DependencyResolver parent;
private final MutableListMultimap<Class, Object> typeDependencies = Multimaps.mutable.list.empty();

public Dependencies()
{
Expand All @@ -40,33 +41,23 @@ public Dependencies()

public Dependencies( final DependencyResolver parent )
{
this.parent = () -> parent;
}

public Dependencies( Supplier<DependencyResolver> parent )
{
Objects.requireNonNull( parent );
this.parent = parent;
}

@Override
public <T> T resolveDependency( Class<T> type, SelectionStrategy selector )
{
List<?> options = typeDependencies.get( type );

if ( options != null )
RichIterable options = typeDependencies.get( type );
if ( options.notEmpty() )
{
return selector.select( type, (Iterable<T>) options);
return selector.select( type, (Iterable<T>) options );
}

// Try parent
if ( parent != null )
{
DependencyResolver dependencyResolver = parent.get();

if ( dependencyResolver != null )
{
return dependencyResolver.resolveDependency( type, selector );
}
return parent.resolveDependency( type, selector );
}

// Out of options
Expand All @@ -92,13 +83,7 @@ public <T> T satisfyDependency( T dependency )
Class<?> type = dependency.getClass();
do
{
List<Object> deps = (List<Object>) typeDependencies.get( type );
if ( deps == null )
{
deps = new ArrayList<>( );
typeDependencies.put(type, deps);
}
deps.add( dependency );
typeDependencies.put( type, dependency );

// Add as all interfaces
Class<?>[] interfaces = type.getInterfaces();
Expand All @@ -123,15 +108,7 @@ private <T> void addInterfaces( Class<?>[] interfaces, T dependency )
{
for ( Class<?> type : interfaces )
{
List<Object> deps = (List<Object>) typeDependencies.get( type );
if ( deps == null )
{
deps = new ArrayList<>( );
typeDependencies.put(type, deps);
}
deps.add( dependency );

// Add as all sub-interfaces
typeDependencies.put( type, dependency );
addInterfaces(type.getInterfaces(), dependency);
}
}
Expand Down

0 comments on commit cc73c11

Please sign in to comment.