Add before state to neo store commands

community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java

@@ -220,9 +220,9 @@ public void relationshipType( int id, String relationshipType )
             writer.relationshipType( id, relationshipType, id + 1 );
         }
 
-        public void update( NeoStoreRecord record )
+        public void update( NeoStoreRecord before, NeoStoreRecord after )
         {
-            writer.update( record );
+            writer.update( before, after );
         }
 
         public void create( NodeRecord node )

community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/TransactionWriter.java

@@ -81,10 +81,10 @@ public void relationshipType( int id, String label, int... dynamicIds )
         addCommand( command );
     }
 
-    public void update( NeoStoreRecord record )
+    public void update( NeoStoreRecord before, NeoStoreRecord after )
     {
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( before, after );
         addCommand( command );
     }
 
@@ -272,10 +272,10 @@ public void add( PropertyKeyTokenRecord record )
         addCommand( command );
     }
 
-    public void add( NeoStoreRecord record )
+    public void add( NeoStoreRecord before, NeoStoreRecord after )
     {
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( before, after );
         addCommand( command );
     }
 

community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/full/FullCheckIntegrationTest.java

@@ -246,9 +246,10 @@ public void shouldReportNeoStoreInconsistencies() throws Exception
             protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx,
                                             GraphStoreFixture.IdGenerator next )
             {
-                NeoStoreRecord record = new NeoStoreRecord();
-                record.setNextProp( next.property() );
-                tx.update( record );
+                NeoStoreRecord before = new NeoStoreRecord();
+                NeoStoreRecord after = new NeoStoreRecord();
+                after.setNextProp( next.property() );
+                tx.update( before, after );
                 // We get exceptions when only the above happens in a transaction...
                 tx.create( new NodeRecord( next.node(), false, -1, -1 ) );
             }

community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java

@@ -262,9 +262,9 @@ public void relationshipType( int id, String relationshipType )
             writer.relationshipType( id, relationshipType, id + 1 );
         }
 
-        public void update( NeoStoreRecord record )
+        public void update( NeoStoreRecord before, NeoStoreRecord after )
         {
-            writer.update( record );
+            writer.update( before, after );
         }
 
         public void create( NodeRecord node )

community/consistency-check/src/test/java/org/neo4j/consistency/checking/TransactionWriter.java

@@ -81,10 +81,10 @@ public void relationshipType( int id, String label, int... dynamicIds )
         addCommand( command );
     }
 
-    public void update( NeoStoreRecord record )
+    public void update( NeoStoreRecord before, NeoStoreRecord after )
     {
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( before, after );
         addCommand( command );
     }
 
@@ -272,10 +272,10 @@ public void add( PropertyKeyTokenRecord record )
         addCommand( command );
     }
 
-    public void add( NeoStoreRecord record )
+    public void add( NeoStoreRecord before, NeoStoreRecord after )
     {
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( before, after );
         addCommand( command );
     }
 

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java

@@ -281,9 +281,10 @@ public void shouldReportNeoStoreInconsistencies() throws Exception
             protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx,
                                             GraphStoreFixture.IdGenerator next )
             {
-                NeoStoreRecord record = new NeoStoreRecord();
-                record.setNextProp( next.property() );
-                tx.update( record );
+                NeoStoreRecord before = new NeoStoreRecord();
+                NeoStoreRecord after = new NeoStoreRecord();
+                after.setNextProp( next.property() );
+                tx.update( before, after );
                 // We get exceptions when only the above happens in a transaction...
                 tx.create( new NodeRecord( next.node(), false, -1, -1 ) );
             }

community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/NeoStoreRecord.java

@@ -41,4 +41,12 @@ public String toString()
     public void setIdTo( PropertyRecord property )
     {
     }
+
+    @Override
+    public NeoStoreRecord clone()
+    {
+        NeoStoreRecord neoStoreRecord = new NeoStoreRecord();
+        neoStoreRecord.setNextProp( getNextProp() );
+        return neoStoreRecord;
+    }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/Command.java

@@ -88,7 +88,7 @@ public static Mode fromRecordState( AbstractBaseRecord record )
     protected final void setup( long key, Mode mode )
     {
         this.mode = mode;
-        this.keyHash = (int) (( key >>> 32 ) ^ key );
+        this.keyHash = (int) ((key >>> 32) ^ key);
         this.key = key;
     }
 
@@ -235,22 +235,21 @@ public RelationshipGroupRecord getAfter()
 
     public static class NeoStoreCommand extends Command
     {
-        private NeoStoreRecord record;
+        private NeoStoreRecord before;
+        private NeoStoreRecord after;
 
-        public NeoStoreCommand init( NeoStoreRecord record )
+        public NeoStoreCommand init( NeoStoreRecord before, NeoStoreRecord after )
         {
-            if( record != null )
-            {
-                setup( record.getId(), Mode.fromRecordState( record ) );
-            }
-            this.record = record;
+            setup( after.getId(), Mode.fromRecordState( after ) );
+            this.before = before;
+            this.after = after;
             return this;
         }
 
         @Override
         public String toString()
         {
-            return record.toString();
+            return beforeAndAfterToString( before, after );
         }
 
         @Override
@@ -259,9 +258,14 @@ public boolean handle( CommandVisitor handler ) throws IOException
             return handler.visitNeoStoreCommand( this );
         }
 
-        public NeoStoreRecord getRecord()
+        public NeoStoreRecord getBefore()
         {
-            return record;
+            return before;
+        }
+
+        public NeoStoreRecord getAfter()
+        {
+            return after;
         }
     }
 
@@ -375,7 +379,7 @@ public static class SchemaRuleCommand extends Command
         private SchemaRule schemaRule;
 
         public SchemaRuleCommand init( Collection<DynamicRecord> recordsBefore,
-                           Collection<DynamicRecord> recordsAfter, SchemaRule schemaRule )
+                Collection<DynamicRecord> recordsAfter, SchemaRule schemaRule )
         {
             setup( first( recordsAfter ).getId(), Mode.fromRecordState( first( recordsAfter ) ) );
             this.recordsBefore = recordsBefore;
@@ -434,7 +438,7 @@ public NodeCountsCommand init( int labelId, long delta )
         public String toString()
         {
             return String.format( "UpdateCounts[(%s) %s %d]",
-                                  label( labelId ), delta < 0 ? "-" : "+", Math.abs( delta ) );
+                    label( labelId ), delta < 0 ? "-" : "+", Math.abs( delta ) );
         }
 
         @Override
@@ -464,7 +468,8 @@ public static class RelationshipCountsCommand extends Command
         public RelationshipCountsCommand init( int startLabelId, int typeId, int endLabelId, long delta )
         {
             setup( typeId, Mode.UPDATE );
-            assert delta != 0 : "Tried to create a RelationshipCountsCommand for something that didn't change any count";
+            assert delta !=
+                   0 : "Tried to create a RelationshipCountsCommand for something that didn't change any count";
             this.startLabelId = startLabelId;
             this.typeId = typeId;
             this.endLabelId = endLabelId;

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplier.java

@@ -178,7 +178,7 @@ public boolean visitSchemaRuleCommand( Command.SchemaRuleCommand command ) throw
     @Override
     public boolean visitNeoStoreCommand( Command.NeoStoreCommand command ) throws IOException
     {
-        neoStores.getMetaDataStore().setGraphNextProp( command.getRecord().getNextProp() );
+        neoStores.getMetaDataStore().setGraphNextProp( command.getAfter().getNextProp() );
         return false;
     }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV1_9.java

@@ -199,7 +199,7 @@ private Command visitNeoStoreCommand( ReadableLogChannel channel ) throws IOExce
         NeoStoreRecord record = new NeoStoreRecord();
         record.setNextProp( nextProp );
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( null, record );
         return command;
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_0.java

@@ -285,7 +285,7 @@ private Command visitNeoStoreCommand( ReadableLogChannel channel ) throws IOExce
         NeoStoreRecord record = new NeoStoreRecord();
         record.setNextProp( nextProp );
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( null, record );
         return command;
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_1.java

@@ -306,7 +306,7 @@ private Command visitNeoStoreCommand( ReadableLogChannel channel ) throws IOExce
         NeoStoreRecord record = new NeoStoreRecord();
         record.setNextProp( nextProp );
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( null, record );
         return command;
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2.java

@@ -355,7 +355,7 @@ private Command visitNeoStoreCommand( ReadableLogChannel channel ) throws IOExce
         NeoStoreRecord record = new NeoStoreRecord();
         record.setNextProp( nextProp );
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( null, record );
         return command;
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_4.java

@@ -355,7 +355,7 @@ private Command visitNeoStoreCommand( ReadableLogChannel channel ) throws IOExce
         NeoStoreRecord record = new NeoStoreRecord();
         record.setNextProp( nextProp );
         Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
+        command.init( null, record );
         return command;
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java

@@ -344,13 +344,20 @@ private Command visitSchemaRuleCommand( ReadableLogChannel channel ) throws IOEx
     }
 
     private Command visitNeoStoreCommand( ReadableLogChannel channel ) throws IOException
+    {
+        NeoStoreRecord before = readNeoStoreRecord( channel );
+        NeoStoreRecord after = readNeoStoreRecord( channel );
+        Command.NeoStoreCommand command = new Command.NeoStoreCommand();
+        command.init( before, after );
+        return command;
+    }
+
+    private NeoStoreRecord readNeoStoreRecord( ReadableLogChannel channel ) throws IOException
     {
         long nextProp = channel.getLong();
         NeoStoreRecord record = new NeoStoreRecord();
         record.setNextProp( nextProp );
-        Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-        command.init( record );
-        return command;
+        return record;
     }
 
     private NodeRecord readNodeRecord( long id, ReadableLogChannel channel ) throws IOException

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/CommandWriter.java

@@ -33,6 +33,7 @@
 import org.neo4j.kernel.impl.index.IndexDefineCommand;
 import org.neo4j.kernel.impl.store.record.DynamicRecord;
 import org.neo4j.kernel.impl.store.record.LabelTokenRecord;
+import org.neo4j.kernel.impl.store.record.NeoStoreRecord;
 import org.neo4j.kernel.impl.store.record.NodeRecord;
 import org.neo4j.kernel.impl.store.record.PropertyBlock;
 import org.neo4j.kernel.impl.store.record.PropertyKeyTokenRecord;
@@ -221,10 +222,17 @@ public boolean visitSchemaRuleCommand( Command.SchemaRuleCommand command ) throw
     @Override
     public boolean visitNeoStoreCommand( Command.NeoStoreCommand command ) throws IOException
     {
-        channel.put( NeoCommandType.NEOSTORE_COMMAND ).putLong( command.getRecord().getNextProp() );
+        channel.put( NeoCommandType.NEOSTORE_COMMAND );
+        writeNeoStoreRecord( command.getBefore() );
+        writeNeoStoreRecord( command.getAfter() );
         return false;
     }
 
+    private void writeNeoStoreRecord( NeoStoreRecord record ) throws IOException
+    {
+        channel.putLong( record.getNextProp() );
+    }
+
     @Override
     public boolean visitIndexAddNodeCommand( AddNodeCommand command ) throws IOException
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java

@@ -210,7 +210,7 @@ public void extractCommands( Collection<Command> commands ) throws TransactionFa
             for ( RecordProxy<Long,NeoStoreRecord, Void> change : neoStoreRecord.changes() )
             {
                 Command.NeoStoreCommand command = new Command.NeoStoreCommand();
-                command.init( change.forReadingData() );
+                command.init( change.getBefore(), change.forReadingData() );
                 commands.add( command );
             }
         }
@@ -485,11 +485,11 @@ public void ensureHeavy( NeoStoreRecord record )
                 }
 
                 @Override
-                public NeoStoreRecord clone(NeoStoreRecord neoStoreRecord ) {
-                    // We do not expect to manage the before state, so this operation will not be called.
-                    throw new UnsupportedOperationException("Clone on NeoStoreRecord");
+                public NeoStoreRecord clone( NeoStoreRecord neoStoreRecord )
+                {
+                    return neoStoreRecord.clone();
                 }
-            }, false, new IntCounter() );
+            }, true, new IntCounter() );
         }
         return neoStoreRecord.getOrLoad( 0L, null );
     }

community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java

@@ -857,35 +857,37 @@ public void shouldApplyNeoStoreCommandToTheStore() throws Exception
     {
         // given
         final BatchTransactionApplier applier = newApplier( false );
-        final NeoStoreRecord record = new NeoStoreRecord();
-        record.setNextProp( 42 );
-        final Command command = new Command.NeoStoreCommand().init( record );
+        final NeoStoreRecord before = new NeoStoreRecord();
+        final NeoStoreRecord after = new NeoStoreRecord();
+        after.setNextProp( 42 );
+        final Command command = new Command.NeoStoreCommand().init( before, after );
 
         // when
         boolean result = apply( applier, command::handle, transactionToApply );
 
         // then
         assertFalse( result );
 
-        verify( metaDataStore, times( 1 ) ).setGraphNextProp( record.getNextProp() );
+        verify( metaDataStore, times( 1 ) ).setGraphNextProp( after.getNextProp() );
     }
 
     @Test
     public void shouldApplyNeoStoreCommandToTheStoreInRecovery() throws Exception
     {
         // given
         final BatchTransactionApplier applier = newApplier( true );
-        final NeoStoreRecord record = new NeoStoreRecord();
-        record.setNextProp( 42 );
-        final Command command = new Command.NeoStoreCommand().init( record );
+        final NeoStoreRecord before = new NeoStoreRecord();
+        final NeoStoreRecord after = new NeoStoreRecord();
+        after.setNextProp( 42 );
+        final Command command = new Command.NeoStoreCommand().init( before, after );
 
         // when
         boolean result = apply( applier, command::handle, transactionToApply );
 
         // then
         assertFalse( result );
 
-        verify( metaDataStore, times( 1 ) ).setGraphNextProp( record.getNextProp() );
+        verify( metaDataStore, times( 1 ) ).setGraphNextProp( after.getNextProp() );
     }
 
     private BatchTransactionApplier newApplier( boolean recovery )