Added spatial fusion tests

neo4j · Feb 14, 2018 · cd00c9e · cd00c9e
1 parent d011eba
commit cd00c9e
Show file tree

Hide file tree

Showing 11 changed files with 1,284 additions and 27 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialKnownIndex.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialKnownIndex.java
@@ -55,7 +55,7 @@ public class SpatialKnownIndex
 
     public interface Factory
     {
-        SpatialKnownIndex selectAndCreate( Map<CoordinateReferenceSystem,SpatialKnownIndex> indexMap, long indexId, Value... values );
+        SpatialKnownIndex selectAndCreate( Map<CoordinateReferenceSystem,SpatialKnownIndex> indexMap, long indexId, Value value );
 
         SpatialKnownIndex selectAndCreate( Map<CoordinateReferenceSystem,SpatialKnownIndex> indexMap, long indexId, CoordinateReferenceSystem crs );
     }

diff --git a/.../src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulator.java b/.../src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexPopulator.java
@@ -128,7 +128,10 @@ public void markAsFailed( String failure ) throws IOException
     @Override
     public void includeSample( IndexEntryUpdate<?> update )
     {
-        indexFactory.selectAndCreate( indexMap, indexId, update.values() ).getPopulator( descriptor, samplingConfig ).includeSample( update );
+        Value[] values = update.values();
+        assert values.length == 1;
+        SpatialKnownIndex index = indexFactory.selectAndCreate( indexMap, indexId, values[0] );
+        index.getPopulator( descriptor, samplingConfig ).includeSample( update );
     }
 
     @Override

diff --git a/...nel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReader.java b/...nel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexReader.java
@@ -21,6 +21,7 @@
 
 import java.util.Map;
 
+import org.neo4j.collection.primitive.PrimitiveLongResourceCollections;
 import org.neo4j.collection.primitive.PrimitiveLongResourceIterator;
 import org.neo4j.internal.kernel.api.IndexOrder;
 import org.neo4j.internal.kernel.api.IndexQuery;
@@ -95,9 +96,23 @@ public IndexSampler createSampler()
     @Override
     public PrimitiveLongResourceIterator query( IndexQuery... predicates ) throws IndexNotApplicableKernelException
     {
-        NodeValueIterator nodeValueIterator = new NodeValueIterator();
+        if ( predicates[0] instanceof ExistsPredicate )
-        query( nodeValueIterator, IndexOrder.NONE, predicates );
+        {
-        return nodeValueIterator;
+            PrimitiveLongResourceIterator[] iterators = new PrimitiveLongResourceIterator[readerMap.size()];
+            int i = 0;
+            for ( IndexReader reader : readerMap.values() )
+            {
+                iterators[i] = reader.query( predicates[0] );
+                ++i;
+            }
+            return PrimitiveLongResourceCollections.concat( iterators );
+        }
+        else
+        {
+            NodeValueIterator nodeValueIterator = new NodeValueIterator();
+            query( nodeValueIterator, IndexOrder.NONE, predicates );
+            return nodeValueIterator;
+        }
     }
 
     private IndexReader selectIf( IndexQuery... predicates ) throws IndexNotApplicableKernelException

diff --git a/...el/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdater.java b/...el/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionIndexUpdater.java
@@ -35,6 +35,8 @@
 import org.neo4j.values.storable.PointValue;
 import org.neo4j.values.storable.Value;
 
+import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexUtils.forAll;
+
 class SpatialFusionIndexUpdater implements IndexUpdater
 {
     private final Map<CoordinateReferenceSystem,SpatialKnownIndex> indexMap;
@@ -136,10 +138,7 @@ public void close() throws IOException, IndexEntryConflictException
     {
         while ( !currentUpdaters.isEmpty() )
         {
-            for ( IndexUpdater updater : currentUpdaters.values() )
+            forAll( updater -> ((IndexUpdater) updater).close(), currentUpdaters.values().toArray() );
-            {
-                updater.close();
-            }
             currentUpdaters.clear();
         }
     }

diff --git a/...main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionSchemaIndexProvider.java b/...main/java/org/neo4j/kernel/impl/index/schema/fusion/SpatialFusionSchemaIndexProvider.java
@@ -91,7 +91,7 @@ public IndexAccessor getOnlineAccessor( long indexId, IndexDescriptor descriptor
         return new SpatialFusionIndexAccessor( indexesFor( indexId ), indexId, descriptor, samplingConfig, this );
     }
 
-    private Map<CoordinateReferenceSystem,SpatialKnownIndex> indexesFor( long indexId )
+    Map<CoordinateReferenceSystem,SpatialKnownIndex> indexesFor( long indexId )
     {
         return indexes.computeIfAbsent( indexId, k -> new HashMap<>() );
     }
@@ -170,10 +170,9 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio
     }
 
     @Override
-    public SpatialKnownIndex selectAndCreate( Map<CoordinateReferenceSystem,SpatialKnownIndex> indexMap, long indexId, Value... values )
+    public SpatialKnownIndex selectAndCreate( Map<CoordinateReferenceSystem,SpatialKnownIndex> indexMap, long indexId, Value value )
     {
-        assert values.length == 1;
+        PointValue pointValue = (PointValue) value;
-        PointValue pointValue = (PointValue) values[0];
         CoordinateReferenceSystem crs = pointValue.getCoordinateReferenceSystem();
         return selectAndCreate( indexMap, indexId, crs );
     }
@@ -188,7 +187,12 @@ public SpatialKnownIndex selectAndCreate( Map<CoordinateReferenceSystem,SpatialK
     private void findAndCreateKnownSpatialIndexes()
     {
         Pattern pattern = Pattern.compile( "(\\d+)-(\\d+)" );
-        File[] files = this.directoryStructure().rootDirectory().listFiles();
+        File rootDirectory = this.directoryStructure().rootDirectory();
+        if (rootDirectory == null)
+        {
+            return;
+        }
+        File[] files = rootDirectory.listFiles();
         if ( files != null )
         {
             for ( File file : files )

diff --git a/...rnel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java b/...rnel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessorTest.java
@@ -417,50 +417,50 @@ public void allEntriesReaderMustReportFusionMaxCountOfNativeAndLucene()
         assertThat( fusionAllEntriesReader.maxCount(), is( 6L ) );
     }
 
-    private void assertResultContainsAll( Set<Long> result, long[] nativeEntries )
+    static void assertResultContainsAll( Set<Long> result, long[] nativeEntries )
     {
         for ( long nativeEntry : nativeEntries )
         {
             assertTrue( "Expected to contain " + nativeEntry + ", but was " + result, result.contains( nativeEntry ) );
         }
     }
 
-    private void mockAllEntriesReaders( long[] nativeEntries, long[] luceneEntries )
+    static BoundedIterable<Long> mockSingleAllEntriesReader( IndexAccessor targetAccessor, long[] entries )
-    {
-        mockSingleAllEntriesReader( nativeAccessor, nativeEntries );
-        mockSingleAllEntriesReader( spatialAccessor, nativeEntries );
-        mockSingleAllEntriesReader( luceneAccessor, luceneEntries );
-    }
-
-    private BoundedIterable<Long> mockSingleAllEntriesReader( IndexAccessor targetAccessor, long[] entries )
     {
         BoundedIterable<Long> allEntriesReader = mockedAllEntriesReader( entries );
         when( targetAccessor.newAllEntriesReader() ).thenReturn( allEntriesReader );
         return allEntriesReader;
     }
 
-    private BoundedIterable<Long> mockedAllEntriesReader( long... entries )
+    static BoundedIterable<Long> mockedAllEntriesReader( long... entries )
     {
         return mockedAllEntriesReader( true, entries );
     }
 
-    private BoundedIterable<Long> mockSingleAllEntriesReaderWithUnknownMaxCount( IndexAccessor targetAccessor, long[] entries )
+    static BoundedIterable<Long> mockSingleAllEntriesReaderWithUnknownMaxCount( IndexAccessor targetAccessor, long[] entries )
     {
         BoundedIterable<Long> allEntriesReader = mockedAllEntriesReaderUnknownMaxCount( entries );
         when( targetAccessor.newAllEntriesReader() ).thenReturn( allEntriesReader );
         return allEntriesReader;
     }
 
-    private BoundedIterable<Long> mockedAllEntriesReaderUnknownMaxCount( long... entries )
+    static BoundedIterable<Long> mockedAllEntriesReaderUnknownMaxCount( long... entries )
     {
         return mockedAllEntriesReader( false, entries );
     }
 
-    private BoundedIterable<Long> mockedAllEntriesReader( boolean knownMaxCount, long... entries )
+    static BoundedIterable<Long> mockedAllEntriesReader( boolean knownMaxCount, long... entries )
     {
         BoundedIterable<Long> mockedAllEntriesReader = mock( BoundedIterable.class );
         when( mockedAllEntriesReader.maxCount() ).thenReturn( knownMaxCount ? entries.length : BoundedIterable.UNKNOWN_MAX_COUNT );
         when( mockedAllEntriesReader.iterator() ).thenReturn( Iterators.asIterator(entries ) );
         return mockedAllEntriesReader;
     }
+
+    private void mockAllEntriesReaders( long[] nativeEntries, long[] luceneEntries )
+    {
+        mockSingleAllEntriesReader( nativeAccessor, nativeEntries );
+        mockSingleAllEntriesReader( spatialAccessor, nativeEntries );
+        mockSingleAllEntriesReader( luceneAccessor, luceneEntries );
+    }
 }