Refactor keys and queries in datastore service and implementation.

filter/dscache/ds.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 dscache
 
 import (
         "time"
 
         ds "github.com/luci/gae/service/datastore"
         "github.com/luci/gae/service/memcache"
         log "github.com/luci/luci-go/common/logging"
         "golang.org/x/net/context"
 )
 
 type dsCache struct {
         ds.RawInterface
 
         *supportContext
 }
 
 var _ ds.RawInterface = (*dsCache)(nil)
 
-func (d *dsCache) DeleteMulti(keys []ds.Key, cb ds.DeleteMultiCB) error {
+func (d *dsCache) DeleteMulti(keys []*ds.Key, cb ds.DeleteMultiCB) error {
         return d.mutation(keys, func() error {
                 return d.RawInterface.DeleteMulti(keys, cb)
         })
 }
 
-func (d *dsCache) PutMulti(keys []ds.Key, vals []ds.PropertyMap, cb ds.PutMultiCB) error {
+func (d *dsCache) PutMulti(keys []*ds.Key, vals []ds.PropertyMap, cb ds.PutMultiCB) error {
         return d.mutation(keys, func() error {
                 return d.RawInterface.PutMulti(keys, vals, cb)
         })
 }
 
-func (d *dsCache) GetMulti(keys []ds.Key, metas ds.MultiMetaGetter, cb ds.GetMultiCB) error {
+func (d *dsCache) GetMulti(keys []*ds.Key, metas ds.MultiMetaGetter, cb ds.GetMultiCB) error {
         lockItems, nonce := d.mkRandLockItems(keys, metas)
         if len(lockItems) == 0 {
                 return d.RawInterface.GetMulti(keys, metas, cb)
         }
 
         if err := d.mc.AddMulti(lockItems); err != nil {
                 (log.Fields{log.ErrorKey: err}).Warningf(
                         d.c, "dscache: GetMulti: memcache.AddMulti")
 
         }
@@ skipping 83 matching lines @@
                 if err == nil {
                         err = txnState.apply(d.supportContext)
                 }
                 return err
         }, opts)
         if err == nil {
                 txnState.release(d.supportContext)
         }
         return err
 }