Split off serialization and key functions to their own packages.

impl/memory/datastore.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 (
         "errors"
         "fmt"
 
         "golang.org/x/net/context"
 
         ds "github.com/luci/gae/service/datastore"
+        "github.com/luci/gae/service/datastore/dskey"
 )
 
 //////////////////////////////////// public ////////////////////////////////////
 
 // useRDS adds a gae.Datastore implementation to context, accessible
 // by gae.GetDS(c)
 func useRDS(c context.Context) context.Context {
         return ds.SetRawFactory(c, func(ic context.Context) ds.RawInterface {
                 dsd := cur(ic).Get(memContextDSIdx)
 
@@ skipping 10 matching lines @@
 // dsImpl exists solely to bind the current c to the datastore data.
 type dsImpl struct {
         data *dataStoreData
         ns   string
         c    context.Context
 }
 
 var _ ds.RawInterface = (*dsImpl)(nil)
 
 func (d *dsImpl) DecodeKey(encoded string) (ds.Key, error) {
-        return ds.NewKeyFromEncoded(encoded)
+        return dskey.NewFromEncoded(encoded)
 }
 
 func (d *dsImpl) NewKey(kind, stringID string, intID int64, parent ds.Key) ds.Key {
-        return ds.NewKey(globalAppID, d.ns, kind, stringID, intID, parent)
+        return dskey.New(globalAppID, d.ns, kind, stringID, intID, parent)
 }
 
 func (d *dsImpl) PutMulti(keys []ds.Key, vals []ds.PropertyMap, cb ds.PutMultiCB) error {
         d.data.putMulti(keys, vals, cb)
         return nil
 }
 
 func (d *dsImpl) GetMulti(keys []ds.Key, _meta ds.MultiMetaGetter, cb ds.GetMultiCB) error {
         d.data.getMulti(keys, cb)
         return nil
@@ skipping 48 matching lines @@
 ////////////////////////////////// txnDsImpl ///////////////////////////////////
 
 type txnDsImpl struct {
         data *txnDataStoreData
         ns   string
 }
 
 var _ ds.RawInterface = (*txnDsImpl)(nil)
 
 func (d *txnDsImpl) DecodeKey(encoded string) (ds.Key, error) {
-        return ds.NewKeyFromEncoded(encoded)
+        return dskey.NewFromEncoded(encoded)
 }
 
 func (d *txnDsImpl) NewKey(kind, stringID string, intID int64, parent ds.Key) ds.Key {
-        return ds.NewKey(globalAppID, d.ns, kind, stringID, intID, parent)
+        return dskey.New(globalAppID, d.ns, kind, stringID, intID, parent)
 }
 
 func (d *txnDsImpl) PutMulti(keys []ds.Key, vals []ds.PropertyMap, cb ds.PutMultiCB) error {
         return d.data.run(func() error {
                 d.data.putMulti(keys, vals, cb)
                 return nil
         })
 }
 
 func (d *txnDsImpl) GetMulti(keys []ds.Key, _meta ds.MultiMetaGetter, cb ds.GetMultiCB) error {
@@ skipping 26 matching lines @@
         return errors.New("datastore: nested transactions are not supported")
 }
 
 func (d *txnDsImpl) NewQuery(kind string) ds.Query {
         return &queryImpl{ns: d.ns, kind: kind}
 }
 
 func (*txnDsImpl) Testable() ds.Testable {
         return nil
 }