Collapses ComposableRecordStore into CommonAbstractStore

because CommonAbstractStore already had knowledge about RecordFormat
at this point and so could implement the (previously) abstract methods
on its own. This results in shallower inheritance in store classes
and may make JITs job easier.

As a side effect MetaDataStore had to be changed to act as a real
record store in that it now has a proper MetaDataRecordFormat.
It still have the static record accessors, but that can be improved later.

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

@@ -62,7 +62,7 @@
  * The record size is what's stored in the header (first record). {@link #getRecordDataSize()} returns
  * the size which was configured at the store creation, {@link #getRecordSize()} returns what the store header says.
  */
-public abstract class AbstractDynamicStore extends ComposableRecordStore<DynamicRecord,IntStoreHeader>
+public abstract class AbstractDynamicStore extends CommonAbstractStore<DynamicRecord,IntStoreHeader>
         implements DynamicRecordAllocator
 {
     public static final byte[] NO_DATA = new byte[0];

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

@@ -58,7 +58,7 @@
 /**
  * Contains common implementation of {@link RecordStore}.
  */
-public abstract class CommonAbstractStore<RECORD extends AbstractBaseRecord>
+public abstract class CommonAbstractStore<RECORD extends AbstractBaseRecord,HEADER extends StoreHeader>
         implements RecordStore<RECORD>, AutoCloseable
 {
     public static final String UNKNOWN_VERSION = "Unknown";
@@ -78,6 +78,9 @@ public abstract class CommonAbstractStore<RECORD extends AbstractBaseRecord>
     private final String typeDescriptor;
     protected int recordSize;
 
+    private final StoreHeaderFormat<HEADER> storeHeaderFormat;
+    private HEADER storeHeader;
+
     /**
      * Opens and validates the store contained in <CODE>fileName</CODE>
      * loading any configuration defined in <CODE>config</CODE>. After
@@ -102,6 +105,7 @@ public CommonAbstractStore(
             LogProvider logProvider,
             String typeDescriptor,
             RecordFormat<RECORD> recordFormat,
+            StoreHeaderFormat<HEADER> storeHeaderFormat,
             String storeVersion )
     {
         this.storageFileName = fileName;
@@ -111,6 +115,7 @@ public CommonAbstractStore(
         this.idType = idType;
         this.typeDescriptor = typeDescriptor;
         this.recordFormat = recordFormat;
+        this.storeHeaderFormat = storeHeaderFormat;
         this.storeVersion = storeVersion;
         this.log = logProvider.getLog( getClass() );
     }
@@ -218,7 +223,10 @@ protected void initialiseNewStoreFile( PagedFile file ) throws IOException
 
     protected void createHeaderRecord( PageCursor cursor ) throws IOException
     {
-        assert getNumberOfReservedLowIds() == 0;
+        int offset = cursor.getOffset();
+        storeHeaderFormat.writeHeader( cursor );
+        cursor.setOffset( offset );
+        readHeaderAndInitializeRecordFormat( cursor );
     }
 
     /**
@@ -317,8 +325,9 @@ public byte[] getRawRecordData( long id ) throws IOException
      * of the record format still happens in here.
      * @throws IOException if there were problems reading header information.
      */
-    protected void readHeaderAndInitializeRecordFormat( PageCursor cursor ) throws IOException
+    private void readHeaderAndInitializeRecordFormat( PageCursor cursor ) throws IOException
     {
+        storeHeader = storeHeaderFormat.readHeader( cursor );
     }
 
     private void loadIdGenerator()
@@ -735,7 +744,10 @@ private boolean isJustLegacyStoreTrailer( PageCursor cursor, int offset, byte[]
         }
     }
 
-    protected abstract int determineRecordSize();
+    protected int determineRecordSize()
+    {
+        return recordFormat.getRecordSize( storeHeader );
+    }
 
     @Override
     public final int getRecordSize()
@@ -746,10 +758,13 @@ public final int getRecordSize()
     @Override
     public int getRecordDataSize()
     {
-        return getRecordSize();
+        return recordSize - recordFormat.getRecordHeaderSize();
     }
 
-    protected abstract boolean isInUse( PageCursor cursor );
+    private boolean isInUse( PageCursor cursor )
+    {
+        return recordFormat.isInUse( cursor );
+    }
 
     protected boolean isRecordReserved( PageCursor cursor )
     {
@@ -882,7 +897,7 @@ public long getNumberOfIdsInUse()
     @Override
     public int getNumberOfReservedLowIds()
     {
-        return 0;
+        return storeHeaderFormat.numberOfReservedRecords();
     }
 
     public IdType getIdType()
@@ -911,7 +926,7 @@ public void logIdUsage( Logger logger )
      * {@link #logVersions(Logger)}
      * For a good samaritan to pick up later.
      */
-    public void visitStore( Visitor<CommonAbstractStore<RECORD>,RuntimeException> visitor )
+    public void visitStore( Visitor<CommonAbstractStore<RECORD,HEADER>,RuntimeException> visitor )
     {
         visitor.visit( this );
     }
@@ -937,7 +952,13 @@ final void deleteIdGenerator()
     @Override
     public long getNextRecordReference( RECORD record )
     {
-        return Record.NULL_REFERENCE.intValue();
+        return recordFormat.getNextRecordReference( record );
+    }
+
+    @Override
+    public RECORD newRecord()
+    {
+        return recordFormat.newRecord();
     }
 
     /**
@@ -967,7 +988,7 @@ public RECORD getRecord( long id, RECORD record, RecordLoad mode )
                 do
                 {
                     prepareForReading( cursor, offset, record );
-                    readRecord( cursor, record, mode );
+                    recordFormat.read( record, cursor, mode, recordSize, storeFile );
                 }
                 while ( cursor.shouldRetry() );
                 verifyAfterReading( record, mode );
@@ -984,12 +1005,6 @@ public RECORD getRecord( long id, RECORD record, RecordLoad mode )
         }
     }
 
-    /**
-     * Reads data from {@link PageCursor} into the record.
-     * @throws IOException on error reading.
-     */
-    protected abstract void readRecord( PageCursor cursor, RECORD record, RecordLoad mode ) throws IOException;
-
     @Override
     public void updateRecord( RECORD record )
     {
@@ -1003,7 +1018,7 @@ public void updateRecord( RECORD record )
                 do
                 {
                     cursor.setOffset( offset );
-                    writeRecord( cursor, record );
+                    recordFormat.write( record, cursor, recordSize, storeFile );
                 }
                 while ( cursor.shouldRetry() );
                 if ( !record.inUse() )
@@ -1024,7 +1039,14 @@ public void updateRecord( RECORD record )
         }
     }
 
-    protected abstract void writeRecord( PageCursor cursor, RECORD record ) throws IOException;
+    @Override
+    public void prepareForCommit( RECORD record )
+    {
+        if ( record.inUse() )
+        {
+            recordFormat.prepare( record, recordSize, this );
+        }
+    }
 
     /**
      * Scan the given range of records both inclusive, and pass all the in-use ones to the given processor, one by one.
@@ -1098,7 +1120,7 @@ public boolean next()
                             do
                             {
                                 prepareForReading( pageCursor, offset, record );
-                                readRecord( pageCursor, record, mode );
+                                recordFormat.read( record, pageCursor, mode, recordSize, storeFile );
                             }
                             while ( pageCursor.shouldRetry() );
                             verifyAfterReading( record, mode );
@@ -1210,7 +1232,7 @@ public String toString()
     @Override
     public int getStoreHeaderInt()
     {
-        throw new UnsupportedOperationException( "No header" );
+        return ((IntStoreHeader) storeHeader).value();
     }
 
     public static abstract class Configuration