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.

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

Add process results and attachments in parallel #1965

Merged
merged 5 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@
import java.io.InputStream;
import java.nio.file.Path;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

import static java.nio.file.Files.newInputStream;
import static java.nio.file.Files.size;
Expand All @@ -63,9 +62,9 @@ public class DefaultResultsVisitor implements ResultsVisitor {

public DefaultResultsVisitor(final Configuration configuration) {
this.configuration = configuration;
this.results = new HashSet<>();
this.attachments = new HashMap<>();
this.extra = new HashMap<>();
this.results = ConcurrentHashMap.newKeySet();
this.attachments = new ConcurrentHashMap<>();
this.extra = new ConcurrentHashMap<>();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,14 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -109,8 +108,8 @@ public void readResults(final Configuration configuration,
final Path resultsDirectory) {
final RandomUidContext context = configuration.requireContext(RandomUidContext.class);

final Map<String, List<StageResult>> befores = new HashMap<>();
final Map<String, List<StageResult>> afters = new HashMap<>();
final Map<String, List<StageResult>> befores = new ConcurrentHashMap<>();
final Map<String, List<StageResult>> afters = new ConcurrentHashMap<>();

readTestResultsContainers(resultsDirectory)
.filter(group -> !Objects.isNull(group.getChildren()))
Expand Down Expand Up @@ -155,10 +154,10 @@ private void processStages(final ResultsVisitor visitor,
.map(fixtureResult -> convert(resultsDirectory, visitor, fixtureResult))
.collect(Collectors.toList());

final Set<String> visited = new HashSet<>();
final Set<String> visited = ConcurrentHashMap.newKeySet();

group.getChildren()
.stream()
.parallelStream()
.filter(Objects::nonNull)
.filter(visited::add)
.forEach(child -> befores.compute(child, (s, stageResults) -> {
Expand Down Expand Up @@ -364,13 +363,15 @@ private static <T> T firstNonNull(final T... items) {

private Stream<TestResultContainer> readTestResultsContainers(final Path resultsDirectory) {
return listFiles(resultsDirectory, "*-container.json")
.parallel()
.map(this::readTestResultContainer)
.filter(Optional::isPresent)
.map(Optional::get);
}

private Stream<TestResult> readTestResults(final Path resultsDirectory) {
return listFiles(resultsDirectory, "*-result.json")
.parallel()
.map(this::readTestResult)
.filter(Optional::isPresent)
.map(Optional::get);
Expand All @@ -396,7 +397,7 @@ private Optional<TestResultContainer> readTestResultContainer(final Path file) {

private Stream<Path> listFiles(final Path directory, final String glob) {
try (DirectoryStream<Path> directoryStream = newDirectoryStream(directory, glob)) {
return StreamSupport.stream(directoryStream.spliterator(), false)
return StreamSupport.stream(directoryStream.spliterator(), true)
.filter(Files::isRegularFile)
.collect(Collectors.toList())
.stream();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@

import io.qameta.allure.Aggregator;
import io.qameta.allure.Constants;
import io.qameta.allure.entity.Attachment;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.List;
import java.util.Map;

/**
* Plugin that stores attachments to report data folder.
Expand All @@ -34,17 +33,23 @@
public class AttachmentsPlugin implements Aggregator {

@Override
@SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
public void aggregate(final Configuration configuration,
final List<LaunchResults> launchesResults,
final Path outputDirectory) throws IOException {
final Path attachmentsFolder = Files.createDirectories(
outputDirectory.resolve(Constants.DATA_DIR).resolve("attachments")
);
for (LaunchResults launch : launchesResults) {
for (Map.Entry<Path, Attachment> entry : launch.getAttachments().entrySet()) {
final Path file = attachmentsFolder.resolve(entry.getValue().getSource());
Files.copy(entry.getKey(), file, StandardCopyOption.REPLACE_EXISTING);
}
}
launchesResults.forEach(launch -> launch.getAttachments().entrySet()
.parallelStream()
.forEach(
entry -> {
final Path file = attachmentsFolder.resolve(entry.getValue().getSource());
try {
Files.copy(entry.getKey(), file, StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}));
}
}