got performance

Author: darkcoderrises

algo/uidlist.go

@@ -43,7 +43,7 @@ func IntersectCompressedWith(pack *pb.UidPack, afterUID uint64, v, o *pb.List) {
 	if pack == nil {
 		return
 	}
-	dec := codec.Decoder{Pack: pack}
+	dec := codec.Decoder{Pack: pack, UnpackedBlocks: make(map[int][]uint64)}
 	dec.Seek(afterUID, codec.SeekStart)
 	n := dec.ApproxLen()
 	m := len(v.Uids)

codec/codec.go

@@ -151,12 +151,15 @@ type Decoder struct {
 	Pack     *pb.UidPack
 	blockIdx int
 	uids     []uint64
+
+	UnpackedBlocks map[int][]uint64
 }
 
 // NewDecoder returns a decoder for the given UidPack and properly initializes it.
 func NewDecoder(pack *pb.UidPack) *Decoder {
 	decoder := &Decoder{
-		Pack: pack,
+		Pack:           pack,
+		UnpackedBlocks: make(map[int][]uint64),
 	}
 	decoder.Seek(0, SeekStart)
 	return decoder
@@ -173,6 +176,11 @@ func (d *Decoder) UnpackBlock() []uint64 {
 	if d.blockIdx >= len(d.Pack.Blocks) {
 		return d.uids
 	}
+
+	if val, ok := d.UnpackedBlocks[d.blockIdx]; ok {
+		return val
+	}
+
 	block := d.Pack.Blocks[d.blockIdx]
 
 	last := block.Base
@@ -207,6 +215,7 @@ func (d *Decoder) UnpackBlock() []uint64 {
 	}
 
 	d.uids = d.uids[:block.NumUids]
+	d.UnpackedBlocks[d.blockIdx] = append(make([]uint64, 0, len(d.uids)), d.uids...)
 	return d.uids
 }
 

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}
+	it.dec = &codec.Decoder{Pack: it.plist.Pack, UnpackedBlocks: make(map[int][]uint64)}
 	it.uids = it.dec.Seek(it.afterUid, codec.SeekCurrent)
 	it.uidx = 0
 
@@ -1180,7 +1180,11 @@ 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
 	}

worker/sort.go

@@ -21,7 +21,6 @@ import (
 	"encoding/hex"
 	"sort"
 	"strings"
-	"time"
 
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
@@ -512,34 +511,7 @@ func processSort(ctx context.Context, ts *pb.SortMessage) (*pb.SortResult, error
 	cctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	resCh := make(chan *sortresult, 2)
-	go func() {
-		select {
-		case <-time.After(3 * time.Millisecond):
-			// Wait between ctx chan and time chan.
-		case <-ctx.Done():
-			resCh <- &sortresult{err: ctx.Err()}
-			return
-		}
-		r := sortWithoutIndex(cctx, ts)
-		resCh <- r
-	}()
-
-	go func() {
-		sr := sortWithIndex(cctx, ts)
-		resCh <- sr
-	}()
-
-	r := <-resCh
-	if r.err == nil {
-		cancel()
-		// wait for other goroutine to get cancelled
-		<-resCh
-	} else {
-		span.Annotatef(nil, "processSort error: %v", r.err)
-		r = <-resCh
-	}
-
+	r := sortWithIndex(cctx, ts)
 	if r.err != nil {
 		return nil, r.err
 	}