filter/txnBuf: Use fully-qualified App ID.

impl/memory/datastore.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 memory
 
 import (
         "errors"
         "fmt"
 
@@ skipping 34 matching lines @@
 
 // NewDatastore creates a new standalone memory implementation of the datastore,
 // suitable for embedding for doing in-memory data organization.
 //
 // It's configured by default with the following settings:
 //   * AutoIndex(true)
 //   * Consistent(true)
 //   * DisableSpecialEntities(true)
 //
 // These settings can of course be changed by using the Testable() interface.
-func NewDatastore(aid, ns string) (ds.Interface, error) {
-        ctx := UseWithAppID(context.Background(), aid)
+func NewDatastore(inf info.Interface) ds.Interface {
+        fqAppID := inf.FullyQualifiedAppID()
+        ns, hasNS := inf.GetNamespace()
 
-        if ns != "" {
-                var err error
-                ctx, err = info.Get(ctx).Namespace(ns)
-                if err != nil {
-                        return nil, err
-                }
-        }
+        memctx := newMemContext(fqAppID)
 
-        ret := ds.Get(ctx)
+        dsCtx := info.Set(context.Background(), inf)
+        rds := &dsImpl{memctx.Get(memContextDSIdx).(*dataStoreData), ns, hasNS, dsCtx}
+
+        ret := ds.Get(ds.SetRaw(dsCtx, rds))
         t := ret.Testable()
         t.AutoIndex(true)
         t.Consistent(true)
         t.DisableSpecialEntities(true)
-        return ret, nil
+
+        return ret
 }
 
 //////////////////////////////////// dsImpl ////////////////////////////////////
 
 // dsImpl exists solely to bind the current c to the datastore data.
 type dsImpl struct {
         data  *dataStoreData
         ns    string
         hasNS bool
         c     context.Context
@@ skipping 171 matching lines @@
         if ns == "" && hasNS {
                 // The user has set an empty namespace. Datastore does not support this
                 // for queries.
                 //
                 // Bug on file is:
                 // https://code.google.com/p/googleappengine/issues/detail?id=12914
                 return errors.New("namespace may not be present and empty")
         }
         return nil
 }