Split off serialization and key functions to their own packages.

service/datastore/checkfilter.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 datastore
 
 import (
         "fmt"
 
         "github.com/luci/gae/service/info"
@@ skipping 27 matching lines @@
 
 func (tcf *checkFilter) GetMulti(keys []Key, meta MultiMetaGetter, cb GetMultiCB) error {
         if len(keys) == 0 {
                 return nil
         }
         if cb == nil {
                 return fmt.Errorf("datastore: GetMulti callback is nil")
         }
         lme := errors.NewLazyMultiError(len(keys))
         for i, k := range keys {
-                if KeyIncomplete(k) || !KeyValid(k, true, tcf.aid, tcf.ns) {
+                if k.Incomplete() || !k.Valid(true, tcf.aid, tcf.ns) {
                         lme.Assign(i, ErrInvalidKey)
                 }
         }
         if me := lme.Get(); me != nil {
                 for _, err := range me.(errors.MultiError) {
                         cb(nil, err)
                 }
                 return nil
         }
         return tcf.RawInterface.GetMulti(keys, meta, cb)
 }
 
 func (tcf *checkFilter) PutMulti(keys []Key, vals []PropertyMap, cb PutMultiCB) error {
         if len(keys) != len(vals) {
                 return fmt.Errorf("datastore: PutMulti with mismatched keys/vals lengths (%d/%d)", len(keys), len(vals))
         }
         if len(keys) == 0 {
                 return nil
         }
         if cb == nil {
                 return fmt.Errorf("datastore: PutMulti callback is nil")
         }
         lme := errors.NewLazyMultiError(len(keys))
         for i, k := range keys {
-                if KeyIncomplete(k) {
-                        // use NewKey to avoid going all the way down the stack for this check.
-                        k = NewKey(k.AppID(), k.Namespace(), k.Kind(), "", 1, k.Parent())
-                }
-                if !KeyValid(k, false, tcf.aid, tcf.ns) {
+                if !k.PartialValid(tcf.aid, tcf.ns) {
                         lme.Assign(i, ErrInvalidKey)
                         continue
                 }
                 v := vals[i]
                 if v == nil {
                         lme.Assign(i, errors.New("datastore: PutMulti got nil vals entry"))
                 }
         }
         if me := lme.Get(); me != nil {
                 for _, err := range me.(errors.MultiError) {
                         cb(nil, err)
                 }
                 return nil
         }
 
         return tcf.RawInterface.PutMulti(keys, vals, cb)
 }
 
 func (tcf *checkFilter) DeleteMulti(keys []Key, cb DeleteMultiCB) error {
         if len(keys) == 0 {
                 return nil
         }
         if cb == nil {
                 return fmt.Errorf("datastore: DeleteMulti callback is nil")
         }
         lme := errors.NewLazyMultiError(len(keys))
         for i, k := range keys {
-                if KeyIncomplete(k) || !KeyValid(k, false, tcf.aid, tcf.ns) {
+                if k.Incomplete() || !k.Valid(false, tcf.aid, tcf.ns) {
                         lme.Assign(i, ErrInvalidKey)
                 }
         }
         if me := lme.Get(); me != nil {
                 for _, err := range me.(errors.MultiError) {
                         cb(err)
                 }
                 return nil
         }
         return tcf.RawInterface.DeleteMulti(keys, cb)
 }
 
 func applyCheckFilter(c context.Context, i RawInterface) RawInterface {
         inf := info.Get(c)
         return &checkFilter{i, inf.AppID(), inf.GetNamespace()}
 }