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 563af0841538a..bce013c17b3be 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 @@ -151,7 +151,7 @@ public Result runFullConsistencyCheck( File storeDir, Config config, ProgressMon Log log = logProvider.getLog( getClass() ); ConfiguringPageCacheFactory pageCacheFactory = new ConfiguringPageCacheFactory( fileSystem, config, PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, - logProvider.getLog( PageCache.class ), EmptyVersionContextSupplier.INSTANCE ); + logProvider.getLog( PageCache.class ), EmptyVersionContextSupplier.EMPTY ); PageCache pageCache = pageCacheFactory.getOrCreatePageCache(); try @@ -210,7 +210,7 @@ public Result runFullConsistencyCheck( final File storeDir, Config config, Progr config.augment( GraphDatabaseSettings.read_only, TRUE ); StoreFactory factory = new StoreFactory( storeDir, config, - new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.INSTANCE ); + new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.EMPTY ); ConsistencySummaryStatistics summary; final File reportFile = chooseReportPath( reportDir ); 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 7eb4b385f273a..c54af5e1bc5ab 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 @@ -167,7 +167,7 @@ public DirectStoreAccess directStoreAccess() Config config = Config.defaults(); DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fileSystem ); StoreFactory storeFactory = new StoreFactory( - directory, config, idGeneratorFactory, pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.INSTANCE ); + directory, config, idGeneratorFactory, pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.EMPTY ); neoStore = storeFactory.openAllNeoStores(); StoreAccess nativeStores; if ( keepStatistics ) diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java index f01bfffee4b5a..4cdafaa5d91e7 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java @@ -151,7 +151,7 @@ private StoreFactory newStoreFactory( PageCache pageCache ) FileSystemAbstraction fileSystem = fileSystemRule.get(); return new StoreFactory( directory.directory(), getTuningConfiguration(), new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, NullLogProvider.getInstance(), - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); } private Config getTuningConfiguration() diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContextTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContextTest.scala index d10aa8e3c4753..d9c2e070f7e3a 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContextTest.scala +++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContextTest.scala @@ -67,7 +67,7 @@ class TransactionBoundQueryContextTest extends CypherFunSuite { val storeStatement = mock[StorageStatement] val operations = mock[StatementOperationParts](RETURNS_DEEP_STUBS) statement = new KernelStatement(kernelTransaction, null, storeStatement, new Procedures(), new CanWrite(), - LockTracer.NONE, operations, EmptyVersionContextSupplier.INSTANCE) + LockTracer.NONE, operations, EmptyVersionContextSupplier.EMPTY) statement.initialize(null, PageCursorTracerSupplier.NULL.get()) statement.acquire() } diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreePrinter.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreePrinter.java index d6e6c001c60c0..da75b6f52623c 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreePrinter.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreePrinter.java @@ -76,7 +76,7 @@ public static void printHeader( FileSystemAbstraction fs, File file, PrintStream SingleFilePageSwapperFactory swapper = new SingleFilePageSwapperFactory(); swapper.open( fs, EMPTY ); try ( PageCache pageCache = new MuninnPageCache( swapper, 100, (int) kibiBytes( 8 ), NULL, - PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.INSTANCE ) ) + PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.EMPTY ) ) { printHeader( pageCache, file, out ); } diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreePartialCreateFuzzIT.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreePartialCreateFuzzIT.java index 4f5ea9bac25ee..cc82c12081751 100644 --- a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreePartialCreateFuzzIT.java +++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreePartialCreateFuzzIT.java @@ -105,7 +105,7 @@ public static void main( String[] args ) throws IOException SingleFilePageSwapperFactory swapper = new SingleFilePageSwapperFactory(); swapper.open( fs, EMPTY ); try ( PageCache pageCache = new MuninnPageCache( swapper, 10, (int) kibiBytes( 8 ), - PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.INSTANCE ) ) + PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.EMPTY ) ) { fs.deleteFile( file ); new GBPTreeBuilder<>( pageCache, file, new SimpleLongLayout() ).build().close(); diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCache.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCache.java index 8fcef4a4c6d60..d049b6bec4e24 100644 --- a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCache.java +++ b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCache.java @@ -894,7 +894,7 @@ private void addFreePageToFreelist( long pageRef ) do { current = getFreelistHead(); - if ( current instanceof AtomicInteger && ((AtomicInteger) current).get() >= pages.getPageCount() ) + if ( current instanceof AtomicInteger && ((AtomicInteger) current).get() > pages.getPageCount() ) { current = null; } diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/StandalonePageCacheFactory.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/StandalonePageCacheFactory.java index 737af3c487c06..6a26aec9900bb 100644 --- a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/StandalonePageCacheFactory.java +++ b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/StandalonePageCacheFactory.java @@ -46,13 +46,13 @@ private StandalonePageCacheFactory() public static PageCache createPageCache( FileSystemAbstraction fileSystem ) { return createPageCache( fileSystem, null, PageCacheTracer.NULL, DefaultPageCursorTracerSupplier.INSTANCE, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); } public static PageCache createPageCache( FileSystemAbstraction fileSystem, Integer pageSize ) { return createPageCache( fileSystem, pageSize, PageCacheTracer.NULL, DefaultPageCursorTracerSupplier.INSTANCE, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); } public static PageCache createPageCache( FileSystemAbstraction fileSystem, Integer pageSize, diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/SwapperSet.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/SwapperSet.java index 0675a5c4c3d12..e0c6fb376ee90 100644 --- a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/SwapperSet.java +++ b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/SwapperSet.java @@ -26,9 +26,9 @@ import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveIntIterator; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.helpers.Numbers; import org.neo4j.io.pagecache.PageSwapper; +import static org.neo4j.helpers.Numbers.safeCastIntToShort; import static org.neo4j.helpers.Numbers.safeCastLongToShort; /** @@ -101,7 +101,7 @@ synchronized short allocate( PageSwapper swapper ) { if ( !free.isEmpty() ) { - short id = Numbers.safeCastIntToShort( free.iterator().next() ); + short id = safeCastIntToShort( free.iterator().next() ); free.remove( id ); swapperMappings[id] = new SwapperMapping( id, swapper ); this.swapperMappings = swapperMappings; // Volatile store synchronizes-with loads in getters. diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContext.java b/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContext.java index f984394f9b6e7..518b801b46085 100644 --- a/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContext.java +++ b/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContext.java @@ -25,7 +25,7 @@ */ public class EmptyVersionContext implements VersionContext { - public static final VersionContext INSTANCE = new EmptyVersionContext(); + public static final VersionContext EMPTY = new EmptyVersionContext(); private EmptyVersionContext() { diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContextSupplier.java b/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContextSupplier.java index b03be30110e29..2274d5358071e 100644 --- a/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContextSupplier.java +++ b/community/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContextSupplier.java @@ -27,7 +27,7 @@ */ public class EmptyVersionContextSupplier implements VersionContextSupplier { - public static final VersionContextSupplier INSTANCE = new EmptyVersionContextSupplier(); + public static final VersionContextSupplier EMPTY = new EmptyVersionContextSupplier(); private EmptyVersionContextSupplier() { @@ -41,6 +41,6 @@ public void init( LongSupplier lastClosedTransactionIdSupplier ) @Override public VersionContext getVersionContext() { - return EmptyVersionContext.INSTANCE; + return EmptyVersionContext.EMPTY; } } diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTestSupport.java b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTestSupport.java index a2cf14f6baa66..32e88ccb350a4 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTestSupport.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTestSupport.java @@ -114,7 +114,7 @@ protected final T createPageCache( PageSwapperFactory swapperFactory, int maxPag PageCacheTracer tracer, PageCursorTracerSupplier cursorTracerSupplier ) { return createPageCache( swapperFactory, maxPages, pageSize, tracer, cursorTracerSupplier, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); } protected final T createPageCache( PageSwapperFactory swapperFactory, int maxPages, int pageSize, @@ -128,7 +128,7 @@ protected T createPageCache( FileSystemAbstraction fs, int maxPages, int pageSiz PageCursorTracerSupplier cursorTracerSupplier ) { return createPageCache( fs, maxPages, pageSize, tracer, cursorTracerSupplier, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); } protected T createPageCache( FileSystemAbstraction fs, int maxPages, int pageSize, PageCacheTracer tracer, diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheTest.java index 53acacdc50d22..8ebb4503fdbad 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheTest.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheTest.java @@ -42,7 +42,6 @@ import org.neo4j.io.pagecache.tracing.EvictionRunEvent; import org.neo4j.io.pagecache.tracing.MajorFlushEvent; import org.neo4j.io.pagecache.tracing.PageCacheTracer; -import org.neo4j.io.pagecache.tracing.PageFaultEvent; import org.neo4j.io.pagecache.tracing.cursor.DefaultPageCursorTracerSupplier; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier; import org.neo4j.io.pagecache.tracing.cursor.context.VersionContext; @@ -95,6 +94,28 @@ public MajorFlushEvent beginCacheFlush() }; } + @Test + public void ableToEvictAllPageInAPageCache() throws IOException + { + writeInitialDataTo( file( "a" ) ); + RecordingPageCacheTracer tracer = new RecordingPageCacheTracer(); + RecordingPageCursorTracer cursorTracer = new RecordingPageCursorTracer(); + ConfigurablePageCursorTracerSupplier cursorTracerSupplier = new ConfigurablePageCursorTracerSupplier( cursorTracer ); + try ( MuninnPageCache pageCache = createPageCache( fs, 2, 8, blockCacheFlush( tracer ), cursorTracerSupplier ); + PagedFile pagedFile = pageCache.map( file( "a" ), 8 ) ) + { + try ( PageCursor cursor = pagedFile.io( 0, PF_SHARED_READ_LOCK ) ) + { + assertTrue( cursor.next() ); + } + try ( PageCursor cursor = pagedFile.io( 1, PF_SHARED_READ_LOCK ) ) + { + assertTrue( cursor.next() ); + } + assertEquals( 2, pageCache.evictPages( 2, 0, EvictionRunEvent.NULL ) ); + } + } + @Test public void mustEvictCleanPageWithoutFlushing() throws Exception { @@ -414,8 +435,7 @@ public void markContextAsDirtyWhenAnyEvictedPageHaveModificationTransactionHighe cursor.putLong( 4 ); } - pageCache.pages.tryEvict( pageCache.grabFreeAndExclusivelyLockedPage( PageFaultEvent.NULL ), - EvictionRunEvent.NULL ); + assertEquals( 2, pageCache.evictPages( 2, 0, EvictionRunEvent.NULL ) ); cursorContext.initRead(); try ( PageCursor cursor = pagedFile.io( 0, PF_SHARED_READ_LOCK ) ) @@ -449,8 +469,7 @@ public void doNotMarkContextAsDirtyWhenAnyEvictedPageHaveModificationTransaction cursor.putLong( 4 ); } - pageCache.pages.tryEvict( pageCache.grabFreeAndExclusivelyLockedPage( PageFaultEvent.NULL ), - EvictionRunEvent.NULL ); + assertEquals( 2, pageCache.evictPages( 2, 0, EvictionRunEvent.NULL ) ); cursorContext.initRead(); try ( PageCursor cursor = pagedFile.io( 0, PF_SHARED_READ_LOCK ) ) diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/RandomPageCacheTestHarness.java b/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/RandomPageCacheTestHarness.java index a65b9f8435c90..0b425a1151075 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/RandomPageCacheTestHarness.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/randomharness/RandomPageCacheTestHarness.java @@ -386,7 +386,7 @@ private void runIteration( long timeout, TimeUnit unit ) throws Exception PageSwapperFactory swapperFactory = new SingleFilePageSwapperFactory(); swapperFactory.open( fs, Configuration.EMPTY ); MuninnPageCache cache = new MuninnPageCache( swapperFactory, cachePageCount, cachePageSize, tracer, - cursorTracerSupplier, EmptyVersionContextSupplier.INSTANCE ); + cursorTracerSupplier, EmptyVersionContextSupplier.EMPTY ); cache.setPrintExceptionsOnClose( false ); Map fileMap = new HashMap<>( files.length ); for ( int i = 0; i < Math.min( files.length, initialMappedFiles ); i++ ) diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/stress/PageCacheStressTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/stress/PageCacheStressTest.java index 3c97cdd3eea39..d3414496ecdb4 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/stress/PageCacheStressTest.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/stress/PageCacheStressTest.java @@ -92,7 +92,7 @@ public void run() throws Exception swapperFactory.open( fs, Configuration.EMPTY ); try ( PageCache pageCacheUnderTest = new MuninnPageCache( swapperFactory, numberOfCachePages, cachePageSize, - tracer, pageCursorTracerSupplier, EmptyVersionContextSupplier.INSTANCE ) ) + tracer, pageCursorTracerSupplier, EmptyVersionContextSupplier.EMPTY ) ) { PageCacheStresser pageCacheStresser = new PageCacheStresser( numberOfPages, numberOfThreads, workingDirectory ); diff --git a/community/io/src/test/java/org/neo4j/test/rule/PageCacheRule.java b/community/io/src/test/java/org/neo4j/test/rule/PageCacheRule.java index 646365039801c..de65a101412c1 100644 --- a/community/io/src/test/java/org/neo4j/test/rule/PageCacheRule.java +++ b/community/io/src/test/java/org/neo4j/test/rule/PageCacheRule.java @@ -173,7 +173,7 @@ public PageCache getPageCache( FileSystemAbstraction fs, PageCacheConfig overrid selectConfig( baseConfig.pageSize, overriddenConfig.pageSize, null ), selectConfig( baseConfig.tracer, overriddenConfig.tracer, PageCacheTracer.NULL ), selectConfig( baseConfig.pageCursorTracerSupplier, overriddenConfig.pageCursorTracerSupplier, - DefaultPageCursorTracerSupplier.INSTANCE ), EmptyVersionContextSupplier.INSTANCE); + DefaultPageCursorTracerSupplier.INSTANCE ), EmptyVersionContextSupplier.EMPTY ); pageCachePostConstruct( overriddenConfig ); return pageCache; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionToApply.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionToApply.java index cd0838edf13c6..7ac14651a4bbc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionToApply.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionToApply.java @@ -81,7 +81,7 @@ public class TransactionToApply implements CommandsToApply, AutoCloseable */ public TransactionToApply( TransactionRepresentation transactionRepresentation ) { - this( transactionRepresentation, EmptyVersionContext.INSTANCE ); + this( transactionRepresentation, EmptyVersionContext.EMPTY ); } /** @@ -94,7 +94,7 @@ public TransactionToApply( TransactionRepresentation transactionRepresentation, public TransactionToApply( TransactionRepresentation transactionRepresentation, long transactionId ) { - this( transactionRepresentation, transactionId, EmptyVersionContext.INSTANCE ); + this( transactionRepresentation, transactionId, EmptyVersionContext.EMPTY ); } public TransactionToApply( TransactionRepresentation transactionRepresentation, long transactionId, diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/context/TransactionVersionContextSupplier.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/context/TransactionVersionContextSupplier.java index f00275f2b03f0..eff9d33ba15a9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/context/TransactionVersionContextSupplier.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/context/TransactionVersionContextSupplier.java @@ -42,7 +42,7 @@ public void init( LongSupplier lastClosedTransactionIdSupplier ) @Override public VersionContext getVersionContext() { - return cursorContext == null ? EmptyVersionContext.INSTANCE : cursorContext.get(); + return cursorContext == null ? EmptyVersionContext.EMPTY : cursorContext.get(); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java index 449859ee4c563..11aeaecde0855 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java @@ -214,7 +214,7 @@ public PlatformModule( File providedStoreDir, Config config, DatabaseInfo databa protected VersionContextSupplier createCursorContextSupplier( Config config ) { return config.get( GraphDatabaseSettings.snapshot_query ) ? new TransactionVersionContextSupplier() - : EmptyVersionContextSupplier.INSTANCE; + : EmptyVersionContextSupplier.EMPTY; } protected AvailabilityGuard createAvailabilityGuard() diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfigurableStandalonePageCacheFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfigurableStandalonePageCacheFactory.java index 86f4e3bf83b80..553e8b8937e36 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfigurableStandalonePageCacheFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfigurableStandalonePageCacheFactory.java @@ -48,13 +48,13 @@ private ConfigurableStandalonePageCacheFactory() public static PageCache createPageCache( FileSystemAbstraction fileSystem ) { return createPageCache( fileSystem, PageCacheTracer.NULL, DefaultPageCursorTracerSupplier.INSTANCE, - Config.defaults(), EmptyVersionContextSupplier.INSTANCE ); + Config.defaults(), EmptyVersionContextSupplier.EMPTY ); } public static PageCache createPageCache( FileSystemAbstraction fileSystem, Config config ) { return createPageCache( fileSystem, PageCacheTracer.NULL, DefaultPageCursorTracerSupplier.INSTANCE, config, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); } /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreAccess.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreAccess.java index 7f3c0516c2548..6b10e056cc4e6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreAccess.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreAccess.java @@ -76,7 +76,7 @@ public StoreAccess( NeoStores store ) public StoreAccess( FileSystemAbstraction fileSystem, PageCache pageCache, File storeDir, Config config ) { this( new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fileSystem ), pageCache, - fileSystem, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ).openAllNeoStores() ); + fileSystem, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ).openAllNeoStores() ); this.closeable = true; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/ReadOnlyCountsTracker.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/ReadOnlyCountsTracker.java index 9f0e958ab75d6..44286776e3602 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/ReadOnlyCountsTracker.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/ReadOnlyCountsTracker.java @@ -35,7 +35,7 @@ public class ReadOnlyCountsTracker extends CountsTracker public ReadOnlyCountsTracker( LogProvider logProvider, FileSystemAbstraction fileSystem, PageCache pageCache, Config config, File baseFile ) { - super( logProvider, fileSystem, pageCache, config, baseFile, EmptyVersionContextSupplier.INSTANCE ); + super( logProvider, fileSystem, pageCache, config, baseFile, EmptyVersionContextSupplier.EMPTY ); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/State.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/State.java index b95ba414a72f3..10842622f0d08 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/State.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/State.java @@ -51,7 +51,7 @@ public ActiveState open( ReadableState store, File file, Version @Override public ActiveState open( ReadableState store, File file, VersionContextSupplier versionContextSupplier ) { - return new ConcurrentMapState( store, file, EmptyVersionContextSupplier.INSTANCE ) + return new ConcurrentMapState( store, file, EmptyVersionContextSupplier.EMPTY ) { @Override protected boolean hasChanges() diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/DirectRecordStoreMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/DirectRecordStoreMigrator.java index 79f7b560875f4..adb6bd79fb12f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/DirectRecordStoreMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/DirectRecordStoreMigrator.java @@ -66,11 +66,11 @@ public void migrate( File fromStoreDir, RecordFormats fromFormat, File toStoreDi try ( NeoStores fromStores = new StoreFactory( fromStoreDir, config, new DefaultIdGeneratorFactory( fs ), - pageCache, fs, fromFormat, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ) + pageCache, fs, fromFormat, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ) .openNeoStores( true, storesToOpen ); NeoStores toStores = new StoreFactory( toStoreDir, withPersistedStoreHeadersAsConfigFrom( fromStores, storesToOpen ), new DefaultIdGeneratorFactory( fs ), pageCache, fs, toFormat, NullLogProvider.getInstance(), - EmptyVersionContextSupplier.INSTANCE ) + EmptyVersionContextSupplier.EMPTY ) .openNeoStores( true, storesToOpen ) ) { for ( StoreType type : types ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/CountsMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/CountsMigrator.java index 7fbea955561ec..b88f2e65e2fd1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/CountsMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/CountsMigrator.java @@ -159,7 +159,7 @@ private void rebuildCountsFromScratch( File storeDirToReadFrom, File migrationDi RecordFormats recordFormats = selectForVersion( expectedStoreVersion ); IdGeneratorFactory idGeneratorFactory = new ReadOnlyIdGeneratorFactory( fileSystem ); StoreFactory storeFactory = new StoreFactory( storeDirToReadFrom, config, idGeneratorFactory, pageCache, - fileSystem, recordFormats, logProvider, EmptyVersionContextSupplier.INSTANCE ); + fileSystem, recordFormats, logProvider, EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStores = storeFactory .openNeoStores( StoreType.NODE, StoreType.RELATIONSHIP, StoreType.LABEL_TOKEN, StoreType.RELATIONSHIP_TYPE_TOKEN ) ) @@ -175,7 +175,7 @@ private void rebuildCountsFromScratch( File storeDirToReadFrom, File migrationDi highRelationshipTypeId, NumberArrayFactory.auto( pageCache, migrationDir, true ), progressMonitor ); life.add( new CountsTracker( logProvider, fileSystem, pageCache, config, - storeFileBase, EmptyVersionContextSupplier.INSTANCE ).setInitializer( initializer ) ); + storeFileBase, EmptyVersionContextSupplier.EMPTY ).setInitializer( initializer ) ); } } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigrator.java index c4a8243111296..c60d12a30be23 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigrator.java @@ -141,7 +141,7 @@ private StoreFactory getStoreFactory( File storeDir, String versionToMigrateFrom RecordFormats recordFormats = selectForVersion( versionToMigrateFrom ); IdGeneratorFactory idGeneratorFactory = new ReadOnlyIdGeneratorFactory( fileSystem ); return new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fileSystem, - recordFormats, logProvider, EmptyVersionContextSupplier.INSTANCE ); + recordFormats, logProvider, EmptyVersionContextSupplier.EMPTY ); } private boolean isNativeLabelScanStoreMigrationRequired( File storeDir ) throws IOException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java index 00ab8e6d06b32..26200bb2a3887 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java @@ -427,7 +427,7 @@ public boolean parallelRecordReadsWhenWriting() private NeoStores instantiateLegacyStore( RecordFormats format, File storeDir ) { return new StoreFactory( storeDir, config, new ReadOnlyIdGeneratorFactory(), pageCache, fileSystem, - format, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ).openAllNeoStores( true ); + format, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ).openAllNeoStores( true ); } private void prepareBatchImportMigration( File storeDir, File migrationDir, RecordFormats oldFormat, @@ -497,7 +497,7 @@ private void createStore( File migrationDir, RecordFormats newFormat ) NullLogProvider logProvider = NullLogProvider.getInstance(); StoreFactory storeFactory = new StoreFactory( migrationDir, config, idGeneratorFactory, pageCache, fileSystem, newFormat, logProvider, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStores = storeFactory.openAllNeoStores( true ) ) { neoStores.getMetaDataStore(); 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 3fbe77101b0eb..0fd15a039cf6b 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 @@ -238,7 +238,7 @@ public BatchInserterImpl( final File storeDir, final FileSystemAbstraction fileS this.storeDir = storeDir; ConfiguringPageCacheFactory pageCacheFactory = new ConfiguringPageCacheFactory( fileSystem, config, PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, NullLog.getInstance(), - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); PageCache pageCache = pageCacheFactory.getOrCreatePageCache(); life.add( new PageCacheLifecycle( pageCache ) ); @@ -256,7 +256,7 @@ public BatchInserterImpl( final File storeDir, final FileSystemAbstraction fileS RecordFormats recordFormats = RecordFormatSelector.selectForStoreOrConfig( config, storeDir, fileSystem, pageCache, internalLogProvider ); StoreFactory sf = new StoreFactory( this.storeDir, config, idGeneratorFactory, pageCache, fileSystem, - recordFormats, internalLogProvider, EmptyVersionContextSupplier.INSTANCE ); + recordFormats, internalLogProvider, EmptyVersionContextSupplier.EMPTY ); maxNodeId = recordFormats.node().getMaxId(); diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java index e178af9abfe2d..657aab999292a 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java @@ -167,7 +167,7 @@ public static BatchingNeoStores batchingNeoStores( FileSystemAbstraction fileSys Config neo4jConfig = getNeo4jConfig( config, dbConfig ); final PageCacheTracer tracer = new DefaultPageCacheTracer(); PageCache pageCache = createPageCache( fileSystem, neo4jConfig, logService.getInternalLogProvider(), tracer, - DefaultPageCursorTracerSupplier.INSTANCE, EmptyVersionContextSupplier.INSTANCE ); + DefaultPageCursorTracerSupplier.INSTANCE, EmptyVersionContextSupplier.EMPTY ); return new BatchingNeoStores( fileSystem, pageCache, storeDir, recordFormats, neo4jConfig, config, logService, initialIds, false, tracer::bytesWritten ); @@ -207,7 +207,7 @@ private StoreFactory newStoreFactory( String name, OpenOption... openOptions ) { return new StoreFactory( storeDir, name, neo4jConfig, new BatchingIdGeneratorFactory( fileSystem ), pageCache, fileSystem, recordFormats, logProvider, - EmptyVersionContextSupplier.INSTANCE, openOptions ); + EmptyVersionContextSupplier.EMPTY, openOptions ); } /** diff --git a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java index fa048ec2245cb..4e557f7469c62 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java @@ -443,7 +443,7 @@ private long lastCommittedTxId( GraphDatabaseService db ) private void assertSameStoreContents( EphemeralFileSystemAbstraction fs1, EphemeralFileSystemAbstraction fs2, File storeDir ) { NullLogProvider logProvider = NullLogProvider.getInstance(); - VersionContextSupplier contextSupplier = EmptyVersionContextSupplier.INSTANCE; + VersionContextSupplier contextSupplier = EmptyVersionContextSupplier.EMPTY; try ( PageCache pageCache1 = new ConfiguringPageCacheFactory( fs1, defaults(), PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, NullLog.getInstance(), contextSupplier ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java b/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java index 5d04ccd2651a5..ee2a6c164246e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java @@ -96,7 +96,7 @@ static Instances kernelTransactionWithInternals( SecurityContext securityContext NULL, LockTracer.NONE, PageCursorTracerSupplier.NULL, - storageEngine, new CanWrite(), EmptyVersionContextSupplier.INSTANCE ); + storageEngine, new CanWrite(), EmptyVersionContextSupplier.EMPTY ); StatementLocks statementLocks = new SimpleStatementLocks( new NoOpClient() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java index ea6e76076d29f..c8428216c7126 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java @@ -49,7 +49,7 @@ public void shouldThrowTerminateExceptionWhenTransactionTerminated() throws Exce when( transaction.securityContext() ).thenReturn( AUTH_DISABLED ); KernelStatement statement = new KernelStatement( transaction, null, mock( StorageStatement.class ), null, new CanWrite(), - LockTracer.NONE, mock( StatementOperationParts.class ), EmptyVersionContextSupplier.INSTANCE ); + LockTracer.NONE, mock( StatementOperationParts.class ), EmptyVersionContextSupplier.EMPTY ); statement.acquire(); statement.readOperations().nodeExists( 0 ); @@ -62,7 +62,7 @@ public void shouldReleaseStorageStatementWhenForceClosed() throws Exception StorageStatement storeStatement = mock( StorageStatement.class ); KernelStatement statement = new KernelStatement( mock( KernelTransactionImplementation.class ), null, storeStatement, new Procedures(), new CanWrite(), LockTracer.NONE, - mock( StatementOperationParts.class ), EmptyVersionContextSupplier.INSTANCE ); + mock( StatementOperationParts.class ), EmptyVersionContextSupplier.EMPTY ); statement.acquire(); // when @@ -89,7 +89,7 @@ public void assertStatementIsNotOpenWhileAcquireIsNotInvoked() Procedures procedures = mock( Procedures.class ); KernelStatement statement = new KernelStatement( transaction, txStateHolder, storeStatement, procedures, accessCapability, LockTracer.NONE, mock( StatementOperationParts.class ), - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); statement.assertOpen(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java index 6809c4f84f573..6243fecc420b6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java @@ -338,7 +338,7 @@ private static class TestKernelTransaction extends KernelTransactionImplementati mock( Pool.class ), Clocks.fakeClock(), TransactionTracer.NULL, LockTracer.NONE, PageCursorTracerSupplier.NULL, mock( StorageEngine.class, RETURNS_MOCKS ), new CanWrite(), - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); this.monitor = monitor; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java index 02823436462ef..c51244f4b367e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java @@ -144,7 +144,7 @@ public KernelTransactionImplementation newNotInitializedTransaction() return new KernelTransactionImplementation( statementOperations, schemaWriteGuard, hooks, null, null, headerInformationFactory, commitProcess, transactionMonitor, explicitIndexStateSupplier, txPool, clock, TransactionTracer.NULL, LockTracer.NONE, - PageCursorTracerSupplier.NULL, storageEngine, new CanWrite(), EmptyVersionContextSupplier.INSTANCE ); + PageCursorTracerSupplier.NULL, storageEngine, new CanWrite(), EmptyVersionContextSupplier.EMPTY ); } public class CapturingCommitProcess implements TransactionCommitProcess diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java index 451f0a4ee71d5..714bfb9edf816 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java @@ -563,7 +563,7 @@ private static KernelTransactions createTransactions( StorageEngine storageEngin commitProcess, null, null, new TransactionHooks(), mock( TransactionMonitor.class ), availabilityGuard, tracers, storageEngine, new Procedures(), transactionIdStore, clock, new CanWrite(), - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); } private static TestKernelTransactions createTestTransactions( StorageEngine storageEngine, @@ -575,7 +575,7 @@ private static TestKernelTransactions createTestTransactions( StorageEngine stor null, DEFAULT, commitProcess, null, null, new TransactionHooks(), mock( TransactionMonitor.class ), availabilityGuard, tracers, storageEngine, new Procedures(), transactionIdStore, clock, - new CanWrite(), EmptyVersionContextSupplier.INSTANCE ); + new CanWrite(), EmptyVersionContextSupplier.EMPTY ); } private static TransactionCommitProcess newRememberingCommitProcess( final TransactionRepresentation[] slot ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java index 69d201438cdf4..6d5e12b210bc2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java @@ -91,7 +91,7 @@ public class LockingStatementOperationsTest private final TxState txState = new TxState(); private final KernelStatement state = new KernelStatement( transaction, new SimpleTxStateHolder( txState ), mock( StorageStatement.class ), new Procedures(), new CanWrite(), LockTracer.NONE, null, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); private final SchemaStateOperations schemaStateOps; private final LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( 123, 456 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementLifecycleTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementLifecycleTest.java index 5e3cd9594c38c..191191bab699b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementLifecycleTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementLifecycleTest.java @@ -80,6 +80,6 @@ private KernelStatement getKernelStatement( KernelTransactionImplementation tran StorageStatement storageStatement ) { return new KernelStatement( transaction, null, storageStatement, new Procedures(), new CanWrite(), - LockTracer.NONE, mock( StatementOperationParts.class ), EmptyVersionContextSupplier.INSTANCE ); + LockTracer.NONE, mock( StatementOperationParts.class ), EmptyVersionContextSupplier.EMPTY ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java index e3e9bed252745..f2e8ca0e17b24 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java @@ -228,7 +228,7 @@ public void before() throws Exception fs.get().mkdirs( storeDir ); StoreFactory storeFactory = new StoreFactory( storeDir, Config.defaults(), new DefaultIdGeneratorFactory( fs.get() ), pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); neoStores = storeFactory.openAllNeoStores( true ); store = neoStores.getPropertyStore(); converter = new PropertyPhysicalToLogicalConverter( store ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerTest.java index 79ba4e1d027a5..7b74c6fa23ef8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerTest.java @@ -68,7 +68,7 @@ public void before() DependencyResolver resolver = db.getDependencyResolver(); this.disk = resolver.resolveDependency( StorageEngine.class ).storeReadLayer(); this.state = new KernelStatement( null, null, disk.newStatement(), new Procedures(), new CanWrite(), - LockTracer.NONE, null, EmptyVersionContextSupplier.INSTANCE ); + LockTracer.NONE, null, EmptyVersionContextSupplier.EMPTY ); } protected GraphDatabaseService createGraphDatabase() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreNodeRelationshipCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreNodeRelationshipCursorTest.java index 88561df94f702..4555307976671 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreNodeRelationshipCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreNodeRelationshipCursorTest.java @@ -104,13 +104,13 @@ public static void setupStores() fs = new DefaultFileSystemAbstraction(); Config config = Config.defaults( pagecache_memory, "8m" ); pageCache = new ConfiguringPageCacheFactory( fs, - config, NULL, PageCursorTracerSupplier.NULL, NullLog.getInstance(), EmptyVersionContextSupplier.INSTANCE ) + config, NULL, PageCursorTracerSupplier.NULL, NullLog.getInstance(), EmptyVersionContextSupplier.EMPTY ) .getOrCreatePageCache(); DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); NullLogProvider logProvider = NullLogProvider.getInstance(); StoreFactory storeFactory = new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); neoStores = storeFactory.openAllNeoStores( true ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java index 36beeae493020..cdba6051e4957 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java @@ -296,7 +296,7 @@ public static void setUp() throws IOException DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); NullLogProvider logProvider = NullLogProvider.getInstance(); neoStores = new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider, - EmptyVersionContextSupplier.INSTANCE ) + EmptyVersionContextSupplier.EMPTY ) .openAllNeoStores( true ); propertyStore = neoStores.getPropertyStore(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreSingleRelationshipCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreSingleRelationshipCursorTest.java index 70a69a66a0ee7..fee1c569dec01 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreSingleRelationshipCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreSingleRelationshipCursorTest.java @@ -114,7 +114,7 @@ private StoreFactory getStoreFactory() return new StoreFactory( testDirectory.directory(), Config.defaults(), new DefaultIdGeneratorFactory( fileSystemRule.get() ), pageCacheRule.getPageCache( fileSystemRule.get() ), fileSystemRule.get(), - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); } private StoreSingleRelationshipCursor createRelationshipCursor() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java index d28f16c411212..7189bea536c71 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java @@ -135,7 +135,7 @@ private GraphDatabaseAPI databaseWithManyPropertyKeys( int propertyKeyCount ) th StoreFactory storeFactory = new StoreFactory( storeDir, Config.defaults(), new DefaultIdGeneratorFactory( fileSystemRule.get() ), pageCache, fileSystemRule.get(), - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = storeFactory.openAllNeoStores( true ); PropertyKeyTokenStore store = neoStores.getPropertyKeyTokenStore(); for ( int i = 0; i < propertyKeyCount; i++ ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java index 297ce78caeec8..6edf0f4273a02 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java @@ -67,7 +67,7 @@ public void shouldFitAsManyPagesAsItCan() throws Throwable // When ConfiguringPageCacheFactory factory = new ConfiguringPageCacheFactory( fsRule.get(), config, PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, - NullLog.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLog.getInstance(), EmptyVersionContextSupplier.EMPTY ); // Then try ( PageCache cache = factory.getOrCreatePageCache() ) @@ -89,7 +89,7 @@ public void shouldWarnWhenCreatedWithConfiguredPageCache() throws Exception // When ConfiguringPageCacheFactory pageCacheFactory = new ConfiguringPageCacheFactory( fsRule.get(), config, - PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, log, EmptyVersionContextSupplier.INSTANCE ); + PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, log, EmptyVersionContextSupplier.EMPTY ); // Then try ( PageCache pageCache = pageCacheFactory.getOrCreatePageCache() ) @@ -112,7 +112,7 @@ public void mustUseAndLogConfiguredPageSwapper() throws Exception // When ConfiguringPageCacheFactory cacheFactory = new ConfiguringPageCacheFactory( fsRule.get(), config, PageCacheTracer.NULL, - PageCursorTracerSupplier.NULL, log, EmptyVersionContextSupplier.INSTANCE ); + PageCursorTracerSupplier.NULL, log, EmptyVersionContextSupplier.EMPTY ); try ( PageCache pageCache = cacheFactory.getOrCreatePageCache() ) { // empty block @@ -134,7 +134,7 @@ public void mustThrowIfConfiguredPageSwapperCannotBeFound() throws Exception // When try ( PageCache pageCache = new ConfiguringPageCacheFactory( fsRule.get(), config, PageCacheTracer.NULL, - PageCursorTracerSupplier.NULL, NullLog.getInstance(), EmptyVersionContextSupplier.INSTANCE ) + PageCursorTracerSupplier.NULL, NullLog.getInstance(), EmptyVersionContextSupplier.EMPTY ) .getOrCreatePageCache() ) { //empty @@ -153,7 +153,7 @@ public void mustIgnoreExplicitlySpecifiedCachePageSizeIfPageSwapperHintIsStrict( // When ConfiguringPageCacheFactory factory = new ConfiguringPageCacheFactory( fsRule.get(), config, PageCacheTracer.NULL, PageCursorTracerSupplier.NULL, - NullLog.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLog.getInstance(), EmptyVersionContextSupplier.EMPTY ); // Then try ( PageCache cache = factory.getOrCreatePageCache() ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/FreeIdsAfterRecoveryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/FreeIdsAfterRecoveryTest.java index 7d48db20c0ad3..65ce9e33a96ce 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/FreeIdsAfterRecoveryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/FreeIdsAfterRecoveryTest.java @@ -56,7 +56,7 @@ public void shouldCompletelyRebuildIdGeneratorsAfterCrash() throws Exception StoreFactory storeFactory = new StoreFactory( directory.directory(), Config.defaults(), new DefaultIdGeneratorFactory( fileSystemRule.get() ), pageCacheRule.getPageCache( fileSystemRule.get() ), fileSystemRule.get(), - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); long highId; try ( NeoStores stores = storeFactory.openAllNeoStores( true ) ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java index 1e85f21b49289..4bf78eb0e407d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java @@ -124,7 +124,7 @@ public void initialize() params.put( GraphDatabaseSettings.rebuild_idgenerators_fast.name(), Settings.FALSE ); Config config = Config.defaults( params ); factory = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fs ), - pageCacheRule.getPageCache( fs ), fs, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + pageCacheRule.getPageCache( fs ), fs, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); } @After diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java index 8dcf1e9cbadc9..f1ce2b35f7d7b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java @@ -116,7 +116,7 @@ private MetaDataStore newMetaDataStore() throws IOException { LogProvider logProvider = NullLogProvider.getInstance(); StoreFactory storeFactory = new StoreFactory( STORE_DIR, Config.defaults(), new DefaultIdGeneratorFactory( fs ), - pageCacheWithFakeOverflow, fs, logProvider, EmptyVersionContextSupplier.INSTANCE ); + pageCacheWithFakeOverflow, fs, logProvider, EmptyVersionContextSupplier.EMPTY ); return storeFactory.openNeoStores( true, StoreType.META_DATA ).getMetaDataStore(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java index f838e59e61ee7..7b9383173d960 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java @@ -149,7 +149,7 @@ public void setUpNeoStores() throws Exception Config config = Config.defaults(); pageCache = pageCacheRule.getPageCache( fs.get() ); StoreFactory sf = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fs.get() ), pageCache, - fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); sf.openAllNeoStores( true ).close(); } @@ -158,7 +158,7 @@ public void impossibleToGetStoreFromClosedNeoStoresContainer() { Config config = Config.defaults(); StoreFactory sf = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fs.get() ), pageCache, - fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = sf.openAllNeoStores( true ); assertNotNull( neoStores.getMetaDataStore() ); @@ -175,7 +175,7 @@ public void notAllowCreateDynamicStoreWithNegativeBlockSize() { Config config = Config.defaults(); StoreFactory sf = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fs.get() ), pageCache, - fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); exception.expect( IllegalArgumentException.class ); exception.expectMessage( "Block size of dynamic array store should be positive integer." ); @@ -191,7 +191,7 @@ public void impossibleToGetNotRequestedStore() { Config config = Config.defaults(); StoreFactory sf = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fs.get() ), pageCache, - fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = sf.openNeoStores( true, StoreType.NODE_LABEL ); exception.expect( IllegalStateException.class ); @@ -541,7 +541,7 @@ public void setVersion() throws Exception Config config = Config.defaults(); StoreFactory sf = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fileSystem ), pageCache, - fileSystem, LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + fileSystem, LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = sf.openAllNeoStores(); assertEquals( 12, neoStores.getMetaDataStore().getCurrentLogVersion() ); @@ -598,7 +598,7 @@ public void testSetLatestConstraintTx() throws Exception // given Config config = Config.defaults(); StoreFactory sf = new StoreFactory( dir.directory(), config, new DefaultIdGeneratorFactory( fs.get() ), - pageCacheRule.getPageCache( fs.get() ), fs.get(), LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + pageCacheRule.getPageCache( fs.get() ), fs.get(), LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); // when NeoStores neoStores = sf.openAllNeoStores( true ); @@ -630,7 +630,7 @@ public void shouldInitializeTheTxIdToOne() new StoreFactory( new File( "graph.db/neostore" ), Config.defaults(), new DefaultIdGeneratorFactory( fs.get() ), pageCache, fs.get(), - LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStores = factory.openAllNeoStores( true ) ) { @@ -651,7 +651,7 @@ public void shouldThrowUnderlyingStorageExceptionWhenFailingToLoadStorage() File neoStoreDir = new File( "/tmp/graph.db/neostore" ).getAbsoluteFile(); StoreFactory factory = new StoreFactory( neoStoreDir, Config.defaults(), new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, - LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStores = factory.openAllNeoStores( true ) ) { @@ -730,7 +730,7 @@ public void shouldSetHighestTransactionIdWhenNeeded() throws Throwable fileSystem.mkdirs( storeDir ); StoreFactory factory = new StoreFactory( storeDir, Config.defaults(), new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, - LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStore = factory.openAllNeoStores( true ) ) { @@ -756,7 +756,7 @@ public void shouldNotSetHighestTransactionIdWhenNeeded() throws Throwable fileSystem.mkdirs( storeDir ); StoreFactory factory = new StoreFactory( storeDir, Config.defaults(), new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, - LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStore = factory.openAllNeoStores( true ) ) { @@ -782,7 +782,7 @@ public void shouldCloseAllTheStoreEvenIfExceptionsAreThrown() throws Exception Config defaults = Config.defaults( counts_store_rotation_timeout, "60m" ); StoreFactory factory = new StoreFactory( storeDir, defaults, new DefaultIdGeneratorFactory( fileSystem ), pageCache, - fileSystem, LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + fileSystem, LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); NeoStores neoStore = factory.openAllNeoStores( true ); // let's hack the counts store so it fails to rotate and hence it fails to close as well... @@ -841,7 +841,7 @@ public void isPresentAfterCreatingAllStores() throws Exception fileSystem.deleteRecursively( storeDir ); DefaultIdGeneratorFactory idFactory = new DefaultIdGeneratorFactory( fileSystem ); StoreFactory factory = new StoreFactory( storeDir, Config.defaults(), idFactory, pageCache, fileSystem, - LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); // when try ( NeoStores ignore = factory.openAllNeoStores( true ) ) @@ -859,7 +859,7 @@ public void isPresentFalseAfterCreatingAllButLastStoreType() throws Exception fileSystem.deleteRecursively( storeDir ); DefaultIdGeneratorFactory idFactory = new DefaultIdGeneratorFactory( fileSystem ); StoreFactory factory = new StoreFactory( storeDir, Config.defaults(), idFactory, pageCache, fileSystem, - LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); StoreType[] allStoreTypes = StoreType.values(); StoreType[] allButLastStoreTypes = Arrays.copyOf( allStoreTypes, allStoreTypes.length - 1 ); @@ -913,7 +913,7 @@ private static StoreFactory newStoreFactory( File neoStoreDir, PageCache pageCac Config config = Config.defaults(); IdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); return new StoreFactory( neoStoreDir, config, idGeneratorFactory, pageCache, fs, recordFormats, LOG_PROVIDER, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); } private Token createDummyIndex( int id, String key ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java index ef9f09b77b01a..69c5998404ab0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java @@ -382,7 +382,7 @@ protected IdGenerator instantiate( FileSystemAbstraction fs, File fileName, int } } ); StoreFactory factory = new StoreFactory( storeDir, Config.defaults(), idGeneratorFactory, pageCache, fs, - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); neoStores = factory.openAllNeoStores( true ); nodeStore = neoStores.getNodeStore(); return nodeStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreConsistentReadTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreConsistentReadTest.java index c0afc1bfedc5a..29248a55778d1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreConsistentReadTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreConsistentReadTest.java @@ -88,7 +88,7 @@ private NeoStores storeFixture() config().withInconsistentReads( nextReadIsInconsistent ) ); File storeDir = new File( "stores" ); StoreFactory factory = new StoreFactory( storeDir, Config.defaults(), new DefaultIdGeneratorFactory( fs ), - pageCache, fs, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + pageCache, fs, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = factory.openAllNeoStores( true ); S store = initialiseStore( neoStores ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java index c34358274a5f2..af4ff2236d5ef 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java @@ -171,7 +171,7 @@ private StoreFactory factory( Integer customThreshold, PageCache pageCache ) customConfig.put( GraphDatabaseSettings.dense_node_threshold.name(), "" + customThreshold ); } return new StoreFactory( directory, Config.defaults( customConfig ), new DefaultIdGeneratorFactory( fs ), pageCache, - fs, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + fs, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); } @Test 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 c9f1c4e3027a7..dc695c8cba450 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 @@ -71,7 +71,7 @@ public void before() throws Exception config = Config.defaults(); DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs.get() ); storeFactory = new StoreFactory( storeDir, config, idGeneratorFactory, pageCacheRule.getPageCache( fs.get() ), - fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); neoStores = storeFactory.openAllNeoStores( true ); store = neoStores.getSchemaStore(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreFactoryTest.java index f66525676fe5e..9b0bf7ad84f38 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreFactoryTest.java @@ -75,7 +75,7 @@ private StoreFactory storeFactory( Config config, OpenOption... openOptions ) LogProvider logProvider = NullLogProvider.getInstance(); RecordFormats recordFormats = selectForStoreOrConfig( config, storeDir, fsRule.get(), pageCache, logProvider ); return new StoreFactory( storeDir, DEFAULT_NAME, config, idGeneratorFactory, pageCache, fsRule.get(), - recordFormats, logProvider, EmptyVersionContextSupplier.INSTANCE, openOptions ); + recordFormats, logProvider, EmptyVersionContextSupplier.EMPTY, openOptions ); } private File directory( String name ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java index 050607e6372dc..3762958430163 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java @@ -69,7 +69,7 @@ public void before() throws Exception DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); PageCache pageCache = pageCacheRule.getPageCache( fs ); StoreFactory factory = new StoreFactory( dir, Config.defaults(), idGeneratorFactory, pageCache, fs, - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); neoStores = factory.openAllNeoStores( true ); arrayStore = neoStores.getPropertyStore().getArrayStore(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java index d927a2efda216..9ef60cb1898d3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java @@ -64,7 +64,7 @@ public void setUp() fs.get().mkdir( storeDir ); config = config(); storeFactory = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fs.get() ), - pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); } @After diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java index 2e06192a2aab2..6ba4348741022 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java @@ -192,7 +192,7 @@ public void firstRecordOtherThanZeroIfNotFirst() throws Exception Config config = Config.defaults(); StoreFactory storeFactory = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fs.get() ), - pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = storeFactory.openAllNeoStores(); long prop = neoStores.getMetaDataStore().getGraphNextProp(); assertTrue( prop != 0 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGrowingFileMemoryMapping.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGrowingFileMemoryMapping.java index 05325fb7553ba..dd9657755cce5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGrowingFileMemoryMapping.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGrowingFileMemoryMapping.java @@ -71,7 +71,7 @@ public void shouldGrowAFileWhileContinuingToMemoryMapNewRegions() throws Excepti DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fileSystemAbstraction ); PageCache pageCache = pageCacheRule.getPageCache( fileSystemAbstraction, config ); StoreFactory storeFactory = new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, - fileSystemAbstraction, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + fileSystemAbstraction, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = storeFactory.openAllNeoStores( true ); NodeStore nodeStore = neoStores.getNodeStore(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java index c1b23c7302803..2f6334478e6aa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java @@ -125,7 +125,7 @@ public void verifyDynamicSizedStoresCanRebuildIdGeneratorSlowly() throws Excepti StoreFactory storeFactory = new StoreFactory( testDirectory.graphDbDir(), config, new DefaultIdGeneratorFactory( fs ), pageCacheRule.getPageCache( fs ), fs, NullLogProvider - .getInstance(), EmptyVersionContextSupplier.INSTANCE ); + .getInstance(), EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = storeFactory.openAllNeoStores( true ); DynamicStringStore store = neoStores.getPropertyStore().getStringStore(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java index 68b47aa5453bb..88f495934df74 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java @@ -317,7 +317,7 @@ private void cleanupCountsForRebuilding() private CountsTracker createCountsTracker() { return new CountsTracker( LOG_PROVIDER, fs, pageCache, - CONFIG, new File( dir, COUNTS_STORE_BASE ), EmptyVersionContextSupplier.INSTANCE ); + CONFIG, new File( dir, COUNTS_STORE_BASE ), EmptyVersionContextSupplier.EMPTY ); } private void rebuildCounts( long lastCommittedTransactionId ) throws IOException @@ -325,7 +325,7 @@ private void rebuildCounts( long lastCommittedTransactionId ) throws IOException cleanupCountsForRebuilding(); IdGeneratorFactory idGenFactory = new DefaultIdGeneratorFactory( fs ); - StoreFactory storeFactory = new StoreFactory( dir, CONFIG, idGenFactory, pageCache, fs, LOG_PROVIDER, EmptyVersionContextSupplier.INSTANCE ); + StoreFactory storeFactory = new StoreFactory( dir, CONFIG, idGenFactory, pageCache, fs, LOG_PROVIDER, EmptyVersionContextSupplier.EMPTY ); try ( Lifespan life = new Lifespan(); NeoStores neoStores = storeFactory.openAllNeoStores() ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java index 8080fc775274f..eebf84294f8b2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java @@ -389,7 +389,7 @@ private CountsTracker createCountsTracker( PageCache pageCache ) private CountsTracker createCountsTracker( PageCache pageCache, Config config ) { return new CountsTracker( NullLogProvider.getInstance(), fs, pageCache, config, - new File( dir.getPath(), COUNTS_STORE_BASE ), EmptyVersionContextSupplier.INSTANCE ); + new File( dir.getPath(), COUNTS_STORE_BASE ), EmptyVersionContextSupplier.EMPTY ); } private void checkPoint( GraphDatabaseAPI db ) throws IOException diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java index a390f07533bd3..61b56be247725 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java @@ -272,7 +272,7 @@ public void shouldBeAbleToReadUpToDateValueWhileAnotherThreadIsPerformingRotatio final Barrier.Control barrier = new Barrier.Control(); CountsTracker tracker = life.add( new CountsTracker( resourceManager.logProvider(), resourceManager.fileSystem(), resourceManager.pageCache(), - Config.defaults(), resourceManager.testPath(), EmptyVersionContextSupplier.INSTANCE ) + Config.defaults(), resourceManager.testPath(), EmptyVersionContextSupplier.EMPTY ) { @Override protected boolean include( CountsKey countsKey, ReadableBuffer value ) @@ -413,7 +413,7 @@ public void shouldNotEndUpInBrokenStateAfterRotationFailure() throws Exception // GIVEN FakeClock clock = Clocks.fakeClock(); CallTrackingClock callTrackingClock = new CallTrackingClock( clock ); - CountsTracker tracker = resourceManager.managed( newTracker( callTrackingClock, EmptyVersionContextSupplier.INSTANCE ) ); + CountsTracker tracker = resourceManager.managed( newTracker( callTrackingClock, EmptyVersionContextSupplier.EMPTY ) ); int labelId = 1; try ( CountsAccessor.Updater tx = tracker.apply( 2 ).get() ) { @@ -463,7 +463,7 @@ public void shouldNotEndUpInBrokenStateAfterRotationFailure() throws Exception private CountsTracker newTracker() { - return newTracker( Clocks.nanoClock(), EmptyVersionContextSupplier.INSTANCE ); + return newTracker( Clocks.nanoClock(), EmptyVersionContextSupplier.EMPTY ); } private CountsTracker newTracker( VersionContextSupplier versionContextSupplier ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStoreTest.java index 25b069e8f35ef..8ef2f03f0f8ca 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStoreTest.java @@ -94,7 +94,7 @@ public String toString() public void retryLookupOnConcurrentStoreStateChange() throws IOException { Store testStore = resourceManager.managed( createTestStore( TimeUnit.DAYS.toMillis( 2 ) ) ); - ConcurrentMapState newState = new ConcurrentMapState<>( testStore.state, mock( File.class ), EmptyVersionContextSupplier.INSTANCE ); + ConcurrentMapState newState = new ConcurrentMapState<>( testStore.state, mock( File.class ), EmptyVersionContextSupplier.EMPTY ); testStore.put( "test", "value" ); CountingErroneousReader countingErroneousReader = new CountingErroneousReader( testStore, newState ); @@ -597,7 +597,7 @@ private Store( long rotationTimeout, HeaderField... headerFields ) { super( resourceManager.fileSystem(), resourceManager.pageCache(), resourceManager.testPath(), null, new RotationTimerFactory( Clocks.nanoClock(), rotationTimeout ), - EmptyVersionContextSupplier.INSTANCE, 16, 16, headerFields ); + EmptyVersionContextSupplier.EMPTY, 16, 16, headerFields ); this.headerFields = headerFields; setEntryUpdaterInitializer( new DataInitializer>() { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/ConcurrentMapStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/ConcurrentMapStateTest.java index 4b603fefa19d4..5c5e581f9164f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/ConcurrentMapStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/ConcurrentMapStateTest.java @@ -226,7 +226,7 @@ public void doNotMarkVersionAsDirtyOnAnotherKeyUpdate() throws IOException private ConcurrentMapState createMapState() { - return createMapState( EmptyVersionContextSupplier.INSTANCE ); + return createMapState( EmptyVersionContextSupplier.EMPTY ); } private ConcurrentMapState createMapState( VersionContextSupplier versionContextSupplier ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java index ea2fe9310e1b2..116d20c14aaf4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java @@ -139,7 +139,7 @@ public void shouldBeAbleToResumeMigrationOnMoving() throws Exception // THEN starting the new store should be successful StoreFactory storeFactory = new StoreFactory( storeDirectory, CONFIG, new DefaultIdGeneratorFactory( fs ), pageCache, fs, - logService.getInternalLogProvider(), EmptyVersionContextSupplier.INSTANCE ); + logService.getInternalLogProvider(), EmptyVersionContextSupplier.EMPTY ); storeFactory.openAllNeoStores().close(); } @@ -179,7 +179,7 @@ public void shouldBeAbleToMigrateWithoutErrors() throws Exception // THEN starting the new store should be successful StoreFactory storeFactory = new StoreFactory( storeDirectory, CONFIG, new DefaultIdGeneratorFactory( fs ), pageCache, fs, - logService.getInternalLogProvider(), EmptyVersionContextSupplier.INSTANCE ); + logService.getInternalLogProvider(), EmptyVersionContextSupplier.EMPTY ); storeFactory.openAllNeoStores().close(); logProvider.assertNoLogCallContaining( "ERROR" ); } @@ -219,7 +219,7 @@ public void shouldBeAbleToResumeMigrationOnRebuildingCounts() throws Exception // THEN starting the new store should be successful StoreFactory storeFactory = new StoreFactory( storeDirectory, CONFIG, new DefaultIdGeneratorFactory( fs ), pageCache, fs, - logService.getInternalLogProvider(), EmptyVersionContextSupplier.INSTANCE ); + logService.getInternalLogProvider(), EmptyVersionContextSupplier.EMPTY ); storeFactory.openAllNeoStores().close(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java index b6fffa1000f2c..07a84e7f645a6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java @@ -115,7 +115,7 @@ public void before() FileSystemAbstraction fs = fsr.get(); File storeDir = new File( "dir" ); StoreFactory storeFactory = new StoreFactory( storeDir, Config.defaults(), new DefaultIdGeneratorFactory( fs ), - pageCacheRule.getPageCache( fs ), fs, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + pageCacheRule.getPageCache( fs ), fs, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); neoStores = storeFactory.openAllNeoStores( true ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java index 8f3c4d5598d6d..ee45e37d14e6b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java @@ -247,7 +247,7 @@ public void before() throws Exception @SuppressWarnings( "deprecation" ) StoreFactory storeFactory = new StoreFactory( dir, Config.defaults(), new DefaultIdGeneratorFactory( fs.get() ), pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); neoStores = storeFactory.openAllNeoStores( true ); nodeStore = neoStores.getNodeStore(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java index 17c38e5a8d429..19e100d38d2aa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java @@ -81,7 +81,7 @@ public void startUp() fs.get().mkdirs( storeDir ); Config config = Config.defaults( GraphDatabaseSettings.label_block_size, "60" ); StoreFactory storeFactory = new StoreFactory( storeDir, config, new DefaultIdGeneratorFactory( fs.get() ), - pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + pageCacheRule.getPageCache( fs.get() ), fs.get(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); neoStores = storeFactory.openAllNeoStores( true ); nodeStore = neoStores.getNodeStore(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java index 91955acd70708..99b5e7d34df3d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java @@ -67,7 +67,7 @@ public void shouldAbortLoadingGroupChainIfComeTooFar() throws Exception LogProvider logProvider = NullLogProvider.getInstance(); StoreFactory storeFactory = new StoreFactory( dir, Config.defaults(), new DefaultIdGeneratorFactory( fs.get() ), pageCache.getPageCache( fs.get() ), fs.get(), - logProvider, EmptyVersionContextSupplier.INSTANCE ); + logProvider, EmptyVersionContextSupplier.EMPTY ); try ( NeoStores stores = storeFactory.openNeoStores( true, StoreType.RELATIONSHIP_GROUP ) ) { RecordStore store = spy( stores.getRelationshipGroupStore() ); diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/ConfigurablePageCacheRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/ConfigurablePageCacheRule.java index 9d50e238184fc..568405008ea22 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/ConfigurablePageCacheRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/ConfigurablePageCacheRule.java @@ -55,7 +55,7 @@ private PageCache createPageCache( FileSystemAbstraction fs, PageCacheConfig pag FormattedLogProvider logProvider = FormattedLogProvider.toOutputStream( System.err ); ConfiguringPageCacheFactory pageCacheFactory = new ConfiguringPageCacheFactory( fs, config, tracer, cursorTracerSupplier, logProvider.getLog( PageCache.class ), - EmptyVersionContextSupplier.INSTANCE ) + EmptyVersionContextSupplier.EMPTY ) { @Override public int calculatePageSize( Config config, PageSwapperFactory swapperFactory ) diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java index ae1c71f163999..425cc5711a10d 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java @@ -81,7 +81,7 @@ private NeoStores open( FileSystemAbstraction fs, PageCache pageCache, RecordFor File storeDir = testDirectory.makeGraphDbDir(); Config configuration = configOf( config ); StoreFactory storeFactory = new StoreFactory( storeDir, configuration, idGeneratorFactory.apply( fs ), - pageCache, fs, format, NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + pageCache, fs, format, NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); return neoStores = stores.length == 0 ? storeFactory.openAllNeoStores( true ) : storeFactory.openNeoStores( true, stores ); @@ -106,7 +106,7 @@ private static PageCache getOrCreatePageCache( Config config, FileSystemAbstract { Log log = NullLog.getInstance(); ConfiguringPageCacheFactory pageCacheFactory = new ConfiguringPageCacheFactory( fs, config, NULL, - PageCursorTracerSupplier.NULL, log, EmptyVersionContextSupplier.INSTANCE ); + PageCursorTracerSupplier.NULL, log, EmptyVersionContextSupplier.EMPTY ); return pageCacheFactory.getOrCreatePageCache(); } 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 7e12ac45b947f..3720f535406d2 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 @@ -210,7 +210,7 @@ private class ExtendedRecordStorageEngine extends RecordStorageEngine relationshipTypeTokens, schemaState, constraintSemantics, scheduler, tokenNameLookup, lockService, new DefaultSchemaIndexProviderMap( indexProvider ), indexingServiceMonitor, databaseHealth, explicitIndexProviderLookup, indexConfigStore, explicitIndexTransactionOrdering, idGeneratorFactory, - idController, monitors, recoveryCleanupWorkCollector, operationalMode, EmptyVersionContextSupplier.INSTANCE ); + idController, monitors, recoveryCleanupWorkCollector, operationalMode, EmptyVersionContextSupplier.EMPTY ); this.transactionApplierTransformer = transactionApplierTransformer; } 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 eb1237bccea29..0e3bb7fa41677 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 @@ -256,7 +256,7 @@ public void upgradedNeoStoreShouldHaveNewUpgradeTimeAndUpgradeId() throws Except // Then StoreFactory factory = new StoreFactory( dbDirectory, allowMigrateConfig, new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStores = factory.openAllNeoStores() ) { assertThat( neoStores.getMetaDataStore().getUpgradeTransaction(), diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/CoreBootstrapper.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/CoreBootstrapper.java index 85b851ba8ac11..a107a106f8a90 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/CoreBootstrapper.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/CoreBootstrapper.java @@ -110,7 +110,7 @@ public class CoreBootstrapper public CoreSnapshot bootstrap( Set members ) throws IOException { StoreFactory factory = new StoreFactory( storeDir, config, - new DefaultIdGeneratorFactory( fs ), pageCache, fs, logProvider, EmptyVersionContextSupplier.INSTANCE ); + new DefaultIdGeneratorFactory( fs ), pageCache, fs, logProvider, EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = factory.openAllNeoStores( true ); neoStores.close(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/BatchingTxApplierTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/BatchingTxApplierTest.java index 982caeb1eee26..f03bd75c8294f 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/BatchingTxApplierTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/BatchingTxApplierTest.java @@ -57,7 +57,7 @@ public class BatchingTxApplierTest private final BatchingTxApplier txApplier = new BatchingTxApplier( maxBatchSize, () -> idStore, () -> commitProcess, new Monitors(), PageCursorTracerSupplier.NULL, - EmptyVersionContextSupplier.INSTANCE, NullLogProvider.getInstance() ); + EmptyVersionContextSupplier.EMPTY, NullLogProvider.getInstance() ); @Before public void before() throws Throwable diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/id/RebuildReplicatedIdGeneratorsTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/id/RebuildReplicatedIdGeneratorsTest.java index efaed8dae2864..0492095ff5721 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/id/RebuildReplicatedIdGeneratorsTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/id/RebuildReplicatedIdGeneratorsTest.java @@ -67,7 +67,7 @@ public void rebuildReplicatedIdGeneratorsOnRecovery() throws Exception StoreFactory storeFactory = new StoreFactory( testDirectory.graphDbDir(), Config.defaults(), getIdGenerationFactory( fileSystem ), pageCacheRule.getPageCache( fileSystem ), fileSystem, - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStores = storeFactory.openAllNeoStores( true ) ) { NodeStore nodeStore = neoStores.getNodeStore(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenStateMachineTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenStateMachineTest.java index aca5df9a2e85a..d8cd62fd5bd51 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenStateMachineTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenStateMachineTest.java @@ -58,7 +58,7 @@ public void shouldCreateTokenId() throws Exception // given TokenRegistry registry = new TokenRegistry<>( "Label" ); ReplicatedTokenStateMachine stateMachine = new ReplicatedTokenStateMachine<>( registry, - new Token.Factory(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + new Token.Factory(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); stateMachine.installCommitProcess( mock( TransactionCommitProcess.class ), -1 ); // when @@ -75,7 +75,7 @@ public void shouldAllocateTokenIdToFirstReplicateRequest() throws Exception // given TokenRegistry registry = new TokenRegistry<>( "Label" ); ReplicatedTokenStateMachine stateMachine = new ReplicatedTokenStateMachine<>( registry, - new Token.Factory(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + new Token.Factory(), NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); stateMachine.installCommitProcess( mock( TransactionCommitProcess.class ), -1 ); @@ -101,7 +101,7 @@ public void shouldStoreRaftLogIndexInTransactionHeader() throws Exception StubTransactionCommitProcess commitProcess = new StubTransactionCommitProcess( null, null ); ReplicatedTokenStateMachine stateMachine = new ReplicatedTokenStateMachine<>( new TokenRegistry<>( "Token" ), new Token.Factory(), - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); stateMachine.installCommitProcess( commitProcess, -1 ); // when diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/CommitProcessStateMachineCollaborationTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/CommitProcessStateMachineCollaborationTest.java index 0895998ae4a4d..0ef104ad75bac 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/CommitProcessStateMachineCollaborationTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/CommitProcessStateMachineCollaborationTest.java @@ -53,7 +53,7 @@ public void shouldFailTransactionIfLockSessionChanges() throws Exception ReplicatedTransactionStateMachine stateMachine = new ReplicatedTransactionStateMachine( mock( CommandIndexTracker.class ), lockState( finalLockSessionId ), 16, NullLogProvider.getInstance(), - PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.INSTANCE ); + PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.EMPTY ); stateMachine.installCommitProcess( localCommitProcess, -1L ); DirectReplicator replicator = new DirectReplicator<>( stateMachine ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachineTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachineTest.java index 587ce0cc5554b..684a9b2c20349 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachineTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachineTest.java @@ -70,7 +70,7 @@ public void shouldCommitTransaction() throws Exception ReplicatedTransactionStateMachine stateMachine = new ReplicatedTransactionStateMachine( commandIndexTracker, lockState( lockSessionId ), batchSize, logProvider, () -> cursorTracer, - EmptyVersionContextSupplier.INSTANCE ); + EmptyVersionContextSupplier.EMPTY ); stateMachine.installCommitProcess( localCommitProcess, -1L ); // when @@ -98,7 +98,7 @@ public void shouldFailFutureForTransactionCommittedUnderWrongLockSession() throw final ReplicatedTransactionStateMachine stateMachine = new ReplicatedTransactionStateMachine( commandIndexTracker, lockState( currentLockSessionId ), batchSize, logProvider, - PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.INSTANCE ); + PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.EMPTY ); stateMachine.installCommitProcess( localCommitProcess, -1L ); AtomicBoolean called = new AtomicBoolean(); @@ -141,7 +141,7 @@ public void shouldAcceptTransactionCommittedWithNoLockManager() throws Exception ReplicatedTransactionStateMachine stateMachine = new ReplicatedTransactionStateMachine( commandIndexTracker, lockState( currentLockSessionId ), batchSize, logProvider, - PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.INSTANCE ); + PageCursorTracerSupplier.NULL, EmptyVersionContextSupplier.EMPTY ); stateMachine.installCommitProcess( localCommitProcess, -1L ); AtomicBoolean called = new AtomicBoolean(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/io/pagecache/impl/muninn/VersionContextTrackingIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/io/pagecache/impl/muninn/VersionContextTrackingIT.java index f75fb9c3467ff..a3922650affd5 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/io/pagecache/impl/muninn/VersionContextTrackingIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/io/pagecache/impl/muninn/VersionContextTrackingIT.java @@ -34,7 +34,10 @@ import org.neo4j.graphdb.DependencyResolver; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.pagecache.PageCache; +import org.neo4j.io.pagecache.PageSwapper; import org.neo4j.io.pagecache.PagedFile; +import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracer; +import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; @@ -130,14 +133,14 @@ private static long getLatestPageVersion( GraphDatabaseFacade databaseFacade ) t long lastPageId = pageFile.getLastPageId(); for ( int i = 0; i <= lastPageId; i++ ) { -// try ( CursorPageAccessor pageCursor = new CursorPageAccessor( -// (MuninnPageCursor) pageFile.io( i, PagedFile.PF_SHARED_READ_LOCK ) ) ) -// { -// if ( pageCursor.next() ) -// { -// maxTransactionId = Math.max( maxTransactionId, pageCursor.lastTxModifierId() ); -// } -// } + try ( CursorPageAccessor pageCursor = new CursorPageAccessor( + (MuninnPageCursor) pageFile.io( i, PagedFile.PF_SHARED_READ_LOCK ) ) ) + { + if ( pageCursor.next() ) + { + maxTransactionId = Math.max( maxTransactionId, pageCursor.lastTxModifierId() ); + } + } } } return maxTransactionId; @@ -155,68 +158,68 @@ private void generateData() throws Exception } } -// private class CursorPageAccessor extends MuninnPageCursor -// { -// -// private MuninnPageCursor delegate; -// -// CursorPageAccessor( MuninnPageCursor delegate ) -// { -// super( -1, PageCursorTracer.NULL, EmptyVersionContext.INSTANCE ); -// this.delegate = delegate; -// } -// -// long lastTxModifierId() -// { -// return delegate.page.getLastModifiedTxId(); -// } -// -// @Override -// protected void unpinCurrentPage() -// { -// delegate.unpinCurrentPage(); -// } -// -// @Override -// protected void convertPageFaultLock( MuninnPage page ) -// { -// delegate.convertPageFaultLock( page ); -// } -// -// @Override -// protected void pinCursorToPage( MuninnPage page, long filePageId, PageSwapper swapper ) -// { -// delegate.pinCursorToPage( page, filePageId, swapper ); -// } -// -// @Override -// protected boolean tryLockPage( MuninnPage page ) -// { -// return delegate.tryLockPage( page ); -// } -// -// @Override -// protected void unlockPage( MuninnPage page ) -// { -// delegate.unlockPage( page ); -// } -// -// @Override -// protected void releaseCursor() -// { -// delegate.releaseCursor(); -// } -// -// @Override -// public boolean next() throws IOException -// { -// return delegate.next(); -// } -// -// @Override -// public boolean shouldRetry() throws IOException -// { -// return delegate.shouldRetry(); -// } -// } + private static class CursorPageAccessor extends MuninnPageCursor + { + + private MuninnPageCursor delegate; + + CursorPageAccessor( MuninnPageCursor delegate ) + { + super( -1, PageCursorTracer.NULL, EmptyVersionContextSupplier.EMPTY ); + this.delegate = delegate; + } + + long lastTxModifierId() + { + return delegate.pagedFile.getLastModifiedTxId( delegate.pinnedPageRef ); + } + + @Override + protected void unpinCurrentPage() + { + delegate.unpinCurrentPage(); + } + + @Override + protected void convertPageFaultLock( long pageRef ) + { + delegate.convertPageFaultLock( pageRef ); + } + + @Override + protected void pinCursorToPage( long pageRef, long filePageId, PageSwapper swapper ) + { + delegate.pinCursorToPage( pageRef, filePageId, swapper ); + } + + @Override + protected boolean tryLockPage( long pageRef ) + { + return delegate.tryLockPage( pageRef ); + } + + @Override + protected void unlockPage( long pageRef ) + { + delegate.unlockPage( pageRef ); + } + + @Override + protected void releaseCursor() + { + delegate.releaseCursor(); + } + + @Override + public boolean next() throws IOException + { + return delegate.next(); + } + + @Override + public boolean shouldRetry() throws IOException + { + return delegate.shouldRetry(); + } + } } diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java index 5b0970af19ab9..fa9c9cbd27025 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java @@ -113,7 +113,7 @@ private NeoStores createNeoStore( FileSystemAbstraction fs, PageCache pageCache DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); NullLogProvider logProvider = NullLogProvider.getInstance(); StoreFactory storeFactory = - new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider, EmptyVersionContextSupplier.INSTANCE ); + new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider, EmptyVersionContextSupplier.EMPTY ); return storeFactory.openAllNeoStores( true ); } } diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java index 5a8cfc0b8b343..3a6aa51a9f3e8 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java @@ -79,7 +79,7 @@ public void shouldUnfreezeKernelTransactionsAfterApplyIfBatchIsLarge() throws Th TransactionObligationFulfiller fulfiller = mock( TransactionObligationFulfiller.class ); when( dependencies.obligationFulfiller() ).thenReturn( fulfiller ); when( dependencies.logService() ).thenReturn( NullLogService.getInstance() ); - when( dependencies.versionContextSupplier() ).thenReturn( EmptyVersionContextSupplier.INSTANCE ); + when( dependencies.versionContextSupplier() ).thenReturn( EmptyVersionContextSupplier.EMPTY ); KernelTransactions kernelTransactions = mock( KernelTransactions.class ); when( dependencies.kernelTransactions() ).thenReturn( kernelTransactions ); TransactionCommitProcess commitProcess = mock( TransactionCommitProcess.class ); @@ -126,7 +126,7 @@ public void shouldCommitTransactionsInBatches() throws Exception TransactionCountingTransactionCommitProcess commitProcess = new TransactionCountingTransactionCommitProcess(); when( dependencies.commitProcess() ).thenReturn( commitProcess ); when( dependencies.logService() ).thenReturn( NullLogService.getInstance() ); - when( dependencies.versionContextSupplier() ).thenReturn( EmptyVersionContextSupplier.INSTANCE ); + when( dependencies.versionContextSupplier() ).thenReturn( EmptyVersionContextSupplier.EMPTY ); KernelTransactions kernelTransactions = mock( KernelTransactions.class ); when( dependencies.kernelTransactions() ).thenReturn( kernelTransactions ); TransactionCommittingResponseUnpacker unpacker = diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/MasterClientTest.java b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/MasterClientTest.java index 00abe5ecf0e51..73d82064c6da5 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/MasterClientTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/MasterClientTest.java @@ -128,7 +128,7 @@ public void clientShouldReadAndApplyTransactionLogsOnNewLockSessionRequest() thr TransactionCommitProcess commitProcess = mock( TransactionCommitProcess.class ); when( deps.commitProcess() ).thenReturn( commitProcess ); when( deps.logService() ).thenReturn( NullLogService.getInstance() ); - when( deps.versionContextSupplier() ).thenReturn( EmptyVersionContextSupplier.INSTANCE ); + when( deps.versionContextSupplier() ).thenReturn( EmptyVersionContextSupplier.EMPTY ); when( deps.kernelTransactions() ).thenReturn( mock( KernelTransactions.class ) ); ResponseUnpacker unpacker = life.add( diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java index ed23190cade64..8e977d0a2543d 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java @@ -60,7 +60,7 @@ public void lastTransactionIdIsBaseTxIdWhileNeoStoresAreStopped() final StoreFactory storeFactory = new StoreFactory( new File( "store" ), Config.defaults(), new DefaultIdGeneratorFactory( fs.get() ), pageCacheRule.getPageCache( fs.get() ), fs.get(), - NullLogProvider.getInstance(), EmptyVersionContextSupplier.INSTANCE ); + NullLogProvider.getInstance(), EmptyVersionContextSupplier.EMPTY ); final NeoStores neoStores = storeFactory.openAllNeoStores( true ); neoStores.close(); diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java index 2809f3d19928d..7372bf2acbcb6 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java @@ -76,7 +76,7 @@ public void shouldNotDoActualStoreMigrationBetween3_0_5_and_next() throws Except try ( FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); PageCache pageCache = new ConfiguringPageCacheFactory( fs, config, NULL, - PageCursorTracerSupplier.NULL, NullLog.getInstance(), EmptyVersionContextSupplier.INSTANCE ) + PageCursorTracerSupplier.NULL, NullLog.getInstance(), EmptyVersionContextSupplier.EMPTY ) .getOrCreatePageCache() ) { // For test code sanity diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java index 792e2fcaf9efe..a1182ee790526 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java @@ -84,7 +84,7 @@ public static void dumpCountsStore( FileSystemAbstraction fs, File path, PrintSt if ( fs.isDirectory( path ) ) { StoreFactory factory = new StoreFactory( path, Config.defaults(), new DefaultIdGeneratorFactory( fs ), - pages, fs, logProvider, EmptyVersionContextSupplier.INSTANCE ); + pages, fs, logProvider, EmptyVersionContextSupplier.EMPTY ); NeoStores neoStores = factory.openAllNeoStores(); SchemaStorage schemaStorage = new SchemaStorage( neoStores.getSchemaStore() ); @@ -273,7 +273,7 @@ private static class VisitableCountsTracker extends CountsTracker VisitableCountsTracker( LogProvider logProvider, FileSystemAbstraction fs, PageCache pages, Config config, File baseFile ) { - super( logProvider, fs, pages, config, baseFile, EmptyVersionContextSupplier.INSTANCE ); + super( logProvider, fs, pages, config, baseFile, EmptyVersionContextSupplier.EMPTY ); } @Override diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpStore.java b/tools/src/main/java/org/neo4j/tools/dump/DumpStore.java index ebb1cf89b4d44..1ada5c75ee4d1 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpStore.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpStore.java @@ -73,7 +73,7 @@ public static void main( String... args ) throws Exception { final DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); Function createStoreFactory = file -> new StoreFactory( file.getParentFile(), - Config.defaults(), idGeneratorFactory, pageCache, fs, logProvider(), EmptyVersionContextSupplier.INSTANCE ); + Config.defaults(), idGeneratorFactory, pageCache, fs, logProvider(), EmptyVersionContextSupplier.EMPTY ); for ( String arg : args ) { diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpStoreChain.java b/tools/src/main/java/org/neo4j/tools/dump/DumpStoreChain.java index f74c6e492048b..5fbcf7924a949 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpStoreChain.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpStoreChain.java @@ -122,7 +122,7 @@ void dump( File storeDir ) throws IOException DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); Config config = Config.defaults(); StoreFactory storeFactory = new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fs, - logProvider(), EmptyVersionContextSupplier.INSTANCE ); + logProvider(), EmptyVersionContextSupplier.EMPTY ); try ( NeoStores neoStores = storeFactory.openNeoStores( getStoreTypes() ) ) { diff --git a/tools/src/main/java/org/neo4j/tools/rawstorereader/RsdrMain.java b/tools/src/main/java/org/neo4j/tools/rawstorereader/RsdrMain.java index 7514902e633cd..9ebefe701a83b 100644 --- a/tools/src/main/java/org/neo4j/tools/rawstorereader/RsdrMain.java +++ b/tools/src/main/java/org/neo4j/tools/rawstorereader/RsdrMain.java @@ -108,7 +108,7 @@ private static StoreFactory openStore( FileSystemAbstraction fileSystem, File st { IdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fileSystem ); NullLogProvider logProvider = NullLogProvider.getInstance(); - return new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.INSTANCE ); + return new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.EMPTY ); } private static void interact( FileSystemAbstraction fileSystem, NeoStores neoStores ) throws IOException