From 9dd08176164bf599707e1860ee40f60d6440ffdb Mon Sep 17 00:00:00 2001 From: Martin Knobloch Date: Wed, 31 Jan 2018 15:52:48 +0100 Subject: [PATCH 1/2] #551 & #552 --- .../org/neo4j/graphalgo/bench/UFBenchmarkCombination.java | 5 ----- .../org/neo4j/graphalgo/core/huge/HugeGraphWeightTest.java | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/benchmark/src/main/java/org/neo4j/graphalgo/bench/UFBenchmarkCombination.java b/benchmark/src/main/java/org/neo4j/graphalgo/bench/UFBenchmarkCombination.java index 9dbbffaa2..08107cc83 100644 --- a/benchmark/src/main/java/org/neo4j/graphalgo/bench/UFBenchmarkCombination.java +++ b/benchmark/src/main/java/org/neo4j/graphalgo/bench/UFBenchmarkCombination.java @@ -28,11 +28,6 @@ public enum UFBenchmarkCombination { - LIGHT_QUEUE(GraphImpl.LIGHT, UnionFindAlgo.QUEUE), - LIGHT_FORK_JOIN(GraphImpl.LIGHT, UnionFindAlgo.FORK_JOIN), - LIGHT_FJ_MERGE(GraphImpl.LIGHT, UnionFindAlgo.FJ_MERGE), - LIGHT_SEQ(GraphImpl.LIGHT, UnionFindAlgo.SEQ), - HEAVY_QUEUE(GraphImpl.HEAVY, UnionFindAlgo.QUEUE), HEAVY_FORK_JOIN(GraphImpl.HEAVY, UnionFindAlgo.FORK_JOIN), HEAVY_FJ_MERGE(GraphImpl.HEAVY, UnionFindAlgo.FJ_MERGE), diff --git a/tests/src/test/java/org/neo4j/graphalgo/core/huge/HugeGraphWeightTest.java b/tests/src/test/java/org/neo4j/graphalgo/core/huge/HugeGraphWeightTest.java index f6712f467..6c685387e 100644 --- a/tests/src/test/java/org/neo4j/graphalgo/core/huge/HugeGraphWeightTest.java +++ b/tests/src/test/java/org/neo4j/graphalgo/core/huge/HugeGraphWeightTest.java @@ -26,6 +26,7 @@ import org.neo4j.graphalgo.core.utils.paged.MemoryUsage; import org.neo4j.graphalgo.core.utils.paged.PageUtil; import org.neo4j.graphdb.Direction; +import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.TokenWriteOperations; @@ -70,7 +71,7 @@ public void shouldLoadMoreWeights() throws Exception { } private void mkDb(final int nodes, final int relsPerNode) { - db.executeAndCommit(__ -> { + db.executeAndCommit((GraphDatabaseService __) -> { try (Statement st = db.statement()) { TokenWriteOperations token = st.tokenWriteOperations(); int type = token.relationshipTypeGetOrCreateForName("TYPE"); From 435324d44148159a88bb1f7740c624b4825bc9e2 Mon Sep 17 00:00:00 2001 From: Martin Knobloch Date: Wed, 31 Jan 2018 16:12:17 +0100 Subject: [PATCH 2/2] WIP --- .../main/java/org/neo4j/graphalgo/bench/GraphLoadLdbc.java | 2 +- .../java/org/neo4j/graphalgo/bench/PageRankBenchmark.java | 2 +- .../org/neo4j/graphalgo/bench/PageRankBenchmarkLdbc.java | 2 +- .../org/neo4j/graphalgo/bench/TriangleCountBenchmark.java | 2 +- .../org/neo4j/graphalgo/bench/UFBenchmarkCombination.java | 5 ----- .../java/org/neo4j/graphalgo/bench/UnionFindBenchmark.java | 2 +- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/benchmark/src/main/java/org/neo4j/graphalgo/bench/GraphLoadLdbc.java b/benchmark/src/main/java/org/neo4j/graphalgo/bench/GraphLoadLdbc.java index 2550e9b78..bbe02daf9 100644 --- a/benchmark/src/main/java/org/neo4j/graphalgo/bench/GraphLoadLdbc.java +++ b/benchmark/src/main/java/org/neo4j/graphalgo/bench/GraphLoadLdbc.java @@ -50,7 +50,7 @@ @OutputTimeUnit(TimeUnit.MILLISECONDS) public class GraphLoadLdbc { - @Param({"LIGHT", "HEAVY", "HUGE"}) + @Param({"HEAVY", "HUGE"}) GraphImpl graph; @Param({"true", "false"}) diff --git a/benchmark/src/main/java/org/neo4j/graphalgo/bench/PageRankBenchmark.java b/benchmark/src/main/java/org/neo4j/graphalgo/bench/PageRankBenchmark.java index ce2876398..ac1b5eab9 100644 --- a/benchmark/src/main/java/org/neo4j/graphalgo/bench/PageRankBenchmark.java +++ b/benchmark/src/main/java/org/neo4j/graphalgo/bench/PageRankBenchmark.java @@ -57,7 +57,7 @@ public class PageRankBenchmark { @Param({"5", "20", "100"}) int iterations; - @Param({"LIGHT", "HEAVY", "VIEW", "HUGE"}) + @Param({"HEAVY", "VIEW", "HUGE"}) GraphImpl impl; private GraphDatabaseAPI db; diff --git a/benchmark/src/main/java/org/neo4j/graphalgo/bench/PageRankBenchmarkLdbc.java b/benchmark/src/main/java/org/neo4j/graphalgo/bench/PageRankBenchmarkLdbc.java index 93e7a9f5c..7c9f0805f 100644 --- a/benchmark/src/main/java/org/neo4j/graphalgo/bench/PageRankBenchmarkLdbc.java +++ b/benchmark/src/main/java/org/neo4j/graphalgo/bench/PageRankBenchmarkLdbc.java @@ -52,7 +52,7 @@ @OutputTimeUnit(TimeUnit.MILLISECONDS) public class PageRankBenchmarkLdbc { - @Param({"LIGHT", "HEAVY", "HUGE"}) + @Param({"HEAVY", "HUGE"}) GraphImpl graph; @Param({"true", "false"}) diff --git a/benchmark/src/main/java/org/neo4j/graphalgo/bench/TriangleCountBenchmark.java b/benchmark/src/main/java/org/neo4j/graphalgo/bench/TriangleCountBenchmark.java index 5a4c285d2..5fe7837b9 100644 --- a/benchmark/src/main/java/org/neo4j/graphalgo/bench/TriangleCountBenchmark.java +++ b/benchmark/src/main/java/org/neo4j/graphalgo/bench/TriangleCountBenchmark.java @@ -58,7 +58,7 @@ public class TriangleCountBenchmark { @Param({"true", "false"}) private boolean parallel; - @Param({"LIGHT", "HEAVY", "HUGE"}) + @Param({"HEAVY", "HUGE"}) GraphImpl graph; private int concurrency; diff --git a/benchmark/src/main/java/org/neo4j/graphalgo/bench/UFBenchmarkCombination.java b/benchmark/src/main/java/org/neo4j/graphalgo/bench/UFBenchmarkCombination.java index 9dbbffaa2..08107cc83 100644 --- a/benchmark/src/main/java/org/neo4j/graphalgo/bench/UFBenchmarkCombination.java +++ b/benchmark/src/main/java/org/neo4j/graphalgo/bench/UFBenchmarkCombination.java @@ -28,11 +28,6 @@ public enum UFBenchmarkCombination { - LIGHT_QUEUE(GraphImpl.LIGHT, UnionFindAlgo.QUEUE), - LIGHT_FORK_JOIN(GraphImpl.LIGHT, UnionFindAlgo.FORK_JOIN), - LIGHT_FJ_MERGE(GraphImpl.LIGHT, UnionFindAlgo.FJ_MERGE), - LIGHT_SEQ(GraphImpl.LIGHT, UnionFindAlgo.SEQ), - HEAVY_QUEUE(GraphImpl.HEAVY, UnionFindAlgo.QUEUE), HEAVY_FORK_JOIN(GraphImpl.HEAVY, UnionFindAlgo.FORK_JOIN), HEAVY_FJ_MERGE(GraphImpl.HEAVY, UnionFindAlgo.FJ_MERGE), diff --git a/benchmark/src/main/java/org/neo4j/graphalgo/bench/UnionFindBenchmark.java b/benchmark/src/main/java/org/neo4j/graphalgo/bench/UnionFindBenchmark.java index b284750ec..12066cbc2 100644 --- a/benchmark/src/main/java/org/neo4j/graphalgo/bench/UnionFindBenchmark.java +++ b/benchmark/src/main/java/org/neo4j/graphalgo/bench/UnionFindBenchmark.java @@ -49,7 +49,7 @@ @OutputTimeUnit(TimeUnit.MICROSECONDS) public class UnionFindBenchmark { - @Param({"LIGHT_QUEUE", "LIGHT_FORK_JOIN", "LIGHT_FJ_MERGE", "LIGHT_SEQ", "HEAVY_QUEUE", "HEAVY_FORK_JOIN", "HEAVY_FJ_MERGE", "HEAVY_SEQ", "HUGE_QUEUE", "HUGE_FORK_JOIN", "HUGE_FJ_MERGE", "HUGE_SEQ", "HUGE_HUGE_QUEUE", "HUGE_HUGE_FORK_JOIN", "HUGE_HUGE_FJ_MERGE", "HUGE_HUGE_SEQ"}) + @Param({"HEAVY_QUEUE", "HEAVY_FORK_JOIN", "HEAVY_FJ_MERGE", "HEAVY_SEQ", "HUGE_QUEUE", "HUGE_FORK_JOIN", "HUGE_FJ_MERGE", "HUGE_SEQ", "HUGE_HUGE_QUEUE", "HUGE_HUGE_FORK_JOIN", "HUGE_HUGE_FJ_MERGE", "HUGE_HUGE_SEQ"}) UFBenchmarkCombination uf; private Graph theGraph;