Merge pull request #3407 from ipfs/kevina/dskey-minalloc

ds-help: avoid unnecessary allocs when posssible and make use of RawKey

blocks/blockstore/blockstore.go

@@ -196,7 +196,7 @@ func (bs *blockstore) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error)
 			}
 
 			// need to convert to key.Key using key.KeyFromDsKey.
-			c, err := dshelp.DsKeyStringToCid(e.Key)
+			c, err := dshelp.DsKeyToCid(ds.RawKey(e.Key))
 			if err != nil {
 				log.Warningf("error parsing key from DsKey: ", err)
 				return nil, true

namesys/publisher.go

@@ -80,7 +80,7 @@ func (p *ipnsPublisher) PublishWithEOL(ctx context.Context, k ci.PrivKey, value
 }
 
 func (p *ipnsPublisher) getPreviousSeqNo(ctx context.Context, ipnskey string) (uint64, error) {
-	prevrec, err := p.ds.Get(dshelp.NewKeyFromBinary(ipnskey))
+	prevrec, err := p.ds.Get(dshelp.NewKeyFromBinary([]byte(ipnskey)))
 	if err != nil && err != ds.ErrNotFound {
 		// None found, lets start at zero!
 		return 0, err

namesys/republisher/repub.go

@@ -108,7 +108,7 @@ func (rp *Republisher) republishEntries(p goprocess.Process) error {
 }
 
 func (rp *Republisher) getLastVal(k string) (path.Path, uint64, error) {
-	ival, err := rp.ds.Get(dshelp.NewKeyFromBinary(k))
+	ival, err := rp.ds.Get(dshelp.NewKeyFromBinary([]byte(k)))
 	if err != nil {
 		// not found means we dont have a previously published entry
 		return "", 0, errNoEntry

routing/mock/centralized_client.go

@@ -40,13 +40,13 @@ func (c *client) PutValue(ctx context.Context, key string, val []byte) error {
 		return err
 	}
 
-	return c.datastore.Put(dshelp.NewKeyFromBinary(key), data)
+	return c.datastore.Put(dshelp.NewKeyFromBinary([]byte(key)), data)
 }
 
 // FIXME(brian): is this method meant to simulate getting a value from the network?
 func (c *client) GetValue(ctx context.Context, key string) ([]byte, error) {
 	log.Debugf("GetValue: %s", key)
-	v, err := c.datastore.Get(dshelp.NewKeyFromBinary(key))
+	v, err := c.datastore.Get(dshelp.NewKeyFromBinary([]byte(key)))
 	if err != nil {
 		return nil, err
 	}

routing/offline/offline.go

@@ -48,11 +48,11 @@ func (c *offlineRouting) PutValue(ctx context.Context, key string, val []byte) e
 		return err
 	}
 
-	return c.datastore.Put(dshelp.NewKeyFromBinary(key), data)
+	return c.datastore.Put(dshelp.NewKeyFromBinary([]byte(key)), data)
 }
 
 func (c *offlineRouting) GetValue(ctx context.Context, key string) ([]byte, error) {
-	v, err := c.datastore.Get(dshelp.NewKeyFromBinary(key))
+	v, err := c.datastore.Get(dshelp.NewKeyFromBinary([]byte(key)))
 	if err != nil {
 		return nil, err
 	}
@@ -71,7 +71,7 @@ func (c *offlineRouting) GetValue(ctx context.Context, key string) ([]byte, erro
 }
 
 func (c *offlineRouting) GetValues(ctx context.Context, key string, _ int) ([]routing.RecvdVal, error) {
-	v, err := c.datastore.Get(dshelp.NewKeyFromBinary(key))
+	v, err := c.datastore.Get(dshelp.NewKeyFromBinary([]byte(key)))
 	if err != nil {
 		return nil, err
 	}

routing/supernode/server.go

@@ -117,7 +117,7 @@ var _ proxy.RequestHandler = &Server{}
 var _ proxy.Proxy = &Server{}
 
 func getRoutingRecord(ds datastore.Datastore, k string) (*pb.Record, error) {
-	dskey := dshelp.NewKeyFromBinary(k)
+	dskey := dshelp.NewKeyFromBinary([]byte(k))
 	val, err := ds.Get(dskey)
 	if err != nil {
 		return nil, err
@@ -138,7 +138,7 @@ func putRoutingRecord(ds datastore.Datastore, k string, value *pb.Record) error
 	if err != nil {
 		return err
 	}
-	dskey := dshelp.NewKeyFromBinary(k)
+	dskey := dshelp.NewKeyFromBinary([]byte(k))
 	// TODO namespace
 	if err := ds.Put(dskey, data); err != nil {
 		return err

thirdparty/ds-help/key.go

@@ -7,8 +7,12 @@ import (
 )
 
 // TODO: put this code into the go-datastore itself
-func NewKeyFromBinary(s string) ds.Key {
-	return ds.NewKey(base32.RawStdEncoding.EncodeToString([]byte(s)))
+
+func NewKeyFromBinary(rawKey []byte) ds.Key {
+	buf := make([]byte, 1+base32.RawStdEncoding.EncodedLen(len(rawKey)))
+	buf[0] = '/'
+	base32.RawStdEncoding.Encode(buf[1:], rawKey)
+	return ds.RawKey(string(buf))
 }
 
 func BinaryFromDsKey(k ds.Key) ([]byte, error) {
@@ -16,7 +20,7 @@ func BinaryFromDsKey(k ds.Key) ([]byte, error) {
 }
 
 func CidToDsKey(k *cid.Cid) ds.Key {
-	return NewKeyFromBinary(k.KeyString())
+	return NewKeyFromBinary(k.Bytes())
 }
 
 func DsKeyToCid(dsKey ds.Key) (*cid.Cid, error) {
@@ -26,11 +30,3 @@ func DsKeyToCid(dsKey ds.Key) (*cid.Cid, error) {
 	}
 	return cid.Cast(kb)
 }
-
-func DsKeyStringToCid(dsKey string) (*cid.Cid, error) {
-	kb, err := base32.RawStdEncoding.DecodeString(dsKey[1:])
-	if err != nil {
-		return nil, err
-	}
-	return cid.Cast(kb)
-}