Skip to content

Commit

Permalink
go tests build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
macneale4 committed Feb 5, 2025
1 parent 9cc33f8 commit 531c455
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions go/libraries/doltcore/remotestorage/internal/ranges/ranges_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,23 @@ func TestTree(t *testing.T) {
tree := NewTree(8 * 1024)
// Insert 1KB ranges every 16 KB.
for i, j := 0, 0; i < 16; i, j = i+1, j+16*1024 {
tree.Insert("A", []byte{}, uint64(j), 1024)
tree.Insert("A", []byte{}, uint64(j), 1024, 0, 0)
}
// Insert 1KB ranges every 16 KB, offset by 8KB.
for i := 15*16*1024 + 8*1024; i >= 0; i -= 16 * 1024 {
tree.Insert("A", []byte{}, uint64(i), 1024)
tree.Insert("A", []byte{}, uint64(i), 1024, 0, 0)
}
assertTree(t, tree)
})
t.Run("DescendingThenAscending", func(t *testing.T) {
tree := NewTree(8 * 1024)
// Insert 1KB ranges every 16 KB, offset by 8KB.
for i := 15*16*1024 + 8*1024; i >= 0; i -= 16 * 1024 {
tree.Insert("A", []byte{}, uint64(i), 1024)
tree.Insert("A", []byte{}, uint64(i), 1024, 0, 0)
}
// Insert 1KB ranges every 16 KB.
for i, j := 0, 0; i < 16; i, j = i+1, j+16*1024 {
tree.Insert("A", []byte{}, uint64(j), 1024)
tree.Insert("A", []byte{}, uint64(j), 1024, 0, 0)
}
assertTree(t, tree)
})
Expand All @@ -111,7 +111,7 @@ func TestTree(t *testing.T) {
})
tree := NewTree(8 * 1024)
for _, offset := range entries {
tree.Insert("A", []byte{}, offset, 1024)
tree.Insert("A", []byte{}, offset, 1024, 0, 0)
}
assertTree(t, tree)
}
Expand All @@ -126,25 +126,25 @@ func TestTree(t *testing.T) {
"B", "A", "9", "8",
}
for i, j := 0, 0; i < 16; i, j = i+1, j+1024 {
tree.Insert(files[i], []byte{}, uint64(j), 1024)
tree.Insert(files[i], []byte{}, uint64(j), 1024, 0, 0)
}
assert.Equal(t, 16, tree.regions.Len())
assert.Equal(t, 16, tree.t.Len())
})
t.Run("MergeInMiddle", func(t *testing.T) {
tree := NewTree(8 * 1024)
// 1KB chunk at byte 0
tree.Insert("A", []byte{}, 0, 1024)
tree.Insert("A", []byte{}, 0, 1024, 0, 0)
// 1KB chunk at byte 16KB
tree.Insert("A", []byte{}, 16384, 1024)
tree.Insert("A", []byte{}, 16384, 1024, 0, 0)
assert.Equal(t, 2, tree.regions.Len())
assert.Equal(t, 2, tree.t.Len())
// 1KB chunk at byte 8KB
tree.Insert("A", []byte{}, 8192, 1024)
tree.Insert("A", []byte{}, 8192, 1024, 0, 0)
assert.Equal(t, 1, tree.regions.Len())
assert.Equal(t, 3, tree.t.Len())
tree.Insert("A", []byte{}, 4096, 1024)
tree.Insert("A", []byte{}, 12228, 1024)
tree.Insert("A", []byte{}, 4096, 1024, 0, 0)
tree.Insert("A", []byte{}, 12228, 1024, 0, 0)
assert.Equal(t, 1, tree.regions.Len())
assert.Equal(t, 5, tree.t.Len())
e, _ := tree.t.Min()
Expand Down Expand Up @@ -184,15 +184,15 @@ func TestTree(t *testing.T) {
t.Run("InsertAscending", func(t *testing.T) {
tree := NewTree(4 * 1024)
for _, e := range entries {
tree.Insert(e.url, []byte{e.id}, e.offset, e.length)
tree.Insert(e.url, []byte{e.id}, e.offset, e.length, 0, 0)
}
assertTree(t, tree)
})
t.Run("InsertDescending", func(t *testing.T) {
tree := NewTree(4 * 1024)
for i := len(entries) - 1; i >= 0; i-- {
e := entries[i]
tree.Insert(e.url, []byte{e.id}, e.offset, e.length)
tree.Insert(e.url, []byte{e.id}, e.offset, e.length, 0, 0)
}
assertTree(t, tree)
})
Expand All @@ -205,7 +205,7 @@ func TestTree(t *testing.T) {
})
tree := NewTree(4 * 1024)
for _, e := range entries {
tree.Insert(e.url, []byte{e.id}, e.offset, e.length)
tree.Insert(e.url, []byte{e.id}, e.offset, e.length, 0, 0)
}
assertTree(t, tree)
}
Expand Down

0 comments on commit 531c455

Please sign in to comment.