More efficient getRecordSize()

which allows getting record size to be inlined in CommonAbstractStore.

community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java

@@ -75,6 +75,7 @@ public abstract class CommonAbstractStore<RECORD extends AbstractBaseRecord>
     private boolean storeOk = true;
     private Throwable causeOfStoreNotOk;
     private final String typeDescriptor;
+    protected int recordSize;
 
     /**
      * Opens and validates the store contained in <CODE>fileName</CODE>
@@ -204,11 +205,15 @@ protected void initialiseNewStoreFile( PagedFile file ) throws IOException
             }
         }
 
+        // Determine record size right after writing the header since some stores
+        // use it when initializing their stores to write some records.
+        recordSize = determineRecordSize();
+
         File idFileName = new File( storageFileName.getPath() + ".id" );
         idGeneratorFactory.create( idFileName, getNumberOfReservedLowIds(), true );
     }
 
-    protected void createHeaderRecord( PageCursor cursor )
+    protected void createHeaderRecord( PageCursor cursor ) throws IOException
     {
         assert getNumberOfReservedLowIds() == 0;
     }
@@ -231,7 +236,7 @@ protected void loadStorage()
         }
         catch ( IOException e )
         {
-            // TODO: Just throw IOException, add proper handling further up
+            // Just throw IOException, add proper handling further up
             throw new UnderlyingStorageException( e );
         }
         loadIdGenerator();
@@ -261,34 +266,35 @@ private void extractHeaderRecord() throws IOException
         {
             readHeaderAndInitializeRecordFormat( null );
         }
+        recordSize = determineRecordSize();
     }
 
     protected long pageIdForRecord( long id )
     {
-        return RecordPageLocationCalculator.pageIdForRecord( id, storeFile.pageSize(), getRecordSize() );
+        return RecordPageLocationCalculator.pageIdForRecord( id, storeFile.pageSize(), recordSize );
     }
 
     protected int offsetForId( long id )
     {
-        return RecordPageLocationCalculator.offsetForId( id, storeFile.pageSize(), getRecordSize() );
+        return RecordPageLocationCalculator.offsetForId( id, storeFile.pageSize(), recordSize );
     }
 
     @Override
     public int getRecordsPerPage()
     {
-        return storeFile.pageSize() / getRecordSize();
+        return storeFile.pageSize() / recordSize;
     }
 
     public byte[] getRawRecordData( long id ) throws IOException
     {
-        byte[] data = new byte[getRecordSize()];
+        byte[] data = new byte[recordSize];
         try ( PageCursor pageCursor = storeFile.io( id / getRecordsPerPage(), PagedFile.PF_SHARED_READ_LOCK ) )
         {
             if ( pageCursor.next() )
             {
                 do
                 {
-                    pageCursor.setOffset( (int) (id % getRecordsPerPage() * getRecordSize()) );
+                    pageCursor.setOffset( (int) (id % getRecordsPerPage() * recordSize) );
                     pageCursor.getBytes( data );
                 }
                 while ( pageCursor.shouldRetry() );
@@ -726,8 +732,13 @@ private boolean isJustLegacyStoreTrailer( PageCursor cursor, int offset, byte[]
         }
     }
 
+    protected abstract int determineRecordSize();
+
     @Override
-    public abstract int getRecordSize();
+    public final int getRecordSize()
+    {
+        return recordSize;
+    }
 
     @Override
     public int getRecordDataSize()

community/kernel/src/main/java/org/neo4j/kernel/impl/store/ComposableRecordStore.java

@@ -38,7 +38,6 @@ public class ComposableRecordStore<RECORD extends AbstractBaseRecord, HEADER ext
     protected final RecordFormat<RECORD> recordFormat;
     protected final StoreHeaderFormat<HEADER> storeHeaderFormat;
     protected HEADER storeHeader;
-    private int recordSize;
 
     public ComposableRecordStore( File fileName, Config configuration, IdType idType,
             IdGeneratorFactory idGeneratorFactory, PageCache pageCache, LogProvider logProvider, String typeDescriptor,
@@ -58,9 +57,9 @@ public RECORD newRecord()
     }
 
     @Override
-    public int getRecordSize()
+    protected int determineRecordSize()
     {
-        return recordSize;
+        return recordFormat.getRecordSize( storeHeader );
     }
 
     @Override
@@ -97,9 +96,12 @@ public long getNextRecordReference( RECORD record )
     }
 
     @Override
-    protected void createHeaderRecord( PageCursor cursor )
+    protected void createHeaderRecord( PageCursor cursor ) throws IOException
     {
+        int offset = cursor.getOffset();
         storeHeaderFormat.writeHeader( cursor );
+        cursor.setOffset( offset );
+        readHeaderAndInitializeRecordFormat( cursor );
     }
 
     @Override
@@ -112,7 +114,6 @@ public int getNumberOfReservedLowIds()
     protected void readHeaderAndInitializeRecordFormat( PageCursor cursor ) throws IOException
     {
         storeHeader = storeHeaderFormat.readHeader( cursor );
-        recordSize = recordFormat.getRecordSize( storeHeader );
     }
 
     @Override

community/kernel/src/main/java/org/neo4j/kernel/impl/store/MetaDataStore.java

@@ -97,8 +97,6 @@ public String description()
         }
     }
 
-    public static final int META_DATA_RECORD_COUNT = Position.values().length;
-
     // Fields the neostore keeps cached and must be initialized on startup
     private volatile long creationTimeField = FIELD_NOT_INITIALIZED;
     private volatile long randomNumberField = FIELD_NOT_INITIALIZED;
@@ -173,18 +171,6 @@ protected void initialiseNewStoreFile( PagedFile file ) throws IOException
         storeFile = null;
     }
 
-    @Override
-    protected void createHeaderRecord( PageCursor cursor )
-    {
-        // We aren't creating a header, but we have said that we have reserved low ids.
-    }
-
-    @Override
-    public int getNumberOfReservedLowIds()
-    {
-        return META_DATA_RECORD_COUNT;
-    }
-
     // Only for initialization and recovery, so we don't need to lock the records
     @Override
     public void setLastCommittedAndClosedTransactionId(
@@ -202,7 +188,7 @@ public void setLastCommittedAndClosedTransactionId(
     }
 
     @Override
-    public int getRecordSize()
+    protected int determineRecordSize()
     {
         return RECORD_SIZE;
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/lowlimit/LowLimitV2_0.java

@@ -52,7 +52,7 @@ public RecordFormat<NodeRecord> node()
     public RecordFormat<RelationshipRecord> relationship()
     {
         // Yes, uses the same relationship record format as 1.9
-        return new RelationshipRecordFormatV1_9();
+        return new RelationshipRecordFormatV2_0();
     }
 
     @Override