The Unified and Autonomous Development Platform
Use single database query when find history code comments on a file
Robin Shend1e2417d0e06
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex bceb468a0a..bfba14d648 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -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<CodeCommentMap<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<CodeCommentSet<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<CodeCommentfor (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;+ }}}}diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.javaindex 75a8e175c6..7b55b82997 100644--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java@@ -521,19 +521,24 @@ public class GitUtils {}}+ @Nullablepublic 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);}diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex 26f61d2f07..085168fa96 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -258,11 +258,12 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSuppif (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());}}