Use RandomValues in LayoutTestUtil.newUniqueValue and remove sub impl…

…ementations of that method
neo4j · Oct 3, 2018 · fcef0ae · fcef0ae
1 parent 8d7edd6
commit fcef0ae
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 159 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
@@ -22,14 +22,10 @@
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.time.LocalDate;
-import java.util.List;
-import java.util.Set;
 
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
-import org.neo4j.values.storable.DateValue;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
@@ -74,19 +70,6 @@ int compareIndexedPropertyValue( DateIndexKey key1, DateIndexKey key2 )
         return Values.COMPARATOR.compare( key1.asValue(), key2.asValue() );
     }
 
-    @Override
-    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        DateValue candidate;
-        do
-        {
-            candidate = random.nextDateValue();
-        }
-        while ( !uniqueCompareValues.add( candidate ) );
-        uniqueValues.add( candidate );
-        return candidate;
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdatesNoDuplicateValues()
     {

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
@@ -23,14 +23,10 @@
 
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.util.List;
-import java.util.Set;
 
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
-import org.neo4j.values.storable.DateTimeValue;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
@@ -77,19 +73,6 @@ int compareIndexedPropertyValue( ZonedDateTimeIndexKey key1, ZonedDateTimeIndexK
         return Values.COMPARATOR.compare( key1.asValue(), key2.asValue() );
     }
 
-    @Override
-    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        DateTimeValue candidate;
-        do
-        {
-            candidate = random.nextDateTimeValue();
-        }
-        while ( !uniqueCompareValues.add( candidate ) );
-        uniqueValues.add( candidate );
-        return candidate;
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdatesNoDuplicateValues()
     {

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
@@ -21,14 +21,10 @@
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import java.util.List;
-import java.util.Set;
-
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.DurationValue;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
@@ -75,19 +71,6 @@ int compareIndexedPropertyValue( DurationIndexKey key1, DurationIndexKey key2 )
         return Values.COMPARATOR.compare( key1.asValue(), key2.asValue() );
     }
 
-    @Override
-    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        DurationValue candidate;
-        do
-        {
-            candidate = random.nextDuration();
-        }
-        while ( !uniqueCompareValues.add( candidate ) );
-        uniqueValues.add( candidate );
-        return candidate;
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdatesNoDuplicateValues()
     {

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
@@ -116,7 +116,17 @@ private Value existingNonUniqueValue( RandomRule randomRule )
         };
     }
 
-    abstract Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues );
+    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
+    {
+        Value value;
+        do
+        {
+            value = random.nextValueOfTypes( supportedTypes() );
+        }
+        while ( !uniqueCompareValues.add( value ) );
+        uniqueValues.add( value );
+        return value;
+    }
 
     Value[] extractValuesFromUpdates( IndexEntryUpdate<IndexDescriptor>[] updates )
     {

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
@@ -22,14 +22,10 @@
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Set;
 
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
-import org.neo4j.values.storable.LocalDateTimeValue;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
@@ -74,19 +70,6 @@ int compareIndexedPropertyValue( LocalDateTimeIndexKey key1, LocalDateTimeIndexK
         return Values.COMPARATOR.compare( key1.asValue(), key2.asValue() );
     }
 
-    @Override
-    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        LocalDateTimeValue candidate;
-        do
-        {
-            candidate =  random.nextLocalDateTimeValue();
-        }
-        while ( !uniqueCompareValues.add( candidate ) );
-        uniqueValues.add( candidate );
-        return candidate;
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdatesNoDuplicateValues()
     {

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
@@ -22,14 +22,10 @@
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.time.LocalTime;
-import java.util.List;
-import java.util.Set;
 
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
-import org.neo4j.values.storable.LocalTimeValue;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
@@ -74,19 +70,6 @@ int compareIndexedPropertyValue( LocalTimeIndexKey key1, LocalTimeIndexKey key2
         return Values.COMPARATOR.compare( key1.asValue(), key2.asValue() );
     }
 
-    @Override
-    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        LocalTimeValue candidate;
-        do
-        {
-            candidate = random.nextLocalTimeValue();
-        }
-        while ( !uniqueCompareValues.add( candidate ) );
-        uniqueValues.add( candidate );
-        return candidate;
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdatesNoDuplicateValues()
     {

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
@@ -21,14 +21,9 @@
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import java.util.List;
-import java.util.Set;
-
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
-import org.neo4j.values.storable.NumberValue;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 
 abstract class NumberLayoutTestUtil extends LayoutTestUtil<NumberIndexKey,NativeIndexValue>
@@ -88,19 +83,4 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdatesWithDuplicateValues()
     {
         return generateAddUpdatesFor( ArrayUtils.addAll( ALL_EXTREME_VALUES, ALL_EXTREME_VALUES ) );
     }
-
-    @Override
-    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        NumberValue value;
-        Double compareValue;
-        do
-        {
-            value = random.nextNumberValue();
-            compareValue = value.doubleValue();
-        }
-        while ( !uniqueCompareValues.add( compareValue ) );
-        uniqueValues.add( value );
-        return value;
-    }
 }
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
@@ -21,9 +21,6 @@
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import java.util.List;
-import java.util.Set;
-
 import org.neo4j.gis.spatial.index.curves.SpaceFillingCurve;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.kernel.impl.index.schema.config.SpaceFillingCurveSettings;
@@ -32,7 +29,6 @@
 import org.neo4j.values.storable.CoordinateReferenceSystem;
 import org.neo4j.values.storable.PointValue;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
 
 import static org.neo4j.values.storable.CoordinateReferenceSystem.WGS84;
@@ -90,21 +86,6 @@ int compareIndexedPropertyValue( SpatialIndexKey key1, SpatialIndexKey key2 )
         return Long.compare( key1.rawValueBits, key2.rawValueBits );
     }
 
-    @Override
-    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        PointValue pointValue;
-        Long compareValue;
-        do
-        {
-            pointValue = random.nextGeographicPoint();
-            compareValue = curve.derivedValueFor( pointValue.coordinate() );
-        }
-        while ( !uniqueCompareValues.add( compareValue ) );
-        uniqueValues.add( pointValue );
-        return pointValue;
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdatesNoDuplicateValues()
     {

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
@@ -21,14 +21,10 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
-import java.util.Set;
 
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.TextValue;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 
 import static java.util.Arrays.asList;
@@ -82,17 +78,4 @@ IndexEntryUpdate<IndexDescriptor>[] someUpdatesWithDuplicateValues()
         duplicates.addAll( asList( STRINGS ) );
         return generateAddUpdatesFor( duplicates.toArray() );
     }
-
-    @Override
-    protected Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        TextValue candidate;
-        do
-        {
-            candidate = random.nextTextValue();
-        }
-        while ( !uniqueCompareValues.add( candidate.stringValue() ) );
-        uniqueValues.add( candidate );
-        return candidate;
-    }
 }
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
@@ -23,14 +23,10 @@
 
 import java.time.OffsetTime;
 import java.time.ZoneOffset;
-import java.util.List;
-import java.util.Set;
 
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.TimeValue;
-import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
@@ -77,19 +73,6 @@ int compareIndexedPropertyValue( ZonedTimeIndexKey key1, ZonedTimeIndexKey key2
         return Values.COMPARATOR.compare( key1.asValue(), key2.asValue() );
     }
 
-    @Override
-    Value newUniqueValue( RandomValues random, Set<Object> uniqueCompareValues, List<Value> uniqueValues )
-    {
-        TimeValue candidate;
-        do
-        {
-            candidate = random.nextTimeValue();
-        }
-        while ( !uniqueCompareValues.add( candidate ) );
-        uniqueValues.add( candidate );
-        return candidate;
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdatesNoDuplicateValues()
     {