Refactor keys and queries in datastore service and implementation.

filter/dscache/ds_txn_state.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 (
         "sync"
 
         "github.com/luci/gae/service/datastore"
@@ skipping 49 matching lines @@
                 delKeys = append(delKeys, k)
         }
 
         err := sc.mc.DeleteMulti(delKeys)
         if err != nil {
                 (log.Fields{log.ErrorKey: err}).Warningf(
                         sc.c, "dscache: txn.release: memcache.DeleteMulti")
         }
 }
 
-func (s *dsTxnState) add(sc *supportContext, keys []datastore.Key) {
+func (s *dsTxnState) add(sc *supportContext, keys []*datastore.Key) {
         lockItems, lockKeys := sc.mkAllLockItems(keys)
         if lockItems == nil {
                 return
         }
 
         s.Lock()
         defer s.Unlock()
 
         for i, li := range lockItems {
                 k := lockKeys[i]
                 if _, ok := s.toDelete[k]; !ok {
                         s.toLock = append(s.toLock, li)
                         s.toDelete[k] = struct{}{}
                 }
         }
 }