Displays correct import counts

neo4j · Jan 5, 2018 · caa95c2 · caa95c2
1 parent d43c215
commit caa95c2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DataImporter.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DataImporter.java
@@ -85,6 +85,11 @@ public void nodesImported( long nodes )
             this.nodes.add( nodes );
         }
 
+        public void nodesRemoved( long nodes )
+        {
+            this.nodes.add( -nodes );
+        }
+
         public void relationshipsImported( long relationships )
         {
             this.relationships.add( relationships );

diff --git a/...ity/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStage.java b/...ity/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStage.java
@@ -36,9 +36,9 @@
 public class DeleteDuplicateNodesStage extends Stage
 {
     public DeleteDuplicateNodesStage( Configuration config, PrimitiveLongIterator duplicateNodeIds,
-            BatchingNeoStores neoStore )
+            BatchingNeoStores neoStore, DataImporter.Monitor storeMonitor )
     {
         super( "DEDUP", null, config, 0 );
-        add( new DeleteDuplicateNodesStep( control(), config, duplicateNodeIds, neoStore.getNodeStore() ) );
+        add( new DeleteDuplicateNodesStep( control(), config, duplicateNodeIds, neoStore.getNodeStore(), storeMonitor ) );
     }
 }
diff --git a/...nity/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStep.java b/...nity/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStep.java
@@ -33,12 +33,17 @@ public class DeleteDuplicateNodesStep extends LonelyProcessingStep
 {
     private final NodeStore nodeStore;
     private final PrimitiveLongIterator nodeIds;
+    private final DataImporter.Monitor storeMonitor;
 
-    public DeleteDuplicateNodesStep( StageControl control, Configuration config, PrimitiveLongIterator nodeIds, NodeStore nodeStore )
+    private int nodesRemoved;
+
+    public DeleteDuplicateNodesStep( StageControl control, Configuration config, PrimitiveLongIterator nodeIds, NodeStore nodeStore,
+            DataImporter.Monitor storeMonitor )
     {
         super( control, "DEDUP", config );
         this.nodeStore = nodeStore;
         this.nodeIds = nodeIds;
+        this.storeMonitor = storeMonitor;
     }
 
     @Override
@@ -52,6 +57,14 @@ protected void process() throws IOException
             cursor.next( duplicateNodeId );
             record.setInUse( false );
             nodeStore.updateRecord( record );
+            nodesRemoved++;
         }
     }
+
+    @Override
+    public void close() throws Exception
+    {
+        super.close();
+        storeMonitor.nodesRemoved( nodesRemoved );
+    }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ImportLogic.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ImportLogic.java
@@ -236,7 +236,7 @@ public void prepareIdMapper()
             PrimitiveLongIterator duplicateNodeIds = badCollector.leftOverDuplicateNodesIds();
             if ( duplicateNodeIds.hasNext() )
             {
-                executeStage( new DeleteDuplicateNodesStage( config, duplicateNodeIds, neoStore ) );
+                executeStage( new DeleteDuplicateNodesStage( config, duplicateNodeIds, neoStore, storeUpdateMonitor ) );
             }
             updatePeakMemoryUsage();
         }
@@ -472,9 +472,8 @@ public void close() throws IOException
     {
         // We're done, do some final logging about it
         long totalTimeMillis = currentTimeMillis() - startTime;
-        DataStatistics stats = getState( DataStatistics.class );
-        executionMonitor.done( totalTimeMillis, format( "%n%s%nPeak memory usage: %s", stats, bytes( peakMemoryUsage ) ) );
-        log.info( "Import completed successfully, took " + duration( totalTimeMillis ) + ". " + stats );
+        executionMonitor.done( totalTimeMillis, format( "%n%s%nPeak memory usage: %s", storeUpdateMonitor, bytes( peakMemoryUsage ) ) );
+        log.info( "Import completed successfully, took " + duration( totalTimeMillis ) + ". " + storeUpdateMonitor );
 
         if ( nodeRelationshipCache != null )
         {