temp

Author: darkcoderrises

algo/uidlist.go

@@ -60,7 +60,7 @@ func IntersectCompressedWith(pack *pb.UidPack, afterUID uint64, v, o *pb.List) {
 
 	// Select appropriate function based on heuristics.
 	ratio := float64(m) / float64(n)
-	if ratio < 10 {
+	if ratio <= 10 {
 		IntersectCompressedWithLinJump(&dec, v.Uids, &dst)
 	} else {
 		IntersectCompressedWithBin(&dec, v.Uids, &dst)
@@ -238,7 +238,10 @@ func IntersectWithJump(u, v []uint64, o *[]uint64) (int, int) {
 // IntersectWithBin is based on the paper
 // "Fast Intersection Algorithms for Sorted Sequences"
 // https://link.springer.com/chapter/10.1007/978-3-642-12476-1_3
+<<<<<<< HEAD
 // Returns where to move the second array(q) to. O means not found
+=======
+>>>>>>> 6119641bd (temp)
 func IntersectWithBin(d, q []uint64, o *[]uint64) int {
 	ld := len(d)
 	lq := len(q)

algo/uidlist_test.go

@@ -370,6 +370,7 @@ func BenchmarkListIntersectRandom(b *testing.B) {
 func BenchmarkListIntersectCompressBin(b *testing.B) {
 	randomTests := func(sz int, overlap float64) {
 		rs := []float64{0.01, 0.1, 1, 10, 100}
+		//rs := []float64{0.002, 0.01, 0.1}
 		for _, r := range rs {
 			sz1 := sz
 			sz2 := int(float64(sz) * r)

codec/codec.go

@@ -156,7 +156,7 @@ type Decoder struct {
 // NewDecoder returns a decoder for the given UidPack and properly initializes it.
 func NewDecoder(pack *pb.UidPack) *Decoder {
 	decoder := &Decoder{
-		Pack: pack
+		Pack: pack,
 	}
 	decoder.Seek(0, SeekStart)
 	return decoder
@@ -174,10 +174,6 @@ func (d *Decoder) UnpackBlock() []uint64 {
 		return d.uids
 	}
 
-	if val, ok := d.UnpackedBlocks[d.blockIdx]; ok {
-		return val
-	}
-
 	block := d.Pack.Blocks[d.blockIdx]
 
 	last := block.Base

posting/list.go

@@ -141,7 +141,7 @@ func (it *pIterator) seek(l *List, afterUid, deleteBelowTs uint64) error {
 	}
 
 	it.uidPosting = &pb.Posting{}
-	it.dec = &codec.Decoder{Pack: it.plist.Pack, UnpackedBlocks: make(map[int][]uint64)}
+	it.dec = &codec.Decoder{Pack: it.plist.Pack}
 	it.uids = it.dec.Seek(it.afterUid, codec.SeekCurrent)
 	it.uidx = 0
 
@@ -1180,11 +1180,7 @@ func (l *List) Uids(opt ListOptions) (*pb.List, error) {
 			l.RUnlock()
 			return out, ErrTsTooOld
 		}
-		//if len(opt.Intersect.Uids) > 10*codec.ApproxLen(l.plist.Pack) {
-		//	algo.IntersectCompressedWithAlternate(l.plist.Pack, opt.AfterUid, opt.Intersect, out)
-		//} else {
 		algo.IntersectCompressedWith(l.plist.Pack, opt.AfterUid, opt.Intersect, out)
-		//}
 		l.RUnlock()
 		return out, nil
 	}