-
Notifications
You must be signed in to change notification settings - Fork 514
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.
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
Fix RemoteFileUtil to download in parallel as expected. #5515
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
73cf1af
Fix RemoteFileUtil to download in parallel as expected.
psobot 44d6bff
Silly me, using Java 19 features.
psobot 360e038
TIL scalafmtAll != javafmtAll
psobot 671d0ac
Reuse thread pool
RustedBones 718952f
Use common thread pool
RustedBones 9ef2b56
Merge branch 'main' into rfu-parallel
RustedBones File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,11 @@ | |
import java.nio.file.Paths; | ||
import java.nio.file.StandardOpenOption; | ||
import java.util.List; | ||
import java.util.concurrent.Callable; | ||
import java.util.concurrent.ExecutionException; | ||
import java.util.concurrent.ExecutorService; | ||
import java.util.concurrent.Executors; | ||
import java.util.stream.Collectors; | ||
import org.apache.beam.sdk.io.FileSystems; | ||
import org.apache.beam.sdk.io.fs.MatchResult.Metadata; | ||
import org.apache.beam.sdk.io.fs.ResourceId; | ||
|
@@ -103,10 +107,37 @@ public Path download(URI src) { | |
* @return {@link Path}s to the downloaded local files. | ||
*/ | ||
public List<Path> download(List<URI> srcs) { | ||
return download(srcs, CONCURRENCY_LEVEL); | ||
} | ||
|
||
/** | ||
* Download a batch of remote {@link URI}s in parallel, using at most numThreads to do so. | ||
* `numThreads` may not be larger than the number of available processors * 4. | ||
* | ||
* @return {@link Path}s to the downloaded local files. | ||
*/ | ||
public List<Path> download(List<URI> srcs, int numThreads) { | ||
final ExecutorService executor = Executors.newFixedThreadPool(numThreads); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should probably move this as transient member, initializing it in the constructor. This is mainly relevant for the |
||
try { | ||
return paths.getAll(srcs).values().asList(); | ||
} catch (ExecutionException e) { | ||
return executor | ||
.invokeAll( | ||
srcs.stream() | ||
.map(url -> (Callable<Path>) () -> paths.get(url)) | ||
.collect(Collectors.toList())) | ||
.stream() | ||
.map( | ||
f -> { | ||
try { | ||
return f.get(); | ||
} catch (InterruptedException | ExecutionException e) { | ||
throw new RuntimeException(e); | ||
} | ||
}) | ||
.collect(Collectors.toList()); | ||
} catch (InterruptedException e) { | ||
throw new RuntimeException(e); | ||
} finally { | ||
executor.shutdown(); | ||
} | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or maybe
and then actually clamp the size of the thread pool