Made spatial index settings immutable

So that the difference between config based settings for new indexes
is more clearly separate from settings read from existing indexes.

community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java

@@ -189,7 +189,7 @@ static class PartAccessor extends NativeIndexAccessor<SpatialIndexKey,NativeInde
                 RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor,
                 IndexSamplingConfig samplingConfig, SpaceFillingCurveConfiguration searchConfiguration ) throws IOException
         {
-            super( pageCache, fs, fileLayout.indexFile, fileLayout.layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig );
+            super( pageCache, fs, fileLayout.spatialFile.indexFile, fileLayout.layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig );
             this.layout = fileLayout.layout;
             this.descriptor = descriptor;
             this.samplingConfig = samplingConfig;
@@ -237,19 +237,21 @@ static class PartFactory implements Factory<PartAccessor>
         @Override
         public PartAccessor newSpatial( CoordinateReferenceSystem crs ) throws IOException
         {
-            return createPartAccessor( spatialIndexFiles.forCrs( crs ) );
-        }
-
-        private PartAccessor createPartAccessor( SpatialIndexFiles.SpatialFileLayout fileLayout ) throws IOException
-        {
-            if ( !fs.fileExists( fileLayout.indexFile ) )
+            SpatialIndexFiles.SpatialFile indexFile = spatialIndexFiles.forCrs( crs );
+            if ( !fs.fileExists( indexFile.indexFile ) )
             {
+                SpatialIndexFiles.SpatialFileLayout fileLayout = indexFile.getLayoutForNewIndex();
                 createEmptyIndex( fileLayout );
+                return createPartAccessor( fileLayout );
             }
             else
             {
-                fileLayout.readHeader( pageCache );
+                return createPartAccessor( indexFile.getLayoutForExistingIndex( pageCache ) );
             }
+        }
+
+        private PartAccessor createPartAccessor( SpatialIndexFiles.SpatialFileLayout fileLayout ) throws IOException
+        {
             return new PartAccessor( pageCache,
                                      fs,
                                      fileLayout,

community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexFiles.java

@@ -26,7 +26,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.neo4j.index.internal.gbptree.GBPTree;
 import org.neo4j.index.internal.gbptree.Layout;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
@@ -49,27 +48,27 @@ class SpatialIndexFiles
         indexDirectory = directoryStructure.directoryForIndex( indexId );
     }
 
-    Iterable<SpatialFileLayout> existing()
+    Iterable<SpatialFile> existing()
     {
-        List<SpatialFileLayout> existing = new ArrayList<>();
+        List<SpatialFile> existing = new ArrayList<>();
         addExistingFiles( existing );
         return existing;
     }
 
     <T> void loadExistingIndexes( SpatialIndexCache<T> indexCache ) throws IOException
     {
-        for ( SpatialFileLayout fileLayout : existing() )
+        for ( SpatialFile fileLayout : existing() )
         {
             indexCache.select( fileLayout.crs );
         }
     }
 
-    SpatialFileLayout forCrs( CoordinateReferenceSystem crs )
+    SpatialFile forCrs( CoordinateReferenceSystem crs )
     {
-        return new SpatialFileLayout( crs, settingsFactory.settingsFor( crs ).clone(), indexDirectory );
+        return new SpatialFile( crs, settingsFactory, indexDirectory );
     }
 
-    private void addExistingFiles( List<SpatialFileLayout> existing )
+    private void addExistingFiles( List<SpatialFile> existing )
     {
         File[] files = fs.listFiles( indexDirectory );
         if ( files != null )
@@ -89,30 +88,50 @@ private void addExistingFiles( List<SpatialFileLayout> existing )
         }
     }
 
-    static class SpatialFileLayout
+    static class SpatialFile
     {
         final File indexFile;
-        final SpaceFillingCurveSettings settings;
+        final SpaceFillingCurveSettingsFactory settings;
         private final CoordinateReferenceSystem crs;
-        Layout<SpatialIndexKey,NativeIndexValue> layout;
 
-        SpatialFileLayout( CoordinateReferenceSystem crs, SpaceFillingCurveSettings settings, File indexDirectory )
+        SpatialFile( CoordinateReferenceSystem crs, SpaceFillingCurveSettingsFactory settingsFactory, File indexDirectory )
         {
             this.crs = crs;
-            this.settings = settings;
-            this.layout = new SpatialLayout( crs, settings.curve() );
+            this.settings = settingsFactory;
             String s = crs.getTable().getTableId() + "-" + Integer.toString( crs.getCode() );
             this.indexFile = new File( indexDirectory, s );
         }
 
-        public void readHeader( PageCache pageCache ) throws IOException
+        /**
+         * If this is the first time an index is being created, get the layout settings from the config settings only
+         */
+        SpatialFileLayout getLayoutForNewIndex()
         {
-            GBPTree.readHeader( pageCache, indexFile, settings.headerReader( NativeIndexHeaderReader::readFailureMessage ) );
-            if ( settings.isFailed() )
-            {
-                throw new IOException( settings.getFailureMessage() );
-            }
-            this.layout = new SpatialLayout( crs, settings.curve() );
+            return new SpatialFileLayout( this, settings.settingsFor( crs ) );
+        }
+
+        /**
+         * If we are loading a layout for an existing index, read the settings from the index header, and ignore config settings
+         */
+        SpatialFileLayout getLayoutForExistingIndex( PageCache pageCache ) throws IOException
+        {
+            SpaceFillingCurveSettings settings =
+                    SpaceFillingCurveSettings.fromGBPTree( indexFile, pageCache, NativeIndexHeaderReader::readFailureMessage );
+            return new SpatialFileLayout( this, settings );
+        }
+    }
+
+    static class SpatialFileLayout
+    {
+        final SpaceFillingCurveSettings settings;
+        final SpatialFile spatialFile;
+        final Layout<SpatialIndexKey,NativeIndexValue> layout;
+
+        SpatialFileLayout( SpatialFile spatialFile, SpaceFillingCurveSettings settings )
+        {
+            this.spatialFile = spatialFile;
+            this.settings = settings;
+            this.layout = new SpatialLayout( spatialFile.crs, settings.curve() );
         }
     }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java

@@ -151,7 +151,7 @@ static class PartPopulator extends NativeIndexPopulator<SpatialIndexKey,NativeIn
         PartPopulator( PageCache pageCache, FileSystemAbstraction fs, SpatialIndexFiles.SpatialFileLayout fileLayout, IndexProvider.Monitor monitor,
                        StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpaceFillingCurveConfiguration configuration )
         {
-            super( pageCache, fs, fileLayout.indexFile, fileLayout.layout, monitor, descriptor, samplingConfig );
+            super( pageCache, fs, fileLayout.spatialFile.indexFile, fileLayout.layout, monitor, descriptor, samplingConfig );
             this.configuration = configuration;
             this.settings = fileLayout.settings;
         }
@@ -200,7 +200,7 @@ static class PartFactory implements Factory<PartPopulator>
         @Override
         public PartPopulator newSpatial( CoordinateReferenceSystem crs ) throws IOException
         {
-            return create( spatialIndexFiles.forCrs(crs) );
+            return create( spatialIndexFiles.forCrs( crs ).getLayoutForNewIndex() );
         }
 
         private PartPopulator create( SpatialIndexFiles.SpatialFileLayout fileLayout ) throws IOException

community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java

@@ -118,7 +118,7 @@ public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws Ill
 
         try
         {
-            for ( SpatialIndexFiles.SpatialFileLayout subIndex : spatialIndexFiles.existing() )
+            for ( SpatialIndexFiles.SpatialFile subIndex : spatialIndexFiles.existing() )
             {
                 String indexFailure = NativeIndexes.readFailureMessage( pageCache, subIndex.indexFile );
                 if ( indexFailure != null )
@@ -139,9 +139,9 @@ public InternalIndexState getInitialState( StoreIndexDescriptor descriptor )
     {
         SpatialIndexFiles spatialIndexFiles = new SpatialIndexFiles( directoryStructure(), descriptor.getId(), fs, settingsFactory );
 
-        final Iterable<SpatialIndexFiles.SpatialFileLayout> existing = spatialIndexFiles.existing();
+        final Iterable<SpatialIndexFiles.SpatialFile> existing = spatialIndexFiles.existing();
         InternalIndexState state = InternalIndexState.ONLINE;
-        for ( SpatialIndexFiles.SpatialFileLayout subIndex : existing )
+        for ( SpatialIndexFiles.SpatialFile subIndex : existing )
         {
             try
             {