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

ci: Fixed inefficiency in the findRootCause method #2400

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ci: Fixed inefficiency in the findRootCause method #2400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 19 additions & 25 deletions dashboard/src/main/java/com/google/cloud/tools/opensource/dashboard/DashboardMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,9 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.TreeMap;

import org.apache.commons.cli.ParseException;
import org.eclipse.aether.RepositoryException;
import org.eclipse.aether.RepositorySystem;
Expand Down Expand Up @@ -579,35 +573,35 @@ private static ImmutableMap<String, String> findRootCauses(ClassPathResult class
for (ClassPathEntry entry : classPathResult.getClassPath()) {
List<DependencyPath> dependencyPaths = classPathResult.getDependencyPaths(entry);

ImmutableList<String> commonVersionlessArtifacts =
commonVersionlessArtifacts(dependencyPaths);
ImmutableList<String> commonVersionLessArtifacts =
commonVersionLessArtifacts(dependencyPaths);

if (dependencyPaths.size() > MINIMUM_NUMBER_DEPENDENCY_PATHS
&& commonVersionlessArtifacts.size() > 1) { // The last paths elements are always same
&& commonVersionLessArtifacts.size() > 1) { // The last paths elements are always same
builder.put(
entry.toString(),
summaryMessage(
dependencyPaths.size(), commonVersionlessArtifacts, dependencyPaths.get(0)));
dependencyPaths.size(), commonVersionLessArtifacts, dependencyPaths.get(0)));
}
}
return builder.build();
}

private static ImmutableList<String> commonVersionlessArtifacts(
// Fixed inefficiency using Guava's sets utility for more efficient intersection
private static ImmutableList<String> commonVersionLessArtifacts(
List<DependencyPath> dependencyPaths) {
ImmutableList<String> initialVersionlessCoordinates =
dependencyPaths.get(0).getArtifactKeys();
// LinkedHashSet remembers insertion order
LinkedHashSet<String> versionlessCoordinatesIntersection =
Sets.newLinkedHashSet(initialVersionlessCoordinates);
for (DependencyPath dependencyPath : dependencyPaths) {
// List of versionless coordinates ("groupId:artifactId")
ImmutableList<String> versionlessCoordinatesInPath = dependencyPath.getArtifactKeys();
// intersection of elements in DependencyPaths
versionlessCoordinatesIntersection.retainAll(versionlessCoordinatesInPath);

if (dependencyPaths.isEmpty()) {
return ImmutableList.of();
}
// Get the first path's coordinates as a set
Set<String> commonCoordinates = Sets.newLinkedHashSet(dependencyPaths.get(0).getArtifactKeys());

return ImmutableList.copyOf(versionlessCoordinatesIntersection);
for (int i = 1; i < dependencyPaths.size(); i++) {
Set<String> pathCoordinates = Sets.newHashSet(dependencyPaths.get(i).getArtifactKeys());
commonCoordinates = Sets.intersection(commonCoordinates, pathCoordinates);
}
// Preserve the original order while returning as an immutableList
return ImmutableList.copyOf(commonCoordinates);
}

private static String summaryMessage(
Expand Down