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

Jump to bottom

dbeaver/pro#2048 NIO delete performance #21721

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
+57 −25
Open

dbeaver/pro#2048 NIO delete performance #21721

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/RuntimeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,11 @@
}

public static <T> void executeJobsForEach(List<T> objects, DBRRunnableParametrizedWithProgress<T> task) {
JobGroup jobGroup = new JobGroup("executeJobsForEach:" + objects, 10, 1);
executeJobsForEach(objects, 10, new VoidProgressMonitor(), task);
}

public static <T> void executeJobsForEach(List<T> objects, int maxJobs, DBRProgressMonitor monitor, DBRRunnableParametrizedWithProgress<T> task) {

Check warning on line 540 in plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/RuntimeUtils.java

View check run for this annotation

Jenkins-CI-integration / CheckStyle Report

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/RuntimeUtils.java#L540 

Line is longer than 140 characters (found 150).

Check warning on line 540 in plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/RuntimeUtils.java

View check run for this annotation

Jenkins-CI-integration / CheckStyle Report

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/RuntimeUtils.java#L540 

Missing a Javadoc comment.
JobGroup jobGroup = new JobGroup("executeJobsForEach:" + objects, maxJobs, 1);
for (T object : objects) {
AbstractJob job = new AbstractJob("Execute for " + object) {
{
Expand All @@ -559,7 +563,7 @@
job.schedule();
}
try {
jobGroup.join(0, new NullProgressMonitor());
jobGroup.join(0, monitor.getNestedMonitor());
} catch (InterruptedException e) {
// ignore
}
Expand Down
74 changes: 51 additions & 23 deletions ...aver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorObjectsDeleter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.jkiss.dbeaver.ui.navigator.actions;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
Expand Down Expand Up @@ -51,6 +52,7 @@
import org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput;
import org.jkiss.dbeaver.ui.internal.UINavigatorMessages;
import org.jkiss.dbeaver.ui.navigator.database.NavigatorViewBase;
import org.jkiss.dbeaver.utils.RuntimeUtils;

import java.lang.reflect.InvocationTargetException;
import java.util.*;
Expand Down Expand Up @@ -165,32 +167,58 @@ public IProject getProjectToDelete() {

void delete() {
try {
UIUtils.runInProgressService(dbrMonitor -> {
dbrMonitor.beginTask("Delete objects", selection.size());
try {
for (Object obj: selection) {
if (dbrMonitor.isCanceled()) {
break;
List<?> objectsToDelete = new ArrayList<>(selection);
List<IResource> filesToDelete = new ArrayList<>();
for (Iterator<?> iterator = objectsToDelete.iterator(); iterator.hasNext(); ) {
Object obj = iterator.next();
if (obj instanceof DBNNodeWithResource && ((DBNNodeWithResource) obj).getResource() instanceof IFile) {
filesToDelete.add(((DBNNodeWithResource) obj).getResource());
iterator.remove();
}
}

{
UIUtils.runInProgressService(dbrMonitor -> {
dbrMonitor.beginTask("Delete objects", objectsToDelete.size() + filesToDelete.size());
try {
if (!filesToDelete.isEmpty()) {
RuntimeUtils.executeJobsForEach(filesToDelete, 10, dbrMonitor, (monitor, resource) -> {
try {
monitor.subTask("Delete file " + resource.getName());
log.debug("Delete file '" + resource.getName() + "'");
resource.delete(IResource.FORCE | IResource.KEEP_HISTORY, monitor.getNestedMonitor());
} catch (Exception e) {
DBWorkbench.getPlatformUI().showError("File delete error", null, e);
}
});
}
if (obj instanceof DBNDatabaseNode) {
dbrMonitor.subTask("Delete database object '" + ((DBNDatabaseNode) obj).getNodeName() + "'");
UIUtils.asyncExec(() -> deleteDatabaseNode((DBNDatabaseNode)obj));
} else if (obj instanceof DBNNodeWithResource) {
dbrMonitor.subTask("Delete resource '" + ((DBNNodeWithResource) obj).getResource().getName() + "'");
deleteResource(dbrMonitor, ((DBNNodeWithResource) obj).getResource());
} else if (obj instanceof DBNLocalFolder) {
dbrMonitor.subTask("Delete folder '" + ((DBNLocalFolder) obj).getNodeName() + "'");
deleteLocalFolder((DBNLocalFolder) obj);
} else {
log.warn("Don't know how to delete element '" + obj + "'"); //$NON-NLS-1$ //$NON-NLS-2$

if (!objectsToDelete.isEmpty()) {
for (Object obj : objectsToDelete) {
if (dbrMonitor.isCanceled()) {
break;
}
if (obj instanceof DBNDatabaseNode dbn) {
dbrMonitor.subTask("Delete database object '" + dbn.getNodeName() + "'");
UIUtils.asyncExec(() -> deleteDatabaseNode(dbn));
} else if (obj instanceof DBNNodeWithResource nwr) {
dbrMonitor.subTask("Delete resource '" + nwr.getResource().getName() + "'");
deleteResource(dbrMonitor, nwr.getResource());
} else if (obj instanceof DBNLocalFolder lf) {
dbrMonitor.subTask("Delete folder '" + lf.getNodeName() + "'");
deleteLocalFolder(lf);
} else {
log.warn("Don't know how to delete element '" + obj + "'"); //$NON-NLS-1$ //$NON-NLS-2$
}
dbrMonitor.worked(1);
}
}
dbrMonitor.worked(1);
} catch (Exception e) {
throw new InvocationTargetException(e);
}
} catch (Exception e) {
throw new InvocationTargetException(e);
}
dbrMonitor.done();
});
dbrMonitor.done();
});
}
} catch (InvocationTargetException e) {
DBWorkbench.getPlatformUI().showError("Delete error", e.getTargetException().getMessage(), e.getTargetException());
} catch (InterruptedException e) {
Expand Down
Loading