Skip to content

Refactor: Improve refresh action performance with parallel processing #3576

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

Draft
vogella wants to merge 2 commits into
base: master
Choose a base branch
from
+32 −40
Draft

Refactor: Improve refresh action performance with parallel processing #3576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7424eeb
Refactor: Improve refresh action performance with parallel processing
vogella Dec 12, 2025
ecab24c
Version bump(s) for 4.39 stream
eclipse-platform-bot Dec 12, 2025
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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
Bundle-Version: 3.22.800.qualifier
Bundle-Version: 3.22.900.qualifier
Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Plugin.providerName
Expand Down
54 changes: 24 additions & 30 deletions bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/RefreshAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;

Expand All @@ -36,6 +37,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.MultiRule;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
Expand Down Expand Up @@ -217,36 +219,33 @@ final public void refreshAll() {

@Override
final protected IRunnableWithProgress createOperation(final IStatus[] errorStatus) {
ISchedulingRule rule = null;
IResourceRuleFactory factory = ResourcesPlugin.getWorkspace().getRuleFactory();

List<? extends IResource> actionResources = new ArrayList<>(getActionResources());
if (shouldPerformResourcePruning()) {
actionResources = pruneResources(actionResources);
}
final List<? extends IResource> resources = actionResources;

Iterator<? extends IResource> res = resources.iterator();
while (res.hasNext()) {
rule = MultiRule.combine(rule, factory.refreshRule(res.next()));
}
return new WorkspaceModifyOperation(rule) {
return new IRunnableWithProgress() {
@Override
public void execute(IProgressMonitor mon) {
SubMonitor subMonitor = SubMonitor.convert(mon, resources.size());
MultiStatus errors = null;
public void run(IProgressMonitor mon) {
SubMonitor subMonitor = SubMonitor.convert(mon);
subMonitor.setTaskName(getOperationMessage());
Iterator<? extends IResource> resourcesEnum = resources.iterator();
while (resourcesEnum.hasNext()) {
List<IStatus> errors = Collections.synchronizedList(new ArrayList<>());
resources.parallelStream().forEach(resource -> {
try {
IResource resource = resourcesEnum.next();
refreshResource(resource, subMonitor.split(1));
refreshResource(resource, null);
} catch (CoreException e) {
errors = recordError(errors, e);
errors.add(e.getStatus());
}
}
if (errors != null) {
errorStatus[0] = errors;
});

if (!errors.isEmpty()) {
MultiStatus multiStatus = new MultiStatus(IDEWorkbenchPlugin.IDE_WORKBENCH, IStatus.ERROR,
getProblemsMessage(), null);
for (IStatus s : errors) {
multiStatus.merge(s);
}
errorStatus[0] = multiStatus;
}
}
};
Expand Down Expand Up @@ -287,29 +286,24 @@ protected void refreshResource(IResource resource, IProgressMonitor monitor) thr
public void run() {
final IStatus[] errorStatus = new IStatus[1];
errorStatus[0] = Status.OK_STATUS;
final WorkspaceModifyOperation op = (WorkspaceModifyOperation) createOperation(errorStatus);
WorkspaceJob job = new WorkspaceJob("refresh") { //$NON-NLS-1$
final IRunnableWithProgress op = createOperation(errorStatus);
Job job = new Job("refresh") { //$NON-NLS-1$

@Override
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
public IStatus run(IProgressMonitor monitor) {
try {
op.run(monitor);
} catch (InvocationTargetException e) {
String msg = NLS.bind(
IDEWorkbenchMessages.WorkspaceAction_logTitle, getClass()
.getName(), e.getTargetException());
throw new CoreException(StatusUtil.newStatus(IStatus.ERROR, msg, e.getTargetException()));
String msg = NLS.bind(IDEWorkbenchMessages.WorkspaceAction_logTitle, getClass().getName(),
e.getTargetException());
return StatusUtil.newStatus(IStatus.ERROR, msg, e.getTargetException());
} catch (InterruptedException e) {
return Status.CANCEL_STATUS;
}
return errorStatus[0];
}

};
ISchedulingRule rule = op.getRule();
if (rule != null) {
job.setRule(rule);
}
job.setUser(true);
job.schedule();
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true
Bundle-Version: 3.9.900.qualifier
Bundle-Version: 3.9.1000.qualifier
Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Expand Down
14 changes: 6 additions & 8 deletions ...s/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
Expand Down Expand Up @@ -218,11 +220,11 @@ protected void makeActions() {
public void run() {
final IStatus[] errorStatus = new IStatus[1];
errorStatus[0] = Status.OK_STATUS;
final WorkspaceModifyOperation op = (WorkspaceModifyOperation) createOperation(errorStatus);
WorkspaceJob job = new WorkspaceJob("refresh") { //$NON-NLS-1$
final IRunnableWithProgress op = createOperation(errorStatus);
Job job = new Job("refresh") { //$NON-NLS-1$

@Override
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
public IStatus run(IProgressMonitor monitor) {
try {
op.run(monitor);
if (shell != null && !shell.isDisposed()) {
Expand All @@ -236,18 +238,14 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
}
} catch (InvocationTargetException e) {
String msg = NLS.bind(WorkbenchNavigatorMessages.ResourceMgmtActionProvider_logTitle, getClass().getName(), e.getTargetException());
throw new CoreException(new Status(IStatus.ERROR, NavigatorPlugin.PLUGIN_ID, IStatus.ERROR, msg, e.getTargetException()));
return new Status(IStatus.ERROR, NavigatorPlugin.PLUGIN_ID, IStatus.ERROR, msg, e.getTargetException());
} catch (InterruptedException e) {
return Status.CANCEL_STATUS;
}
return errorStatus[0];
}

};
ISchedulingRule rule = op.getRule();
if (rule != null) {
job.setRule(rule);
}
job.setUser(true);
job.schedule();
}
Expand Down
Loading