Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[VP7iRcuF] Introduce helper methods from neo4j #187

Merged
merged 9 commits into from
Oct 5, 2022
Merged

[VP7iRcuF] Introduce helper methods from neo4j #187

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ce784a6
Copy over Pair helper from Neo4j
Lojjs Sep 12, 2022
ff193a4
Copy over relevant parts of Iterators and Iterables
Lojjs Sep 15, 2022
fbb6999
Use apoc MapUtil instead of Neo4j one
Lojjs Sep 15, 2022
5088d3d
Copy over rest of Neo4j helpers
Lojjs Sep 15, 2022
290c827
Remove unused benchmarking code
Lojjs Sep 16, 2022
2523252
Fix smaller review comments
Lojjs Sep 28, 2022
029b29b
Use Pair from apache instead of Neo4j
Lojjs Sep 29, 2022
61ef528
Add tests for helper methods from Neo4j
Lojjs Sep 30, 2022
322240d
Simplify test assertions
Lojjs Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ dependencies {
testImplementation group: 'org.neo4j', name: 'neo4j-kernel', version: neo4jVersionEffective, classifier: "tests"
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.1'

configurations.all {
exclude group: 'org.slf4j', module: 'slf4j-nop'
Expand Down
16 changes: 0 additions & 16 deletions common/src/jmh/java/apoc/AsyncIndexingGraphDatabaseState.java
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions common/src/jmh/java/apoc/GraphDatabaseState.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions common/src/jmh/java/apoc/IndexTrackingGraphDatabaseState.java
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions common/src/jmh/java/apoc/IndexUpdateBenchmarks.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions common/src/jmh/java/apoc/SyncIndexingGraphDatabaseState.java
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions common/src/main/java/apoc/algo/PathFindingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package apoc.algo;

import apoc.path.RelationshipTypeAndDirections;
import org.apache.commons.lang3.tuple.Pair;
import org.neo4j.graphalgo.EstimateEvaluator;
import org.neo4j.graphdb.Direction;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.PathExpander;
import org.neo4j.graphdb.PathExpanderBuilder;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.internal.helpers.collection.Pair;
import org.neo4j.values.storable.PointValue;

public class PathFindingUtils {
Expand Down Expand Up @@ -62,17 +62,17 @@ public static PathExpander<Double> buildPathExpander(String relationshipsAndDire
PathExpanderBuilder builder = PathExpanderBuilder.empty();
for (Pair<RelationshipType, Direction> pair : RelationshipTypeAndDirections
.parse(relationshipsAndDirections)) {
if (pair.first() == null) {
if (pair.other() == null) {
if (pair.getLeft() == null) {
if (pair.getRight() == null) {
builder = PathExpanderBuilder.allTypesAndDirections();
} else {
builder = PathExpanderBuilder.allTypes(pair.other());
builder = PathExpanderBuilder.allTypes(pair.getRight());
}
} else {
if (pair.other() == null) {
builder = builder.add(pair.first());
if (pair.getRight() == null) {
builder = builder.add(pair.getLeft());
} else {
builder = builder.add(pair.first(), pair.other());
builder = builder.add(pair.getLeft(), pair.getRight());
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions common/src/main/java/apoc/convert/ConvertUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package apoc.convert;

import org.neo4j.internal.helpers.collection.Iterators;

import apoc.util.collection.Iterables;
import apoc.util.collection.Iterators;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not directly related, but we could change rows 20 and 21 with these?

        else if (list instanceof Iterable) return Iterables.asList((Iterable)list);
        else if (list instanceof Iterator) return Iterators.asList((Iterator)list);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -19,8 +19,8 @@ public static List convertToList(Object list) {
if (list == null) return null;
else if (list instanceof List) return (List) list;
else if (list instanceof Collection) return new ArrayList((Collection)list);
else if (list instanceof Iterable) return Iterators.addToCollection(((Iterable)list).iterator(),(List)new ArrayList<>(100));
else if (list instanceof Iterator) return Iterators.addToCollection((Iterator)list,(List)new ArrayList<>(100));
else if (list instanceof Iterable) return Iterables.asList((Iterable)list);
else if (list instanceof Iterator) return Iterators.asList((Iterator)list);
else if (list.getClass().isArray()) {
final Object[] objectArray;
if (list.getClass().getComponentType().isPrimitive()) {
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/apoc/export/cypher/formatter/AbstractCypherFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import apoc.export.util.ExportFormat;
import apoc.export.util.Reporter;
import apoc.util.Util;
import apoc.util.collection.Iterables;
import org.apache.commons.lang3.StringUtils;
import org.neo4j.graphdb.Direction;
import org.neo4j.graphdb.GraphDatabaseService;
Expand All @@ -12,7 +13,6 @@
import org.neo4j.graphdb.Relationship;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.graphdb.Transaction;
import org.neo4j.internal.helpers.collection.Iterables;

import java.io.PrintWriter;
import java.util.*;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/apoc/export/cypher/formatter/CypherFormatterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import apoc.export.util.FormatUtils;
import apoc.util.Util;
import apoc.util.collection.Iterables;
import org.neo4j.graphdb.Label;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.internal.helpers.collection.Iterables;
import org.neo4j.values.storable.DurationValue;
import org.neo4j.values.storable.Value;
import org.neo4j.values.storable.Values;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/apoc/export/util/MetaInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import static apoc.gephi.GephiFormatUtils.getCaption;
import static apoc.meta.tablesforlabels.PropertyTracker.typeMappings;
import static apoc.util.collection.Iterables.stream;
import static java.util.Arrays.asList;
import static org.neo4j.internal.helpers.collection.Iterables.stream;

/**
* @author mh
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/apoc/export/util/NodesAndRelsSubGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package apoc.export.util;

import apoc.util.collection.Iterables;
import org.neo4j.cypher.export.SubGraph;
import org.neo4j.graphdb.Label;
import org.neo4j.graphdb.Node;
Expand All @@ -9,7 +10,6 @@
import org.neo4j.graphdb.schema.ConstraintDefinition;
import org.neo4j.graphdb.schema.IndexDefinition;
import org.neo4j.graphdb.schema.Schema;
import org.neo4j.internal.helpers.collection.Iterables;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/apoc/graph/GraphsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package apoc.graph;

import apoc.util.collection.Iterables;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Path;
import org.neo4j.graphdb.Relationship;
import org.neo4j.internal.helpers.collection.Iterables;

public class GraphsUtils {
public static boolean extract(Object data, Set<Node> nodes, Set<Relationship> rels) {
Expand Down
6 changes: 3 additions & 3 deletions common/src/main/java/apoc/path/RelationshipTypeAndDirections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package apoc.path;

import org.apache.commons.lang3.tuple.Pair;
import org.neo4j.graphdb.Direction;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.internal.helpers.collection.Pair;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -20,8 +20,8 @@ public abstract class RelationshipTypeAndDirections {
public static final char BACKTICK = '`';

public static String format(Pair<RelationshipType, Direction> typeAndDirection) {
String type = typeAndDirection.first().name();
switch (typeAndDirection.other()) {
String type = typeAndDirection.getLeft().name();
switch (typeAndDirection.getRight()) {
case OUTGOING:
return type + ">";
case INCOMING:
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/apoc/periodic/PeriodicUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import apoc.Pools;
import apoc.util.Util;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.QueryStatistics;
import org.neo4j.graphdb.Transaction;
import org.neo4j.internal.helpers.collection.Pair;
import org.neo4j.logging.Log;
import org.neo4j.procedure.TerminationGuard;

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/apoc/result/VirtualGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package apoc.result;

import apoc.util.MapUtil;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.internal.helpers.collection.MapUtil;

import java.util.Collection;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/apoc/result/VirtualNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package apoc.result;

import apoc.util.Util;
import apoc.util.collection.FilteringIterable;
import apoc.util.collection.Iterables;
import org.neo4j.graphdb.*;
import org.neo4j.internal.helpers.collection.FilteringIterable;
import org.neo4j.internal.helpers.collection.Iterables;

import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/apoc/result/WrappedNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package apoc.result;

import apoc.util.collection.FilteringIterable;
import apoc.util.collection.Iterables;
import org.neo4j.graphdb.*;
import org.neo4j.internal.helpers.collection.FilteringIterable;
import org.neo4j.internal.helpers.collection.Iterables;

import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
Expand Down
6 changes: 3 additions & 3 deletions common/src/main/java/apoc/trigger/TriggerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
import apoc.Pools;
import apoc.SystemLabels;
import apoc.SystemPropertyKeys;
import apoc.util.MapUtil;
import apoc.util.collection.Iterators;
import apoc.util.Util;
import org.apache.commons.lang3.tuple.Pair;
import org.neo4j.dbms.api.DatabaseManagementService;
import org.neo4j.function.ThrowingFunction;
import org.neo4j.graphdb.GraphDatabaseService;
Expand All @@ -13,9 +16,6 @@
import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.event.TransactionData;
import org.neo4j.graphdb.event.TransactionEventListener;
import org.neo4j.internal.helpers.collection.Iterators;
import org.neo4j.internal.helpers.collection.MapUtil;
import org.neo4j.internal.helpers.collection.Pair;
import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
import org.neo4j.kernel.api.procedure.Context;
import org.neo4j.kernel.api.procedure.GlobalProcedures;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/apoc/trigger/TriggerMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import apoc.result.VirtualNode;
import apoc.result.VirtualRelationship;
import apoc.util.Util;
import apoc.util.collection.Iterables;
import org.neo4j.graphdb.Entity;
import org.neo4j.graphdb.Label;
import org.neo4j.graphdb.Node;
Expand All @@ -12,7 +13,6 @@
import org.neo4j.graphdb.event.LabelEntry;
import org.neo4j.graphdb.event.PropertyEntry;
import org.neo4j.graphdb.event.TransactionData;
import org.neo4j.internal.helpers.collection.Iterables;

import java.util.ArrayList;
import java.util.Collections;
Expand Down
Loading