Fix compilation issues after rebase

neo4j · Oct 3, 2018 · eb5e298 · eb5e298
1 parent 8a6d568
commit eb5e298
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/...unity-it/kernel-it/src/test/java/org/neo4j/kernel/impl/newapi/IndexProvidedOrderTest.java b/...unity-it/kernel-it/src/test/java/org/neo4j/kernel/impl/newapi/IndexProvidedOrderTest.java
@@ -42,6 +42,7 @@
 import org.neo4j.values.storable.RandomValues;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueTuple;
+import org.neo4j.values.storable.ValueType;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -59,7 +60,7 @@ public class IndexProvidedOrderTest extends KernelAPIReadTestBase<ReadTestSuppor
 
     private TreeSet<NodeValueTuple> singlePropValues = new TreeSet<>( COMPARATOR );
     private TreeSet<NodeValueTuple> doublePropValues = new TreeSet<>( COMPARATOR );
-    private RandomValues.Type[] targetedTypes;
+    private ValueType[] targetedTypes;
 
     @Override
     public ReadTestSupport newTestSupport()
@@ -86,17 +87,17 @@ public void createTestGraph( GraphDatabaseService graphDb )
 
         RandomValues randomValues = randomRule.randomValues();
 
-        RandomValues.Type[] allExceptNonOrderable = RandomValues.excluding(
-                RandomValues.Type.STRING,
-                RandomValues.Type.STRING_ARRAY,
-                RandomValues.Type.GEOGRAPHIC_POINT,
-                RandomValues.Type.GEOGRAPHIC_POINT_ARRAY,
-                RandomValues.Type.GEOGRAPHIC_POINT_3D,
-                RandomValues.Type.GEOGRAPHIC_POINT_3D_ARRAY,
-                RandomValues.Type.CARTESIAN_POINT,
-                RandomValues.Type.CARTESIAN_POINT_ARRAY,
-                RandomValues.Type.CARTESIAN_POINT_3D,
-                RandomValues.Type.CARTESIAN_POINT_3D_ARRAY
+        ValueType[] allExceptNonOrderable = RandomValues.excluding(
+                ValueType.STRING,
+                ValueType.STRING_ARRAY,
+                ValueType.GEOGRAPHIC_POINT,
+                ValueType.GEOGRAPHIC_POINT_ARRAY,
+                ValueType.GEOGRAPHIC_POINT_3D,
+                ValueType.GEOGRAPHIC_POINT_3D_ARRAY,
+                ValueType.CARTESIAN_POINT,
+                ValueType.CARTESIAN_POINT_ARRAY,
+                ValueType.CARTESIAN_POINT_3D,
+                ValueType.CARTESIAN_POINT_3D_ARRAY
         );
         targetedTypes = randomValues.selection( allExceptNonOrderable, 1, allExceptNonOrderable.length, false );
         try ( Transaction tx = graphDb.beginTx() )
@@ -136,7 +137,7 @@ public void shouldProvideResultInOrderIfCapable() throws KernelException
         IndexReference index = schemaRead.index( label, prop );
         for ( int i = 0; i < N_ITERATIONS; i++ )
         {
-            RandomValues.Type type = randomValues.among( targetedTypes );
+            ValueType type = randomValues.among( targetedTypes );
             IndexOrder[] order = index.orderCapability( type.valueGroup.category() );
             for ( IndexOrder indexOrder : order )
             {

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
@@ -182,7 +182,7 @@ private static <TK extends NativeIndexSingleValueKey<TK>> AccessorFactory<TK,Nat
         };
     }
 
-    private static AccessorFactory<CompositeGenericKey,NativeIndexValue> genericAccessorFactory()
+    private static AccessorFactory<GenericKey,NativeIndexValue> genericAccessorFactory()
     {
         return ( pageCache, fs, storeFile, layout, cleanup, monitor, descriptor ) ->
                 new GenericNativeIndexAccessor( pageCache, fs, storeFile, layout, cleanup, monitor, descriptor, spaceFillingCurveSettings, configuration );

diff --git a/...ity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexPopulatorTest.java b/...ity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexPopulatorTest.java
@@ -118,7 +118,7 @@ private static <TK extends NativeIndexSingleValueKey<TK>> PopulatorFactory<TK,Na
         };
     }
 
-    private static PopulatorFactory<CompositeGenericKey,NativeIndexValue> genericPopulatorFactory()
+    private static PopulatorFactory<GenericKey,NativeIndexValue> genericPopulatorFactory()
     {
         return ( pageCache, fs, storeFile, layout, monitor, descriptor ) ->
                 new GenericNativeIndexPopulator( pageCache, fs, storeFile, layout, monitor, descriptor, spaceFillingCurveSettings,

diff --git a/...nity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTest.java b/...nity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTest.java
@@ -75,7 +75,7 @@ public static Object[][] data()
     private static ProviderFactory genericProviderFactory()
     {
         return ( pageCache, fs, dir, monitor, collector, readOnly ) ->
-                new GenericNativeIndexProvider( 0, dir, pageCache, fs, monitor, collector, readOnly, Config.defaults() );
+                new GenericNativeIndexProvider( dir, pageCache, fs, monitor, collector, readOnly, Config.defaults() );
     }
 
     private static ProviderFactory spatialProviderFactory()