diff --git a/sumdb/tlog/tile.go b/sumdb/tlog/tile.go index 857d487..37771c5 100644 --- a/sumdb/tlog/tile.go +++ b/sumdb/tlog/tile.go @@ -115,16 +115,14 @@ func NewTiles(h int, oldTreeSize, newTreeSize int64) []Tile { for level := uint(0); newTreeSize>>(H*level) > 0; level++ { oldN := oldTreeSize >> (H * level) newN := newTreeSize >> (H * level) + if oldN == newN { + continue + } for n := oldN >> H; n < newN>>H; n++ { tiles = append(tiles, Tile{H: h, L: int(level), N: n, W: 1 << H}) } n := newN >> H - maxW := int(newN - n< n< 0 { tiles = append(tiles, Tile{H: h, L: int(level), N: n, W: w}) } } diff --git a/sumdb/tlog/tile_test.go b/sumdb/tlog/tile_test.go index e451a63..62b50b7 100644 --- a/sumdb/tlog/tile_test.go +++ b/sumdb/tlog/tile_test.go @@ -5,6 +5,7 @@ package tlog import ( + "fmt" "testing" ) @@ -22,3 +23,28 @@ func FuzzParseTilePath(f *testing.F) { ParseTilePath(path) }) } + +func TestNewTilesForSize(t *testing.T) { + for _, tt := range []struct { + old, new int64 + want int + }{ + {1, 1, 0}, + {100, 101, 1}, + {1023, 1025, 3}, + {1024, 1030, 1}, + {1030, 2000, 1}, + {1030, 10000, 10}, + {49516517, 49516586, 3}, + } { + t.Run(fmt.Sprintf("%d-%d", tt.old, tt.new), func(t *testing.T) { + tiles := NewTiles(10, tt.old, tt.new) + if got := len(tiles); got != tt.want { + t.Errorf("got %d, want %d", got, tt.want) + for _, tile := range tiles { + t.Logf("%+v", tile) + } + } + }) + } +}