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#2824 Custom scope performance fix #29994

Merged
merged 3 commits into from
May 14, 2024
Merged

dbeaver/pro#2824 Custom scope performance fix #29994

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
633521e
dbeaver/pro#2824 Custom scope performance fix
ShadelessFox May 8, 2024
9b7530e
Merge branch 'devel' into dbeaver/pro#2824-ai-custom-scope-performance
MashaKorax May 13, 2024
d223242
Merge branch 'devel' into dbeaver/pro#2824-ai-custom-scope-performance
ShadelessFox May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 18 additions & 29 deletions ...editors.sql.ai/src/org/jkiss/dbeaver/ui/editors/sql/ai/controls/ScopeSelectorControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.ai.completion.DAICompletionScope;
import org.jkiss.dbeaver.model.ai.completion.DAICompletionSettings;
import org.jkiss.dbeaver.model.app.DBPProject;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.logical.DBSLogicalDataSource;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSEntity;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import org.jkiss.dbeaver.model.struct.DBSStructContainer;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.utils.ArrayUtils;
Expand Down Expand Up @@ -192,42 +190,33 @@ public static List<DBSEntity> loadCustomEntities(
@NotNull DBPDataSource dataSource,
@NotNull Set<String> ids
) {
List<DBSEntity> entities = new ArrayList<>();
monitor.beginTask("Load custom entities", ids.size());
try {
if (dataSource instanceof DBSObjectContainer) {
monitor.beginTask("Load custom entities", 1);
try {
loadCheckedEntitiesById(monitor, (DBSObjectContainer) dataSource, ids, entities);
} finally {
monitor.done();
}
}
return loadCheckedEntitiesById(monitor, dataSource.getContainer().getProject(), ids);
} catch (Exception e) {
log.error(e);
return List.of();
} finally {
monitor.done();
}
return entities;
}


private static void loadCheckedEntitiesById(
@NotNull
private static List<DBSEntity> loadCheckedEntitiesById(
@NotNull DBRProgressMonitor monitor,
@NotNull DBSObjectContainer container,
@NotNull Set<String> ids,
@NotNull List<DBSEntity> output
@NotNull DBPProject project,
@NotNull Set<String> ids
) throws DBException {
Collection<? extends DBSObject> children = container.getChildren(monitor);

if (children != null) {
for (DBSObject child : children) {
if (child instanceof DBSEntity) {
if (ids.contains(DBUtils.getObjectFullId(child))) {
output.add((DBSEntity) child);
}
} else if (child instanceof DBSStructContainer) {
loadCheckedEntitiesById(monitor, (DBSObjectContainer) child, ids, output);
}
final List<DBSEntity> output = new ArrayList<>();

for (String id : ids) {
if (DBUtils.findObjectById(monitor, project, id) instanceof DBSEntity entity) {
output.add(entity);
}
monitor.worked(1);
}

return output;
}

public void changeScope(@NotNull DAICompletionScope scope) {
Expand Down