wumpz · wumpz · commit 24c3df1f39d6 · 2021-07-09T18:27:52.000+02:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
@@ -87,9 +87,6 @@ private void buildScript(DiffData data, int start1, int end1, int start2, int en
             }
         } else {
             buildScript(data, start1, middle.start, start2, middle.start - middle.diag);
-//            for (int i = middle.getStart(); i < middle.getEnd(); ++i) {
-//                script.append(new KeepCommand<>(left.charAt(i)));
-//            }
             buildScript(data, middle.end, end1, middle.end - middle.diag, end2);
         }
     }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
@@ -15,11 +15,14 @@
  */
 package com.github.difflib.algorithm.myers;
 
+import com.github.difflib.DiffUtils;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
 import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import static java.util.stream.Collectors.toList;
+import java.util.stream.IntStream;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -70,4 +73,19 @@ public void diffEnd() {
         System.out.println(logdata);
         assertEquals(8, logdata.size());
     }
+    
+    
+    @Test
+    public void testPerformanceProblemsIssue124() {
+         List<String> old = Arrays.asList("abcd");
+         List<String> newl = IntStream.range(0, 90000)
+                    .boxed()
+                    .map(i -> i.toString())
+                    .collect(toList());
+         
+        long start = System.currentTimeMillis();
+        Patch<String> diff = DiffUtils.diff(old, newl, new MeyersDiffWithLinearSpace<String>());
+        long end = System.currentTimeMillis();
+        System.out.println("Finished in " + (end - start) + "ms and resulted " + diff.getDeltas().size() + " deltas");
+    }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
@@ -95,7 +95,7 @@ public void testPatch_Change_withExceptionProcessor() {
             List<String> data = DiffUtils.patch(changeTest_from, patch);
             assertEquals(11, data.size());
             
-            assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
+            assertEquals(Arrays.asList("aaa", "bxb", "cxc", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
             
         } catch (PatchFailedException e) {
             fail(e.getMessage());

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,6 @@ private void buildScript(DiffData data, int start1, int end1, int start2, int en`
`87`	`87`	`}`
`88`	`88`	`} else {`
`89`	`89`	`buildScript(data, start1, middle.start, start2, middle.start - middle.diag);`
`90`		`-// for (int i = middle.getStart(); i < middle.getEnd(); ++i) {`
`91`		`-// script.append(new KeepCommand<>(left.charAt(i)));`
`92`		`-// }`
`93`	`90`	`buildScript(data, middle.end, end1, middle.end - middle.diag, end2);`
`94`	`91`	`}`
`95`	`92`	`}`