Skip to content

Find Usage performance: moved classpath merging out of the inner loop #8957

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

Merged
merged 1 commit into from
Oct 30, 2025
+52 −43
Merged

Find Usage performance: moved classpath merging out of the inner loop #8957

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
95 changes: 52 additions & 43 deletions java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,17 +599,18 @@ public static ClasspathInfo getClasspathInfoFor(boolean dependencies, FileObject
* @param files
* @return
*/
@SuppressWarnings("CollectionContainsUrl")
public static ClasspathInfo getClasspathInfoFor(boolean dependencies, boolean backSource, FileObject... files) {
assert files.length > 0;
Set<URL> dependentSourceRoots = new HashSet<>();
Set<URL> dependentCompileRoots = new HashSet<>();
ClassPath nullPath = ClassPathSupport.createClassPath(new FileObject[0]);
ClassPath boot = null;
ClassPath moduleBoot = null;
ClassPath compile = null;
ClassPath moduleCompile = null;
ClassPath moduleClass = null;
ClassPath nullPath = ClassPath.EMPTY;

List<ClassPath> bootCPs = new ArrayList<>();
List<ClassPath> moduleBootCPs = new ArrayList<>();
List<ClassPath> compileCPs = new ArrayList<>();
List<ClassPath> moduleCompileCPs = new ArrayList<>();
List<ClassPath> moduleClassCPs = new ArrayList<>();

for (FileObject fo : files) {
ClassPath cp = null;
FileObject ownerRoot = null;
Expand All @@ -621,30 +622,30 @@ public static ClasspathInfo getClasspathInfoFor(boolean dependencies, boolean ba
}
if (cp != null && ownerRoot != null && FileUtil.getArchiveFile(ownerRoot) == null) {
for (FileObject src : cp.getRoots()) { // Keep all source roots from cp. Needed if project has multiple source roots.
URL sourceRoot = URLMapper.findURL(src, URLMapper.INTERNAL);
if (dependencies) {
Set<URL> urls = SourceUtils.getDependentRoots(sourceRoot, false);
Set<ClassPath> cps = GlobalPathRegistry.getDefault().getPaths(ClassPath.SOURCE);
Set<URL> toRetain = new HashSet<URL>();
for (ClassPath path : cps) {
for (ClassPath.Entry e : path.entries()) {
toRetain.add(e.getURL());
URL sourceRoot = URLMapper.findURL(src, URLMapper.INTERNAL);
if (dependencies) {
Set<URL> urls = SourceUtils.getDependentRoots(sourceRoot, false);
Set<ClassPath> cps = GlobalPathRegistry.getDefault().getPaths(ClassPath.SOURCE);
Set<URL> toRetain = new HashSet<>();
for (ClassPath path : cps) {
for (ClassPath.Entry e : path.entries()) {
toRetain.add(e.getURL());
}
}
Set<URL> compileUrls = new HashSet<>(urls);
urls.retainAll(toRetain);
compileUrls.removeAll(toRetain);
dependentSourceRoots.addAll(urls);
dependentCompileRoots.addAll(compileUrls);
} else {
dependentSourceRoots.add(sourceRoot);
}
Set<URL> compileUrls = new HashSet<URL>(urls);
urls.retainAll(toRetain);
compileUrls.removeAll(toRetain);
dependentSourceRoots.addAll(urls);
dependentCompileRoots.addAll(compileUrls);
} else {
dependentSourceRoots.add(sourceRoot);
}
if (FileOwnerQuery.getOwner(fo) != null) {
for (FileObject f : cp.getRoots()) {
dependentCompileRoots.add(URLMapper.findURL(f, URLMapper.INTERNAL));
if (FileOwnerQuery.getOwner(fo) != null) {
for (FileObject f : cp.getRoots()) {
dependentCompileRoots.add(URLMapper.findURL(f, URLMapper.INTERNAL));
}
}
}
}
} else {
for (ClassPath scp : GlobalPathRegistry.getDefault().getPaths(ClassPath.SOURCE)) {
for (FileObject root : scp.getRoots()) {
Expand All @@ -669,20 +670,19 @@ public static ClasspathInfo getClasspathInfoFor(boolean dependencies, boolean ba
if (fcompile == null) {
LOG.log(Level.WARNING, "No classpath for: {0} {1}", new Object[]{FileUtil.getFileDisplayName(fo), FileOwnerQuery.getOwner(fo)}); //NOI18N
} else {
compile = compile != null ? merge(compile, fcompile) : fcompile;
compileCPs.add(fcompile);
}

if (fboot != null) {
boot = boot != null ? merge(boot, fboot) : fboot;
bootCPs.add(fboot);
}
if (fmoduleboot != null) {
moduleBoot = moduleBoot != null ? merge(moduleBoot, fmoduleboot) : fmoduleboot;
moduleBootCPs.add(fmoduleboot);
}
if (fmodulecompile != null) {
moduleCompile = moduleCompile != null ? merge(moduleCompile, fmodulecompile) : fmodulecompile;
moduleCompileCPs.add(fmodulecompile);
}
if (fmoduleclass != null) {
moduleClass = moduleClass != null ? merge(moduleClass, fmoduleclass) : fmoduleclass;
moduleClassCPs.add(fmoduleclass);
}
}
}
Expand All @@ -700,12 +700,18 @@ public static ClasspathInfo getClasspathInfoFor(boolean dependencies, boolean ba
}
}
}

ClassPath rcp = ClassPathSupport.createClassPath(dependentSourceRoots.toArray(new URL[0]));

ClassPath compile = !compileCPs.isEmpty() ? merge(compileCPs) : null;
ClassPath boot = !bootCPs.isEmpty() ? merge(bootCPs) : null;
ClassPath moduleBoot = !moduleBootCPs.isEmpty() ? merge(moduleBootCPs) : null;
ClassPath moduleCompile = !moduleCompileCPs.isEmpty() ? merge(moduleCompileCPs) : null;
ClassPath moduleClass = !moduleClassCPs.isEmpty() ? merge(moduleClassCPs) : null;

ClassPath rcp = ClassPathSupport.createClassPath(dependentSourceRoots.toArray(URL[]::new));
if (compile == null) {
compile = nullPath;
}
compile = merge(compile, ClassPathSupport.createClassPath(dependentCompileRoots.toArray(new URL[0])));
compile = merge(compile, ClassPathSupport.createClassPath(dependentCompileRoots.toArray(URL[]::new)));
if (boot == null) {
boot = JavaPlatform.getDefault().getBootstrapLibraries();
}
Expand Down Expand Up @@ -1085,20 +1091,23 @@ public static FileObject getRootFileObject(URL url) throws IOException {
return result;
}

@SuppressWarnings("CollectionContainsUrl")
public static ClassPath merge(final ClassPath... cps) {
final Set<URL> roots = new LinkedHashSet<URL>(cps.length);
for (final ClassPath cp : cps) {
public static ClassPath merge(ClassPath... cps) {
return merge(Arrays.asList(cps));
}

public static ClassPath merge(List<ClassPath> cps) {
Set<URL> roots = new LinkedHashSet<>((int) Math.ceil(cps.size() / 0.75));
for (ClassPath cp : cps) {
if (cp != null) {
for (final ClassPath.Entry entry : cp.entries()) {
final URL root = entry.getURL();
for (ClassPath.Entry entry : cp.entries()) {
URL root = entry.getURL();
if (!roots.contains(root)) {
roots.add(root);
}
}
}
}
return ClassPathSupport.createClassPath(roots.toArray(new URL[0]));
return ClassPathSupport.createClassPath(roots.toArray(URL[]::new));
}

public static boolean isFromEditor(EditorCookie ec) {
Expand Down
Loading