From 6e70257af5d99cc68493f5c9fb1b651228b430d7 Mon Sep 17 00:00:00 2001 From: Anton Persson Date: Tue, 20 Jun 2017 10:21:58 +0200 Subject: [PATCH] Rename NumberKey/Value to SchemaNumberKey/Value To avoid name conflict with values.NumberValue --- .../schema/ConflictDetectingValueMerger.java | 2 +- .../schema/FullScanNonUniqueIndexSampler.java | 2 +- ...veNonUniqueSchemaNumberIndexPopulator.java | 2 +- .../index/schema/NativeSchemaNumberIndex.java | 2 +- .../NativeSchemaNumberIndexAccessor.java | 2 +- .../NativeSchemaNumberIndexPopulator.java | 6 ++--- .../schema/NativeSchemaNumberIndexReader.java | 2 +- .../NativeSchemaNumberIndexUpdater.java | 10 +++---- ...ativeUniqueSchemaNumberIndexPopulator.java | 2 +- .../index/schema/NonUniqueNumberLayout.java | 4 +-- .../index/schema/NumberAllEntriesReader.java | 2 +- .../impl/index/schema/NumberHitIterator.java | 6 ++--- .../impl/index/schema/NumberLayout.java | 26 +++++++++---------- .../index/schema/NumberValueConversion.java | 6 ++--- .../{NumberKey.java => SchemaNumberKey.java} | 12 ++++----- ...umberValue.java => SchemaNumberValue.java} | 6 ++--- .../impl/index/schema/UniqueNumberLayout.java | 4 +-- .../ConflictDetectingValueMergerTest.java | 18 ++++++------- .../FullScanNonUniqueIndexSamplerTest.java | 16 ++++++------ .../impl/index/schema/LayoutTestUtil.java | 4 +-- ...onUniqueSchemaNumberIndexAccessorTest.java | 4 +-- ...nUniqueSchemaNumberIndexPopulatorTest.java | 8 +++--- .../NativeSchemaNumberIndexAccessorTest.java | 2 +- .../NativeSchemaNumberIndexPopulatorTest.java | 2 +- ...veUniqueSchemaNumberIndexAccessorTest.java | 4 +-- ...eUniqueSchemaNumberIndexPopulatorTest.java | 8 +++--- .../index/schema/NonUniqueLayoutTestUtil.java | 4 +-- .../schema/SchemaNumberIndexTestUtil.java | 2 +- .../index/schema/UniqueLayoutTestUtil.java | 4 +-- 29 files changed, 86 insertions(+), 86 deletions(-) rename community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/{NumberKey.java => SchemaNumberKey.java} (96%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/{NumberValue.java => SchemaNumberValue.java} (87%) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ConflictDetectingValueMerger.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ConflictDetectingValueMerger.java index dc4a00b6a0d8..cdb7705ea48a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ConflictDetectingValueMerger.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ConflictDetectingValueMerger.java @@ -30,7 +30,7 @@ * * @param type of values being merged. */ -class ConflictDetectingValueMerger implements ValueMerger +class ConflictDetectingValueMerger implements ValueMerger { private boolean conflict; private long existingNodeId; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/FullScanNonUniqueIndexSampler.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/FullScanNonUniqueIndexSampler.java index 4b0623a12a76..0bf78f6d5ae3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/FullScanNonUniqueIndexSampler.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/FullScanNonUniqueIndexSampler.java @@ -37,7 +37,7 @@ * @param type of keys in tree. * @param type of values in tree. */ -class FullScanNonUniqueIndexSampler +class FullScanNonUniqueIndexSampler extends NonUniqueIndexSampler.Adapter { private final GBPTree gbpTree; 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 d6518c819f9d..8fc2b48c5d24 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 @@ -34,7 +34,7 @@ /** * {@link NativeSchemaNumberIndexPopulator} which can accept duplicate values (for different entity ids). */ -class NativeNonUniqueSchemaNumberIndexPopulator +class NativeNonUniqueSchemaNumberIndexPopulator extends NativeSchemaNumberIndexPopulator { private final IndexSamplingConfig samplingConfig; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndex.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndex.java index 414468e8ce01..8c53f7ec1ef1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndex.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndex.java @@ -32,7 +32,7 @@ import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR; -class NativeSchemaNumberIndex +class NativeSchemaNumberIndex { final PageCache pageCache; final File storeFile; 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 1d2c35b7a885..ed181d79ae66 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 @@ -40,7 +40,7 @@ import static org.neo4j.helpers.collection.Iterators.asResourceIterator; import static org.neo4j.helpers.collection.Iterators.iterator; -public class NativeSchemaNumberIndexAccessor +public class NativeSchemaNumberIndexAccessor extends NativeSchemaNumberIndex implements IndexAccessor { private final NativeSchemaNumberIndexUpdater singleUpdater; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulator.java index 1c9b0d53836c..a6d6af06751a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulator.java @@ -40,10 +40,10 @@ /** * {@link IndexPopulator} backed by a {@link GBPTree}. * - * @param type of {@link NumberKey}. - * @param type of {@link NumberValue}. + * @param type of {@link SchemaNumberKey}. + * @param type of {@link SchemaNumberValue}. */ -public abstract class NativeSchemaNumberIndexPopulator +public abstract class NativeSchemaNumberIndexPopulator extends NativeSchemaNumberIndex implements IndexPopulator { static final byte BYTE_ONLINE = 1; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexReader.java index 8cfa9911cca9..348e876a275d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexReader.java @@ -41,7 +41,7 @@ import org.neo4j.values.Value; import org.neo4j.values.Values; -class NativeSchemaNumberIndexReader +class NativeSchemaNumberIndexReader implements IndexReader { private final GBPTree tree; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexUpdater.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexUpdater.java index e2275c050670..eb30f14e7cb6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexUpdater.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexUpdater.java @@ -28,7 +28,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.values.ValueTuple; -class NativeSchemaNumberIndexUpdater +class NativeSchemaNumberIndexUpdater implements IndexUpdater { private final KEY treeKey; @@ -103,7 +103,7 @@ private void assertOpen() } } - private static void processRemove( KEY treeKey, + private static void processRemove( KEY treeKey, IndexEntryUpdate update, Writer writer ) throws IOException { // todo Do we need to verify that we actually removed something at all? @@ -112,7 +112,7 @@ private static void processRe writer.remove( treeKey ); } - private static void processChange( KEY treeKey, VALUE treeValue, + private static void processChange( KEY treeKey, VALUE treeValue, IndexEntryUpdate update, Writer writer, ConflictDetectingValueMerger conflictDetectingValueMerger ) throws IOException, IndexEntryConflictException @@ -127,7 +127,7 @@ private static void processCh assertNoConflict( update, conflictDetectingValueMerger ); } - static void processAdd( KEY treeKey, VALUE treeValue, + static void processAdd( KEY treeKey, VALUE treeValue, IndexEntryUpdate update, Writer writer, ConflictDetectingValueMerger conflictDetectingValueMerger ) throws IOException, IndexEntryConflictException @@ -138,7 +138,7 @@ static void processAdd( KEY t assertNoConflict( update, conflictDetectingValueMerger ); } - private static void assertNoConflict( IndexEntryUpdate update, + private static void assertNoConflict( IndexEntryUpdate update, ConflictDetectingValueMerger conflictDetectingValueMerger ) throws IndexEntryConflictException { if ( conflictDetectingValueMerger.wasConflict() ) 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 f5e5b5362a80..8c555c5d71d7 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 @@ -30,7 +30,7 @@ /** * {@link NativeSchemaNumberIndexPopulator} which can enforces unique values. */ -class NativeUniqueSchemaNumberIndexPopulator +class NativeUniqueSchemaNumberIndexPopulator extends NativeSchemaNumberIndexPopulator { private final UniqueIndexSampler sampler; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NonUniqueNumberLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NonUniqueNumberLayout.java index e21d60ccd065..76debfcb89b7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NonUniqueNumberLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NonUniqueNumberLayout.java @@ -28,11 +28,11 @@ public class NonUniqueNumberLayout extends NumberLayout @Override public long identifier() { - return Layout.namedIdentifier( IDENTIFIER_NAME, NumberValue.SIZE ); + return Layout.namedIdentifier( IDENTIFIER_NAME, SchemaNumberValue.SIZE ); } @Override - public int compare( NumberKey o1, NumberKey o2 ) + public int compare( SchemaNumberKey o1, SchemaNumberKey o2 ) { int comparison = o1.compareValueTo( o2 ); return comparison != 0 ? comparison : Long.compare( o1.entityId, o2.entityId ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberAllEntriesReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberAllEntriesReader.java index 82d17fdd6ce6..48f2ebbf95bd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberAllEntriesReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberAllEntriesReader.java @@ -30,7 +30,7 @@ import org.neo4j.index.internal.gbptree.Hit; import org.neo4j.index.internal.gbptree.Layout; -class NumberAllEntriesReader implements BoundedIterable +class NumberAllEntriesReader implements BoundedIterable { private final GBPTree tree; private final Layout layout; 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 8f8b67f9b63d..67bd3f33038b 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 @@ -33,10 +33,10 @@ * The {@link RawCursor seeker} which gets passed in will have to be closed somewhere else because * the {@link PrimitiveLongIterator} is just a plain iterator, no resource. * - * @param type of {@link NumberKey}. - * @param type of {@link NumberValue}. + * @param type of {@link SchemaNumberKey}. + * @param type of {@link SchemaNumberValue}. */ -public class NumberHitIterator +public class NumberHitIterator extends PrimitiveLongCollections.PrimitiveLongBaseIterator { private final RawCursor,IOException> seeker; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberLayout.java index 5bdea2f6a9e9..21ce9031f658 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberLayout.java @@ -25,17 +25,17 @@ /** * {@link Layout} for numbers where numbers doesn't need to be unique. */ -abstract class NumberLayout implements Layout +abstract class NumberLayout implements Layout { @Override - public NumberKey newKey() + public SchemaNumberKey newKey() { - return new NumberKey(); + return new SchemaNumberKey(); } @Override - public NumberKey copyKey( NumberKey key, - NumberKey into ) + public SchemaNumberKey copyKey( SchemaNumberKey key, + SchemaNumberKey into ) { into.type = key.type; into.rawValueBits = key.rawValueBits; @@ -45,25 +45,25 @@ public NumberKey copyKey( NumberKey key, } @Override - public NumberValue newValue() + public SchemaNumberValue newValue() { - return NumberValue.INSTANCE; + return SchemaNumberValue.INSTANCE; } @Override public int keySize() { - return NumberKey.SIZE; + return SchemaNumberKey.SIZE; } @Override public int valueSize() { - return NumberValue.SIZE; + return SchemaNumberValue.SIZE; } @Override - public void writeKey( PageCursor cursor, NumberKey key ) + public void writeKey( PageCursor cursor, SchemaNumberKey key ) { cursor.putByte( key.type ); cursor.putLong( key.rawValueBits ); @@ -71,12 +71,12 @@ public void writeKey( PageCursor cursor, NumberKey key ) } @Override - public void writeValue( PageCursor cursor, NumberValue value ) + public void writeValue( PageCursor cursor, SchemaNumberValue value ) { } @Override - public void readKey( PageCursor cursor, NumberKey into ) + public void readKey( PageCursor cursor, SchemaNumberKey into ) { into.type = cursor.getByte(); into.rawValueBits = cursor.getLong(); @@ -84,7 +84,7 @@ public void readKey( PageCursor cursor, NumberKey into ) } @Override - public void readValue( PageCursor cursor, NumberValue into ) + public void readValue( PageCursor cursor, SchemaNumberValue into ) { } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberValueConversion.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberValueConversion.java index 26de36f2d939..75d62a05e2b9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberValueConversion.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberValueConversion.java @@ -22,9 +22,9 @@ import org.neo4j.values.Value; import org.neo4j.values.Values; -import static org.neo4j.kernel.impl.index.schema.NumberKey.TYPE_DOUBLE; -import static org.neo4j.kernel.impl.index.schema.NumberKey.TYPE_FLOAT; -import static org.neo4j.kernel.impl.index.schema.NumberKey.TYPE_LONG; +import static org.neo4j.kernel.impl.index.schema.SchemaNumberKey.TYPE_DOUBLE; +import static org.neo4j.kernel.impl.index.schema.SchemaNumberKey.TYPE_FLOAT; +import static org.neo4j.kernel.impl.index.schema.SchemaNumberKey.TYPE_LONG; /** * Utilities for converting number values to and from different representations. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SchemaNumberKey.java similarity index 96% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberKey.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SchemaNumberKey.java index ddf49e4bc19d..ebe53fad1b91 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberKey.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SchemaNumberKey.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.impl.index.schema; -import org.neo4j.values.Value; import org.neo4j.index.internal.gbptree.GBPTree; +import org.neo4j.values.Value; import static org.neo4j.kernel.impl.index.schema.NumberValueConversion.assertValidSingleNumber; @@ -32,7 +32,7 @@ * Distinction between double and float exists because coersions between each other and long may differ. * TODO this should be figured out and potentially reduced to long, double types only. */ -class NumberKey +class SchemaNumberKey { static final int SIZE = Byte.BYTES + /* type of value */ @@ -90,10 +90,10 @@ void initAsHighest() * Compares the value of this key to that of another key. * This method is expected to be called in scenarios where inconsistent reads may happen (and later retried). * - * @param other the {@link NumberKey} to compare to. - * @return comparison against the {@code other} {@link NumberKey}. + * @param other the {@link SchemaNumberKey} to compare to. + * @return comparison against the {@code other} {@link SchemaNumberKey}. */ - int compareValueTo( NumberKey other ) + int compareValueTo( SchemaNumberKey other ) { return type == TYPE_LONG && other.type == TYPE_LONG // If both are long values then compare them directly, w/o going through double. @@ -129,7 +129,7 @@ private double doubleValue() } /** - * Extracts data from a {@link Number} into state of this {@link NumberKey} instance. + * Extracts data from a {@link Number} into state of this {@link SchemaNumberKey} instance. * * @param value actual {@link Number} value. */ diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberValue.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SchemaNumberValue.java similarity index 87% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberValue.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SchemaNumberValue.java index 63a711a2d3ef..53c0a3ba9e23 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberValue.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SchemaNumberValue.java @@ -25,16 +25,16 @@ /** * Value in a {@link GBPTree} handling numbers suitable for schema indexing. * - * NOTE: For the time being no data exists in {@link NumberValue}, but since the layout is under development + * NOTE: For the time being no data exists in {@link SchemaNumberValue}, but since the layout is under development * it's very convenient to have this class still exist so that it's very easy to try out different types * of layouts without changing the entire stack of arguments. In the end it may just be that this class * will be deleted, but for now it sticks around. */ -class NumberValue +class SchemaNumberValue { static final int SIZE = 0; - static final NumberValue INSTANCE = new NumberValue(); + static final SchemaNumberValue INSTANCE = new SchemaNumberValue(); void from( Value[] values ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/UniqueNumberLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/UniqueNumberLayout.java index 8e3eae0bada4..6c253579b877 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/UniqueNumberLayout.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/UniqueNumberLayout.java @@ -32,11 +32,11 @@ class UniqueNumberLayout extends NumberLayout public long identifier() { // todo Is Number.Value.SIZE a good checksum? - return Layout.namedIdentifier( IDENTIFIER_NAME, NumberKey.SIZE ); + return Layout.namedIdentifier( IDENTIFIER_NAME, SchemaNumberKey.SIZE ); } @Override - public int compare( NumberKey o1, NumberKey o2 ) + public int compare( SchemaNumberKey o1, SchemaNumberKey o2 ) { int comparison = o1.compareValueTo( o2 ); if ( comparison == 0 ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/ConflictDetectingValueMergerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/ConflictDetectingValueMergerTest.java index 77e417486137..bcfd7e320514 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/ConflictDetectingValueMergerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/ConflictDetectingValueMergerTest.java @@ -31,7 +31,7 @@ public class ConflictDetectingValueMergerTest { - private final ConflictDetectingValueMerger detector = new ConflictDetectingValueMerger<>(); + private final ConflictDetectingValueMerger detector = new ConflictDetectingValueMerger<>(); @Test public void shouldReportConflictOnSameValueAndDifferentEntityIds() throws Exception @@ -42,11 +42,11 @@ public void shouldReportConflictOnSameValueAndDifferentEntityIds() throws Except long entityId2 = 20; // when - NumberValue merged = detector.merge( + SchemaNumberValue merged = detector.merge( key( entityId1, value ), key( entityId2, value ), - NumberValue.INSTANCE, - NumberValue.INSTANCE ); + SchemaNumberValue.INSTANCE, + SchemaNumberValue.INSTANCE ); // then assertNull( merged ); @@ -63,20 +63,20 @@ public void shouldNotReportConflictOnSameValueSameEntityId() throws Exception long entityId = 10; // when - NumberValue merged = detector.merge( + SchemaNumberValue merged = detector.merge( key( entityId, value ), key( entityId, value ), - NumberValue.INSTANCE, - NumberValue.INSTANCE ); + SchemaNumberValue.INSTANCE, + SchemaNumberValue.INSTANCE ); // then assertNull( merged ); assertFalse( detector.wasConflict() ); } - private static NumberKey key( long entityId, Value... value ) + private static SchemaNumberKey key( long entityId, Value... value ) { - NumberKey key = new NumberKey(); + SchemaNumberKey key = new SchemaNumberKey(); key.from( entityId, value ); return key; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/FullScanNonUniqueIndexSamplerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/FullScanNonUniqueIndexSamplerTest.java index 1f17ea1edfcb..ba9e9d8f0987 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/FullScanNonUniqueIndexSamplerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/FullScanNonUniqueIndexSamplerTest.java @@ -48,7 +48,7 @@ import static org.neo4j.kernel.impl.index.schema.LayoutTestUtil.countUniqueValues; import static org.neo4j.values.Values.values; -public class FullScanNonUniqueIndexSamplerTest extends SchemaNumberIndexTestUtil +public class FullScanNonUniqueIndexSamplerTest extends SchemaNumberIndexTestUtil { @Test public void shouldIncludeAllValuesInTree() throws Exception @@ -59,10 +59,10 @@ public void shouldIncludeAllValuesInTree() throws Exception // WHEN IndexSample sample; - try ( GBPTree gbpTree = getTree() ) + try ( GBPTree gbpTree = getTree() ) { IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); - FullScanNonUniqueIndexSampler sampler = + FullScanNonUniqueIndexSampler sampler = new FullScanNonUniqueIndexSampler<>( gbpTree, layout, samplingConfig ); sample = sampler.result(); } @@ -86,12 +86,12 @@ private Number[] generateNumberValues() private void buildTree( Number[] values ) throws IOException { - try ( GBPTree gbpTree = getTree() ) + try ( GBPTree gbpTree = getTree() ) { - try ( Writer writer = gbpTree.writer() ) + try ( Writer writer = gbpTree.writer() ) { - NumberKey key = layout.newKey(); - NumberValue value = layout.newValue(); + SchemaNumberKey key = layout.newKey(); + SchemaNumberValue value = layout.newValue(); long nodeId = 0; for ( Number number : values ) { @@ -106,7 +106,7 @@ private void buildTree( Number[] values ) throws IOException } @Override - protected LayoutTestUtil createLayoutTestUtil() + protected LayoutTestUtil createLayoutTestUtil() { return new NonUniqueLayoutTestUtil(); } 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 fdc0902081ed..64768ddd7135 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 @@ -37,7 +37,7 @@ import org.neo4j.values.Value; import org.neo4j.values.Values; -abstract class LayoutTestUtil +abstract class LayoutTestUtil { private final IndexDescriptor indexDescriptor; @@ -61,7 +61,7 @@ void copyValue( VALUE value, VALUE intoValue ) { } - int compareIndexedPropertyValue( NumberKey key1, NumberKey key2 ) + int compareIndexedPropertyValue( SchemaNumberKey key1, SchemaNumberKey key2 ) { int typeCompare = Byte.compare( key1.type, key2.type ); if ( typeCompare == 0 ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexAccessorTest.java index a42d3d8acf58..35325525c088 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeNonUniqueSchemaNumberIndexAccessorTest.java @@ -20,10 +20,10 @@ package org.neo4j.kernel.impl.index.schema; public class NativeNonUniqueSchemaNumberIndexAccessorTest - extends NativeSchemaNumberIndexAccessorTest + extends NativeSchemaNumberIndexAccessorTest { @Override - protected LayoutTestUtil createLayoutTestUtil() + protected LayoutTestUtil createLayoutTestUtil() { return new NonUniqueLayoutTestUtil(); } 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 dc63b9da9416..d30c4b13eaec 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 @@ -39,11 +39,11 @@ import static org.neo4j.kernel.impl.index.schema.LayoutTestUtil.countUniqueValues; public class NativeNonUniqueSchemaNumberIndexPopulatorTest - extends NativeSchemaNumberIndexPopulatorTest + extends NativeSchemaNumberIndexPopulatorTest { @Override - NativeSchemaNumberIndexPopulator createPopulator( PageCache pageCache, File indexFile, - Layout layout, IndexSamplingConfig samplingConfig ) + NativeSchemaNumberIndexPopulator createPopulator( PageCache pageCache, File indexFile, + Layout layout, IndexSamplingConfig samplingConfig ) { return new NativeNonUniqueSchemaNumberIndexPopulator<>( pageCache, indexFile, layout, samplingConfig ); } @@ -151,7 +151,7 @@ public void shouldSampleUpdatesIfConfiguredForOnlineSampling() throws Exception } @Override - protected LayoutTestUtil createLayoutTestUtil() + protected LayoutTestUtil createLayoutTestUtil() { return new NonUniqueLayoutTestUtil(); } 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 072667194d1e..63c2874a0681 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 @@ -76,7 +76,7 @@ *
  • {@link NativeSchemaNumberIndexReader}
    • * */ -public abstract class NativeSchemaNumberIndexAccessorTest +public abstract class NativeSchemaNumberIndexAccessorTest extends SchemaNumberIndexTestUtil { private NativeSchemaNumberIndexAccessor accessor; 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 337b8b3911f3..dcb12d5a345a 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 @@ -60,7 +60,7 @@ import static org.neo4j.kernel.impl.index.schema.NativeSchemaNumberIndexPopulator.BYTE_FAILED; import static org.neo4j.kernel.impl.index.schema.NativeSchemaNumberIndexPopulator.BYTE_ONLINE; -public abstract class NativeSchemaNumberIndexPopulatorTest +public abstract class NativeSchemaNumberIndexPopulatorTest extends SchemaNumberIndexTestUtil { private static final int LARGE_AMOUNT_OF_UPDATES = 1_000; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexAccessorTest.java index ae9e0b75caa7..e5f5bb73620d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueSchemaNumberIndexAccessorTest.java @@ -20,10 +20,10 @@ package org.neo4j.kernel.impl.index.schema; public class NativeUniqueSchemaNumberIndexAccessorTest - extends NativeSchemaNumberIndexAccessorTest + extends NativeSchemaNumberIndexAccessorTest { @Override - protected LayoutTestUtil createLayoutTestUtil() + protected LayoutTestUtil createLayoutTestUtil() { return new UniqueLayoutTestUtil(); } 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 b74ad655c8e9..8bd69a275988 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 @@ -36,18 +36,18 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -public class NativeUniqueSchemaNumberIndexPopulatorTest extends NativeSchemaNumberIndexPopulatorTest +public class NativeUniqueSchemaNumberIndexPopulatorTest extends NativeSchemaNumberIndexPopulatorTest { @Override - NativeSchemaNumberIndexPopulator createPopulator( + NativeSchemaNumberIndexPopulator createPopulator( PageCache pageCache, File indexFile, - Layout layout, IndexSamplingConfig samplingConfig ) + Layout layout, IndexSamplingConfig samplingConfig ) { return new NativeUniqueSchemaNumberIndexPopulator<>( pageCache, indexFile, layout ); } @Override - protected LayoutTestUtil createLayoutTestUtil() + protected LayoutTestUtil createLayoutTestUtil() { return new UniqueLayoutTestUtil(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NonUniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NonUniqueLayoutTestUtil.java index 1fe090678230..34cc1f48f457 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NonUniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NonUniqueLayoutTestUtil.java @@ -24,7 +24,7 @@ import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -class NonUniqueLayoutTestUtil extends LayoutTestUtil +class NonUniqueLayoutTestUtil extends LayoutTestUtil { NonUniqueLayoutTestUtil() { @@ -32,7 +32,7 @@ class NonUniqueLayoutTestUtil extends LayoutTestUtil } @Override - Layout createLayout() + Layout createLayout() { return new NonUniqueNumberLayout(); } 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 1d24d5d17ac9..148a6f10c3f9 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 @@ -55,7 +55,7 @@ import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER; import static org.neo4j.test.rule.PageCacheRule.config; -public abstract class SchemaNumberIndexTestUtil +public abstract class SchemaNumberIndexTestUtil { static final long NON_EXISTENT_VALUE = Short.MAX_VALUE + 1; static final long NON_EXISTENT_ENTITY_ID = 1_000_000_000; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java index 5f438678fd67..4b2402270105 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java @@ -24,7 +24,7 @@ import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -public class UniqueLayoutTestUtil extends LayoutTestUtil +public class UniqueLayoutTestUtil extends LayoutTestUtil { UniqueLayoutTestUtil() { @@ -32,7 +32,7 @@ public class UniqueLayoutTestUtil extends LayoutTestUtil } @Override - public Layout createLayout() + public Layout createLayout() { return new UniqueNumberLayout(); }