The Unified and Autonomous Development Platform
fix issue #17: Revision compare page performance is not good
Robin Shen07f7aba55279
diff --git a/server-core/src/main/java/io/onedev/server/web/WebConstants.java b/server-core/src/main/java/io/onedev/server/web/WebConstants.javaindex f9df35faaf..fc5bc8891f 100644--- a/server-core/src/main/java/io/onedev/server/web/WebConstants.java+++ b/server-core/src/main/java/io/onedev/server/web/WebConstants.java@@ -7,8 +7,8 @@ public class WebConstants {/* diff constants */public static final int DIFF_EXPAND_SIZE = 15;public static final int MAX_DIFF_FILES = 200;- public static final int MAX_SINGLE_FILE_DIFF_LINES = 5000;- public static final int MAX_DIFF_LINES = 10000;+ public static final int MAX_SINGLE_DIFF_LINES = 2000;+ public static final int MAX_TOTAL_DIFF_LINES = 5000;public static final int DIFF_CONTEXT_SIZE = 3;/* commit constants */diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.javaindex bad2e572bf..2fdc76406b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java@@ -74,7 +74,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {if (blob.getText() != null) {if (blob.getText().getLines().size() > DiffUtils.MAX_DIFF_SIZE) {add(newFragment("Unable to diff as the file is too large.", true));- } else if (change.getAdditions()+change.getDeletions() > WebConstants.MAX_SINGLE_FILE_DIFF_LINES) {+ } else if (change.getAdditions()+change.getDeletions() > WebConstants.MAX_SINGLE_DIFF_LINES) {add(newFragment("Diff is too large to be displayed.", true));} else if (change.getDiffBlocks().isEmpty()) {if (change.getNewBlobIdent().path != null)@@ -112,7 +112,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {if (change.getOldText() != null && change.getNewText() != null) {if (change.getOldText().getLines().size() + change.getNewText().getLines().size() > DiffUtils.MAX_DIFF_SIZE) {add(newFragment("Unable to diff as the file is too large.", true));- } else if (change.getAdditions() + change.getDeletions() > WebConstants.MAX_SINGLE_FILE_DIFF_LINES) {+ } else if (change.getAdditions() + change.getDeletions() > WebConstants.MAX_SINGLE_DIFF_LINES) {add(newFragment("Diff is too large to be displayed.", true));} else if (change.getAdditions() + change.getDeletions() == 0&& (commentSupport == null || commentSupport.getComments().isEmpty())) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex d636f5a862..ae87d1aad0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -323,9 +323,9 @@ public class RevisionDiffPanel extends Panel {* display smaller diffs from different files as many as* possible*/- if (changedLines <= WebConstants.MAX_SINGLE_FILE_DIFF_LINES) {+ if (changedLines <= WebConstants.MAX_SINGLE_DIFF_LINES) {totalChangedLines += changedLines;- if (totalChangedLines <= WebConstants.MAX_DIFF_LINES)+ if (totalChangedLines <= WebConstants.MAX_TOTAL_DIFF_LINES)displayChanges.add(change);elsebreak;diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex f75a867a01..f3ba308084 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -258,7 +258,7 @@ onedev.server = {if ($ajaxLoadingIndicator[0].timer)clearTimeout($ajaxLoadingIndicator[0].timer);$ajaxLoadingIndicator[0].timer = setTimeout(function() {- if (!$ajaxLoadingIndicator.is(":visible") && $(".ajax-indicator:visible").length == 0)+ if (!$ajaxLoadingIndicator.is(":visible") && $(".ajax-indicator").filter(":visible").length == 0)$ajaxLoadingIndicator.show();}, 2000);}@@ -296,16 +296,16 @@ onedev.server = {* via Wicket*/setTimeout(function() {- var focusibleSelector = "input[type=text]:visible, input[type=password]:visible, input:not([type]):visible, textarea:visible, .CodeMirror:visible";-- var inErrorSelector = ".has-error:visible:first";- var $inError = $containers.find(inErrorSelector).addBack(inErrorSelector);+ // do not use :visible selector directly for performance reason+ var focusibleSelector = "input[type=text], input[type=password], input:not([type]), textarea, .CodeMirror";+ var inErrorSelector = ".has-error";+ var $inError = $containers.find(inErrorSelector).addBack(inErrorSelector).filter(":visible:first");if ($inError.length == 0) {- inErrorSelector = ".feedbackPanelERROR:visible:first";- $inError = $containers.find(inErrorSelector).addBack(inErrorSelector);+ inErrorSelector = ".feedbackPanelERROR";+ $inError = $containers.find(inErrorSelector).addBack(inErrorSelector).filter(":visible:first");}if ($inError.length != 0) {- var $focusable = $inError.find(focusibleSelector).addBack(focusibleSelector);+ var $focusable = $inError.find(focusibleSelector).addBack(focusibleSelector).filter(":visible");if ($focusable.hasClass("CodeMirror") && $focusable[0].CodeMirror.options.readOnly == false) {$focusable[0].CodeMirror.focus();} else if ($focusable.length != 0@@ -316,7 +316,7 @@ onedev.server = {$inError[0].scrollIntoView({behavior: "smooth", block: "center"});}} else {- $containers.find(focusibleSelector).addBack(focusibleSelector).each(function() {+ $containers.find(focusibleSelector).addBack(focusibleSelector).filter(":visible").each(function() {var $this = $(this);if ($this.closest(".no-autofocus").length == 0) {if ($this.hasClass("CodeMirror") && $this[0].CodeMirror.options.readOnly == false) {@@ -431,10 +431,10 @@ onedev.server = {viewState: {getInnerMostAutoFit: function() {var $innerMost;- var $autofits = $(".autofit:visible");+ var $autofits = $(".autofit").filter(":visible");while ($autofits.length != 0) {$innerMost = $autofits.first();- $autofits = $innerMost.find(".autofit:visible");+ $autofits = $innerMost.find(".autofit").filter(":visible");}return $innerMost;},@@ -675,7 +675,7 @@ onedev.server = {setupModalOverlays: function() {$(document).on('hidden.bs.modal', '.modal', function () {- $('.modal:visible').length && $(document.body).addClass('modal-open');+ $('.modal').filter(":visible").length && $(document.body).addClass('modal-open');});},diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex b639874d2a..92c68bf92a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -792,10 +792,12 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,public Collection<String> getWebSocketObservables() {Collection<String> observables = super.getWebSocketObservables();if (getProject().getDefaultBranch() != null) {- if (state.compareWithMergeBase)- observables.add(CommitIndexed.getWebSocketObservable(mergeBase.name()));- else+ if (state.compareWithMergeBase) {+ if (mergeBase != null)+ observables.add(CommitIndexed.getWebSocketObservable(mergeBase.name()));+ } else {observables.add(CommitIndexed.getWebSocketObservable(state.leftSide.getCommit().name()));+ }observables.add(CommitIndexed.getWebSocketObservable(state.rightSide.getCommit().name()));if (state.commentId != null)observables.add(CodeComment.getWebSocketObservable(state.commentId));