Break out IndexLayout creation from LayoutTestUtil, now renamed to Va…

…lueCreatorUtil

As well as fixing some compilation issues

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java → community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeValueCreatorUtil.java

@@ -33,7 +33,7 @@
 
 import static java.time.ZoneOffset.UTC;
 
-public class DateTimeLayoutTestUtil extends LayoutTestUtil<ZonedDateTimeIndexKey,NativeIndexValue>
+public class DateTimeValueCreatorUtil extends ValueCreatorUtil<ZonedDateTimeIndexKey,NativeIndexValue>
 {
     private static final ZonedDateTime[] ALL_EXTREME_VALUES = new ZonedDateTime[]
     {
@@ -45,17 +45,11 @@ public class DateTimeLayoutTestUtil extends LayoutTestUtil<ZonedDateTimeIndexKey
             ZonedDateTime.of( -1, 12, 31, 23,59,59,999_999_999, UTC )
     };
 
-    DateTimeLayoutTestUtil( StoreIndexDescriptor schemaIndexDescriptor )
+    DateTimeValueCreatorUtil( StoreIndexDescriptor schemaIndexDescriptor )
     {
         super( schemaIndexDescriptor );
     }
 
-    @Override
-    IndexLayout<ZonedDateTimeIndexKey,NativeIndexValue> createLayout()
-    {
-        return new ZonedDateTimeLayout();
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdates()
     {

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java → community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateValueCreatorUtil.java

@@ -30,7 +30,7 @@
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
-public class DateLayoutTestUtil extends LayoutTestUtil<DateIndexKey,NativeIndexValue>
+public class DateValueCreatorUtil extends ValueCreatorUtil<DateIndexKey,NativeIndexValue>
 {
     private static final LocalDate[] ALL_EXTREME_VALUES = new LocalDate[]
     {
@@ -42,17 +42,11 @@ public class DateLayoutTestUtil extends LayoutTestUtil<DateIndexKey,NativeIndexV
             LocalDate.of( -1, 12, 31)
     };
 
-    DateLayoutTestUtil( StoreIndexDescriptor indexDescriptor )
+    DateValueCreatorUtil( StoreIndexDescriptor indexDescriptor )
     {
         super( indexDescriptor );
     }
 
-    @Override
-    IndexLayout<DateIndexKey,NativeIndexValue> createLayout()
-    {
-        return new DateLayout();
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdates()
     {

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java → community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationValueCreatorUtil.java

@@ -29,7 +29,7 @@
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
-public class DurationLayoutTestUtil extends LayoutTestUtil<DurationIndexKey,NativeIndexValue>
+public class DurationValueCreatorUtil extends ValueCreatorUtil<DurationIndexKey,NativeIndexValue>
 {
     private static final DurationValue[] ALL_EXTREME_VALUES = new DurationValue[]
     {
@@ -43,17 +43,11 @@ public class DurationLayoutTestUtil extends LayoutTestUtil<DurationIndexKey,Nati
             DurationValue.duration( 0, 0, 0, Long.MAX_VALUE),
     };
 
-    DurationLayoutTestUtil( StoreIndexDescriptor schemaIndexDescriptor )
+    DurationValueCreatorUtil( StoreIndexDescriptor schemaIndexDescriptor )
     {
         super( schemaIndexDescriptor );
     }
 
-    @Override
-    IndexLayout<DurationIndexKey,NativeIndexValue> createLayout()
-    {
-        return new DurationLayout();
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdates()
     {

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericLayoutTestUtil.java → community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericValueCreatorUtil.java

@@ -33,7 +33,7 @@
 import org.neo4j.values.storable.RandomValues;
 import org.neo4j.values.storable.Values;
 
-class GenericLayoutTestUtil extends LayoutTestUtil<CompositeGenericKey,NativeIndexValue>
+class GenericValueCreatorUtil extends ValueCreatorUtil<CompositeGenericKey,NativeIndexValue>
 {
     // todo This is only here to have SOME values to start with. It will be replaced by random value generation later on.
     private static final Number[] SOME_VALUE = new Number[]
@@ -62,17 +62,11 @@ class GenericLayoutTestUtil extends LayoutTestUtil<CompositeGenericKey,NativeInd
             new IndexSpecificSpaceFillingCurveSettingsCache( new ConfiguredSpaceFillingCurveSettingsCache( Config.defaults() ), new HashMap<>() );
     StandardConfiguration configuration = new StandardConfiguration();
 
-    GenericLayoutTestUtil( StoreIndexDescriptor indexDescriptor )
+    GenericValueCreatorUtil( StoreIndexDescriptor indexDescriptor )
     {
         super( indexDescriptor );
     }
 
-    @Override
-    IndexLayout<CompositeGenericKey,NativeIndexValue> createLayout()
-    {
-        return new GenericLayout( 1, spaceFillingCurveSettings );
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdates()
     {

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/IndexLayoutFactory.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.kernel.impl.index.schema;
+
+@FunctionalInterface
+interface IndexLayoutFactory<KEY extends NativeIndexKey<KEY>, VALUE extends NativeIndexValue>
+{
+    IndexLayout<KEY,VALUE> create();
+}

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java → community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeValueCreatorUtil.java

@@ -30,7 +30,7 @@
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
-public class LocalDateTimeLayoutTestUtil extends LayoutTestUtil<LocalDateTimeIndexKey,NativeIndexValue>
+public class LocalDateTimeValueCreatorUtil extends ValueCreatorUtil<LocalDateTimeIndexKey,NativeIndexValue>
 {
     private static final LocalDateTime[] ALL_EXTREME_VALUES = new LocalDateTime[]
     {
@@ -42,17 +42,11 @@ public class LocalDateTimeLayoutTestUtil extends LayoutTestUtil<LocalDateTimeInd
             LocalDateTime.of( -1, 12, 31, 23,59,59,999_999_999 )
     };
 
-    LocalDateTimeLayoutTestUtil( StoreIndexDescriptor schemaIndexDescriptor )
+    LocalDateTimeValueCreatorUtil( StoreIndexDescriptor schemaIndexDescriptor )
     {
         super( schemaIndexDescriptor );
     }
 
-    @Override
-    IndexLayout<LocalDateTimeIndexKey,NativeIndexValue> createLayout()
-    {
-        return new LocalDateTimeLayout();
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdates()
     {

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java → community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeValueCreatorUtil.java

@@ -30,7 +30,7 @@
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
-public class LocalTimeLayoutTestUtil extends LayoutTestUtil<LocalTimeIndexKey,NativeIndexValue>
+public class LocalTimeValueCreatorUtil extends ValueCreatorUtil<LocalTimeIndexKey,NativeIndexValue>
 {
     private static final LocalTime[] ALL_EXTREME_VALUES = new LocalTime[]
     {
@@ -42,17 +42,11 @@ public class LocalTimeLayoutTestUtil extends LayoutTestUtil<LocalTimeIndexKey,Na
             LocalTime.of(23,59,59,999_999_999 )
     };
 
-    LocalTimeLayoutTestUtil( StoreIndexDescriptor indexDescriptor )
+    LocalTimeValueCreatorUtil( StoreIndexDescriptor indexDescriptor )
     {
         super( indexDescriptor );
     }
 
-    @Override
-    IndexLayout<LocalTimeIndexKey,NativeIndexValue> createLayout()
-    {
-        return new LocalTimeLayout();
-    }
-
     @Override
     IndexEntryUpdate<IndexDescriptor>[] someUpdates()
     {

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTest.java

@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.Collections;
 
 import org.neo4j.gis.spatial.index.curves.StandardConfiguration;
 import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector;
@@ -49,56 +49,75 @@ public static Collection<Object[]> data()
         return Arrays.asList( new Object[][]{
                 {"Number",
                         numberAccessorFactory(),
-                        (LayoutTestUtilFactory) NumberLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) NumberValueCreatorUtil::new,
+                        (IndexLayoutFactory) NumberLayoutNonUnique::new
                 },
                 {"String",
                         stringAccessorFactory(),
-                        (LayoutTestUtilFactory) StringLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) StringValueCreatorUtil::new,
+                        (IndexLayoutFactory) StringLayout::new
                 },
                 {"Date",
                         temporalAccessorFactory( ValueGroup.DATE ),
-                        (LayoutTestUtilFactory) DateLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) DateValueCreatorUtil::new,
+                        (IndexLayoutFactory) DateLayout::new
                 },
                 {"DateTime",
                         temporalAccessorFactory( ValueGroup.ZONED_DATE_TIME ),
-                        (LayoutTestUtilFactory) DateTimeLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) DateTimeValueCreatorUtil::new,
+                        (IndexLayoutFactory) ZonedDateTimeLayout::new
                 },
                 {"Duration",
                         temporalAccessorFactory( ValueGroup.DURATION ),
-                        (LayoutTestUtilFactory) DurationLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) DurationValueCreatorUtil::new,
+                        (IndexLayoutFactory) DurationLayout::new
                 },
                 {"LocalDateTime",
                         temporalAccessorFactory( ValueGroup.LOCAL_DATE_TIME ),
-                        (LayoutTestUtilFactory) LocalDateTimeLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) LocalDateTimeValueCreatorUtil::new,
+                        (IndexLayoutFactory) LocalDateTimeLayout::new
                 },
                 {"LocalTime",
                         temporalAccessorFactory( ValueGroup.LOCAL_TIME ),
-                        (LayoutTestUtilFactory) LocalTimeLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) LocalTimeValueCreatorUtil::new,
+                        (IndexLayoutFactory) LocalTimeLayout::new
                 },
                 {"LocalDateTime",
                         temporalAccessorFactory( ValueGroup.LOCAL_DATE_TIME ),
-                        (LayoutTestUtilFactory) LocalDateTimeLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) LocalDateTimeValueCreatorUtil::new,
+                        (IndexLayoutFactory) LocalDateTimeLayout::new
                 },
                 {"Time",
                         temporalAccessorFactory( ValueGroup.ZONED_TIME ),
-                        (LayoutTestUtilFactory) TimeLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) TimeValueCreatorUtil::new,
+                        (IndexLayoutFactory) ZonedTimeLayout::new
                 },
                 {"Generic",
                         genericAccessorFactory(),
-                        (LayoutTestUtilFactory) GenericLayoutTestUtil::new
+                        (ValueCreatorUtilFactory) GenericValueCreatorUtil::new,
+                        (IndexLayoutFactory) () -> new GenericLayout( 1, spaceFillingCurveSettings )
                 },
                 //{ Spatial has it's own subclass because it need to override some of the test methods }
         } );
     }
 
+    private static final IndexSpecificSpaceFillingCurveSettingsCache spaceFillingCurveSettings =
+            new IndexSpecificSpaceFillingCurveSettingsCache( new ConfiguredSpaceFillingCurveSettingsCache( Config.defaults() ), Collections.emptyMap() );
+    private static final StandardConfiguration configuration = new StandardConfiguration();
+
     private final AccessorFactory<KEY,VALUE> accessorFactory;
-    private final LayoutTestUtilFactory<KEY,VALUE> layoutTestUtilFactory;
+    private final ValueCreatorUtilFactory<KEY,VALUE> valueCreatorUtilFactory;
+    private final IndexLayoutFactory<KEY,VALUE> indexLayoutFactory;
 
     @SuppressWarnings( "unused" )
-    public NativeIndexAccessorTest( String name, AccessorFactory<KEY,VALUE> accessorFactory, LayoutTestUtilFactory<KEY,VALUE> layoutTestUtilFactory )
+    public NativeIndexAccessorTest( String name,
+            AccessorFactory<KEY,VALUE> accessorFactory,
+            ValueCreatorUtilFactory<KEY,VALUE> valueCreatorUtilFactory,
+            IndexLayoutFactory<KEY,VALUE> indexLayoutFactory )
     {
         this.accessorFactory = accessorFactory;
-        this.layoutTestUtilFactory = layoutTestUtilFactory;
+        this.valueCreatorUtilFactory = valueCreatorUtilFactory;
+        this.indexLayoutFactory = indexLayoutFactory;
     }
 
     @Override
@@ -108,9 +127,15 @@ NativeIndexAccessor<KEY,VALUE> makeAccessor() throws IOException
     }
 
     @Override
-    LayoutTestUtil<KEY,VALUE> createLayoutTestUtil()
+    ValueCreatorUtil<KEY,VALUE> createValueCreatorUtil()
+    {
+        return valueCreatorUtilFactory.create( TestIndexDescriptorFactory.forLabel( 42, 666 ).withId( 0 ) );
+    }
+
+    @Override
+    IndexLayout<KEY,VALUE> createLayout()
     {
-        return layoutTestUtilFactory.create( TestIndexDescriptorFactory.forLabel( 42, 666 ).withId( 0 ) );
+        return indexLayoutFactory.create();
     }
 
     /* Helpers */
@@ -135,9 +160,6 @@ private static <TK extends NativeIndexSingleValueKey<TK>> AccessorFactory<TK,Nat
 
     private static AccessorFactory<CompositeGenericKey,NativeIndexValue> genericAccessorFactory()
     {
-        IndexSpecificSpaceFillingCurveSettingsCache spaceFillingCurveSettings =
-                new IndexSpecificSpaceFillingCurveSettingsCache( new ConfiguredSpaceFillingCurveSettingsCache( Config.defaults() ), new HashMap<>() );
-        StandardConfiguration configuration = new StandardConfiguration();
         return ( pageCache, fs, storeFile, layout, cleanup, monitor, descriptor ) ->
                 new GenericNativeIndexAccessor( pageCache, fs, storeFile, layout, cleanup, monitor, descriptor, spaceFillingCurveSettings, configuration );
     }

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTests.java

@@ -72,7 +72,7 @@
 import static org.neo4j.kernel.api.index.IndexEntryUpdate.change;
 import static org.neo4j.kernel.api.index.IndexEntryUpdate.remove;
 import static org.neo4j.kernel.impl.api.index.IndexUpdateMode.ONLINE;
-import static org.neo4j.kernel.impl.index.schema.LayoutTestUtil.countUniqueValues;
+import static org.neo4j.kernel.impl.index.schema.ValueCreatorUtil.countUniqueValues;
 import static org.neo4j.values.storable.Values.of;
 
 /**