added local file tests - small changes

neo4j · Dec 9, 2022 · 3d226f2 · 3d226f2
1 parent 4d14a8d
commit 3d226f2
Show file tree

Hide file tree

Showing 10 changed files with 65,304 additions and 16 deletions.
diff --git a/core/src/main/java/apoc/export/graphml/ExportGraphML.java b/core/src/main/java/apoc/export/graphml/ExportGraphML.java
@@ -75,7 +75,7 @@ public Stream<ProgressInfo> file(@Name("urlOrBinaryFile") Object urlOrBinaryFile
 
             if (exportConfig.storeNodeIds()) graphMLReader.storeNodeIds();
 
-            graphMLReader.parseXML(FileUtils.readerFor(urlOrBinaryFile, exportConfig.getCompressionAlgo()));
+            graphMLReader.parseXML(FileUtils.readerFor(urlOrBinaryFile, exportConfig.getCompressionAlgo()), terminationGuard);
             return reporter.getTotal();
         });
         return Stream.of(result);

diff --git a/core/src/main/java/apoc/export/graphml/XmlGraphMLReader.java b/core/src/main/java/apoc/export/graphml/XmlGraphMLReader.java
@@ -6,6 +6,7 @@
 import apoc.util.JsonUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.neo4j.graphdb.*;
+import org.neo4j.procedure.TerminationGuard;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventReader;
@@ -214,6 +215,7 @@ public long parseXML(Reader input) throws XMLStreamException {
         try (BatchTransaction tx = new BatchTransaction(db, batchSize * 10, reporter)) {
 
             while (reader.hasNext()) {
+                terminationGuard.check();
                 XMLEvent event;
                 try {
                     event = (XMLEvent) reader.next();

diff --git a/core/src/test/java/apoc/export/BigGraphTest.java b/core/src/test/java/apoc/export/BigGraphTest.java
@@ -60,15 +60,11 @@ public static void setUp() throws Exception {
     @Test
     public void testTerminateExportCsv() {
         checkTerminationGuard(db, "CALL apoc.export.csv.all('testTerminate.csv',{bulkImport: true})");
-
-        checkTerminationGuard(db, "CALL apoc.import.csv([{fileName: 'testTerminate.nodes.Other.csv', labels: ['Other']}], [], {})");
     }
 
     @Test
-    public void testTerminateExportGraphMl() {
+    public void testTerminateExportImportGraphMl() {
         checkTerminationGuard(db, "CALL apoc.export.graphml.all('testTerminate.graphml', {})");
-
-        checkTerminationGuard(db, "CALL apoc.import.graphml('testTerminate.graphml', {})");
     }
 
     @Test
@@ -77,9 +73,8 @@ public void testTerminateExportCypher() {
     }
 
     @Test
-    public void testTerminateExportJson() {
+    public void testTerminateExportImportLoadJson() {
         checkTerminationGuard(db, "CALL apoc.export.json.all('testTerminate.json',{})");
-        checkTerminationGuard(db, "CALL apoc.import.json('testTerminate.json',{})");
     }
 
     @Test

diff --git a/core/src/test/java/apoc/export/csv/ImportCsvTest.java b/core/src/test/java/apoc/export/csv/ImportCsvTest.java
@@ -43,6 +43,7 @@
 import static apoc.util.BinaryTestUtil.fileToBinary;
 import static apoc.util.CompressionConfig.COMPRESSION;
 import static apoc.util.MapUtil.map;
+import static apoc.util.TransactionTestUtil.checkTerminationGuard;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -186,10 +187,9 @@ public void testImportCsvLargeFile() {
 
     @Test
     public void testImportCsvTerminate() {
-        TestUtil.testCall(db, "CALL apoc.import.csv([{fileName: $nodeFile, labels: ['Person']}], [], $config)",
+        checkTerminationGuard(db, "CALL apoc.import.csv([{fileName: $nodeFile, labels: ['Person']}], [], $config)",
                 map("nodeFile", "file:/largeFile.csv",
-                        "config", map("batchSize", 100L)),
-                (r) -> assertEquals(664850L, r.get("nodes")));
+                        "config", map("batchSize", 100L)));
     }
 
     @Test

diff --git a/core/src/test/java/apoc/export/graphml/ExportGraphMLTest.java b/core/src/test/java/apoc/export/graphml/ExportGraphMLTest.java
@@ -49,6 +49,7 @@
 import static apoc.util.BinaryTestUtil.fileToBinary;
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestUtil.isRunningInCI;
+import static apoc.util.TransactionTestUtil.checkTerminationGuard;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -267,6 +268,13 @@ public void testImportGraphMLLargeFile() {
                 });
     }
 
+    @Test
+    public void testImportGraphMLTerminate() {
+        final String file = ClassLoader.getSystemResource("largeFile.graphml").toString();
+        checkTerminationGuard(db, 5L, "CALL apoc.import.graphml($file,{readLabels:true})",
+                map("file", file));
+    }
+
     @Test
     public void testImportGraphMLWithEdgeWithoutDataKeys() throws Exception {
         db.executeTransactionally("MATCH (n) DETACH DELETE n");

diff --git a/core/src/test/java/apoc/export/json/ImportJsonTest.java b/core/src/test/java/apoc/export/json/ImportJsonTest.java
@@ -43,6 +43,7 @@
 import static apoc.util.BinaryTestUtil.fileToBinary;
 import static apoc.util.CompressionConfig.COMPRESSION;
 import static apoc.util.MapUtil.map;
+import static apoc.util.TransactionTestUtil.checkTerminationGuard;
 import static java.lang.String.format;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -306,6 +307,12 @@ public void shouldImportAllJsonFromBinary()  {
         assertionsAllJsonDbResult();
     }
 
+    @Test
+    public void shouldTerminateImportJson()  {
+        createConstraints(List.of("Movie", "Other", "Person"));
+        checkTerminationGuard(db, "CALL apoc.import.json('testTerminate.json',{})");
+    }
+
     private void assertionsAllJsonProgressInfo(Map<String, Object> r, boolean isBinary) {
         // then
         Assert.assertEquals(isBinary ? null : "all.json", r.get("file"));

diff --git a/core/src/test/java/apoc/load/LoadJsonTest.java b/core/src/test/java/apoc/load/LoadJsonTest.java
@@ -37,6 +37,7 @@
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestUtil.testCall;
 import static apoc.util.TestUtil.testResult;
+import static apoc.util.TransactionTestUtil.checkTerminationGuard;
 import static java.util.Arrays.asList;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
@@ -423,8 +424,9 @@ public void testLoadJsonParams() {
     }
 
     @Test
-    public void shouldTerminateLoadWhenTransactionIsTimedOut() {
-        final String query = "CALL apoc.load.json('https://github.com/knowitall/yelp-dataset-challenge/blob/master/data/yelp_phoenix_academic_dataset/yelp_academic_dataset_review.json?raw=truehttps://github.com/knowitall/yelp-dataset-challenge/blob/master/data/yelp_phoenix_academic_dataset/yelp_academic_dataset_review.json?raw=true')";
-        TransactionTestUtil.checkTerminationGuard(db, query);
+    public void shouldTerminateLoadJson()  {
+        URL url = ClassLoader.getSystemResource("exportJSON/testTerminate.json");
+        checkTerminationGuard(db, "CALL apoc.load.json($file)",
+                Map.of("file", url.toString()));
     }
 }