From c26c2b1e0ad8c38902f290ca3fe054819d035ae0 Mon Sep 17 00:00:00 2001 From: Anton Persson Date: Fri, 2 Jun 2017 17:09:37 +0200 Subject: [PATCH] Cleanup in native schema index main and test --- ...tiveNonUniqueSchemaNumberIndexPopulator.java | 3 +-- .../schema/NativeSchemaNumberIndexAccessor.java | 8 ++------ .../NativeUniqueSchemaNumberIndexPopulator.java | 4 +--- .../impl/index/schema/NumberHitIterator.java | 4 ++-- .../impl/index/schema/LayoutTestUtil.java | 5 +++++ ...NonUniqueSchemaNumberIndexPopulatorTest.java | 3 +-- .../NativeSchemaNumberIndexAccessorTest.java | 17 ++++++----------- .../NativeSchemaNumberIndexPopulatorTest.java | 6 +++--- ...iveUniqueSchemaNumberIndexPopulatorTest.java | 3 +-- .../index/schema/SchemaNumberIndexTestUtil.java | 6 ++++-- 10 files changed, 26 insertions(+), 33 deletions(-) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexPopulator.java index 2922cad4d049..e1faf37b4d77 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexPopulator.java @@ -23,7 +23,6 @@ import java.io.IOException; import org.neo4j.index.internal.gbptree.Layout; -import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.impl.api.index.sampling.DefaultNonUniqueIndexSampler; @@ -42,7 +41,7 @@ class NativeNonUniqueSchemaNumberIndexPopulator layout, - RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexSamplingConfig samplingConfig ) + IndexSamplingConfig samplingConfig ) { super( pageCache, storeFile, layout ); this.samplingConfig = samplingConfig; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexAccessor.java index 51a90dac350c..0588783e662c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexAccessor.java @@ -33,7 +33,6 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.index.GBPTreeUtil; import org.neo4j.storageengine.api.schema.IndexReader; @@ -45,14 +44,11 @@ public class NativeSchemaNumberIndexAccessor implements IndexAccessor { private final NativeSchemaNumberIndexUpdater singleUpdater; - private final IndexDescriptor indexDescriptor; NativeSchemaNumberIndexAccessor( PageCache pageCache, File storeFile, - Layout layout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - IndexDescriptor indexDescriptor ) throws IOException + Layout layout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector ) throws IOException { super( pageCache, storeFile, layout ); - this.indexDescriptor = indexDescriptor; singleUpdater = new NativeSchemaNumberIndexUpdater<>( layout.newKey(), layout.newValue() ); instantiateTree( recoveryCleanupWorkCollector ); } @@ -93,7 +89,7 @@ public void close() throws IOException @Override public IndexReader newReader() { - return new NativeSchemaNumberIndexReader<>( tree, layout, indexDescriptor ); + return new NativeSchemaNumberIndexReader<>( tree, layout ); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexPopulator.java index 2a57f161818b..f5e5b5362a80 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexPopulator.java @@ -22,7 +22,6 @@ import java.io.File; import org.neo4j.index.internal.gbptree.Layout; -import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.impl.api.index.sampling.UniqueIndexSampler; @@ -36,8 +35,7 @@ class NativeUniqueSchemaNumberIndexPopulator layout, - RecoveryCleanupWorkCollector recoveryCleanupWorkCollector ) + NativeUniqueSchemaNumberIndexPopulator( PageCache pageCache, File storeFile, Layout layout ) { super( pageCache, storeFile, layout ); this.sampler = new UniqueIndexSampler(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberHitIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberHitIterator.java index 642df38c415b..c39b1a8dd7c0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberHitIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberHitIterator.java @@ -40,7 +40,7 @@ public class NumberHitIterator { private final RawCursor,IOException> seeker; - public NumberHitIterator( RawCursor,IOException> seeker ) + NumberHitIterator( RawCursor,IOException> seeker ) { this.seeker = seeker; } @@ -50,7 +50,7 @@ protected boolean fetchNext() { try { - return seeker.next() ? next( seeker.get().key().entityId ) : false; + return seeker.next() && next( seeker.get().key().entityId ); } catch ( IOException e ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java index 1d2546e96015..b057b86739a7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java @@ -53,6 +53,11 @@ abstract class LayoutTestUtil protected abstract double fractionDuplicates(); + IndexDescriptor indexDescriptor() + { + return indexDescriptor; + } + void copyValue( VALUE value, VALUE intoValue ) { intoValue.type = value.type; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexPopulatorTest.java index aa3d13953159..8d658373df73 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexPopulatorTest.java @@ -38,7 +38,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.neo4j.helpers.ArrayUtil.array; -import static org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector.IMMEDIATE; import static org.neo4j.kernel.impl.index.schema.FullScanNonUniqueIndexSamplerTest.countUniqueValues; public class NativeNonUniqueSchemaNumberIndexPopulatorTest @@ -48,7 +47,7 @@ public class NativeNonUniqueSchemaNumberIndexPopulatorTest NativeSchemaNumberIndexPopulator createPopulator( PageCache pageCache, File indexFile, Layout layout, IndexSamplingConfig samplingConfig ) { - return new NativeNonUniqueSchemaNumberIndexPopulator<>( pageCache, indexFile, layout, IMMEDIATE, samplingConfig ); + return new NativeNonUniqueSchemaNumberIndexPopulator<>( pageCache, indexFile, layout, samplingConfig ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexAccessorTest.java index ac279b45b110..ec4867019da4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexAccessorTest.java @@ -49,7 +49,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.collection.primitive.PrimitiveLongCollections.EMPTY_LONG_ARRAY; import static org.neo4j.function.Predicates.all; import static org.neo4j.function.Predicates.alwaysTrue; @@ -70,18 +69,14 @@ public abstract class NativeSchemaNumberIndexAccessorTest extends SchemaNumberIndexTestUtil { - private IndexDescriptor indexDescriptor; - NativeSchemaNumberIndexAccessor accessor; + private NativeSchemaNumberIndexAccessor accessor; @Before public void setupAccessor() throws IOException { - indexDescriptor = createIndexDescriptor(); - accessor = new NativeSchemaNumberIndexAccessor<>( pageCache, indexFile, layout, IMMEDIATE, indexDescriptor ); + accessor = new NativeSchemaNumberIndexAccessor<>( pageCache, indexFile, layout, IMMEDIATE ); } - abstract IndexDescriptor createIndexDescriptor(); - @After public void closeAccessor() throws IOException { @@ -459,7 +454,7 @@ public void shouldHandleMultipleConsecutiveUpdaters() throws Exception public void requestForSecondUpdaterMustThrow() throws Exception { // given - try ( IndexUpdater updater = accessor.newUpdater( ONLINE ) ) + try ( IndexUpdater ignored = accessor.newUpdater( ONLINE ) ) { // when try @@ -581,11 +576,11 @@ private long[] extractEntityIds( IndexEntryUpdate[] updates, Predicate update : updates ) { - if ( valueFilter.test( updates[i].values()[0] ) ) + if ( valueFilter.test( update.values()[0] ) ) { - entityIds[cursor++] = updates[i].getEntityId(); + entityIds[cursor++] = update.getEntityId(); } } return Arrays.copyOf( entityIds, cursor ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulatorTest.java index a645ea13d807..80c169330476 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulatorTest.java @@ -61,7 +61,7 @@ public abstract class NativeSchemaNumberIndexPopulatorTest extends SchemaNumberIndexTestUtil { - static final int LARGE_AMOUNT_OF_UPDATES = 1_000; + private static final int LARGE_AMOUNT_OF_UPDATES = 1_000; static final PropertyAccessor null_property_accessor = ( nodeId, propKeyId ) -> { throw new RuntimeException( "Did not expect an attempt to go to store" ); @@ -484,7 +484,7 @@ public void unsuccessfulCloseMustThrowAfterDrop() throws Exception } } - int interleaveLargeAmountOfUpdates( Random updaterRandom, + private int interleaveLargeAmountOfUpdates( Random updaterRandom, Iterator> updates ) throws IOException, IndexEntryConflictException { int count = 0; @@ -562,7 +562,7 @@ private void applyInterleaved( IndexEntryUpdate[] updates, Inde } } - void verifyUpdates( Iterator> indexEntryUpdateIterator, int count ) + private void verifyUpdates( Iterator> indexEntryUpdateIterator, int count ) throws IOException { @SuppressWarnings( "unchecked" ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexPopulatorTest.java index 582ad87b030d..72dbbabfb4b9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexPopulatorTest.java @@ -35,7 +35,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector.IMMEDIATE; public class NativeUniqueSchemaNumberIndexPopulatorTest extends NativeSchemaNumberIndexPopulatorTest { @@ -44,7 +43,7 @@ NativeSchemaNumberIndexPopulator createPopulator( PageCache pageCache, File indexFile, Layout layout, IndexSamplingConfig samplingConfig ) { - return new NativeUniqueSchemaNumberIndexPopulator<>( pageCache, indexFile, layout, IMMEDIATE ); + return new NativeUniqueSchemaNumberIndexPopulator<>( pageCache, indexFile, layout ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SchemaNumberIndexTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SchemaNumberIndexTestUtil.java index 4fddd59f7c98..e7c6a1f5bc30 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SchemaNumberIndexTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SchemaNumberIndexTestUtil.java @@ -67,6 +67,7 @@ public abstract class SchemaNumberIndexTestUtil layoutUtil; Layout layout; File indexFile; @@ -76,6 +77,7 @@ public abstract class SchemaNumberIndexTestUtil hit( final KEY key, final VALUE value ) return new SimpleHit( key, value ); } - protected void assertFilePresent() + void assertFilePresent() { assertTrue( fs.fileExists( indexFile ) ); } - protected void assertFileNotPresent() + void assertFileNotPresent() { assertFalse( fs.fileExists( indexFile ) ); }