Bunch of PR fixes

community/common/src/main/java/org/neo4j/helpers/Exceptions.java

@@ -22,6 +22,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.Thread.State;
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.function.Predicate;
@@ -30,6 +31,10 @@
 
 public class Exceptions
 {
+    public static final UncaughtExceptionHandler SILENT_UNCAUGHT_EXCEPTION_HANDLER = ( t, e ) ->
+    {   // Don't print about it
+    };
+
     private static final String UNEXPECTED_MESSAGE = "Unexpected Exception";
 
     public static <T extends Throwable> T withCause( T exception, Throwable cause )

community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java

@@ -22,7 +22,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
-
 import org.neo4j.csv.reader.CharSeeker;
 import org.neo4j.csv.reader.CharSeekers;
 import org.neo4j.csv.reader.Extractors;
@@ -45,6 +44,7 @@
 import org.neo4j.unsafe.impl.batchimport.input.csv.IdType;
 
 import static java.lang.System.currentTimeMillis;
+import static java.util.Collections.emptyList;
 
 import static org.neo4j.graphdb.factory.GraphDatabaseSettings.dense_node_threshold;
 import static org.neo4j.kernel.configuration.Settings.parseLongWithUnit;
@@ -139,7 +139,7 @@ public long pageCacheMemory()
             @Override
             public long maxMemoryUsage()
             {
-                String custom = args.get( ImportTool.Options.MAX_MEMORY.key(), null );
+                String custom = args.get( ImportTool.Options.MAX_MEMORY.key(), (String) ImportTool.Options.MAX_MEMORY.defaultValue() );
                 return custom != null ? ImportTool.parseMaxMemory( custom ) : DEFAULT.maxMemoryUsage();
             }
         };
@@ -166,6 +166,7 @@ public long maxMemoryUsage()
                 consumer = new ParallelBatchImporter( dir, fileSystem, null, importConfig,
                         new SimpleLogService( sysoutLogProvider, sysoutLogProvider ), defaultVisible(), EMPTY, dbConfig,
                         RecordFormatSelector.selectForConfig( dbConfig, sysoutLogProvider ) );
+                ImportTool.printOverview( dir, emptyList(), emptyList(), importConfig, System.out );
             }
             consumer.doImport( input );
         }

community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ImportLogic.java

@@ -120,9 +120,6 @@ public class ImportLogic implements Closeable
     private long availableMemoryForLinking;
 
     /**
-     * Advanced usage of the parallel batch importer, for special and very specific cases. Please use
-     * a constructor with fewer arguments instead.
-     *
      * @param storeDir directory which the db will be created in.
      * @param fileSystem {@link FileSystemAbstraction} that the {@code storeDir} lives in.
      * @param neoStore {@link BatchingNeoStores} to import into.
@@ -368,6 +365,20 @@ public int linkRelationships( int startingFromType )
         return upToType;
     }
 
+    /**
+     * Links relationships of all types, potentially doing multiple passes, each pass calling {@link #linkRelationships(int)}
+     * with a type range.
+     */
+    public void linkRelationshipsOfAllTypes()
+    {
+        int type = 0;
+        do
+        {
+            type = linkRelationships( type );
+        }
+        while ( type != -1 );
+    }
+
     /**
      * Convenience method (for code reading) to have a zero-based value become one based (for printing/logging).
      */
@@ -461,7 +472,6 @@ public void close() throws IOException
             idMapper.close();
         }
         inputCache.close();
-        // TODO close badCollector here instead of in import tool?
     }
 
     private void updatePeakMemoryUsage()

community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporter.java

@@ -83,14 +83,7 @@ public void doImport( Input input ) throws IOException
             logic.prepareIdMapper();
             logic.importRelationships();
             logic.calculateNodeDegrees();
-
-            int type = 0;
-            do
-            {
-                type = logic.linkRelationships( type );
-            }
-            while ( type != -1 );
-
+            logic.linkRelationshipsOfAllTypes();
             logic.defragmentRelationshipGroups();
             logic.buildCountsStore();
 

community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java

@@ -29,7 +29,6 @@
 import org.neo4j.unsafe.impl.batchimport.InputIterable;
 import org.neo4j.unsafe.impl.batchimport.InputIterator;
 import org.neo4j.unsafe.impl.batchimport.Utils.CompareType;
-import org.neo4j.unsafe.impl.batchimport.cache.IntArray;
 import org.neo4j.unsafe.impl.batchimport.cache.LongArray;
 import org.neo4j.unsafe.impl.batchimport.cache.LongBitsManipulator;
 import org.neo4j.unsafe.impl.batchimport.cache.MemoryStatsVisitor;
@@ -829,21 +828,6 @@ private long findFromEIdRange( long fromIndex, long toIndex, int groupId, Object
         return lowestFound;
     }
 
-    static boolean compareDataCache( LongArray dataCache, IntArray tracker, int a, int b, CompareType compareType )
-    {
-        int indexA = tracker.get( a );
-        int indexB = tracker.get( b );
-        if ( indexA == ID_NOT_FOUND || indexB == ID_NOT_FOUND )
-        {
-            return false;
-        }
-
-        return unsignedCompare(
-                clearCollision( dataCache.get( indexA ) ),
-                clearCollision( dataCache.get( indexB ) ),
-                compareType );
-    }
-
     @Override
     public void acceptMemoryStatsVisitor( MemoryStatsVisitor visitor )
     {

community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutor.java

@@ -19,7 +19,6 @@
  */
 package org.neo4j.unsafe.impl.batchimport.executor;
 
-import java.lang.Thread.UncaughtExceptionHandler;
 import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -32,6 +31,8 @@
 import static java.lang.Integer.max;
 import static java.lang.Integer.min;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import static org.neo4j.helpers.Exceptions.SILENT_UNCAUGHT_EXCEPTION_HANDLER;
 import static org.neo4j.helpers.Exceptions.launderedException;
 
 /**
@@ -193,10 +194,6 @@ private void parkAWhile()
         parkStrategy.park( Thread.currentThread() );
     }
 
-    public static final UncaughtExceptionHandler SILENT_UNCAUGHT_EXCEPTION_HANDLER = ( t, e ) ->
-    {   // Don't print about it
-    };
-
     private class Processor extends Thread
     {
         // In addition to the global shutDown flag in the executor each processor has a local flag

community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ProducerStep.java

@@ -28,7 +28,7 @@
 import org.neo4j.unsafe.impl.batchimport.stats.Stat;
 import org.neo4j.unsafe.impl.batchimport.stats.StatsProvider;
 
-import static org.neo4j.unsafe.impl.batchimport.executor.DynamicTaskExecutor.SILENT_UNCAUGHT_EXCEPTION_HANDLER;
+import static org.neo4j.helpers.Exceptions.SILENT_UNCAUGHT_EXCEPTION_HANDLER;
 
 /**
  * Step that generally sits first in a {@link Stage} and produces batches that will flow downstream

community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ImportLogicTest.java

@@ -65,7 +65,6 @@ public void shouldSplitUpRelationshipTypesInBatches() throws Exception
             numberOfRelationships += count;
         }
         types.sort( ( t1, t2 ) -> Long.compare( t2.other(), t1.other() ) );
-        @SuppressWarnings( "unchecked" )
         RelationshipTypeDistribution typeDistribution = new RelationshipTypeDistribution( types.stream().toArray( Pair[]::new ) );
 
         // WHEN enough memory for all types

enterprise/neo4j-enterprise/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresIT.java

@@ -56,7 +56,6 @@ public void startBatchingNeoStoreWithMetricsPluginEnabled() throws Exception
                 .batchingNeoStores( fileSystem, storeDir, RecordFormatSelector.defaultFormat(), Configuration.DEFAULT,
                         logService, AdditionalInitialIds.EMPTY, config ) )
         {
-            // empty block
             batchingNeoStores.createNew();
         }
         provider.assertNone( AssertableLogProvider.inLog( MetricsExtension.class ).any() );