WIP start of true composite support

neo4j · Jul 27, 2018 · 33af284 · 33af284
1 parent ddea2af
commit 33af284
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/.../src/test/java/org/neo4j/kernel/api/index/GenericIndexProviderCompatibilitySuiteTest.java b/.../src/test/java/org/neo4j/kernel/api/index/GenericIndexProviderCompatibilitySuiteTest.java
@@ -56,4 +56,10 @@ public boolean supportsTemporal()
     {
         return true;
     }
+
+    @Override
+    public boolean supportsGranularCompositeQueries()
+    {
+        return true;
+    }
 }
diff --git a/...rnel-it/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java b/...rnel-it/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java
@@ -68,6 +68,11 @@ public abstract class IndexProviderCompatibilityTestSuite
 
     public abstract boolean supportsTemporal();
 
+    public boolean supportsGranularCompositeQueries()
+    {
+        return false;
+    }
+
     public abstract static class Compatibility
     {
         @Rule

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericKeyState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericKeyState.java
@@ -79,7 +79,7 @@ class GenericKeyState extends TemporalValueWriterAdapter<RuntimeException>
     private long long2;
     private long long3;
     private byte[] byteArray;
-    private NativeIndexKey.Inclusion inclusion;
+    NativeIndexKey.Inclusion inclusion;
 
     void clear()
     {
@@ -554,6 +554,11 @@ void copyFrom( GenericKeyState key )
     }
 
     int size()
+    {
+        return valueSize() + TYPE_ID_SIZE;
+    }
+
+    private int valueSize()
     {
         // TODO copy-pasted from individual keys
         // TODO also put this in Type enum

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericLayout.java
@@ -30,8 +30,8 @@
 
 class GenericLayout extends IndexLayout<CompositeGenericKey>
 {
-    private static final int KEY_HEADER_SIZE = Byte.BYTES;
     static final Comparator<Type> TYPE_COMPARATOR = comparing( t -> t.valueGroup );
+    private final int numberOfSlots;
 
     enum Type
     {
@@ -72,16 +72,16 @@ enum Type
         }
     }
 
-    GenericLayout()
+    GenericLayout( int numberOfSlots )
     {
         super( "NSIL", 0, 1 );
+        this.numberOfSlots = numberOfSlots;
     }
 
     @Override
     public CompositeGenericKey newKey()
     {
-        // TODO for now it's not composite
-        return new CompositeGenericKey( 1 );
+        return new CompositeGenericKey( numberOfSlots );
     }
 
     @Override
@@ -95,11 +95,6 @@ public CompositeGenericKey copyKey( CompositeGenericKey key, CompositeGenericKey
 
     @Override
     public int keySize( CompositeGenericKey key )
-    {
-        return KEY_HEADER_SIZE + actualKeySize( key );
-    }
-
-    private int actualKeySize( CompositeGenericKey key )
     {
         return key.size();
     }

diff --git a/...y/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProvider.java b/...y/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProvider.java
@@ -70,7 +70,8 @@ public GenericNativeIndexProvider( int priority, IndexDirectoryStructure.Factory
     @Override
     Layout<CompositeGenericKey,NativeIndexValue> layout( StoreIndexDescriptor descriptor )
     {
-        return new GenericLayout();
+        int numberOfSlots = descriptor.properties().length;
+        return new GenericLayout( numberOfSlots );
     }
 
     @Override