Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
import java.util.stream.Collectors;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.server.ServerSide;
import org.sonar.api.web.UserRole;
import org.sonar.db.DbClient;
Expand All @@ -43,6 +46,30 @@
@ServerSide
public class ProjectFinder {

private static final Logger logger = LoggerFactory.getLogger(ProjectFinder.class);

static class PocketWatch {
private final Logger logger;
private final long startTime;

PocketWatch(Logger logger) {
this.logger = logger;
this.startTime = System.currentTimeMillis();
}

long elapsedTime() {
return System.currentTimeMillis() - startTime;
}

void logStartTime() {
logger.info("Start time");
}

void logElapsedTime(String message) {
logger.info("{} - elapsed time: {} ms", message, elapsedTime());
}
}

private final DbClient dbClient;
private final UserSession userSession;

Expand All @@ -52,27 +79,42 @@ public ProjectFinder(DbClient dbClient, UserSession userSession) {
}

public SearchResult search(DbSession dbSession, @Nullable String searchQuery) {
var pocketWatch = new PocketWatch(logger);
pocketWatch.logStartTime();
List<ProjectDto> allProjects = dbClient.projectDao().selectProjects(dbSession);
pocketWatch.logElapsedTime("Query 1. Fetched all projects from DB");

Set<String> projectsUserHasAccessTo = userSession.keepAuthorizedEntities(UserRole.SCAN, allProjects)
.stream()
.map(ProjectDto::getKey)
.collect(toSet());
pocketWatch.logElapsedTime("Query 2. Computed projects user has access to");

applyQueryAndPermissionFilter(searchQuery, allProjects, projectsUserHasAccessTo);
pocketWatch.logElapsedTime("Query 3. Applied query and permission filter");
List<ProjectDto> projectsWithOrgLevelPermissions = searchProjectsWithOrgLevelPermissions(dbSession);
pocketWatch.logElapsedTime("Query 4. Fetched projects with org-level permissions");
if (!projectsWithOrgLevelPermissions.isEmpty()) {
List<ProjectDto> uniqueProjects = projectsWithOrgLevelPermissions
.stream()
.filter(p -> !allProjects.contains(p))
.toList();
// Set<String> allProjectUuids = allProjects.stream()
// .map(ProjectDto::getUuid)
// .collect(toSet());
// List<ProjectDto> uniqueProjects = projectsWithOrgLevelPermissions
// .stream()
// .filter(p -> !allProjectUuids.contains(p.getUuid()))
// .toList();
List<ProjectDto> uniqueProjects = projectsWithOrgLevelPermissions
.stream()
.filter(p -> !allProjects.contains(p))
.toList();
if (!uniqueProjects.isEmpty()) {
allProjects.addAll(uniqueProjects);
}
}
pocketWatch.logElapsedTime("Query 5. Merged projects with org-level permissions");
List<Project> resultProjects = allProjects.stream()
.sorted(comparing(ProjectDto::getName, nullsFirst(String.CASE_INSENSITIVE_ORDER)))
.map(p -> new Project(p.getKey(), p.getName())).collect(Collectors.toList());
pocketWatch.logElapsedTime("Query 6. Mapped to WS model");
return new SearchResult(resultProjects);
}

Expand Down