modest perf improv for launching tests (#389)

salesforce · Jan 5, 2022 · d7c8457 · d7c8457
1 parent 9baa902
commit d7c8457
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/...e.bazel.eclipse.core/src/main/java/com/salesforce/bazel/eclipse/builder/BazelBuilder.java b/...e.bazel.eclipse.core/src/main/java/com/salesforce/bazel/eclipse/builder/BazelBuilder.java
@@ -61,6 +61,7 @@
 import com.salesforce.bazel.eclipse.classpath.IClasspathContainerConstants;
 import com.salesforce.bazel.eclipse.component.ComponentContext;
 import com.salesforce.bazel.eclipse.component.EclipseBazelWorkspaceContext;
+import com.salesforce.bazel.eclipse.launch.BazelTestClasspathProvider;
 import com.salesforce.bazel.eclipse.project.EclipseProjectUtils;
 import com.salesforce.bazel.eclipse.projectimport.ProjectImporterFactory;
 import com.salesforce.bazel.eclipse.runtime.api.JavaCoreHelper;
@@ -191,8 +192,10 @@ protected void clean(IProgressMonitor monitor) throws CoreException {
             // bazelWorkspaceCmdRunner.runBazelClean(null);
         }
 
+        // TODO implement a clean() listener and let impls register with us, instead of hacking like this
         BazelClasspathContainer.clean();
         BazelGlobalSearchClasspathContainer.clean();
+        BazelTestClasspathProvider.clean();
     }
 
     private boolean buildProjects(BazelWorkspaceCommandRunner cmdRunner, Collection<IProject> projects,

diff --git a/...se.core/src/main/java/com/salesforce/bazel/eclipse/launch/BazelTestClasspathProvider.java b/...se.core/src/main/java/com/salesforce/bazel/eclipse/launch/BazelTestClasspathProvider.java
@@ -39,7 +39,10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -86,6 +89,9 @@ public class BazelTestClasspathProvider extends StandardClasspathProvider {
 
     // collaborator for retrieving/analyzing Bazel test param files
     BazelJvmTestClasspathHelper bazelJvmTestClasspathHelper = new BazelJvmTestClasspathHelper();
+
+    // entry cache
+    private static Map<String, IRuntimeClasspathEntry[]> resolvedEntriesCache = new HashMap<>();
 
     /**
      * Compute classpath entries for test
@@ -104,12 +110,28 @@ public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entrie
             ILaunchConfiguration configuration) throws CoreException {
         List<IRuntimeClasspathEntry> result = new ArrayList<>();
 
+        Set<String> addedPaths = new HashSet<>();
         for (IRuntimeClasspathEntry entry : entries) {
-            IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(entry, configuration);
+            String path = entry.getClasspathEntry().getPath().toString();
+
+            // de-dupe the list
+            if (addedPaths.contains(path)) {
+                continue;
+            }
+            addedPaths.add(path);
+
+            // now check the cache, this will prevent work being redone across invocations of this method
+            IRuntimeClasspathEntry[] resolved = resolvedEntriesCache.get(path);
+            if (resolved == null) {
+                resolved = JavaRuntime.resolveRuntimeClasspathEntry(entry, configuration);
+                resolvedEntriesCache.put(path, resolved);
+            }
             Collections.addAll(result, resolved);
         }
 
-        Collections.addAll(result, JavaRuntime.resolveSourceLookupPath(entries, configuration));
+        // the Bazel param file lists --sources so entries[] should already contain the source paths
+        // this call is left here for future reference in case a situation is found where it is needed BEF #381
+        //Collections.addAll(result, JavaRuntime.resolveSourceLookupPath(entries, configuration));
 
         IRuntimeClasspathEntry[] resolvedClasspath = result.toArray(new IRuntimeClasspathEntry[result.size()]);
         LOG.info("Test classpath: {}", (Object[]) resolvedClasspath);
@@ -206,6 +228,13 @@ public static void enable(ILaunchConfiguration config) throws CoreException {
         }
     }
 
+    /**
+     * Clean caches.
+     */
+    public static void clean() {
+        resolvedEntriesCache.clear();
+    }
+
     private void showUnrunnableErrorDialog(StringBuffer unrunnableLabelsString) {
         Display.getDefault().asyncExec(new Runnable() {
             @Override