archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2026-02-01 17:37:19 +00:00
Code Issues Projects Releases Wiki Activity

Use single database query when find history code comments on a file

Browse Source
This commit is contained in:
Robin Shen 2020-05-13 16:49:06 +08:00
parent b0debc7c0e
commit d1e2417d0e
3 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
View File

@ -52,6 +52,7 @@ import io.onedev.server.model.CodeCommentRelation;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@ -155,26 +156,26 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
Map<String, Map<String, List<CodeComment>>> possibleComments = new HashMap<>();
Collection<String> possiblePaths = Sets.newHashSet(path);
possiblePaths.addAll(commitInfoManager.getHistoryPaths(project, path));
for (String possiblePath: possiblePaths) {
EntityCriteria<CodeComment> criteria = EntityCriteria.of(CodeComment.class);
criteria.add(Restrictions.eq("markPos.path", possiblePath));
for (CodeComment comment: query(criteria)) {
if (comment.getMarkPos().getCommit().equals(commitId.name()) && possiblePath.equals(path)) {
comments.put(comment, comment.getMarkPos().getRange());
} else {
Map<String, List<CodeComment>> commentsOnCommit =
possibleComments.get(comment.getMarkPos().getCommit());
if (commentsOnCommit == null) {
commentsOnCommit = new HashMap<>();
possibleComments.put(comment.getMarkPos().getCommit(), commentsOnCommit);
}
List<CodeComment> commentsOnPath = commentsOnCommit.get(possiblePath);
if (commentsOnPath == null) {
commentsOnPath = new ArrayList<>();
commentsOnCommit.put(possiblePath, commentsOnPath);
}
commentsOnPath.add(comment);
EntityCriteria<CodeComment> criteria = EntityCriteria.of(CodeComment.class);
criteria.add(Restrictions.in(CodeComment.PROP_MARK_POS + "." + MarkPos.PROP_PATH, possiblePaths));
for (CodeComment comment: query(criteria)) {
String possiblePath = comment.getMarkPos().getPath();
if (comment.getMarkPos().getCommit().equals(commitId.name()) && possiblePath.equals(path)) {
comments.put(comment, comment.getMarkPos().getRange());
} else {
Map<String, List<CodeComment>> commentsOnCommit =
possibleComments.get(comment.getMarkPos().getCommit());
if (commentsOnCommit == null) {
commentsOnCommit = new HashMap<>();
possibleComments.put(comment.getMarkPos().getCommit(), commentsOnCommit);
}
List<CodeComment> commentsOnPath = commentsOnCommit.get(possiblePath);
if (commentsOnPath == null) {
commentsOnPath = new ArrayList<>();
commentsOnCommit.put(possiblePath, commentsOnPath);
}
commentsOnPath.add(comment);
}
}
@ -202,8 +203,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
Set<String> revisions = new HashSet<>(command.call());
RevCommit commit = revWalk.parseCommit(commitId);
List<String> newLines = GitUtils.readLines(project.getRepository(), commit, path,
WhitespaceOption.DEFAULT);
List<String> newLines = Preconditions.checkNotNull(
GitUtils.readLines(project.getRepository(), commit, path, WhitespaceOption.DEFAULT));
Collections.sort(historyCommits, new Comparator<RevCommit>() {
@ -221,14 +222,16 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
for (Map.Entry<String, List<CodeComment>> pathEntry: commentsOnCommit.entrySet()) {
List<String> oldLines = GitUtils.readLines(project.getRepository(), historyCommit,
pathEntry.getKey(), WhitespaceOption.DEFAULT);
Map<Integer, Integer> lineMapping = DiffUtils.mapLines(oldLines, newLines);
for (CodeComment comment: pathEntry.getValue()) {
PlanarRange newRange = DiffUtils.mapRange(lineMapping, comment.getMarkPos().getRange());
if (newRange != null)
comments.put(comment, newRange);
}
if (++checkedHistoryFiles == MAX_HISTORY_FILES_TO_CHECK) {
return comments;
if (oldLines != null) {
Map<Integer, Integer> lineMapping = DiffUtils.mapLines(oldLines, newLines);
for (CodeComment comment: pathEntry.getValue()) {
PlanarRange newRange = DiffUtils.mapRange(lineMapping, comment.getMarkPos().getRange());
if (newRange != null)
comments.put(comment, newRange);
}
if (++checkedHistoryFiles == MAX_HISTORY_FILES_TO_CHECK) {
return comments;
}
}
}
}

23
server-core/src/main/java/io/onedev/server/git/GitUtils.java
View File

@ -521,19 +521,24 @@ public class GitUtils {
}
}
@Nullable
public static List<String> readLines(Repository repository, RevCommit commit, String path,
WhitespaceOption whitespaceOption) {
try {
TreeWalk treeWalk = Preconditions.checkNotNull(TreeWalk.forPath(repository, path, commit.getTree()));
ObjectId blobId = treeWalk.getObjectId(0);
ObjectReader objectReader = treeWalk.getObjectReader();
BlobIdent blobIdent = new BlobIdent(commit.name(), path, FileMode.REGULAR_FILE.getBits());
Blob blob = new Blob(blobIdent, blobId, objectReader);
List<String> normalizedLines = new ArrayList<>();
for (String line: Preconditions.checkNotNull(blob.getText()).getLines()) {
normalizedLines.add(whitespaceOption.process(line));
TreeWalk treeWalk = TreeWalk.forPath(repository, path, commit.getTree());
if (treeWalk != null) {
ObjectId blobId = treeWalk.getObjectId(0);
ObjectReader objectReader = treeWalk.getObjectReader();
BlobIdent blobIdent = new BlobIdent(commit.name(), path, FileMode.REGULAR_FILE.getBits());
Blob blob = new Blob(blobIdent, blobId, objectReader);
List<String> normalizedLines = new ArrayList<>();
for (String line: Preconditions.checkNotNull(blob.getText()).getLines()) {
normalizedLines.add(whitespaceOption.process(line));
}
return normalizedLines;
} else {
return null;
}
return normalizedLines;
} catch (IOException e) {
throw new RuntimeException(e);
}

11
server-core/src/main/java/io/onedev/server/model/CodeComment.java
View File

@ -258,11 +258,12 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
if (commit.name().equals(getMarkPos().getCommit())) {
return getMarkPos().getRange();
} else {
List<String> newLines = GitUtils.readLines(getProject().getRepository(),
commit, blobIdent.path, WhitespaceOption.DEFAULT);
List<String> oldLines = GitUtils.readLines(getProject().getRepository(),
project.getRevCommit(getMarkPos().getCommit(), true), getMarkPos().getPath(),
WhitespaceOption.DEFAULT);
List<String> newLines = Preconditions.checkNotNull(
GitUtils.readLines(getProject().getRepository(), commit, blobIdent.path, WhitespaceOption.DEFAULT));
RevCommit commitOfComment = project.getRevCommit(getMarkPos().getCommit(), true);
List<String> oldLines = Preconditions.checkNotNull(
GitUtils.readLines(getProject().getRepository(), commitOfComment, getMarkPos().getPath(), WhitespaceOption.DEFAULT));
return DiffUtils.mapRange(DiffUtils.mapLines(oldLines, newLines), getMarkPos().getRange());
}
}