[NOID] Close resources for open readers (neo4j#620)

hvub · May 8, 2024 · 27c604c · 27c604c
1 parent 3587920
commit 27c604c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/core/src/main/java/apoc/export/csv/CsvEntityLoader.java b/core/src/main/java/apoc/export/csv/CsvEntityLoader.java
@@ -205,8 +205,7 @@ public void loadRelationships(
             final Object data,
             final String type,
             final GraphDatabaseService db,
-            final Map<String, Map<String, String>> idMapping,
-            final URLAccessChecker urlAccessChecker)
+            final Map<String, Map<String, String>> idMapping)
             throws IOException {
 
         try (final CountingReader reader = FileUtils.readerFor(data, clc.getCompressionAlgo(), urlAccessChecker)) {

diff --git a/core/src/main/java/apoc/export/csv/ImportCsv.java b/core/src/main/java/apoc/export/csv/ImportCsv.java
@@ -63,15 +63,15 @@ public Stream<ProgressInfo> importCsv(
 
             final Map<String, Map<String, String>> idMapping = new HashMap<>();
             for (Map<String, Object> node : nodes) {
-                final Object data = node.getOrDefault("fileName", node.get("data"));
+                final Object fileName = node.getOrDefault("fileName", node.get("data"));
                 final List<String> labels = (List<String>) node.get("labels");
-                loader.loadNodes(data, labels, db, idMapping);
+                loader.loadNodes(fileName, labels, db, idMapping);
             }
 
             for (Map<String, Object> relationship : relationships) {
                 final Object fileName = relationship.getOrDefault("fileName", relationship.get("data"));
                 final String type = (String) relationship.get("type");
-                loader.loadRelationships(fileName, type, db, idMapping, urlAccessChecker);
+                loader.loadRelationships(fileName, type, db, idMapping);
             }
 
             return reporter.getTotal();

diff --git a/core/src/main/java/apoc/export/graphml/ExportGraphML.java b/core/src/main/java/apoc/export/graphml/ExportGraphML.java
@@ -22,6 +22,7 @@
 import apoc.Pools;
 import apoc.export.cypher.ExportFileManager;
 import apoc.export.cypher.FileManagerFactory;
+import apoc.export.util.CountingReader;
 import apoc.export.util.ExportConfig;
 import apoc.export.util.ExportUtils;
 import apoc.export.util.NodesAndRelsSubGraph;
@@ -98,9 +99,11 @@ public Stream<ProgressInfo> file(
 
             if (exportConfig.storeNodeIds()) graphMLReader.storeNodeIds();
 
-            graphMLReader.parseXML(
-                    FileUtils.readerFor(urlOrBinaryFile, exportConfig.getCompressionAlgo(), urlAccessChecker),
-                    terminationGuard);
+            try (CountingReader reader =
+                    FileUtils.readerFor(urlOrBinaryFile, exportConfig.getCompressionAlgo(), urlAccessChecker)) {
+                graphMLReader.parseXML(reader, 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
@@ -337,6 +337,7 @@ public long parseXML(Reader input, TerminationGuard terminationGuard) throws XML
             throw e;
         } finally {
             tx.close();
+            reader.close();
         }
         return count;
     }