robertwb commented on a change in pull request #11205: [BEAM-9578] Enumerating
artifacts is too expensive in Java
URL: https://github.com/apache/beam/pull/11205#discussion_r405136418
##########
File path:
runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
##########
@@ -207,31 +210,94 @@ public static Environment createProcessEnvironment(
}
}
- public static Collection<ArtifactInformation> getArtifacts(PipelineOptions
options) {
- Set<String> pathsToStage = Sets.newHashSet();
- List<String> stagingFiles =
options.as(PortablePipelineOptions.class).getFilesToStage();
- if (stagingFiles != null) {
- pathsToStage.addAll(stagingFiles);
- }
-
- ImmutableList.Builder<ArtifactInformation> filesToStage =
ImmutableList.builder();
+ private static List<ArtifactInformation> getArtifacts(List<String>
stagingFiles) {
+ Set<String> pathsToStage = Sets.newHashSet(stagingFiles);
+ ImmutableList.Builder<ArtifactInformation> artifactsBuilder =
ImmutableList.builder();
for (String path : pathsToStage) {
File file = new File(path);
- if (new File(path).exists()) {
- // Spurious items get added to the classpath. Filter by just those
that exist.
+ // Spurious items get added to the classpath. Filter by just those that
exist.
+ if (file.exists()) {
+ ArtifactInformation.Builder artifactBuilder =
ArtifactInformation.newBuilder();
+
artifactBuilder.setTypeUrn(BeamUrns.getUrn(StandardArtifacts.Types.FILE));
+
artifactBuilder.setRoleUrn(BeamUrns.getUrn(StandardArtifacts.Roles.STAGING_TO));
+ artifactBuilder.setRolePayload(
+ RunnerApi.ArtifactStagingToRolePayload.newBuilder()
+ .setStagedName(createStagingFileName(file))
+ .build()
+ .toByteString());
if (file.isDirectory()) {
- // Zip up directories so we can upload them to the artifact service.
+ File zippedFile;
+ HashCode hashCode;
try {
- filesToStage.add(createArtifactInformation(zipDirectory(file)));
+ zippedFile = zipDirectory(file);
+ hashCode = Files.asByteSource(zippedFile).hash(Hashing.sha256());
} catch (IOException e) {
throw new RuntimeException(e);
}
+ artifactsBuilder.add(
+ artifactBuilder
+ .setTypePayload(
+ RunnerApi.ArtifactFilePayload.newBuilder()
+ .setPath(zippedFile.getPath())
+ .setSha256(hashCode.toString())
+ .build()
+ .toByteString())
+ .build());
} else {
- filesToStage.add(createArtifactInformation(file));
+ HashCode hashCode;
+ try {
+ hashCode = Files.asByteSource(file).hash(Hashing.sha256());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
Review comment:
Or would it be better to let the method throw an IOException?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
