| Summary: | Compare: After using formatJS in a large file, the compare widget somehow gets slow. | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | libing wang <libingw> |
| Component: | Client | Assignee: | libing wang <libingw> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | mamacdon |
| Version: | 1.0 | Flags: | mamacdon:
review+
|
| Target Milestone: | 2.0 RC2 | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| Whiteboard: | |||
|
Description
libing wang
In the following commit, the change is huge. http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=8f83461bf744e07bde588ec3a10e39285546e0b8. If you open the orion commit page and expand searchExplorer.js, the inline compare almost got unresponsive. I did a investigation before I commit this commit. 1.Copy the searchExplorer.js 2.Checkout the searchExplorer.js 3.Select the copy and searchExplorer.js 4. Use comapre two files action It worked on the two way compare. I bet there are something wrong on the inline compare in this case, as the both the dummy file size and annotation doubled the two way compare. I saw the diff from git is kind of strange. As it is really a rare case and the reason is complex, somehow the jsDiff is spending a lot of time for the WORD DIFF. Will investigate in 3.0M1 time frame. We should not calculate word diff if either side of the diff block is huge. The word diff in this case is time consuming and meaningless. Proposed fix in http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=a1dc4d3e79cc6a1020f4f9ec96ea908adc2f3c2b. looks good Merged back to master. |