From a5e2de95600dcec9303d53cf99b6c260605e4816 Mon Sep 17 00:00:00 2001 From: Mattias Persson Date: Thu, 29 Jun 2017 14:04:26 +0200 Subject: [PATCH] Private builder fields and generics diamonds added --- .../gbptree/FormatCompatibilityTest.java | 4 ++-- .../internal/gbptree/GBPTreeBuilder.java | 20 +++++++++--------- .../gbptree/GBPTreeConcurrencyIT.java | 2 +- .../index/internal/gbptree/GBPTreeIT.java | 2 +- .../internal/gbptree/GBPTreeRecoveryIT.java | 2 +- .../index/internal/gbptree/GBPTreeTest.java | 21 +++++++++++-------- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/FormatCompatibilityTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/FormatCompatibilityTest.java index de8616dd54bf3..6cdde24bf5112 100644 --- a/community/index/src/test/java/org/neo4j/index/internal/gbptree/FormatCompatibilityTest.java +++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/FormatCompatibilityTest.java @@ -95,7 +95,7 @@ public void shouldDetectFormatChange() throws Throwable // THEN everything should work, otherwise there has likely been a format change PageCache pageCache = pageCacheRule.getPageCache( fsRule.get() ); try ( GBPTree tree = - new GBPTreeBuilder( pageCache, storeFile, new SimpleLongLayout() ).build() ) + new GBPTreeBuilder<>( pageCache, storeFile, new SimpleLongLayout() ).build() ) { try { @@ -171,7 +171,7 @@ private void createAndZipTree( File storeFile ) throws IOException { PageCache pageCache = pageCacheRule.getPageCache( fsRule.get() ); try ( GBPTree tree = - new GBPTreeBuilder( pageCache, storeFile, new SimpleLongLayout() ).build() ) + new GBPTreeBuilder<>( pageCache, storeFile, new SimpleLongLayout() ).build() ) { MutableLong insertKey = new MutableLong(); MutableLong insertValue = new MutableLong(); diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeBuilder.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeBuilder.java index bcb090a02ad00..1331cbd2ba7ce 100644 --- a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeBuilder.java +++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeBuilder.java @@ -40,13 +40,13 @@ */ class GBPTreeBuilder { - PageCache pageCache; - File file; - int tentativePageSize = 0; - Monitor monitor = NO_MONITOR; - Header.Reader headerReader = NO_HEADER_READER; - Layout layout; - Consumer headerWriter = NO_HEADER_WRITER; + private PageCache pageCache; + private File file; + private int tentativeIndexPageSize; + private Monitor monitor = NO_MONITOR; + private Header.Reader headerReader = NO_HEADER_READER; + private Layout layout; + private Consumer headerWriter = NO_HEADER_WRITER; GBPTreeBuilder() { @@ -77,9 +77,9 @@ GBPTreeBuilder with( PageCache pageCache ) return this; } - GBPTreeBuilder withIndexPageSize( int tentativePageSize ) + GBPTreeBuilder withIndexPageSize( int tentativeIndexPageSize ) { - this.tentativePageSize = tentativePageSize; + this.tentativeIndexPageSize = tentativeIndexPageSize; return this; } @@ -103,6 +103,6 @@ GBPTreeBuilder with( Consumer headerWriter ) GBPTree build() throws IOException { - return new GBPTree<>( pageCache, file, layout, tentativePageSize, monitor, headerReader, headerWriter ); + return new GBPTree<>( pageCache, file, layout, tentativeIndexPageSize, monitor, headerReader, headerWriter ); } } diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeConcurrencyIT.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeConcurrencyIT.java index 9d8d8d659b4ec..8807e62594d0f 100644 --- a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeConcurrencyIT.java +++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeConcurrencyIT.java @@ -104,7 +104,7 @@ private GBPTree createIndex( GBPTree.Monitor monitor ) int pageSize = 256; PageCache pageCache = pageCacheRule.getPageCache( fs.get(), config().withPageSize( pageSize ).withAccessChecks( true ) ); - return index = new GBPTreeBuilder( pageCache, directory.file( "index" ), layout ).build(); + return index = new GBPTreeBuilder<>( pageCache, directory.file( "index" ), layout ).build(); } @After diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeIT.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeIT.java index 493a193571b1f..51643bd468d0a 100644 --- a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeIT.java +++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeIT.java @@ -73,7 +73,7 @@ private GBPTree createIndex( int pageSize, GBPTree.Moni throws IOException { pageCache = pageCacheRule.getPageCache( fs.get(), config().withPageSize( pageSize ).withAccessChecks( true ) ); - return index = new GBPTreeBuilder( pageCache, directory.file( "index" ), layout ).build(); + return index = new GBPTreeBuilder<>( pageCache, directory.file( "index" ), layout ).build(); } @After diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeRecoveryIT.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeRecoveryIT.java index b7963cbea3cd5..d08620f4f1455 100644 --- a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeRecoveryIT.java +++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeRecoveryIT.java @@ -379,7 +379,7 @@ private long[] modificationData( int min, int max ) private static GBPTree createIndex( PageCache pageCache, File file ) throws IOException { - return new GBPTreeBuilder( pageCache, file, new SimpleLongLayout() ).build(); + return new GBPTreeBuilder<>( pageCache, file, new SimpleLongLayout() ).build(); } private PageCache createPageCache() diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeTest.java index 023d30d750932..31aed3d6e3791 100644 --- a/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeTest.java +++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeTest.java @@ -360,11 +360,12 @@ public void shouldFailWhenTryingToOpenWithDifferentFormatVersion() throws Except { // GIVEN int pageSize = 256; - GBPTreeBuilder builder = index( pageSize ); + PageCache pageCache = createPageCache( pageSize ); + GBPTreeBuilder builder = new GBPTreeBuilder<>( pageCache, indexFile, layout ); try ( GBPTree ignored = builder.build() ) { // Open/close is enough } - setFormatVersion( builder.pageCache, pageSize, GBPTree.FORMAT_VERSION - 1 ); + setFormatVersion( pageCache, pageSize, GBPTree.FORMAT_VERSION - 1 ); try { @@ -454,7 +455,7 @@ public void failureDuringInitializeWriterShouldNotFailNextInitialize() throws Ex AtomicBoolean throwOnNextIO = new AtomicBoolean(); PageCache controlledPageCache = pageCacheThatThrowExceptionWhenToldTo( no, throwOnNextIO ); try ( GBPTree index = - new GBPTreeBuilder( controlledPageCache, indexFile, layout ).build() ) + new GBPTreeBuilder<>( controlledPageCache, indexFile, layout ).build() ) { // WHEN assert throwOnNextIO.compareAndSet( false, true ); @@ -697,7 +698,8 @@ public void closeShouldLockOutWriter() throws Exception AtomicBoolean enabled = new AtomicBoolean(); Barrier.Control barrier = new Barrier.Control(); PageCache pageCacheWithBarrier = pageCacheWithBarrierInClose( enabled, barrier ); - GBPTree index = new GBPTreeBuilder( pageCacheWithBarrier, indexFile, layout ).build(); + GBPTree index = + new GBPTreeBuilder<>( pageCacheWithBarrier, indexFile, layout ).build(); long key = 10; try ( Writer writer = index.writer() ) { @@ -1064,7 +1066,8 @@ public void indexMustBeDirtyWhenCrashedWithChangesSinceLastCheckpoint() throws E ephemeralFs.mkdirs( indexFile.getParentFile() ); PageCache pageCache = pageCacheRule.getPageCache( ephemeralFs ); EphemeralFileSystemAbstraction snapshot; - try ( GBPTree index = new GBPTreeBuilder( pageCache, indexFile, layout ).build() ) + try ( GBPTree index = + new GBPTreeBuilder<>( pageCache, indexFile, layout ).build() ) { insert( index, 0, 1 ); @@ -1077,7 +1080,7 @@ public void indexMustBeDirtyWhenCrashedWithChangesSinceLastCheckpoint() throws E // THEN MonitorDirty monitorDirty = new MonitorDirty(); pageCache = pageCacheRule.getPageCache( snapshot ); - try ( GBPTree ignored = new GBPTreeBuilder( pageCache, indexFile, layout ) + try ( GBPTree ignored = new GBPTreeBuilder<>( pageCache, indexFile, layout ) .with( pageCache ).with( monitorDirty ).build() ) { } @@ -1136,7 +1139,7 @@ public void shouldThrowIfTreeStatePointToRootWithValidSuccessor() throws Excepti try ( PageCache specificPageCache = createPageCache( pageSize ) ) { try ( GBPTree ignore = - new GBPTreeBuilder( specificPageCache, indexFile, layout ).build() ) + new GBPTreeBuilder<>( specificPageCache, indexFile, layout ).build() ) { } @@ -1157,7 +1160,7 @@ public void shouldThrowIfTreeStatePointToRootWithValidSuccessor() throws Excepti // WHEN try ( GBPTree index = - new GBPTreeBuilder( specificPageCache, indexFile, layout ).build() ) + new GBPTreeBuilder<>( specificPageCache, indexFile, layout ).build() ) { try ( Writer ignored = index.writer() ) { @@ -1180,7 +1183,7 @@ public void mustRetryCloseIfFailure() throws Exception AtomicBoolean throwOnNext = new AtomicBoolean(); IOException exception = new IOException( "My failure" ); PageCache pageCache = pageCacheThatThrowExceptionWhenToldTo( exception, throwOnNext ); - try ( GBPTree index = new GBPTreeBuilder( pageCache, indexFile, layout ).build() ) + try ( GBPTree index = new GBPTreeBuilder<>( pageCache, indexFile, layout ).build() ) { // WHEN throwOnNext.set( true );