Skip to content

Handle zero deadlines differently #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 29, 2016
Merged

Handle zero deadlines differently #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
082fb5f
Test case to confirm that a timeout of 0 does not alter the patch
zimmski Oct 29, 2016
f2030ee
Refactor, remove diffMain
zimmski Oct 29, 2016
8bdce7a
Introduce a note that diffLineMode is faster using strings than rune
zimmski Oct 29, 2016
dc65385
Fix, timeout of 0 was not a timeout of "infinity".
zimmski Oct 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions diffmatchpatch/dmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,25 +250,13 @@ func New() *DiffMatchPatch {

// DiffMain finds the differences between two texts.
func (dmp *DiffMatchPatch) DiffMain(text1, text2 string, checklines bool) []Diff {
var deadline time.Time
if dmp.DiffTimeout <= 0 {
deadline = time.Now().Add(24 * 365 * time.Hour)
} else {
deadline = time.Now().Add(dmp.DiffTimeout)
}
return dmp.diffMain(text1, text2, checklines, deadline)
}

func (dmp *DiffMatchPatch) diffMain(text1, text2 string, checklines bool, deadline time.Time) []Diff {
return dmp.diffMainRunes([]rune(text1), []rune(text2), checklines, deadline)
return dmp.DiffMainRunes([]rune(text1), []rune(text2), checklines)
}

// DiffMainRunes finds the differences between two rune sequences.
func (dmp *DiffMatchPatch) DiffMainRunes(text1, text2 []rune, checklines bool) []Diff {
var deadline time.Time
if dmp.DiffTimeout <= 0 {
deadline = time.Now().Add(24 * 365 * time.Hour)
} else {
if dmp.DiffTimeout > 0 {
deadline = time.Now().Add(dmp.DiffTimeout)
}
return dmp.diffMainRunes(text1, text2, checklines, deadline)
Expand Down Expand Up @@ -387,6 +375,8 @@ func (dmp *DiffMatchPatch) diffLineMode(text1, text2 []rune, deadline time.Time)
pointer := 0
countDelete := 0
countInsert := 0

// NOTE: Rune slices are slower than using strings in this case.
textDelete := ""
textInsert := ""

Expand All @@ -406,7 +396,7 @@ func (dmp *DiffMatchPatch) diffLineMode(text1, text2 []rune, deadline time.Time)
countDelete+countInsert)

pointer = pointer - countDelete - countInsert
a := dmp.diffMain(textDelete, textInsert, false, deadline)
a := dmp.diffMainRunes([]rune(textDelete), []rune(textInsert), false, deadline)
for j := len(a) - 1; j >= 0; j-- {
diffs = splice(diffs, pointer, 0, a[j])
}
Expand Down Expand Up @@ -464,7 +454,7 @@ func (dmp *DiffMatchPatch) diffBisect(runes1, runes2 []rune, deadline time.Time)
k2end := 0
for d := 0; d < maxD; d++ {
// Bail out if deadline is reached.
if time.Now().After(deadline) {
if !deadline.IsZero() && time.Now().After(deadline) {
break
}

Expand Down
19 changes: 15 additions & 4 deletions diffmatchpatch/dmp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,18 +907,21 @@ func Test_diffBisect(t *testing.T) {
// Since the resulting diff hasn't been normalized, it would be ok if
// the insertion and deletion pairs are swapped.
// If the order changes, tweak this test as required.
diffs := []Diff{
correctDiffs := []Diff{
Diff{DiffDelete, "c"},
Diff{DiffInsert, "m"},
Diff{DiffEqual, "a"},
Diff{DiffDelete, "t"},
Diff{DiffInsert, "p"}}

assertDiffEqual(t, diffs, dmp.DiffBisect(a, b, time.Date(9999, time.December, 31, 23, 59, 59, 59, time.UTC)))
assertDiffEqual(t, correctDiffs, dmp.DiffBisect(a, b, time.Date(9999, time.December, 31, 23, 59, 59, 59, time.UTC)))

// Timeout.
diffs = []Diff{Diff{DiffDelete, "cat"}, Diff{DiffInsert, "map"}}
assertDiffEqual(t, diffs, dmp.DiffBisect(a, b, time.Date(0001, time.January, 01, 00, 00, 00, 00, time.UTC)))
diffs := []Diff{Diff{DiffDelete, "cat"}, Diff{DiffInsert, "map"}}
assertDiffEqual(t, diffs, dmp.DiffBisect(a, b, time.Now().Add(time.Nanosecond)))

// Negative deadlines count as having infinite time.
assertDiffEqual(t, correctDiffs, dmp.DiffBisect(a, b, time.Date(0001, time.January, 01, 00, 00, 00, 00, time.UTC)))
}

func Test_diffMain(t *testing.T) {
Expand Down Expand Up @@ -1259,6 +1262,14 @@ func Test_patch_make(t *testing.T) {

patches = dmp.PatchMake("2016-09-01T03:07:14.807830741Z", "2016-09-01T03:07:15.154800781Z")
assert.Equal(t, "@@ -15,16 +15,16 @@\n 07:1\n+5.15\n 4\n-.\n 80\n+0\n 78\n-3074\n 1Z\n", dmp.PatchToText(patches), "patch_make: Corner case of #31 fixed by #32")

text1 = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ut risus et enim consectetur convallis a non ipsum. Sed nec nibh cursus, interdum libero vel."
text2 = "Lorem a ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ut risus et enim consectetur convallis a non ipsum. Sed nec nibh cursus, interdum liberovel."
dmp2 := New()
dmp2.DiffTimeout = 0
diffs = dmp2.DiffMain(text1, text2, true)
patches = dmp2.PatchMake(text1, diffs)
assert.Equal(t, "@@ -1,14 +1,16 @@\n Lorem \n+a \n ipsum do\n@@ -148,13 +148,12 @@\n m libero\n- \n vel.\n", dmp2.PatchToText(patches), "patch_make: Corner case of #28 wrong patch with timeout of 0")
}

func Test_PatchSplitMax(t *testing.T) {
Expand Down