Backport logging performance improvements to 1.1

DarthMax · DarthMax · commit 09e5bd427dcc · 2020-05-04T14:45:38.000+02:00
diff --git a/algo/src/main/java/org/neo4j/graphalgo/beta/k1coloring/K1ColoringFactory.java b/algo/src/main/java/org/neo4j/graphalgo/beta/k1coloring/K1ColoringFactory.java
@@ -35,7 +35,7 @@ public class K1ColoringFactory<T extends K1ColoringConfig> extends AlgorithmFact
 
     @Override
     public K1Coloring build(Graph graph, T configuration, AllocationTracker tracker, Log log) {
-        var progressLogger = new BatchingProgressLogger(
+        ProgressLogger progressLogger = new BatchingProgressLogger(
             log,
             graph.nodeCount() * 2,
             "K1Coloring",
diff --git a/algo/src/main/java/org/neo4j/graphalgo/beta/modularity/ModularityOptimizationFactory.java b/algo/src/main/java/org/neo4j/graphalgo/beta/modularity/ModularityOptimizationFactory.java
@@ -80,7 +80,7 @@ public ModularityOptimization build(Graph graph, T configuration, AllocationTrac
     }
 
     public ModularityOptimization build(Graph graph, T configuration, NodeProperties seed, AllocationTracker tracker, Log log) {
-        var progressLogger = new BatchingProgressLogger(
+        ProgressLogger progressLogger = new BatchingProgressLogger(
             log,
             graph.relationshipCount(),
             "ModularityOptimization",
diff --git a/algo/src/main/java/org/neo4j/graphalgo/labelpropagation/LabelPropagationFactory.java b/algo/src/main/java/org/neo4j/graphalgo/labelpropagation/LabelPropagationFactory.java
@@ -51,7 +51,7 @@ public LabelPropagation build(
         AllocationTracker tracker,
         Log log
     ) {
-        var progressLogger = new BatchingProgressLogger(
+        ProgressLogger progressLogger = new BatchingProgressLogger(
             log,
             graph.relationshipCount(),
             "LabelPropagation",
diff --git a/algo/src/main/java/org/neo4j/graphalgo/louvain/LouvainFactory.java b/algo/src/main/java/org/neo4j/graphalgo/louvain/LouvainFactory.java
@@ -28,6 +28,7 @@
 import org.neo4j.graphalgo.core.concurrency.Pools;
 import org.neo4j.graphalgo.core.loading.NativeFactory;
 import org.neo4j.graphalgo.core.utils.BatchingProgressLogger;
+import org.neo4j.graphalgo.core.utils.ProgressLogger;
 import org.neo4j.graphalgo.core.utils.mem.MemoryEstimation;
 import org.neo4j.graphalgo.core.utils.mem.MemoryEstimations;
 import org.neo4j.graphalgo.core.utils.mem.MemoryRange;
@@ -46,7 +47,7 @@ public Louvain build(
         final AllocationTracker tracker,
         final Log log
     ) {
-        var progressLogger = new BatchingProgressLogger(log, 1, "Louvain",
+        ProgressLogger progressLogger = new BatchingProgressLogger(log, 1, "Louvain",
             configuration.concurrency()
         );
 
diff --git a/algo/src/main/java/org/neo4j/graphalgo/nodesim/NodeSimilarityFactory.java b/algo/src/main/java/org/neo4j/graphalgo/nodesim/NodeSimilarityFactory.java
@@ -24,6 +24,7 @@
 import org.neo4j.graphalgo.api.Graph;
 import org.neo4j.graphalgo.core.concurrency.Pools;
 import org.neo4j.graphalgo.core.utils.BatchingProgressLogger;
+import org.neo4j.graphalgo.core.utils.ProgressLogger;
 import org.neo4j.graphalgo.core.utils.mem.MemoryEstimation;
 import org.neo4j.graphalgo.core.utils.mem.MemoryEstimations;
 import org.neo4j.graphalgo.core.utils.paged.AllocationTracker;
@@ -36,7 +37,7 @@ public class NodeSimilarityFactory<CONFIG extends NodeSimilarityBaseConfig> exte
 
     @Override
     public NodeSimilarity build(Graph graph, CONFIG configuration, AllocationTracker tracker, Log log) {
-        var progressLogger = new BatchingProgressLogger(
+        ProgressLogger progressLogger = new BatchingProgressLogger(
             log,
             graph.relationshipCount(),
             "NodeSimilarity",
diff --git a/algo/src/main/java/org/neo4j/graphalgo/pagerank/PageRankFactory.java b/algo/src/main/java/org/neo4j/graphalgo/pagerank/PageRankFactory.java
@@ -52,7 +52,7 @@ public PageRank build(
         AllocationTracker tracker,
         Log log
     ) {
-        var progressLogger = new BatchingProgressLogger(
+        ProgressLogger progressLogger = new BatchingProgressLogger(
             log,
             graph.relationshipCount(),
             getClass().getSimpleName(),
diff --git a/algo/src/test/java/org/neo4j/graphalgo/beta/k1coloring/K1ColoringTest.java b/algo/src/test/java/org/neo4j/graphalgo/beta/k1coloring/K1ColoringTest.java
@@ -237,16 +237,16 @@ void everyNodeShouldHaveBeenColored() {
 
     @Test
     void shouldLogProgress(){
-        var graph = RandomGraphGenerator.generate(
+        Graph graph = RandomGraphGenerator.generate(
             100,
             10,
             RelationshipDistribution.UNIFORM,
             42L
         );
 
-        var testLogger = new TestProgressLogger(graph.relationshipCount() * 2, "K1Coloring", 8);
+        TestProgressLogger testLogger = new TestProgressLogger(graph.relationshipCount() * 2, "K1Coloring", 8);
 
-        var k1Coloring = new K1Coloring(
+        K1Coloring k1Coloring = new K1Coloring(
             graph,
             100,
             DEFAULT_BATCH_SIZE,
diff --git a/algo/src/test/java/org/neo4j/graphalgo/beta/modularity/ModularityOptimizationTest.java b/algo/src/test/java/org/neo4j/graphalgo/beta/modularity/ModularityOptimizationTest.java
@@ -215,21 +215,21 @@ private long[] getCommunityIds(long nodeCount, ModularityOptimization pmo) {
 
     @Test
     void testLogging() {
-        var graph = new StoreLoaderBuilder()
+        Graph graph = new StoreLoaderBuilder()
             .api(db)
             .loadAnyLabel()
             .putRelationshipProjectionsWithIdentifier("TYPE_OUT", RelationshipProjection.of("TYPE", Orientation.NATURAL))
             .putRelationshipProjectionsWithIdentifier("TYPE_IN", RelationshipProjection.of("TYPE", Orientation.REVERSE))
             .build()
             .graph(NativeFactory.class);
 
-        var testLogger = new TestProgressLogger(
+        TestProgressLogger testLogger = new TestProgressLogger(
             graph.relationshipCount(),
             "ModularityOptimization",
             3
         );
 
-        var modularityOptimization = new ModularityOptimization(
+        ModularityOptimization modularityOptimization = new ModularityOptimization(
             graph,
             3,
             TOLERANCE_DEFAULT,
diff --git a/algo/src/test/java/org/neo4j/graphalgo/labelpropagation/LabelPropagationTest.java b/algo/src/test/java/org/neo4j/graphalgo/labelpropagation/LabelPropagationTest.java
@@ -262,16 +262,16 @@ void shouldBoundMemEstimationToMaxSupportedDegree() {
 
     @Test
     void shouldLogProgress(){
-        var graph = new StoreLoaderBuilder()
+        Graph graph = new StoreLoaderBuilder()
             .api(db)
             .addNodeLabel("User")
             .addRelationshipType("FOLLOW")
             .build()
             .graph(NativeFactory.class);
 
-        var testLogger = new TestProgressLogger(graph.relationshipCount(), "Louvain", defaultConfig().concurrency());
+        TestProgressLogger testLogger = new TestProgressLogger(graph.relationshipCount(), "Louvain", defaultConfig().concurrency());
 
-        var lp = new LabelPropagation(
+        LabelPropagation lp = new LabelPropagation(
             graph,
             defaultConfig(),
             Pools.DEFAULT,
diff --git a/algo/src/test/java/org/neo4j/graphalgo/louvain/LouvainTest.java b/algo/src/test/java/org/neo4j/graphalgo/louvain/LouvainTest.java
@@ -378,13 +378,13 @@ void testCanBeInterruptedByTxCancelation() {
 
     @Test
     void testLogging() {
-        var graph = loadGraph(NativeFactory.class, DB_CYPHER);
+        Graph graph = loadGraph(NativeFactory.class, DB_CYPHER);
 
-        var config = defaultConfigBuilder().build();
+        LouvainStreamConfig config = defaultConfigBuilder().build();
 
-        var testLogger = new TestProgressLogger(0, "Louvain", config.concurrency());
+        TestProgressLogger testLogger = new TestProgressLogger(0, "Louvain", config.concurrency());
 
-        var louvain = new Louvain(
+        Louvain louvain = new Louvain(
             graph,
             config,
             Pools.DEFAULT,
diff --git a/algo/src/test/java/org/neo4j/graphalgo/nodesim/NodeSimilarityTest.java b/algo/src/test/java/org/neo4j/graphalgo/nodesim/NodeSimilarityTest.java
@@ -814,16 +814,16 @@ void shouldComputeMemrecWithTop(int topK) {
     @ParameterizedTest(name = "topK = {0}, concurrency = {1}")
     @MethodSource("topKAndConcurrencies")
     void shouldLogMessages(int topK, int concurrency) {
-        var graph =  new StoreLoaderBuilder()
+        Graph graph =  new StoreLoaderBuilder()
             .api(db)
             .loadAnyLabel()
             .loadAnyRelationshipType()
             .build()
             .graph(NativeFactory.class);
 
-        var progressLogger = new TestProgressLogger(graph.relationshipCount(), "NodeSimilarity", concurrency);
+        TestProgressLogger progressLogger = new TestProgressLogger(graph.relationshipCount(), "NodeSimilarity", concurrency);
 
-        var nodeSimilarity = new NodeSimilarity(
+        NodeSimilarity nodeSimilarity = new NodeSimilarity(
             graph,
             configBuilder().topN(100).topK(topK).concurrency(concurrency).build(),
             Pools.DEFAULT,
@@ -854,17 +854,17 @@ void shouldLogMessages(int topK, int concurrency) {
     @ParameterizedTest(name = "concurrency = {0}")
     @ValueSource(ints = {1,2})
     void shouldLogProgress(int concurrency) {
-        var graph =  new StoreLoaderBuilder()
+        Graph graph =  new StoreLoaderBuilder()
             .api(db)
             .loadAnyLabel()
             .loadAnyRelationshipType()
             .globalOrientation(NATURAL)
             .build()
             .graph(NativeFactory.class);
 
-        var progressLogger = new TestProgressLogger(graph.relationshipCount(), "NodeSimilarity", concurrency);
+        TestProgressLogger progressLogger = new TestProgressLogger(graph.relationshipCount(), "NodeSimilarity", concurrency);
 
-        var nodeSimilarity = new NodeSimilarity(
+        NodeSimilarity nodeSimilarity = new NodeSimilarity(
             graph,
             configBuilder().degreeCutoff(0).concurrency(concurrency).build(),
             Pools.DEFAULT,
diff --git a/algo/src/test/java/org/neo4j/graphalgo/pagerank/PageRankTest.java b/algo/src/test/java/org/neo4j/graphalgo/pagerank/PageRankTest.java
@@ -302,22 +302,22 @@ void shouldComputeMemoryEstimation42Threads() {
 
     @Test
     void shouldLogProgress() {
-        var graph = new StoreLoaderBuilder()
+        Graph graph = new StoreLoaderBuilder()
             .api(db)
             .addNodeLabel(LABEL.name())
             .addRelationshipType(RELATIONSHIP_TYPE)
             .build()
             .graph(NativeFactory.class);
 
-        var config = ImmutablePageRankStreamConfig.builder().build();
+        PageRankStreamConfig config = ImmutablePageRankStreamConfig.builder().build();
 
-        var testLogger = new TestProgressLogger(
+        TestProgressLogger testLogger = new TestProgressLogger(
             graph.relationshipCount(),
             "PageRank",
             config.concurrency()
         );
 
-        var pageRank = PageRankAlgorithmType.NON_WEIGHTED.create(
+        PageRank pageRank = PageRankAlgorithmType.NON_WEIGHTED.create(
             graph,
             config,
             LongStream.empty(),
diff --git a/algo/src/test/java/org/neo4j/graphalgo/wcc/WccTest.java b/algo/src/test/java/org/neo4j/graphalgo/wcc/WccTest.java
@@ -132,15 +132,15 @@ void shouldComputeComponents(Orientation orientation) {
 
     @Test
     void shouldLogProgress() {
-        var graph = new StoreLoaderBuilder()
+        Graph graph = new StoreLoaderBuilder()
             .api(db)
             .loadAnyLabel()
             .addRelationshipType(RELATIONSHIP_TYPE.name())
             .globalOrientation(Orientation.NATURAL)
             .build()
             .graph(NativeFactory.class);
 
-        var testLogger = new TestProgressLogger(graph.relationshipCount(), "Wcc", 2);
+        TestProgressLogger testLogger = new TestProgressLogger(graph.relationshipCount(), "Wcc", 2);
 
         new Wcc(
             graph,
diff --git a/core/src/main/java/org/neo4j/graphalgo/core/utils/BatchingProgressLogger.java b/core/src/main/java/org/neo4j/graphalgo/core/utils/BatchingProgressLogger.java
@@ -22,7 +22,6 @@
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.neo4j.logging.Log;
 
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAdder;
 import java.util.function.Supplier;
 
@@ -39,7 +38,7 @@ public class BatchingProgressLogger implements ProgressLogger {
 
     private static long calculateBatchSize(long taskVolume, int concurrency) {
         // target 100 logs per full run (every 1 percent)
-        var batchSize = taskVolume / 100;
+        long batchSize = taskVolume / 100;
         // split batchSize into thread-local chunks
         batchSize /= concurrency;
         // batchSize needs to be a power of two
diff --git a/proc/community/src/main/java/org/neo4j/graphalgo/wcc/WccProc.java b/proc/community/src/main/java/org/neo4j/graphalgo/wcc/WccProc.java
@@ -47,7 +47,7 @@ static <CONFIG extends WccBaseConfig> AlgorithmFactory<Wcc, CONFIG> algorithmFac
         return new AlgorithmFactory<Wcc, CONFIG>() {
             @Override
             public Wcc build(Graph graph, CONFIG configuration, AllocationTracker tracker, Log log) {
-                var progressLogger = new BatchingProgressLogger(
+                BatchingProgressLogger progressLogger = new BatchingProgressLogger(
                     log,
                     graph.relationshipCount(),
                     "WCC",

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public ModularityOptimization build(Graph graph, T configuration, AllocationTrac`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public ModularityOptimization build(Graph graph, T configuration, NodeProperties seed, AllocationTracker tracker, Log log) {`
`83`		`- var progressLogger = new BatchingProgressLogger(`
	`83`	`+ ProgressLogger progressLogger = new BatchingProgressLogger(`
`84`	`84`	`log,`
`85`	`85`	`graph.relationshipCount(),`
`86`	`86`	`"ModularityOptimization",`