Roll infra/go/src/github.com/luci/luci-go/ to b85c6dd748361e8244122faac44b5beefcd2db37.

go/src/infra/gae/libs/wrapper/memory/datastore_query.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package memory
 
 import (
         "bytes"
         "errors"
         "fmt"
         "math"
         "strings"
 
         "appengine/datastore"
         pb "appengine_internal/datastore"
 
         "github.com/luci/gkvlite"
-        "github.com/luci/luci-go/common/funnybase"
+        "github.com/luci/luci-go/common/cmpbin"
 
         "infra/gae/libs/wrapper"
 )
 
 type qDirection bool
 
 const (
         qASC qDirection = true
         qDEC            = false
 )
@@ skipping 53 matching lines @@
                 buf.Write(builtinQueryPrefix)
         } else {
                 buf.Write(complexQueryPrefix)
         }
         writeString(buf, i.kind)
         if i.ancestor {
                 buf.WriteByte(0)
         } else {
                 buf.WriteByte(1)
         }
-        funnybase.WriteUint(buf, uint64(len(i.sortby)))
+        cmpbin.WriteUint(buf, uint64(len(i.sortby)))
         for _, sb := range i.sortby {
                 sb.WriteBinary(buf)
         }
 }
 
 func (i *qIndex) String() string {
         ret := &bytes.Buffer{}
         if i.Builtin() {
                 ret.WriteRune('B')
         } else {
@@ skipping 24 matching lines @@
         i.kind, err = readString(buf)
         if err != nil {
                 return err
         }
         anc, err := buf.ReadByte()
         if err != nil {
                 return err
         }
         i.ancestor = anc == 1
 
-        numSorts, err := funnybase.ReadUint(buf)
+        numSorts, _, err := cmpbin.ReadUint(buf)
         if err != nil {
                 return err
         }
         if numSorts > 64 {
                 return fmt.Errorf("qIndex.ReadBinary: Got over 64 sort orders: %d", numSorts)
         }
         i.sortby = make([]qSortBy, numSorts)
         for idx := range i.sortby {
                 err = (&i.sortby[idx]).ReadBinary(buf)
                 if err != nil {
@@ skipping 410 matching lines @@
 func (q *queryImpl) End(c wrapper.DSCursor) wrapper.DSQuery {
         q = q.clone()
         curs := c.(queryCursor)
         if !curs.Valid() {
                 q.err = errors.New("datastore: invalid cursor")
                 return q
         }
         q.end = curs
         return q
 }