Fixes a concurrency record counting issue

neo4j · Jan 5, 2018 · dc1bd29 · dc1bd29
1 parent 4a0e402
commit dc1bd29
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/UpdateRecordsStep.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/UpdateRecordsStep.java
@@ -20,6 +20,7 @@
 package org.neo4j.unsafe.impl.batchimport;
 
 import java.util.Collection;
+import java.util.concurrent.atomic.LongAdder;
 import java.util.function.LongFunction;
 
 import org.neo4j.kernel.impl.store.RecordStore;
@@ -45,7 +46,7 @@ public class UpdateRecordsStep<RECORD extends AbstractBaseRecord>
     protected final RecordStore<RECORD> store;
     private final int recordSize;
     private final PrepareIdSequence prepareIdSequence;
-    private long recordsUpdated;
+    private final LongAdder recordsUpdated = new LongAdder();
 
     public UpdateRecordsStep( StageControl control, Configuration config, RecordStore<RECORD> store,
             PrepareIdSequence prepareIdSequence )
@@ -70,7 +71,7 @@ protected void process( RECORD[] batch, BatchSender sender ) throws Throwable
                 recordsUpdatedInThisBatch++;
             }
         }
-        recordsUpdated += recordsUpdatedInThisBatch;
+        recordsUpdated.add( recordsUpdatedInThisBatch );
     }
 
     @Override
@@ -83,7 +84,7 @@ protected void collectStatsProviders( Collection<StatsProvider> into )
     @Override
     public Stat stat( Key key )
     {
-        return key == Keys.io_throughput ? new IoThroughputStat( startTime, endTime, recordSize * recordsUpdated ) : null;
+        return key == Keys.io_throughput ? new IoThroughputStat( startTime, endTime, recordSize * recordsUpdated.sum() ) : null;
     }
 
     @Override