Add Kind/StringID/IntID back to Key.

impl/memory/datastore_data.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"
         "fmt"
         "sync"
@@ skipping 125 matching lines @@
         ents := d.mutableEnts(incomplete.Namespace())
 
         d.Lock()
         defer d.Unlock()
         return d.allocateIDsLocked(ents, incomplete, n)
 }
 
 func (d *dataStoreData) allocateIDsLocked(ents *memCollection, incomplete *ds.Key, n int) int64 {
         idKey := []byte(nil)
         if incomplete.Parent() == nil {
-                idKey = rootIDsKey(incomplete.Last().Kind)
+                idKey = rootIDsKey(incomplete.Kind())
         } else {
                 idKey = groupIDsKey(incomplete)
         }
         return incrementLocked(ents, idKey, n)
 }
 
 func (d *dataStoreData) fixKeyLocked(ents *memCollection, key *ds.Key) *ds.Key {
         if key.Incomplete() {
                 id := d.allocateIDsLocked(ents, key, 1)
-                key = ds.NewKey(key.AppID(), key.Namespace(), key.Last().Kind, "", id, key.Parent())
+                key = ds.NewKey(key.AppID(), key.Namespace(), key.Kind(), "", id, key.Parent())
         }
         return key
 }
 
 func (d *dataStoreData) putMulti(keys []*ds.Key, vals []ds.PropertyMap, cb ds.PutMultiCB) {
         ents := d.mutableEnts(keys[0].Namespace())
 
         for i, k := range keys {
                 pmap, _ := vals[i].Save(false)
                 dataBytes := serialize.ToBytes(pmap)
@@ skipping 283 matching lines @@
 
 func rpmWoCtx(data []byte, ns string) (ds.PropertyMap, error) {
         return serialize.ReadPropertyMap(bytes.NewBuffer(data),
                 serialize.WithoutContext, globalAppID, ns)
 }
 
 func rpm(data []byte) (ds.PropertyMap, error) {
         return serialize.ReadPropertyMap(bytes.NewBuffer(data),
                 serialize.WithContext, "", "")
 }