Skip to content

Commit

Permalink
Reduce NeoStoreDataSource coupling to NeoStoresModule
Browse files Browse the repository at this point in the history 
Including removing it as an explicit field.
The responsibility of managing the NeoStores is gradually moving into the StoreLayerModule, which will get a better name in due time.
  • Loading branch information
@chrisvest
chrisvest committed Nov 16, 2015
1 parent 8c0f9ab commit c388478
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 42 deletions.
2 changes: 1 addition & 1 deletion advanced/management/src/main/java/org/neo4j/management/impl/TransactionManagerBean.java
View file
Expand Up @@ -94,7 +94,7 @@ public long getLastCommittedTxId()
{
return -1;
}
return neoStoreDataSource.getNeoStores().getMetaDataStore().getLastCommittedTransactionId();
return neoStoreDataSource.getLastCommittedTransactionId();
}
}
}
97 changes: 57 additions & 40 deletions community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
View file
Expand Up @@ -189,8 +189,6 @@ public class NeoStoreDataSource implements NeoStoresSupplier, Lifecycle, IndexPr
private interface NeoStoreModule
{
NeoStores neoStores();

MetaDataStore metaDataStore(); // Used for Dependency resolution
}

private interface CacheModule
Expand Down Expand Up @@ -220,6 +218,9 @@ private interface IndexingModule
private interface StoreLayerModule
{
StoreReadLayer storeLayer();

NeoStores neoStores();
MetaDataStore metaDataStore();
}

private interface TransactionLogModule
Expand Down Expand Up @@ -263,23 +264,23 @@ enum Diagnostics implements DiagnosticsExtractor<NeoStoreDataSource>
@Override
void dump( NeoStoreDataSource source, Logger logger )
{
source.neoStoreModule.neoStores().logVersions( logger );
source.storeLayerModule.neoStores().logVersions( logger );
}
},
NEO_STORE_ID_USAGE( "Id usage:" )
{
@Override
void dump( NeoStoreDataSource source, Logger logger )
{
source.neoStoreModule.neoStores().logIdUsage( logger );
source.storeLayerModule.neoStores().logIdUsage( logger );
}
},
NEO_STORE_RECORDS( "Neostore records:" )
{
@Override
void dump( NeoStoreDataSource source, Logger log )
{
source.neoStoreModule.neoStores().getMetaDataStore().logRecords( log );
source.storeLayerModule.neoStores().getMetaDataStore().logRecords( log );
}
},
TRANSACTION_RANGE( "Transaction log:" )
Expand Down Expand Up @@ -387,7 +388,6 @@ boolean applicable( DiagnosticsPhase phase )
private File storeDir;
private boolean readOnly;

private NeoStoreModule neoStoreModule;
private CacheModule cacheModule;
private IndexingModule indexingModule;
private StoreLayerModule storeLayerModule;
Expand Down Expand Up @@ -518,42 +518,39 @@ public void start() throws IOException
upgradeStore( storeDir, storeMigrationProcess, indexProvider );

// Build all modules and their services
NeoStoreModule neoStoreModule = null;
try
{
LegacyIndexApplierLookup legacyIndexApplierLookup =
dependencies.satisfyDependency( new LegacyIndexApplierLookup.Direct( legacyIndexProviderLookup ) );

StoreFactory storeFactory = new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider );
final NeoStoreModule neoStoreModule =
buildNeoStore( storeFactory, labelTokens, relationshipTypeTokens, propertyKeyTokenHolder );
// TODO The only reason this is here is because of the provider-stuff for DiskLayer. Remove when possible:
this.neoStoreModule = neoStoreModule;

CacheModule cacheModule = buildCaches(
labelTokens, relationshipTypeTokens, propertyKeyTokenHolder );

neoStoreModule = buildNeoStore( labelTokens, relationshipTypeTokens, propertyKeyTokenHolder );

IndexingModule indexingModule = buildIndexing( config, scheduler, indexProvider, lockService,
tokenNameLookup, logProvider, indexingServiceMonitor,
neoStoreModule.neoStores(), cacheModule.updateableSchemaState() );

// TODO Introduce a StorageEngine abstraction at the StoreLayerModule boundary
StoreLayerModule storeLayerModule = buildStoreLayer( neoStoreModule.neoStores(),
StoreLayerModule storeLayerModule = buildStoreLayer( neoStoreModule,
propertyKeyTokenHolder, labelTokens, relationshipTypeTokens,
indexingModule.indexingService(), cacheModule.schemaCache(), cacheModule.procedureCache() );
indexingModule.indexingService(), cacheModule );

TransactionLogModule transactionLogModule =
buildTransactionLogs( storeDir, config, logProvider, scheduler, indexingModule.labelScanStore(),
fs, neoStoreModule.neoStores(), cacheModule.cacheAccess(), indexingModule.indexingService(),
fs, storeLayerModule.neoStores(), cacheModule.cacheAccess(), indexingModule.indexingService(),
indexProviders.values(), legacyIndexApplierLookup );

buildRecovery( fs, cacheModule.cacheAccess(), indexingModule.indexingService(),
indexingModule.labelScanStore(), neoStoreModule.neoStores(),
indexingModule.labelScanStore(), storeLayerModule.neoStores(),
monitors.newMonitor( RecoveryVisitor.Monitor.class ), monitors.newMonitor( Recovery.Monitor.class ),
transactionLogModule.logFiles(), transactionLogModule.storeFlusher(), startupStatistics,
legacyIndexApplierLookup );

KernelModule kernelModule = buildKernel( indexingModule.integrityValidator(),
transactionLogModule.transactionAppender(), neoStoreModule.neoStores(),
transactionLogModule.transactionAppender(), storeLayerModule.neoStores(),
transactionLogModule.storeApplier(), indexingModule.indexingService(),
indexingModule.indexUpdatesValidator(),
storeLayerModule.storeLayer(),
Expand All @@ -578,8 +575,12 @@ public void start() throws IOException
msgLog.warn( "Exception occurred while setting up store modules. Attempting to close things down.",
e, true );
try
{ // Close the neostore, so that locks are released properly
neoStoreModule.neoStores().close();
{
// Close the neostore, so that locks are released properly
if ( neoStoreModule != null )
{
neoStoreModule.neoStores().close();
}
}
catch ( Exception closeException )
{
Expand All @@ -598,7 +599,8 @@ public void start() throws IOException
msgLog.warn( "Exception occurred while starting the datasource. Attempting to close things down.",
e, true );
try
{ // Close the neostore, so that locks are released properly
{
// Close the neostore, so that locks are released properly
neoStoreModule.neoStores().close();
}
catch ( Exception closeException )
Expand Down Expand Up @@ -629,7 +631,7 @@ private void upgradeStore( File storeDir, StoreUpgrader storeMigrationProcess, S
storeMigrationProcess.migrateIfNeeded( storeDir, upgradableDatabase, indexProvider );
}

private NeoStoreModule buildNeoStore( final StoreFactory storeFactory, final LabelTokenHolder
private NeoStoreModule buildNeoStore( final LabelTokenHolder
labelTokens, final RelationshipTypeTokenHolder relationshipTypeTokens,
final PropertyKeyTokenHolder propertyKeyTokenHolder )
{
Expand All @@ -638,19 +640,20 @@ private NeoStoreModule buildNeoStore( final StoreFactory storeFactory, final Lab
@Override
public void start() throws IOException
{
neoStoreModule.neoStores().makeStoreOk();
storeLayerModule.neoStores().makeStoreOk();

propertyKeyTokenHolder.setInitialTokens(
neoStoreModule.neoStores().getPropertyKeyTokenStore().getTokens( Integer.MAX_VALUE ) );
storeLayerModule.neoStores().getPropertyKeyTokenStore().getTokens( Integer.MAX_VALUE ) );
relationshipTypeTokens.setInitialTokens(
neoStoreModule.neoStores().getRelationshipTypeTokenStore().getTokens( Integer.MAX_VALUE ) );
storeLayerModule.neoStores().getRelationshipTypeTokenStore().getTokens( Integer.MAX_VALUE ) );
labelTokens.setInitialTokens(
neoStoreModule.neoStores().getLabelTokenStore().getTokens( Integer.MAX_VALUE ) );
storeLayerModule.neoStores().getLabelTokenStore().getTokens( Integer.MAX_VALUE ) );

neoStoreModule.neoStores().rebuildCountStoreIfNeeded(); // TODO: move this to counts store lifecycle
storeLayerModule.neoStores().rebuildCountStoreIfNeeded(); // TODO: move this to counts store lifecycle
}
} );

final StoreFactory storeFactory = new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider );
final NeoStores neoStores = storeFactory.openAllNeoStores( true );
return new NeoStoreModule()
{
Expand All @@ -659,12 +662,6 @@ public NeoStores neoStores()
{
return neoStores;
}

@Override
public MetaDataStore metaDataStore()
{
return neoStores.getMetaDataStore();
}
};
}

Expand Down Expand Up @@ -781,13 +778,15 @@ public SchemaIndexProviderMap schemaIndexProviderMap()
};
}

private StoreLayerModule buildStoreLayer( NeoStores neoStores,
private StoreLayerModule buildStoreLayer( NeoStoreModule neoStoresModule,
PropertyKeyTokenHolder propertyKeyTokenHolder, LabelTokenHolder labelTokens,
RelationshipTypeTokenHolder relationshipTypeTokens,
IndexingService indexingService,
SchemaCache schemaCache,
ProcedureCache procedureCache )
CacheModule cacheModule )
{
SchemaCache schemaCache = cacheModule.schemaCache();
ProcedureCache procedureCache = cacheModule.procedureCache();
final NeoStores neoStores = neoStoresModule.neoStores();
SchemaStorage schemaStorage = new SchemaStorage( neoStores.getSchemaStore() );
DiskLayer diskLayer = new DiskLayer( propertyKeyTokenHolder, labelTokens, relationshipTypeTokens, schemaStorage,
neoStores, indexingService, storeStatementFactory( neoStores ) );
Expand All @@ -800,6 +799,18 @@ public StoreReadLayer storeLayer()
{
return storeLayer;
}

@Override
public NeoStores neoStores()
{
return neoStores;
}

@Override
public MetaDataStore metaDataStore()
{
return neoStores.getMetaDataStore();
}
};
}

Expand Down Expand Up @@ -1120,13 +1131,14 @@ private void satisfyDependencies( Object... modules )
// Startup sequence done
private void loadSchemaCache()
{
List<SchemaRule> schemaRules = toList( neoStoreModule.neoStores().getSchemaStore().loadAllSchemaRules() );
List<SchemaRule> schemaRules = toList( storeLayerModule.neoStores().getSchemaStore().loadAllSchemaRules() );
cacheModule.schemaCache().load( schemaRules );
}

// Only public for testing purpose
public NeoStores getNeoStores()
{
return neoStoreModule.neoStores();
return storeLayerModule.neoStores();
}

public IndexingService getIndexService()
Expand Down Expand Up @@ -1198,7 +1210,7 @@ public synchronized void stop()
life.shutdown();

// Close the NeoStores
neoStoreModule.neoStores().close();
storeLayerModule.neoStores().close();
msgLog.info( "NeoStores closed" );
}
// After we've released the logFile monitor there might be transactions that wants to commit, but had
Expand All @@ -1208,7 +1220,7 @@ public synchronized void stop()

private void awaitAllTransactionsClosed()
{
while ( !neoStoreModule.neoStores().getMetaDataStore().closedTransactionIdIsOnParWithOpenedTransactionId() )
while ( !storeLayerModule.neoStores().getMetaDataStore().closedTransactionIdIsOnParWithOpenedTransactionId() )
{
LockSupport.parkNanos( 10_000_000 ); // 10 ms
}
Expand Down Expand Up @@ -1246,6 +1258,11 @@ public long getCurrentLogVersion()
return getNeoStores().getMetaDataStore().getCurrentLogVersion();
}

public long getLastCommittedTransactionId()
{
return getNeoStores().getMetaDataStore().getLastCommittedTransactionId();
}

public boolean isReadOnly()
{
return readOnly;
Expand All @@ -1269,7 +1286,7 @@ public void registerDiagnosticsWith( DiagnosticsManager manager )
@Override
public NeoStores get()
{
return neoStoreModule.neoStores();
return storeLayerModule.neoStores();
}

public StoreReadLayer getStoreLayer()
Expand Down
2 changes: 1 addition & 1 deletion enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java
View file
Expand Up @@ -618,7 +618,7 @@ public void shouldContainTransactionsThatHappenDuringBackupProcess() throws Thro

final DependencyResolver resolver = db.getDependencyResolver();
NeoStoreDataSource ds = resolver.resolveDependency( DataSourceManager.class ).getDataSource();
long expectedLastTxId = ds.getNeoStores().getMetaDataStore().getLastCommittedTransactionId();
long expectedLastTxId = ds.getLastCommittedTransactionId();

// This monitor is added server-side...
monitors.addMonitorListener( new StoreSnoopingMonitor( barrier ) );
Expand Down

0 comments on commit c388478

Please sign in to comment.