Merge pull request neo4j#3201 from tinwelint/2.2-del-dyn-label-record…

…s-w-del-node [2.2] Deleted nodes includes deleted dynamic label records
stevexyz · Oct 9, 2014 · 72ac2d8 · 72ac2d8
2 parents 6fc4fad + be27f21
commit 72ac2d8
Show file tree

Hide file tree

Showing 14 changed files with 1,105 additions and 65 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/NodeRecord.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/NodeRecord.java
@@ -33,7 +33,7 @@
 public class NodeRecord extends PrimitiveRecord
 {
     private long nextRel = Record.NO_NEXT_RELATIONSHIP.intValue();
-    private long labels;
+    private long labels = Record.NO_LABELS_FIELD.intValue();
     private Collection<DynamicRecord> dynamicLabelRecords = emptyList();
     private boolean isLight = true;
     private boolean dense;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/Record.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/Record.java
@@ -24,21 +24,24 @@
  */
 public enum Record
 {
-    NOT_IN_USE( (byte) 0, 0 ), 
+    NOT_IN_USE( (byte) 0, 0 ),
     IN_USE( (byte) 1, 1 ),
     FIRST_IN_CHAIN( (byte) 2, 2 ),
-    RESERVED( (byte) -1, -1 ), 
+    RESERVED( (byte) -1, -1 ),
     NO_NEXT_PROPERTY( (byte) -1, -1 ),
     NO_PREVIOUS_PROPERTY( (byte) -1, -1 ),
     NO_NEXT_RELATIONSHIP( (byte) -1, -1 ),
-    NO_PREV_RELATIONSHIP( (byte) -1, -1 ), 
+    NO_PREV_RELATIONSHIP( (byte) -1, -1 ),
     NOT_DIRECTED( (byte) 0, 0 ),
-    DIRECTED( (byte) 2, 2 ), 
-    NO_NEXT_BLOCK( (byte) -1, -1 ), 
+    DIRECTED( (byte) 2, 2 ),
+    NO_NEXT_BLOCK( (byte) -1, -1 ),
     NO_PREV_BLOCK( (byte) -1, -1 ),
 
     NODE_PROPERTY( (byte) 0, 0 ),
-    REL_PROPERTY( (byte) 2, 2 );
+    REL_PROPERTY( (byte) 2, 2 ),
+
+    NO_LABELS_FIELD( (byte)0, 0 );
+
     public static final byte CREATED_IN_TX = 2;
 
     private byte byteValue;
@@ -52,7 +55,7 @@ public enum Record
 
     /**
      * Returns a byte value representation for this record type.
-     * 
+     *
      * @return The byte value for this record type
      */
     public byte byteValue()
@@ -62,7 +65,7 @@ public byte byteValue()
 
     /**
      * Returns a int value representation for this record type.
-     * 
+     *
      * @return The int value for this record type
      */
     public int intValue()

diff --git a/.../kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/CommandReaderFactory.java b/.../kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/CommandReaderFactory.java
@@ -78,8 +78,9 @@ private CommandReader figureOutCorrectReader( byte logFormatVersion, byte logEnt
                     switch ( logFormatVersion )
                     {
                         case LOG_VERSION_2_1:
-                        case LOG_VERSION_2_2:
                             return new PhysicalLogNeoCommandReaderV1();
+                        case LOG_VERSION_2_2:
+                            return new PhysicalLogNeoCommandReaderV2();
                     }
             }
             throw new IllegalArgumentException( "Unknown log format version (" + logFormatVersion + ") and " +