Only add treeBuildProgress in one place

neo4j · Mar 6, 2019 · 6531f65 · 6531f65
1 parent 87308af
commit 6531f65
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockBasedIndexPopulator.java b/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockBasedIndexPopulator.java
@@ -559,15 +559,17 @@ public PopulationProgress progress( PopulationProgress scanProgress )
         }
 
         // Add tree building incl. external updates
+        PopulationProgress treeBuildProgress;
         if ( allScanUpdates.stream().allMatch( part -> part.mergeStarted ) )
         {
             long entryCount = allScanUpdates.stream().mapToLong( part -> part.count ).sum() + externalUpdates.count();
-            builder.add( PopulationProgress.single( numberOfAppliedScanUpdates + numberOfAppliedExternalUpdates, entryCount ), 2 );
+            treeBuildProgress = PopulationProgress.single( numberOfAppliedScanUpdates + numberOfAppliedExternalUpdates, entryCount );
         }
         else
         {
-            builder.add( PopulationProgress.NONE, 2 );
+            treeBuildProgress = PopulationProgress.NONE;
         }
+        builder.add( treeBuildProgress, 2 );
 
         return builder.build();
     }