Add helper methods for reading initial index state and failure message

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

@@ -105,7 +105,7 @@ public String getPopulationFailure( long indexId, IndexDescriptor descriptor ) t
     {
         try
         {
-            String failureMessage = readPopulationFailure( indexId, descriptor );
+            String failureMessage = NativeSchemaIndexes.readFailureMessage( pageCache, nativeIndexFileFromIndexId( indexId ), layout( descriptor ) );
             if ( failureMessage == null )
             {
                 throw new IllegalStateException( "Index " + indexId + " isn't failed" );
@@ -123,19 +123,7 @@ public InternalIndexState getInitialState( long indexId, IndexDescriptor descrip
     {
         try
         {
-            NativeSchemaIndexHeaderReader headerReader = new NativeSchemaIndexHeaderReader();
-            GBPTree.readHeader( pageCache, nativeIndexFileFromIndexId( indexId ), layout( descriptor ), headerReader );
-            switch ( headerReader.state )
-            {
-            case BYTE_FAILED:
-                return InternalIndexState.FAILED;
-            case BYTE_ONLINE:
-                return InternalIndexState.ONLINE;
-            case BYTE_POPULATING:
-                return InternalIndexState.POPULATING;
-            default:
-                throw new IllegalStateException( "Unexpected initial state byte value " + headerReader.state );
-            }
+            return NativeSchemaIndexes.readState( pageCache, nativeIndexFileFromIndexId( indexId ), layout( descriptor ) );
         }
         catch ( IOException e )
         {
@@ -152,13 +140,6 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio
         return StoreMigrationParticipant.NOT_PARTICIPATING;
     }
 
-    private String readPopulationFailure( long indexId, IndexDescriptor descriptor ) throws IOException
-    {
-        NativeSchemaIndexHeaderReader headerReader = new NativeSchemaIndexHeaderReader();
-        GBPTree.readHeader( pageCache, nativeIndexFileFromIndexId( indexId ), layout( descriptor ), headerReader );
-        return headerReader.failureMessage;
-    }
-
     private Layout<KEY,VALUE> layout( IndexDescriptor descriptor )
     {
         switch ( descriptor.type() )

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2002-2018 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.kernel.impl.index.schema;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.neo4j.index.internal.gbptree.GBPTree;
+import org.neo4j.index.internal.gbptree.Layout;
+import org.neo4j.internal.kernel.api.InternalIndexState;
+import org.neo4j.io.pagecache.PageCache;
+
+import static org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.BYTE_FAILED;
+import static org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.BYTE_ONLINE;
+import static org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.BYTE_POPULATING;
+
+public class NativeSchemaIndexes
+{
+    private  NativeSchemaIndexes()
+    {}
+
+    public static InternalIndexState readState( PageCache pageCache, File indexFile, Layout<?,?> layout ) throws IOException
+    {
+        NativeSchemaIndexHeaderReader headerReader = new NativeSchemaIndexHeaderReader();
+        GBPTree.readHeader( pageCache, indexFile, layout, headerReader );
+        switch ( headerReader.state )
+        {
+        case BYTE_FAILED:
+            return InternalIndexState.FAILED;
+        case BYTE_ONLINE:
+            return InternalIndexState.ONLINE;
+        case BYTE_POPULATING:
+            return InternalIndexState.POPULATING;
+        default:
+            throw new IllegalStateException( "Unexpected initial state byte value " + headerReader.state );
+        }
+    }
+
+    public static String readFailureMessage( PageCache pageCache, File indexFile, Layout<?,?> layout )
+            throws IOException
+    {
+        NativeSchemaIndexHeaderReader headerReader = new NativeSchemaIndexHeaderReader();
+        GBPTree.readHeader( pageCache, indexFile, layout, headerReader );
+        return headerReader.failureMessage;
+    }
+}

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

@@ -57,7 +57,6 @@
 import static org.neo4j.helpers.collection.Iterators.asResourceIterator;
 import static org.neo4j.helpers.collection.Iterators.iterator;
 import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_WRITER;
-import static org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.BYTE_FAILED;
 import static org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.BYTE_ONLINE;
 import static org.neo4j.kernel.impl.index.schema.NativeSchemaIndexPopulator.BYTE_POPULATING;
 
@@ -329,26 +328,12 @@ public boolean indexExists()
 
     public String readPopulationFailure( IndexDescriptor descriptor ) throws IOException
     {
-        NativeSchemaIndexHeaderReader headerReader = new NativeSchemaIndexHeaderReader();
-        GBPTree.readHeader( pageCache, indexFile, layout( descriptor ), headerReader );
-        return headerReader.failureMessage;
+        return NativeSchemaIndexes.readFailureMessage( pageCache, indexFile, layout( descriptor ) );
     }
 
     public InternalIndexState readState( IndexDescriptor descriptor ) throws IOException
     {
-        NativeSchemaIndexHeaderReader headerReader = new NativeSchemaIndexHeaderReader();
-        GBPTree.readHeader( pageCache, indexFile, layout( descriptor ), headerReader );
-        switch ( headerReader.state )
-        {
-        case BYTE_FAILED:
-            return InternalIndexState.FAILED;
-        case BYTE_ONLINE:
-            return InternalIndexState.ONLINE;
-        case BYTE_POPULATING:
-            return InternalIndexState.POPULATING;
-        default:
-            throw new IllegalStateException( "Unexpected initial state byte value " + headerReader.state );
-        }
+        return NativeSchemaIndexes.readState( pageCache, indexFile, layout( descriptor ) );
     }
 
     private synchronized void create() throws IOException