Skip to content

Commit

Permalink
Private builder fields and generics diamonds added
Browse files Browse the repository at this point in the history
  • Loading branch information
@tinwelint
tinwelint committed Jun 29, 2017
1 parent 7247caa commit a5e2de9
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 24 deletions.
4 changes: 2 additions & 2 deletions community/index/src/test/java/org/neo4j/index/internal/gbptree/FormatCompatibilityTest.java
View file
Expand Up @@ -95,7 +95,7 @@ public void shouldDetectFormatChange() throws Throwable
// THEN everything should work, otherwise there has likely been a format change // THEN everything should work, otherwise there has likely been a format change
PageCache pageCache = pageCacheRule.getPageCache( fsRule.get() ); PageCache pageCache = pageCacheRule.getPageCache( fsRule.get() );
try ( GBPTree<MutableLong,MutableLong> tree = try ( GBPTree<MutableLong,MutableLong> tree =
new GBPTreeBuilder( pageCache, storeFile, new SimpleLongLayout() ).build() ) new GBPTreeBuilder<>( pageCache, storeFile, new SimpleLongLayout() ).build() )
{ {
try try
{ {
Expand Down Expand Up @@ -171,7 +171,7 @@ private void createAndZipTree( File storeFile ) throws IOException
{ {
PageCache pageCache = pageCacheRule.getPageCache( fsRule.get() ); PageCache pageCache = pageCacheRule.getPageCache( fsRule.get() );
try ( GBPTree<MutableLong,MutableLong> tree = try ( GBPTree<MutableLong,MutableLong> tree =
new GBPTreeBuilder( pageCache, storeFile, new SimpleLongLayout() ).build() ) new GBPTreeBuilder<>( pageCache, storeFile, new SimpleLongLayout() ).build() )
{ {
MutableLong insertKey = new MutableLong(); MutableLong insertKey = new MutableLong();
MutableLong insertValue = new MutableLong(); MutableLong insertValue = new MutableLong();
Expand Down
20 changes: 10 additions & 10 deletions community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeBuilder.java
View file
Expand Up @@ -40,13 +40,13 @@
*/ */
class GBPTreeBuilder<KEY,VALUE> class GBPTreeBuilder<KEY,VALUE>
{ {
PageCache pageCache; private PageCache pageCache;
File file; private File file;
int tentativePageSize = 0; private int tentativeIndexPageSize;
Monitor monitor = NO_MONITOR; private Monitor monitor = NO_MONITOR;
Header.Reader headerReader = NO_HEADER_READER; private Header.Reader headerReader = NO_HEADER_READER;
Layout<KEY,VALUE> layout; private Layout<KEY,VALUE> layout;
Consumer<PageCursor> headerWriter = NO_HEADER_WRITER; private Consumer<PageCursor> headerWriter = NO_HEADER_WRITER;


GBPTreeBuilder() GBPTreeBuilder()
{ {
Expand Down Expand Up @@ -77,9 +77,9 @@ GBPTreeBuilder<KEY,VALUE> with( PageCache pageCache )
return this; return this;
} }


GBPTreeBuilder<KEY,VALUE> withIndexPageSize( int tentativePageSize ) GBPTreeBuilder<KEY,VALUE> withIndexPageSize( int tentativeIndexPageSize )
{ {
this.tentativePageSize = tentativePageSize; this.tentativeIndexPageSize = tentativeIndexPageSize;
return this; return this;
} }


Expand All @@ -103,6 +103,6 @@ GBPTreeBuilder<KEY,VALUE> with( Consumer<PageCursor> headerWriter )


GBPTree<KEY,VALUE> build() throws IOException GBPTree<KEY,VALUE> build() throws IOException
{ {
return new GBPTree<>( pageCache, file, layout, tentativePageSize, monitor, headerReader, headerWriter ); return new GBPTree<>( pageCache, file, layout, tentativeIndexPageSize, monitor, headerReader, headerWriter );
} }
} }
2 changes: 1 addition & 1 deletion community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeConcurrencyIT.java
View file
Expand Up @@ -104,7 +104,7 @@ private GBPTree<MutableLong,MutableLong> createIndex( GBPTree.Monitor monitor )
int pageSize = 256; int pageSize = 256;
PageCache pageCache = PageCache pageCache =
pageCacheRule.getPageCache( fs.get(), config().withPageSize( pageSize ).withAccessChecks( true ) ); 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 @After
Expand Down
2 changes: 1 addition & 1 deletion community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeIT.java
View file
Expand Up @@ -73,7 +73,7 @@ private GBPTree<MutableLong,MutableLong> createIndex( int pageSize, GBPTree.Moni
throws IOException throws IOException
{ {
pageCache = pageCacheRule.getPageCache( fs.get(), config().withPageSize( pageSize ).withAccessChecks( true ) ); 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 @After
Expand Down
2 changes: 1 addition & 1 deletion community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeRecoveryIT.java
View file
Expand Up @@ -379,7 +379,7 @@ private long[] modificationData( int min, int max )


private static GBPTree<MutableLong,MutableLong> createIndex( PageCache pageCache, File file ) throws IOException private static GBPTree<MutableLong,MutableLong> 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() private PageCache createPageCache()
Expand Down
21 changes: 12 additions & 9 deletions community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeTest.java
View file
Expand Up @@ -360,11 +360,12 @@ public void shouldFailWhenTryingToOpenWithDifferentFormatVersion() throws Except
{ {
// GIVEN // GIVEN
int pageSize = 256; int pageSize = 256;
GBPTreeBuilder<MutableLong,MutableLong> builder = index( pageSize ); PageCache pageCache = createPageCache( pageSize );
GBPTreeBuilder<MutableLong,MutableLong> builder = new GBPTreeBuilder<>( pageCache, indexFile, layout );
try ( GBPTree<MutableLong,MutableLong> ignored = builder.build() ) try ( GBPTree<MutableLong,MutableLong> ignored = builder.build() )
{ // Open/close is enough { // Open/close is enough
} }
setFormatVersion( builder.pageCache, pageSize, GBPTree.FORMAT_VERSION - 1 ); setFormatVersion( pageCache, pageSize, GBPTree.FORMAT_VERSION - 1 );


try try
{ {
Expand Down Expand Up @@ -454,7 +455,7 @@ public void failureDuringInitializeWriterShouldNotFailNextInitialize() throws Ex
AtomicBoolean throwOnNextIO = new AtomicBoolean(); AtomicBoolean throwOnNextIO = new AtomicBoolean();
PageCache controlledPageCache = pageCacheThatThrowExceptionWhenToldTo( no, throwOnNextIO ); PageCache controlledPageCache = pageCacheThatThrowExceptionWhenToldTo( no, throwOnNextIO );
try ( GBPTree<MutableLong, MutableLong> index = try ( GBPTree<MutableLong, MutableLong> index =
new GBPTreeBuilder( controlledPageCache, indexFile, layout ).build() ) new GBPTreeBuilder<>( controlledPageCache, indexFile, layout ).build() )
{ {
// WHEN // WHEN
assert throwOnNextIO.compareAndSet( false, true ); assert throwOnNextIO.compareAndSet( false, true );
Expand Down Expand Up @@ -697,7 +698,8 @@ public void closeShouldLockOutWriter() throws Exception
AtomicBoolean enabled = new AtomicBoolean(); AtomicBoolean enabled = new AtomicBoolean();
Barrier.Control barrier = new Barrier.Control(); Barrier.Control barrier = new Barrier.Control();
PageCache pageCacheWithBarrier = pageCacheWithBarrierInClose( enabled, barrier ); PageCache pageCacheWithBarrier = pageCacheWithBarrierInClose( enabled, barrier );
GBPTree<MutableLong,MutableLong> index = new GBPTreeBuilder( pageCacheWithBarrier, indexFile, layout ).build(); GBPTree<MutableLong,MutableLong> index =
new GBPTreeBuilder<>( pageCacheWithBarrier, indexFile, layout ).build();
long key = 10; long key = 10;
try ( Writer<MutableLong,MutableLong> writer = index.writer() ) try ( Writer<MutableLong,MutableLong> writer = index.writer() )
{ {
Expand Down Expand Up @@ -1064,7 +1066,8 @@ public void indexMustBeDirtyWhenCrashedWithChangesSinceLastCheckpoint() throws E
ephemeralFs.mkdirs( indexFile.getParentFile() ); ephemeralFs.mkdirs( indexFile.getParentFile() );
PageCache pageCache = pageCacheRule.getPageCache( ephemeralFs ); PageCache pageCache = pageCacheRule.getPageCache( ephemeralFs );
EphemeralFileSystemAbstraction snapshot; EphemeralFileSystemAbstraction snapshot;
try ( GBPTree<MutableLong, MutableLong> index = new GBPTreeBuilder( pageCache, indexFile, layout ).build() ) try ( GBPTree<MutableLong, MutableLong> index =
new GBPTreeBuilder<>( pageCache, indexFile, layout ).build() )
{ {
insert( index, 0, 1 ); insert( index, 0, 1 );


Expand All @@ -1077,7 +1080,7 @@ public void indexMustBeDirtyWhenCrashedWithChangesSinceLastCheckpoint() throws E
// THEN // THEN
MonitorDirty monitorDirty = new MonitorDirty(); MonitorDirty monitorDirty = new MonitorDirty();
pageCache = pageCacheRule.getPageCache( snapshot ); pageCache = pageCacheRule.getPageCache( snapshot );
try ( GBPTree<MutableLong, MutableLong> ignored = new GBPTreeBuilder( pageCache, indexFile, layout ) try ( GBPTree<MutableLong, MutableLong> ignored = new GBPTreeBuilder<>( pageCache, indexFile, layout )
.with( pageCache ).with( monitorDirty ).build() ) .with( pageCache ).with( monitorDirty ).build() )
{ {
} }
Expand Down Expand Up @@ -1136,7 +1139,7 @@ public void shouldThrowIfTreeStatePointToRootWithValidSuccessor() throws Excepti
try ( PageCache specificPageCache = createPageCache( pageSize ) ) try ( PageCache specificPageCache = createPageCache( pageSize ) )
{ {
try ( GBPTree<MutableLong,MutableLong> ignore = try ( GBPTree<MutableLong,MutableLong> ignore =
new GBPTreeBuilder( specificPageCache, indexFile, layout ).build() ) new GBPTreeBuilder<>( specificPageCache, indexFile, layout ).build() )
{ {
} }


Expand All @@ -1157,7 +1160,7 @@ public void shouldThrowIfTreeStatePointToRootWithValidSuccessor() throws Excepti


// WHEN // WHEN
try ( GBPTree<MutableLong,MutableLong> index = try ( GBPTree<MutableLong,MutableLong> index =
new GBPTreeBuilder( specificPageCache, indexFile, layout ).build() ) new GBPTreeBuilder<>( specificPageCache, indexFile, layout ).build() )
{ {
try ( Writer<MutableLong, MutableLong> ignored = index.writer() ) try ( Writer<MutableLong, MutableLong> ignored = index.writer() )
{ {
Expand All @@ -1180,7 +1183,7 @@ public void mustRetryCloseIfFailure() throws Exception
AtomicBoolean throwOnNext = new AtomicBoolean(); AtomicBoolean throwOnNext = new AtomicBoolean();
IOException exception = new IOException( "My failure" ); IOException exception = new IOException( "My failure" );
PageCache pageCache = pageCacheThatThrowExceptionWhenToldTo( exception, throwOnNext ); PageCache pageCache = pageCacheThatThrowExceptionWhenToldTo( exception, throwOnNext );
try ( GBPTree<MutableLong, MutableLong> index = new GBPTreeBuilder( pageCache, indexFile, layout ).build() ) try ( GBPTree<MutableLong, MutableLong> index = new GBPTreeBuilder<>( pageCache, indexFile, layout ).build() )
{ {
// WHEN // WHEN
throwOnNext.set( true ); throwOnNext.set( true );
Expand Down

0 comments on commit a5e2de9

Please sign in to comment.