From 7686b9429b25e6c5f3543cc9f786f7ae98e040f4 Mon Sep 17 00:00:00 2001 From: Anton Persson Date: Mon, 4 Feb 2019 09:55:39 +0100 Subject: [PATCH] Remove System.out and some visibility cleanup --- .../org/neo4j/kernel/impl/index/schema/BlockStorage.java | 3 +-- .../neo4j/kernel/impl/index/schema/BlockStorageReader.java | 3 +-- .../neo4j/kernel/impl/index/schema/BlockStorageTest.java | 6 ++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorage.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorage.java index e175cceda391c..2d6f545000d98 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorage.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorage.java @@ -92,7 +92,7 @@ public void add( KEY key, VALUE value ) throws IOException monitor.entryAdded( entrySize ); } - public void doneAdding() throws IOException + void doneAdding() throws IOException { if ( !bufferedEntries.isEmpty() ) { @@ -113,7 +113,6 @@ private void flushAndResetBuffer() throws IOException bufferedEntries.sortThis( comparator ); ByteArrayPageCursor pageCursor = new ByteArrayPageCursor( byteBuffer ); - System.out.println( "Writing block at " + storeChannel.position() ); // Header pageCursor.putLong( bufferedEntries.size() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorageReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorageReader.java index ba53f6af8957a..fda34c148a6c6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorageReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorageReader.java @@ -47,7 +47,7 @@ public class BlockStorageReader implements Closeable this.blockSize = blockSize; } - public BlockReader nextBlock() throws IOException + BlockReader nextBlock() throws IOException { long position = channel.position(); if ( position >= channel.size() ) @@ -58,7 +58,6 @@ public BlockReader nextBlock() throws IOException blockChannel.position( position ); channel.position( position + blockSize ); PageCursor pageCursor = new ReadableChannelPageCursor( new ReadAheadChannel<>( blockChannel ) ); - System.out.println( "Opening block reader at " + position ); return new BlockReader<>( pageCursor, layout ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/BlockStorageTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/BlockStorageTest.java index b6792f19e1326..f55be102c8e2d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/BlockStorageTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/BlockStorageTest.java @@ -58,7 +58,7 @@ void shouldCreateAndCloseTheBlockFile() throws IOException // given SimpleLongLayout layout = layout( 0 ); assertFalse( fileSystem.fileExists( file ) ); - try ( BlockStorage storage = new BlockStorage<>( layout, BUFFER_FACTORY, fileSystem, file, NO_MONITOR, 100 ) ) + try ( BlockStorage ignored = new BlockStorage<>( layout, BUFFER_FACTORY, fileSystem, file, NO_MONITOR, 100 ) ) { // then assertTrue( fileSystem.fileExists( file ) ); @@ -191,7 +191,9 @@ private void sortExpectedBlock( List> currentExpec currentExpected.sort( comparingLong( p -> p.getKey().longValue() ) ); } - private void assertContents( SimpleLongLayout layout, BlockStorage storage, List>... expectedBlocks ) + @SafeVarargs + private final void assertContents( SimpleLongLayout layout, BlockStorage storage, + List>... expectedBlocks ) throws IOException { try ( BlockStorageReader reader = storage.reader() )