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

[drqYtb6r] apoc.cypher.run* procedures don't return results (extended) (#3624) #3676

Merged
merged 2 commits into from
Jul 24, 2023
Merged

[drqYtb6r] apoc.cypher.run* procedures don't return results (extended) (#3624) #3676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc213be
[drqYtb6r] apoc.cypher.run* procedures don't return results (extended…
vga91 Jun 16, 2023
f511970
[drqYtb6r] changed importFolder with the correct one provided by Test…
vga91 Jul 24, 2023
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
6 changes: 4 additions & 2 deletions extended/src/main/java/apoc/cypher/CypherExtended.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import apoc.Pools;
import apoc.result.MapResult;
import apoc.util.CompressionAlgo;
import apoc.util.EntityUtil;
import apoc.util.FileUtils;
import apoc.util.QueueBasedSpliterator;
import apoc.util.QueueUtil;
Expand Down Expand Up @@ -242,7 +243,8 @@ private Object consumeResult(Result result, BlockingQueue<RowResult> queue, bool
int row = 0;
while (result.hasNext()) {
terminationGuard.check();
queue.put(new RowResult(row++, result.next()));
Map<String, Object> res = EntityUtil.anyRebind(tx, result.next());
queue.put(new RowResult(row++, res));
}
if (addStatistics) {
queue.put(new RowResult(-1, toMap(result.getQueryStatistics(), System.currentTimeMillis() - time, row)));
Expand Down Expand Up @@ -425,7 +427,7 @@ public Stream<MapResult> parallel2(@Name("fragment") String fragment, @Name("par
}
return futures.stream().flatMap(f -> {
try {
return f.get().stream().map(MapResult::new);
return EntityUtil.anyRebind(tx, f.get()).stream().map(MapResult::new);
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException("Error executing in parallel " + statement, e);
}
Expand Down
Loading