Merge pull request #9811 from tinwelint/3.3-apply-label-and-index-par…

…allel Applies label and index updates in parallel
neo4j · Aug 24, 2017 · 16b8e4a · 16b8e4a
2 parents ec45bb4 + 69244d4
commit 16b8e4a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/...src/main/java/org/neo4j/kernel/impl/transaction/command/IndexBatchTransactionApplier.java b/...src/main/java/org/neo4j/kernel/impl/transaction/command/IndexBatchTransactionApplier.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.Supplier;
 
+import org.neo4j.concurrent.AsyncApply;
 import org.neo4j.concurrent.WorkSync;
 import org.neo4j.kernel.api.exceptions.index.IndexActivationFailedKernelException;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
@@ -87,31 +88,37 @@ public TransactionApplier startTx( CommandsToApply transaction )
 
     private void applyPendingLabelAndIndexUpdates() throws IOException
     {
+        AsyncApply labelUpdatesApply = null;
         if ( labelUpdates != null )
         {
             // Updates are sorted according to node id here, an artifact of node commands being sorted
             // by node id when extracting from TransactionRecordState.
+            labelUpdatesApply = labelScanStoreSync.applyAsync( new LabelUpdateWork( labelUpdates ) );
+            labelUpdates = null;
+        }
+        if ( indexUpdates != null && indexUpdates.hasUpdates() )
+        {
             try
             {
-                labelScanStoreSync.apply( new LabelUpdateWork( labelUpdates ) );
+                indexUpdatesSync.apply( new IndexUpdatesWork( indexUpdates ) );
             }
             catch ( ExecutionException e )
             {
-                throw new IOException( "Failed to flush label updates", e );
+                throw new IOException( "Failed to flush index updates", e );
             }
-            labelUpdates = null;
+            indexUpdates = null;
         }
-        if ( indexUpdates != null && indexUpdates.hasUpdates() )
+
+        if ( labelUpdatesApply != null )
         {
             try
             {
-                indexUpdatesSync.apply( new IndexUpdatesWork( indexUpdates ) );
+                labelUpdatesApply.await();
             }
             catch ( ExecutionException e )
             {
-                throw new IOException( "Failed to flush index updates", e );
+                throw new IOException( "Failed to flush label updates", e );
             }
-            indexUpdates = null;
         }
     }
 

diff --git a/...test/java/org/neo4j/kernel/impl/transaction/command/IndexBatchTransactionApplierTest.java b/...test/java/org/neo4j/kernel/impl/transaction/command/IndexBatchTransactionApplierTest.java
@@ -77,7 +77,7 @@ indexUpdatesSync, mock( NodeStore.class ),
             }
         }
         // THEN all assertions happen inside the LabelScanWriter#write and #close
-        verify( labelScanSync ).apply( any() );
+        verify( labelScanSync ).applyAsync( any() );
     }
 
     private Supplier<LabelScanWriter> singletonProvider( final LabelScanWriter writer )