Skip usage check if record should be skipped to prevent not loaded re…

…cords to be mistreated as not used.
neo4j · Nov 7, 2016 · b9cfdd2 · b9cfdd2
1 parent 6040124
commit b9cfdd2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...nsistency-check/src/main/java/org/neo4j/consistency/checking/RelationshipRecordCheck.java b/...nsistency-check/src/main/java/org/neo4j/consistency/checking/RelationshipRecordCheck.java
@@ -604,7 +604,7 @@ public void checkReference( RelationshipRecord record, RelationshipRecord referr
                 }
                 else
                 {
-                    if ( !referred.inUse() )
+                    if ( !referenceShouldBeSkipped( record, referred.getId(), records ) && !referred.inUse() )
                     {
                         engine.report().notUsedRelationshipReferencedInChain( referred );
                     }

diff --git a/...nity/consistency-check/src/main/java/org/neo4j/consistency/checking/cache/CacheSlots.java b/...nity/consistency-check/src/main/java/org/neo4j/consistency/checking/cache/CacheSlots.java
@@ -30,7 +30,7 @@ interface NodeLabel
         int SLOT_LABEL_FIELD = 1;
     }
 
-    interface NextRelationhip
+    interface NextRelationship
     {
         int SLOT_FIRST_IN_SOURCE = 0;
         int SLOT_FIRST_IN_TARGET = 1;

diff --git a/...unity/consistency-check/src/main/java/org/neo4j/consistency/checking/cache/CacheTask.java b/...unity/consistency-check/src/main/java/org/neo4j/consistency/checking/cache/CacheTask.java
@@ -81,7 +81,7 @@ protected void processCache()
                     NodeRecord node = nodeRecords.next();
                     if ( node.inUse() )
                     {
-                        fields[CacheSlots.NextRelationhip.SLOT_RELATIONSHIP_ID] = node.getNextRel();
+                        fields[CacheSlots.NextRelationship.SLOT_RELATIONSHIP_ID] = node.getNextRel();
                         client.putToCache( node.getId(), fields );
                     }
                 }
@@ -109,7 +109,7 @@ protected void processCache()
             CacheAccess.Client client = cacheAccess.client();
             for ( long nodeId = 0; nodeId < nodeStore.getHighId(); nodeId++ )
             {
-                if ( client.getFromCache( nodeId, CacheSlots.NextRelationhip.SLOT_FIRST_IN_TARGET ) == 0 )
+                if ( client.getFromCache( nodeId, CacheSlots.NextRelationship.SLOT_FIRST_IN_TARGET ) == 0 )
                 {
                     // TODO reuse record instances?
                     NodeRecord node = nodeStore.getRecord( nodeId, nodeStore.newRecord(), FORCE );