From b8b01e3acc5fd5fd5443cae1b44b3041c02e3a01 Mon Sep 17 00:00:00 2001
From: Olivia Ytterbrink <olivia.ytterbrink@neotechnology.com>
Date: Wed, 7 Mar 2018 17:13:08 +0100
Subject: [PATCH] Use simplified layout/key model

---
 .../kernel/impl/index/schema/SpatialCRSSchemaIndex.java   | 3 ++-
 .../org/neo4j/kernel/impl/index/schema/SpatialLayout.java | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java
index 55e7cad22ed7..2fc791abe266 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialCRSSchemaIndex.java
@@ -37,6 +37,7 @@
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.helpers.collection.BoundedIterable;
 import org.neo4j.helpers.collection.Pair;
+import org.neo4j.index.internal.gbptree.Layout;
 import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector;
 import org.neo4j.internal.kernel.api.InternalIndexState;
 import org.neo4j.io.fs.FileSystemAbstraction;
@@ -79,7 +80,7 @@ public class SpatialCRSSchemaIndex
     private byte[] failureBytes;
     private SpatialSchemaKey treeKey;
     private NativeSchemaValue treeValue;
-    private SpatialLayout layout;
+    private Layout<SpatialSchemaKey,NativeSchemaValue> layout;
     private NativeSchemaIndexUpdater<SpatialSchemaKey,NativeSchemaValue> singleUpdater;
     private NativeSchemaIndex<SpatialSchemaKey,NativeSchemaValue> schemaIndex;
     private WorkSync<IndexUpdateApply<SpatialSchemaKey,NativeSchemaValue>,IndexUpdateWork<SpatialSchemaKey,NativeSchemaValue>> additionsWorkSync;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayout.java
index 3bc674433e36..dbbf9a48577b 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayout.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayout.java
@@ -25,7 +25,7 @@
 import org.neo4j.values.storable.CoordinateReferenceSystem;
 
 /**
- * {@link Layout} for PointValues where they don't need to be unique.
+ * {@link Layout} for PointValues.
  */
 class SpatialLayout extends SchemaLayout<SpatialSchemaKey>
 {
@@ -80,10 +80,4 @@ public void readKey( PageCursor cursor, SpatialSchemaKey into, int keySize )
         into.rawValueBits = cursor.getLong();
         into.setEntityId( cursor.getLong() );
     }
-
-    @Override
-    int compareValue( SpatialSchemaKey o1, SpatialSchemaKey o2 )
-    {
-        return o1.compareValueTo( o2 );
-    }
 }