Fix compilation error after rebase

neo4j · May 18, 2017 · 18241e8 · 18241e8
1 parent 31f04ad
commit 18241e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.../index/src/test/java/org/neo4j/index/internal/gbptree/RecoveryCleanupWorkCollectorIT.java b/.../index/src/test/java/org/neo4j/index/internal/gbptree/RecoveryCleanupWorkCollectorIT.java
@@ -91,6 +91,9 @@ private void doTest( int numberOfTrees ) throws IOException
                 fillWithData( tree, keysPerTree );
                 writeTime += System.nanoTime() - start;
                 tree.checkpoint( IOLimiter.unlimited() );
+
+                // Make dirty
+                tree.writer().close();
             }
         }
 
@@ -99,8 +102,6 @@ private void doTest( int numberOfTrees ) throws IOException
         for ( int i = 0; i < numberOfTrees; i++ )
         {
             trees[i] = gbpTree( file[i] );
-            trees[i].prepareForRecovery();
-            trees[i].finishRecovery();
         }
         recoveryCleanupWorkCollector.run();
         IOUtils.closeAll( trees );
@@ -139,7 +140,7 @@ private class CleanLogMonitor implements GBPTree.Monitor
         AtomicLong accumulatedNumberOfPages = new AtomicLong();
 
         @Override
-        public void recoveryCompleted( long numberOfPagesVisited, long numberOfCleanedCrashPointers,
+        public void cleanupFinished( long numberOfPagesVisited, long numberOfCleanedCrashPointers,
                 long durationMillis )
         {
             accumulatedCleanTime.accumulateAndGet( durationMillis, ADD );

diff --git a/.../src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStoreRebuildTest.java b/.../src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStoreRebuildTest.java
@@ -43,6 +43,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector.IMMEDIATE;
 import static org.neo4j.kernel.impl.api.scan.FullStoreChangeStream.EMPTY;
 import static org.neo4j.kernel.impl.api.scan.FullStoreChangeStream.asStream;
 
@@ -76,7 +77,8 @@ public void mustBeDirtyIfFailedDuringRebuild() throws Exception
         try
         {
             nativeLabelScanStore =
-                    new NativeLabelScanStore( pageCache, storeDir, THROWING_STREAM, false, new Monitors() );
+                    new NativeLabelScanStore( pageCache, storeDir, THROWING_STREAM, false, new Monitors(),
+                            IMMEDIATE );
 
             nativeLabelScanStore.init();
             nativeLabelScanStore.start();
@@ -95,7 +97,7 @@ public void mustBeDirtyIfFailedDuringRebuild() throws Exception
         monitors.addMonitorListener( monitor );
 
         nativeLabelScanStore =
-                new NativeLabelScanStore( pageCache, storeDir, EMPTY, false, monitors );
+                new NativeLabelScanStore( pageCache, storeDir, EMPTY, false, monitors, IMMEDIATE );
         nativeLabelScanStore.init();
         nativeLabelScanStore.start();
 
@@ -118,7 +120,7 @@ public void shouldFailOnUnsortedLabelsFromFullStoreChangeStream() throws Excepti
         try
         {
             nativeLabelScanStore =
-                    new NativeLabelScanStore( pageCache, storeDir, changeStream, false, new Monitors() );
+                    new NativeLabelScanStore( pageCache, storeDir, changeStream, false, new Monitors(), IMMEDIATE );
             nativeLabelScanStore.init();
 
             // when