Pulls out record format into RecordFormat

also adds randomized tests to all current records, with ability to easily add other formats to that test suite. During testing a RelationshipGroup format issue was found and fixed. Simpler and finally pluggable record format
neo4j · Feb 1, 2016 · 4d7803a · 4d7803a
1 parent cab9968
commit 4d7803a
Show file tree

Hide file tree

Showing 89 changed files with 2,661 additions and 1,100 deletions.
diff --git a/...-check-legacy/src/main/java/org/neo4j/legacy/consistency/checking/DynamicRecordCheck.java b/...-check-legacy/src/main/java/org/neo4j/legacy/consistency/checking/DynamicRecordCheck.java
@@ -36,7 +36,7 @@ class DynamicRecordCheck
 
     DynamicRecordCheck( RecordStore<DynamicRecord> store, DynamicStore dereference )
     {
-        this.blockSize = store.getRecordSize() - store.getRecordHeaderSize();
+        this.blockSize = store.getRecordDataSize();
         this.dereference = dereference;
         this.store = store;
     }

diff --git a/...ck-legacy/src/test/java/org/neo4j/legacy/consistency/checking/DynamicRecordCheckTest.java b/...ck-legacy/src/test/java/org/neo4j/legacy/consistency/checking/DynamicRecordCheckTest.java
@@ -24,9 +24,9 @@
 import org.junit.runners.JUnit4;
 import org.junit.runners.Suite;
 
-import org.neo4j.kernel.impl.store.AbstractDynamicStore;
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.SchemaStore;
+import org.neo4j.kernel.impl.store.format.current.DynamicRecordFormat;
 import org.neo4j.kernel.impl.store.record.DynamicRecord;
 import org.neo4j.legacy.consistency.report.ConsistencyReport;
 
@@ -330,8 +330,8 @@ public static RecordStore<DynamicRecord> configureDynamicStore( int blockSize )
     {
         @SuppressWarnings( "unchecked" )
         RecordStore<DynamicRecord> mock = mock( RecordStore.class );
-        when( mock.getRecordSize() ).thenReturn( blockSize + AbstractDynamicStore.RECORD_HEADER_SIZE );
-        when( mock.getRecordHeaderSize() ).thenReturn( AbstractDynamicStore.RECORD_HEADER_SIZE );
+        when( mock.getRecordSize() ).thenReturn( blockSize + DynamicRecordFormat.RECORD_HEADER_SIZE );
+        when( mock.getRecordDataSize() ).thenReturn( blockSize );
         return mock;
     }
 }
diff --git a/...ty/consistency-check/src/main/java/org/neo4j/consistency/checking/DynamicRecordCheck.java b/...ty/consistency-check/src/main/java/org/neo4j/consistency/checking/DynamicRecordCheck.java
@@ -34,7 +34,7 @@ public class DynamicRecordCheck
 
     public DynamicRecordCheck( RecordStore<DynamicRecord> store, DynamicStore dereference )
     {
-        this.blockSize = store.getRecordSize() - store.getRecordHeaderSize();
+        this.blockSize = store.getRecordDataSize();
         this.dereference = dereference;
     }
 

diff --git a/...onsistency-check/src/test/java/org/neo4j/consistency/checking/DynamicRecordCheckTest.java b/...onsistency-check/src/test/java/org/neo4j/consistency/checking/DynamicRecordCheckTest.java
@@ -25,9 +25,9 @@
 import org.junit.runners.Suite;
 
 import org.neo4j.consistency.report.ConsistencyReport;
-import org.neo4j.kernel.impl.store.AbstractDynamicStore;
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.SchemaStore;
+import org.neo4j.kernel.impl.store.format.current.DynamicRecordFormat;
 import org.neo4j.kernel.impl.store.record.DynamicRecord;
 
 import static org.mockito.Mockito.mock;
@@ -271,8 +271,8 @@ public static RecordStore<DynamicRecord> configureDynamicStore( int blockSize )
     {
         @SuppressWarnings( "unchecked" )
         RecordStore<DynamicRecord> mock = mock( RecordStore.class );
-        when( mock.getRecordSize() ).thenReturn( blockSize + AbstractDynamicStore.RECORD_HEADER_SIZE );
-        when( mock.getRecordHeaderSize() ).thenReturn( AbstractDynamicStore.RECORD_HEADER_SIZE );
+        when( mock.getRecordSize() ).thenReturn( blockSize + DynamicRecordFormat.RECORD_HEADER_SIZE );
+        when( mock.getRecordDataSize() ).thenReturn( blockSize );
         return mock;
     }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
@@ -90,6 +90,7 @@
 import org.neo4j.kernel.impl.store.MetaDataStore;
 import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.store.UnderlyingStorageException;
+import org.neo4j.kernel.impl.store.format.current.Current;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.storemigration.DatabaseMigrator;
 import org.neo4j.kernel.impl.storemigration.monitoring.VisibleMigrationProgressMonitor;
@@ -561,7 +562,8 @@ private StorageEngine buildStorageEngine(
                 new RecordStorageEngine( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider, propertyKeyTokenHolder,
                         labelTokens, relationshipTypeTokens, schemaStateChangeCallback, constraintSemantics, scheduler,
                         tokenNameLookup, lockService, schemaIndexProvider, indexingServiceMonitor, databaseHealth,
-                        labelScanStore, legacyIndexProviderLookup, indexConfigStore, legacyIndexTransactionOrdering ) );
+                        labelScanStore, legacyIndexProviderLookup, indexConfigStore, legacyIndexTransactionOrdering,
+                        Current.RECORD_FORMATS ) );
     }
 
     private TransactionLogModule buildTransactionLogs(

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorePropertyPayloadCursor.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorePropertyPayloadCursor.java
@@ -30,10 +30,10 @@
 import org.neo4j.kernel.impl.store.DynamicArrayStore;
 import org.neo4j.kernel.impl.store.DynamicStringStore;
 import org.neo4j.kernel.impl.store.LongerShortString;
-import org.neo4j.kernel.impl.store.PropertyStore;
 import org.neo4j.kernel.impl.store.PropertyType;
 import org.neo4j.kernel.impl.store.RecordCursor;
 import org.neo4j.kernel.impl.store.ShortArray;
+import org.neo4j.kernel.impl.store.format.current.PropertyRecordFormat;
 import org.neo4j.kernel.impl.store.record.DynamicRecord;
 import org.neo4j.kernel.impl.store.record.PropertyBlock;
 import org.neo4j.kernel.impl.util.Bits;
@@ -66,7 +66,7 @@
  */
 class StorePropertyPayloadCursor
 {
-    static final int MAX_NUMBER_OF_PAYLOAD_LONG_ARRAY = PropertyStore.DEFAULT_PAYLOAD_SIZE / 8;
+    static final int MAX_NUMBER_OF_PAYLOAD_LONG_ARRAY = PropertyRecordFormat.DEFAULT_PAYLOAD_SIZE / 8;
 
     private static final long PROPERTY_KEY_ID_BITMASK = 0xFFFFFFL;
     private static final int MAX_BYTES_IN_SHORT_STRING_OR_SHORT_ARRAY = 32;

diff --git a/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java b/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java
@@ -31,7 +31,6 @@
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
-import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.api.TokenNameLookup;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationKernelException;
@@ -71,6 +70,8 @@
 import org.neo4j.kernel.impl.store.NeoStores;
 import org.neo4j.kernel.impl.store.SchemaStorage;
 import org.neo4j.kernel.impl.store.StoreFactory;
+import org.neo4j.kernel.impl.store.format.RecordFormats;
+import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.transaction.command.CacheInvalidationBatchTransactionApplier;
 import org.neo4j.kernel.impl.transaction.command.HighIdBatchTransactionApplier;
 import org.neo4j.kernel.impl.transaction.command.IndexBatchTransactionApplier;
@@ -178,7 +179,8 @@ public RecordStorageEngine(
             LabelScanStoreProvider labelScanStoreProvider,
             LegacyIndexProviderLookup legacyIndexProviderLookup,
             IndexConfigStore indexConfigStore,
-            IdOrderingQueue legacyIndexTransactionOrdering )
+            IdOrderingQueue legacyIndexTransactionOrdering,
+            RecordFormats recordFormats )
     {
         this.propertyKeyTokenHolder = propertyKeyTokenHolder;
         this.relationshipTypeTokenHolder = relationshipTypeTokens;
@@ -191,7 +193,8 @@ public RecordStorageEngine(
         this.constraintSemantics = constraintSemantics;
         this.legacyIndexTransactionOrdering = legacyIndexTransactionOrdering;
 
-        final StoreFactory storeFactory = new StoreFactory( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider );
+        final StoreFactory storeFactory = new StoreFactory( storeDir, config, idGeneratorFactory,
+                pageCache, fs, logProvider, recordFormats );
         neoStores = storeFactory.openAllNeoStores( true );
 
         try