Merge pull request #9386 from tinwelint/2.3-batch-insert-dont-cache-reads

Don't cache unchanged records in DirectRecordAccess

Merge pull request #9386 from tinwelint/2.3-batch-insert-dont-cache-reads
Don't cache unchanged records in DirectRecordAccess
9d223c48 · Mattias Persson · GitHub · ec8437fd · 38aa0bd0 · 9d223c48
Commit 9d223c48 authored 7 years ago by Mattias Persson Committed by GitHub 7 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 2 deletions
+3 -2
--- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/DirectRecordAccess.java
+++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/DirectRecordAccess.java
@@ -59,7 +59,7 @@ public class DirectRecordAccess<KEY extends Comparable<KEY>,RECORD extends Abstr
        {
            return loaded;
        }
-        return putInBatch( key, proxy( key, loader.load( key, additionalData ), additionalData, false ) );
+        return proxy( key, loader.load( key, additionalData ), additionalData, false );
    }

    private RecordProxy<KEY, RECORD, ADDITIONAL> putInBatch( KEY key, DirectRecordProxy proxy )
@@ -72,7 +72,7 @@ public class DirectRecordAccess<KEY extends Comparable<KEY>,RECORD extends Abstr
    @Override
    public RecordProxy<KEY, RECORD, ADDITIONAL> create( KEY key, ADDITIONAL additionalData )
    {
-        return putInBatch( key, proxy( key, loader.newUnused( key, additionalData ), additionalData, true ) );
+        return proxy( key, loader.newUnused( key, additionalData ), additionalData, true );
    }

    @Override
@@ -150,6 +150,7 @@ public class DirectRecordAccess<KEY extends Comparable<KEY>,RECORD extends Abstr
            if ( !changed )
            {
                changed = true;
+                putInBatch( key, this );
                changeCounter.increment();
            }
        }