Merge pull request #281 from lqst/test_speedup

Let's make unit tests run faster (4.4)

Author: jbarrasa

README.md

@@ -1,6 +1,7 @@
 # neosemantics (n10s)
 ![n10s Logo](https://guides.neo4j.com/rdf/n10s.png) neosemantics is a plugin that enables the **use of RDF in Neo4j**. [RDF is a W3C standard model](https://www.w3.org/RDF/) for data interchange. Some key features of n10s are:
 
+
 * **Store RDF data in Neo4j** in a
 lossless manner (imported RDF can subsequently be exported without losing a single triple in the process).
 * On-demand **export property graph data** from Neo4j *as RDF*.

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>org.neo4j</groupId>
   <artifactId>neosemantics</artifactId>
-  <version>4.4.0.2</version>
+  <version>5.1.0.0</version>
   <packaging>jar</packaging>
   <name>neosemantics (n10s)</name>
   <description>n10s is a plugin that enables the use of RDF in Neo4j</description>
@@ -34,8 +34,8 @@
   </developers>
 
   <properties>
-    <neo4j.version>4.4.11</neo4j.version>
-    <sesame.version>3.7.7</sesame.version>
+    <neo4j.version>5.1.0</neo4j.version>
+    <sesame.version>4.2.0</sesame.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

src/main/java/n10s/Util.java

@@ -126,7 +126,7 @@ private static String buildCypher(String uri, String graphUri, Map<String, Objec
       cypher.append("AND n.graphUri = $graphUri ");
       params.put("graphUri", graphUri);
     } else {
-      cypher.append("AND NOT EXISTS(n.graphUri) ");
+      cypher.append("AND n.graphUri is null ");
     }
     cypher.append("RETURN n");
     return cypher.toString();

src/main/java/n10s/endpoint/RDFEndpoint.java

@@ -37,7 +37,6 @@
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.NotFoundException;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.logging.Log;
 
 /**
  * Created by jbarrasa on 08/09/2016.
@@ -70,10 +69,6 @@ public class RDFEndpoint {
       RDFFormat.TURTLE, RDFFormat.NTRIPLES, RDFFormat.TRIG, RDFFormat.NQUADS, RDFFormat.TURTLESTAR,
       RDFFormat.TRIGSTAR};
 
-  @Context
-  public Log log;
-
-
   @GET
   @Path("/ping")
   public Response ping() throws IOException {
@@ -321,27 +316,21 @@ private void handleSerialisationError(OutputStream outputStream, Exception e,
   private RDFFormat getFormat(String mimetype, String formatParam) {
     // format request param overrides the one defined in the accept header param
     if (formatParam != null) {
-      log.debug("serialization from param in request: " + formatParam);
       for (RDFFormat parser : availableParsers) {
         if (parser.getName().contains(formatParam)) {
-          log.debug("parser to be used: " + parser.getDefaultMIMEType());
           return parser;
         }
       }
     } else {
       if (mimetype != null) {
-        log.debug("serialization from media type in request: " + mimetype);
         for (RDFFormat parser : availableParsers) {
           if (parser.getMIMETypes().contains(mimetype)) {
-            log.debug("parser to be used: " + parser.getDefaultMIMEType());
             return parser;
           }
         }
       }
     }
 
-    log.debug("Unrecognized or undefined serialization. Defaulting to Turtle serialization");
-
     return RDFFormat.TURTLE;
 
   }

src/main/java/n10s/mapping/MappingUtils.java

@@ -65,7 +65,7 @@ public Stream<MappingDesc> add(@Name("elementUri") String rdfVocElement,
         + "DETACH DELETE oldmd";
 
     String cleanOrphansIfAny = "MATCH (oldns:`_MapNs`)\n"
-        + " WHERE size((oldns)<-[:_IN]-())=0\n"
+        + " WHERE not (oldns)<-[:_IN]-() \n"
         + " DELETE oldns";
 
     String createNewMapping = "MERGE (newmns:`_MapNs` { _ns: $namespace, _prefix: $prefix }) \n"
@@ -105,7 +105,7 @@ public Stream<StringOutput> dropAll(@Name("namespace") String schemaUri) {
   public Stream<StringOutput> drop(@Name("graphElementName") String gElem)
       throws MappingDefinitionException {
     String cypher = "MATCH (mapns)<-[:_IN]-(elem:_MapDef { _key : $local }) DETACH DELETE elem "
-        + "RETURN count(elem) AS deletecount, size((mapns)<-[:_IN]-()) AS remaining, mapns ";
+        + "RETURN count(elem) AS deletecount, size([(mapns)<-[r:_IN]-() | r ]) AS remaining, mapns ";
     Map<String, Object> params = new HashMap<>();
     params.put("local", gElem);
     Result queryResult = tx.execute(cypher, params);

src/main/java/n10s/quadrdf/RDFQuadToLPGStatementProcessor.java

@@ -106,7 +106,7 @@ String buildCypher(String uri, String graphUri, Map<String, Object> params) {
       cypher.append("AND n.graphUri = $graphUri ");
       params.put("graphUri", graphUri);
     } else {
-      cypher.append("AND NOT EXISTS(n.graphUri) ");
+      cypher.append("AND n.graphUri is null ");
     }
     cypher.append("RETURN n");
     return cypher.toString();

src/main/java/n10s/rdf/export/LPGRDFToRDFProcesssor.java

@@ -161,19 +161,19 @@ public Stream<Statement> streamNodeByUri(String uri, String graphId, boolean exc
     params.put("uri", uri);
     if (graphId == null || graphId.equals("")) {
       queryWithContext = "MATCH (x:Resource {uri:$uri}) " +
-          "WHERE NOT EXISTS(x.graphUri)\n" +
+          "WHERE x.graphUri is null \n" +
           "OPTIONAL MATCH (x)-[r]-(val:Resource) " +
-          "WHERE exists(val.uri)\n" +
-          "AND NOT EXISTS(val.graphUri)\n" +
+          "WHERE val.uri is not null \n" +
+          "AND val.graphUri is null \n" +
           "RETURN x, r, val.uri AS value";
 
       queryNoContext = "MATCH (x:Resource {uri:$uri}) " +
-          "WHERE NOT EXISTS(x.graphUri)\n" +
+          "WHERE x.graphUri is null \n" +
           "RETURN x, null AS r, null AS value";
     } else {
       queryWithContext = "MATCH (x:Resource {uri:$uri, graphUri:$graphUri}) " +
           "OPTIONAL MATCH (x)-[r]-(val:Resource {graphUri:$graphUri}) " +
-          "WHERE exists(val.uri)\n" +
+          "WHERE val.uri is not null \n" +
           "RETURN x, r, val.uri AS value";
 
       queryNoContext = "MATCH (x:Resource {uri:$uri, graphUri:$graphUri}) " +
@@ -441,7 +441,7 @@ public Stream<Statement> streamTriplesFromTriplePattern(TriplePattern tp)
             result = tx.execute("MATCH (r:Resource) WHERE size(labels(r))>1 RETURN r");
           }  else {
             result = tx.execute(String
-                .format("MATCH (r:Resource) WHERE exists(r.`%s`) RETURN r\n"
+                .format("MATCH (r:Resource) WHERE r.`%s` is not null RETURN r\n"
                         + "UNION \n"
                         + "MATCH (:Resource)-[r:`%s`]->() RETURN r",
                     predicate, predicate));

src/main/java/n10s/rdf/export/LPGToRDFProcesssor.java

@@ -400,7 +400,7 @@ public Stream<Statement> streamTriplesFromTriplePattern(TriplePattern tp)
             //CHECK IF predicate is <NONE>, in which case there's no point in running the query
             if (!predicate.equals(NOT_MATCHING_NS)) {
               result = tx.execute(String
-                      .format("MATCH (s) WHERE exists(s.`%s`) RETURN s, s.`%s` as o\n"
+                      .format("MATCH (s) WHERE s.`%s` is not null RETURN s, s.`%s` as o\n"
                                       + "UNION \n"
                                       + "MATCH (s)-[:`%s`]->(o) RETURN s, o",
                               predicate, predicate, predicate));

src/main/java/n10s/result/VirtualNode.java

@@ -11,11 +11,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import n10s.Util;
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.Label;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.RelationshipType;
+import org.neo4j.graphdb.*;
 import org.neo4j.internal.helpers.collection.FilteringIterable;
 import org.neo4j.internal.helpers.collection.Iterables;
 
@@ -61,6 +57,12 @@ public long getId() {
     return id;
   }
 
+  @Override
+  public String getElementId()
+  {
+    return String.valueOf( id );
+  }
+
   @Override
   public void delete() {
     for (Relationship rel : rels) {
@@ -69,8 +71,8 @@ public void delete() {
   }
 
   @Override
-  public Iterable<Relationship> getRelationships() {
-    return rels;
+  public ResourceIterable<Relationship> getRelationships() {
+    return Iterables.asResourceIterable(rels);
   }
 
   @Override
@@ -79,8 +81,8 @@ public boolean hasRelationship() {
   }
 
   @Override
-  public Iterable<Relationship> getRelationships(RelationshipType... relationshipTypes) {
-    return new FilteringIterable<>(rels, (r) -> isType(r, relationshipTypes));
+  public ResourceIterable<Relationship> getRelationships(RelationshipType... relationshipTypes) {
+    return Iterables.asResourceIterable(new FilteringIterable<>(rels, (r) -> isType(r, relationshipTypes)));
   }
 
   private boolean isType(Relationship r, RelationshipType... relationshipTypes) {
@@ -93,10 +95,10 @@ private boolean isType(Relationship r, RelationshipType... relationshipTypes) {
   }
 
   @Override
-  public Iterable<Relationship> getRelationships(Direction direction,
+  public ResourceIterable<Relationship> getRelationships(Direction direction,
       RelationshipType... relationshipTypes) {
-    return new FilteringIterable<>(rels,
-        (r) -> isType(r, relationshipTypes) && isDirection(r, direction));
+    return Iterables.asResourceIterable(new FilteringIterable<>(rels,
+        (r) -> isType(r, relationshipTypes) && isDirection(r, direction)));
   }
 
   private boolean isDirection(Relationship r, Direction direction) {
@@ -115,8 +117,8 @@ public boolean hasRelationship(Direction direction, RelationshipType... relation
   }
 
   @Override
-  public Iterable<Relationship> getRelationships(Direction direction) {
-    return new FilteringIterable<>(rels, (r) -> isDirection(r, direction));
+  public ResourceIterable<Relationship> getRelationships(Direction direction) {
+    return Iterables.asResourceIterable(new FilteringIterable<>(rels, (r) -> isDirection(r, direction)));
   }
 
   @Override

src/main/java/n10s/result/VirtualRelationship.java

@@ -54,6 +54,12 @@ public long getId() {
     return id;
   }
 
+  @Override
+  public String getElementId()
+  {
+    return String.valueOf( id );
+  }
+
   @Override
   public void delete() {
     if (getStartNode() instanceof VirtualNode) {