From 131dbf3e50c0d902d87a462f44ffdbe202d0bc9c Mon Sep 17 00:00:00 2001 From: Mattias Persson Date: Mon, 26 Jun 2017 12:07:07 +0200 Subject: [PATCH] Renames NO_HEADER -> NO_HEADER_READER in GBPTree --- .../main/java/org/neo4j/index/internal/gbptree/GBPTree.java | 5 ++++- .../index/internal/gbptree/FormatCompatibilityTest.java | 6 +++--- .../neo4j/index/internal/gbptree/GBPTreeConcurrencyIT.java | 4 ++-- .../java/org/neo4j/index/internal/gbptree/GBPTreeIT.java | 4 ++-- .../org/neo4j/index/internal/gbptree/GBPTreeRecoveryIT.java | 5 +++-- .../java/org/neo4j/index/internal/gbptree/GBPTreeTest.java | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java index 9e6bddd452726..c715a55d5d6d6 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java @@ -139,6 +139,9 @@ public class GBPTree implements Closeable */ public interface Monitor { + /** + * Adapter for {@link Monitor}. + */ class Adaptor implements Monitor { @Override @@ -199,7 +202,7 @@ public void startupState( boolean clean ) /** * No-op header reader. */ - static final Header.Reader NO_HEADER = (cursor,length) -> {}; + static final Header.Reader NO_HEADER_READER = (cursor,length) -> {}; /** * No-op header writer. 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 39d7a324563aa..50bc73a92da05 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 @@ -49,7 +49,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER; +import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_READER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR; import static org.neo4j.test.rule.PageCacheRule.config; @@ -98,7 +98,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 GBPTree<>( pageCache, storeFile, new SimpleLongLayout(), 0, - NO_MONITOR, NO_HEADER, NO_HEADER_WRITER ) ) + NO_MONITOR, NO_HEADER_READER, NO_HEADER_WRITER ) ) { try { @@ -174,7 +174,7 @@ private void createAndZipTree( File storeFile ) throws IOException { PageCache pageCache = pageCacheRule.getPageCache( fsRule.get() ); try ( GBPTree tree = new GBPTree<>( pageCache, storeFile, new SimpleLongLayout(), 0, - NO_MONITOR, NO_HEADER, NO_HEADER_WRITER ) ) + NO_MONITOR, NO_HEADER_READER, NO_HEADER_WRITER ) ) { MutableLong insertKey = new MutableLong(); MutableLong insertValue = new MutableLong(); 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 983e735df2d25..88dc78ba4b402 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 @@ -60,7 +60,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.rules.RuleChain.outerRule; -import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER; +import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_READER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR; import static org.neo4j.test.rule.PageCacheRule.config; @@ -107,7 +107,7 @@ private GBPTree createIndex( GBPTree.Monitor monitor ) PageCache pageCache = pageCacheRule.getPageCache( fs.get(), config().withPageSize( pageSize ).withAccessChecks( true ) ); return index = new GBPTree<>( pageCache, directory.file( "index" ), - layout, 0/*use whatever page cache says*/, monitor, NO_HEADER, NO_HEADER_WRITER ); + layout, 0/*use whatever page cache says*/, monitor, NO_HEADER_READER, NO_HEADER_WRITER ); } @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 2f279762a20e9..d7b69dbeaca14 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 @@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.rules.RuleChain.outerRule; -import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER; +import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_READER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR; import static org.neo4j.test.rule.PageCacheRule.config; @@ -76,7 +76,7 @@ private GBPTree createIndex( int pageSize, GBPTree.Moni { pageCache = pageCacheRule.getPageCache( fs.get(), config().withPageSize( pageSize ).withAccessChecks( true ) ); return index = new GBPTree<>( pageCache, directory.file( "index" ), - layout, 0/*use whatever page cache says*/, monitor, NO_HEADER, NO_HEADER_WRITER ); + layout, 0/*use whatever page cache says*/, monitor, NO_HEADER_READER, NO_HEADER_WRITER ); } @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 e4b28a27baa50..ca5ee67c2479d 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 @@ -43,7 +43,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.rules.RuleChain.outerRule; -import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER; +import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_READER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR; import static org.neo4j.index.internal.gbptree.ThrowingRunnable.throwing; @@ -382,7 +382,8 @@ private long[] modificationData( int min, int max ) private static GBPTree createIndex( PageCache pageCache, File file ) throws IOException { - return new GBPTree<>( pageCache, file, new SimpleLongLayout(), 0, NO_MONITOR, NO_HEADER, NO_HEADER_WRITER ); + return new GBPTree<>( pageCache, file, new SimpleLongLayout(), 0, NO_MONITOR, + NO_HEADER_READER, NO_HEADER_WRITER ); } 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 f5ad60399c9a4..8941dad7ec8e2 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 @@ -73,7 +73,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.rules.RuleChain.outerRule; -import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER; +import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_READER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR; import static org.neo4j.index.internal.gbptree.ThrowingRunnable.throwing; @@ -1261,7 +1261,7 @@ private class GBPTreeBuilder private int pageCachePageSize = 256; private int tentativePageSize = 0; private Monitor monitor = NO_MONITOR; - private Header.Reader headerReader = NO_HEADER; + private Header.Reader headerReader = NO_HEADER_READER; private Layout layout = GBPTreeTest.layout; private PageCache specificPageCache; private Consumer headerWriter = NO_HEADER_WRITER;