Refactor keys and queries in datastore service and implementation.

service/datastore/context.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 (
+        "github.com/luci/gae/service/info"
         "golang.org/x/net/context"
 )
 
 type key int
 
 var (
         rawDatastoreKey       key
         rawDatastoreFilterKey key = 1
 )
 
@@ skipping 22 matching lines @@
                 return nil
         }
         for _, f := range getCurFilters(c) {
                 ret = f(c, ret)
         }
         return applyCheckFilter(c, ret)
 }
 
 // Get gets the Interface implementation from context.
 func Get(c context.Context) Interface {
-        return &datastoreImpl{GetRaw(c)}
+        inf := info.Get(c)
+        return &datastoreImpl{
+                GetRaw(c),
+                inf.FullyQualifiedAppID(),
+                inf.GetNamespace(),
+        }
 }
 
 // SetRawFactory sets the function to produce Datastore instances, as returned by
 // the GetRaw method.
 func SetRawFactory(c context.Context, rdsf RawFactory) context.Context {
         return context.WithValue(c, rawDatastoreKey, rdsf)
 }
 
 // SetRaw sets the current Datastore object in the context. Useful for testing
 // with a quick mock. This is just a shorthand SetRawFactory invocation to set
@@ skipping 14 matching lines @@
 func AddRawFilters(c context.Context, filts ...RawFilter) context.Context {
         if len(filts) == 0 {
                 return c
         }
         cur := getCurFilters(c)
         newFilts := make([]RawFilter, 0, len(cur)+len(filts))
         newFilts = append(newFilts, getCurFilters(c)...)
         newFilts = append(newFilts, filts...)
         return context.WithValue(c, rawDatastoreFilterKey, newFilts)
 }