LayoutTestUtil cleanup

- Don't rely on KEY being NativeIndexSingleValueKey - Move implementation of rangeQuery to super class
neo4j · Oct 3, 2018 · 3a292ea · 3a292ea
1 parent 6542550
commit 3a292ea
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 76 deletions.
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.DateValue;
@@ -62,12 +61,6 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdates()
         return someUpdatesWithDuplicateValues();
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( DateIndexKey key1, DateIndexKey key2 )
     {

diff --git a/...unity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java b/...unity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.DateTimeValue;
@@ -65,12 +64,6 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdates()
         return someUpdatesWithDuplicateValues();
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( ZonedDateTimeIndexKey key1, ZonedDateTimeIndexKey key2 )
     {

diff --git a/...unity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java b/...unity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.DurationValue;
@@ -63,12 +62,6 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdates()
         return someUpdatesWithDuplicateValues();
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( DurationIndexKey key1, DurationIndexKey key2 )
     {

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
@@ -39,7 +39,7 @@
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
 
-abstract class LayoutTestUtil<KEY extends NativeIndexSingleValueKey<KEY>, VALUE extends NativeIndexValue>
+abstract class LayoutTestUtil<KEY extends NativeIndexKey<KEY>, VALUE extends NativeIndexValue>
 {
     private static final Comparator<IndexEntryUpdate<IndexDescriptor>> UPDATE_COMPARATOR = ( u1, u2 ) ->
             Values.COMPARATOR.compare( u1.values()[0], u2.values()[0] );
@@ -65,7 +65,10 @@ protected double fractionDuplicates()
         return 0.1;
     }
 
-    abstract IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive );
+    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
+    {
+        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
+    }
 
     abstract int compareIndexedPropertyValue( KEY key1, KEY key2 );
 

diff --git a/.../kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java b/.../kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.LocalDateTimeValue;
@@ -62,12 +61,6 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdates()
         return someUpdatesWithDuplicateValues();
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( LocalDateTimeIndexKey key1, LocalDateTimeIndexKey key2 )
     {

diff --git a/...nity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java b/...nity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.LocalTimeValue;
@@ -62,12 +61,6 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdates()
         return someUpdatesWithDuplicateValues();
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( LocalTimeIndexKey key1, LocalTimeIndexKey key2 )
     {

diff --git a/...nity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTest.java b/...nity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTest.java
@@ -80,7 +80,7 @@
  * <li>{@link NumberIndexReader}</li>
  * </ul>
  */
-public abstract class NativeIndexAccessorTest<KEY extends NativeIndexSingleValueKey<KEY>, VALUE extends NativeIndexValue>
+public abstract class NativeIndexAccessorTest<KEY extends NativeIndexKey<KEY>, VALUE extends NativeIndexValue>
         extends NativeIndexTestUtil<KEY,VALUE>
 {
     NativeIndexAccessor<KEY,VALUE> accessor;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexTestUtil.java
@@ -56,7 +56,7 @@
 import static org.neo4j.kernel.impl.index.schema.NativeIndexKey.Inclusion.NEUTRAL;
 import static org.neo4j.test.rule.PageCacheRule.config;
 
-public abstract class NativeIndexTestUtil<KEY extends NativeIndexSingleValueKey<KEY>,VALUE extends NativeIndexValue>
+public abstract class NativeIndexTestUtil<KEY extends NativeIndexKey<KEY>,VALUE extends NativeIndexValue>
 {
     static final long NON_EXISTENT_ENTITY_ID = 1_000_000_000;
 
@@ -135,10 +135,10 @@ private RawCursor<Hit<KEY,VALUE>, IOException> scan( GBPTree<KEY,VALUE> tree ) t
     {
         KEY lowest = layout.newKey();
         lowest.initialize( Long.MIN_VALUE );
-        lowest.initValueAsLowest( ValueGroup.UNKNOWN );
+        lowest.initValueAsLowest( 0, ValueGroup.UNKNOWN );
         KEY highest = layout.newKey();
         highest.initialize( Long.MAX_VALUE );
-        highest.initValueAsHighest( ValueGroup.UNKNOWN );
+        highest.initValueAsHighest( 0, ValueGroup.UNKNOWN );
         return tree.seek( lowest, highest );
     }
 

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.NumberValue;
@@ -60,12 +59,6 @@ abstract class NumberLayoutTestUtil extends LayoutTestUtil<NumberIndexKey,Native
         super( indexDescriptor.withId( 0 ) );
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( NumberIndexKey key1, NumberIndexKey key2 )
     {

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java
@@ -25,7 +25,6 @@
 import java.util.Set;
 
 import org.neo4j.gis.spatial.index.curves.SpaceFillingCurve;
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.kernel.impl.index.schema.config.SpaceFillingCurveSettings;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
@@ -79,12 +78,6 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdates()
         return someUpdatesWithDuplicateValues();
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from , fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( SpatialIndexKey key1, SpatialIndexKey key2 )
     {

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.RandomValues;
@@ -43,12 +42,6 @@ abstract class StringLayoutTestUtil extends LayoutTestUtil<StringIndexKey,Native
         super( schemaIndexDescriptor );
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( StringIndexKey key1, StringIndexKey key2 )
     {

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.RandomValues;
@@ -65,12 +64,6 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdates()
         return someUpdatesWithDuplicateValues();
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return IndexQuery.range( 0, from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( ZonedTimeIndexKey key1, ZonedTimeIndexKey key2 )
     {

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
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.RandomValues;
@@ -51,12 +50,6 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdates()
         return delegate.someUpdatesNoDuplicateValues();
     }
 
-    @Override
-    IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive )
-    {
-        return delegate.rangeQuery( from, fromInclusive, to, toInclusive );
-    }
-
     @Override
     int compareIndexedPropertyValue( KEY key1, KEY key2 )
     {