Interface update, per-method Contexts.

filter/dscache/context.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package dscache
 
 import (
         ds "github.com/luci/gae/service/datastore"
-        "github.com/luci/gae/service/info"
-        mc "github.com/luci/gae/service/memcache"
+
         "github.com/luci/luci-go/common/data/rand/mathrand"
+
         "golang.org/x/net/context"
 )
 
 type key int
 
 var dsTxnCacheKey key
 
 // FilterRDS installs a caching RawDatastore filter in the context.
 //
 // It does nothing if IsGloballyEnabled returns false. That way it is possible
@@ skipping 15 matching lines @@
                 return c
         }
         return AlwaysFilterRDS(c, shardsForKey)
 }
 
 // AlwaysFilterRDS installs a caching RawDatastore filter in the context.
 //
 // Unlike FilterRDS it doesn't check GlobalConfig via IsGloballyEnabled call,
 // assuming caller already knows whether filter should be applied or not.
 func AlwaysFilterRDS(c context.Context, shardsForKey func(*ds.Key) int) context.Context {
-        return ds.AddRawFilters(c, func(c context.Context, ds ds.RawInterface) ds.RawInterface {
-                i := info.Get(c)
-                ns, _ := i.GetNamespace()
+        return ds.AddRawFilters(c, func(c context.Context, rds ds.RawInterface) ds.RawInterface {
+                kc := ds.GetKeyContext(c)
 
                 sc := &supportContext{
-                        i.AppID(),
-                        ns,
+                        kc.AppID,
+                        kc.Namespace,
                         c,
-                        mc.Get(c),
                         mathrand.Get(c),
                         shardsForKey,
                 }
 
                 v := c.Value(dsTxnCacheKey)
                 if v == nil {
-                        return &dsCache{ds, sc}
+                        return &dsCache{rds, sc}
                 }
-                return &dsTxnCache{ds, v.(*dsTxnState), sc}
+                return &dsTxnCache{rds, v.(*dsTxnState), sc}
         })
 }