fixed test

Author: darkcoderrises

algo/uidlist_test.go

@@ -554,7 +554,7 @@ func TestIntersectCompressedWithLinJump(t *testing.T) {
 }
 
 func TestIntersectCompressedWithBin(t *testing.T) {
-	lengths := []int{0, 1, 3, 11, 100}
+	lengths := []int{0, 1, 3, 11, 100, 500, 1000}
 
 	for _, N1 := range lengths {
 		for _, N2 := range lengths {
@@ -579,7 +579,7 @@ func TestIntersectCompressedWithBin(t *testing.T) {
 }
 
 func TestIntersectCompressedWithBinMissingSize(t *testing.T) {
-	lengths := []int{0, 1, 3, 11, 100}
+	lengths := []int{0, 1, 3, 11, 100, 500, 1000}
 
 	for _, N1 := range lengths {
 		for _, N2 := range lengths {

codec/codec.go

@@ -286,59 +286,39 @@ func (d *Decoder) Seek(uid uint64, whence seekPos) []uint64 {
 	if d.Pack == nil {
 		return []uint64{}
 	}
-
-	prevBlockIdx := d.blockIdx
-	pack := d.Pack
-	blocksToSearch := pack.Blocks
-	offset := 0
-	if len(d.uids) > 0 {
-		first := d.uids[0]
-		second := d.uids[len(d.uids)-1]
-
-		if uid >= first && uid <= second {
-			blocksToSearch = nil
-		} else if uid > second {
-			blocksToSearch = blocksToSearch[prevBlockIdx:]
-			offset = prevBlockIdx
-		} else {
-			blocksToSearch = blocksToSearch[:prevBlockIdx]
-		}
-	}
-
+	d.blockIdx = 0
 	if uid == 0 {
 		return d.UnpackBlock()
 	}
 
+	pack := d.Pack
 	blocksFunc := func() searchFunc {
 		var f searchFunc
 		switch whence {
 		case SeekStart:
-			f = func(i int) bool { return blocksToSearch[i].Base >= uid }
+			f = func(i int) bool { return pack.Blocks[i].Base >= uid }
 		case SeekCurrent:
-			f = func(i int) bool { return blocksToSearch[i].Base > uid }
+			f = func(i int) bool { return pack.Blocks[i].Base > uid }
 		}
 		return f
 	}
 
+	idx := sort.Search(len(pack.Blocks), blocksFunc())
+	// The first block.Base >= uid.
+	if idx == 0 {
+		return d.UnpackBlock()
+	}
+	// The uid is the first entry in the block.
+	if idx < len(pack.Blocks) && pack.Blocks[idx].Base == uid {
+		d.blockIdx = idx
+		return d.UnpackBlock()
+	}
+
 	// Either the idx = len(pack.Blocks) that means it wasn't found in any of the block's base. Or,
 	// we found the first block index whose base is greater than uid. In these cases, go to the
 	// previous block and search there.
-	if blocksToSearch != nil {
-		idx := sort.Search(len(blocksToSearch), blocksFunc()) + offset
-		// The first block.Base >= uid.
-		if idx == 0 {
-			return d.UnpackBlock()
-		}
-
-		// The uid is the first entry in the block.
-		if idx < len(pack.Blocks) && pack.Blocks[idx].Base == uid {
-			d.blockIdx = idx
-			return d.UnpackBlock()
-		}
-
-		d.blockIdx = idx - 1 // Move to the previous block. If blockIdx<0, unpack will deal with it.
-		d.UnpackBlock()      // And get all their uids.
-	}
+	d.blockIdx = idx - 1 // Move to the previous block. If blockIdx<0, unpack will deal with it.
+	d.UnpackBlock()      // And get all their uids.
 
 	uidsFunc := func() searchFunc {
 		var f searchFunc