filter/txnBuf: Use fully-qualified App ID.

impl/memory/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 memory
 
 import (
         "errors"
+        "strings"
         "sync"
 
         ds "github.com/luci/gae/service/datastore"
         "github.com/luci/luci-go/common/logging/memlogger"
         "golang.org/x/net/context"
 )
 
 var serializationDeterministic = false
 
 type memContextObj interface {
@@ skipping 63 matching lines @@
         return true
 }
 
 func (m *memContext) applyTxn(c context.Context, txnCtxObj memContextObj) {
         txnCtx := *txnCtxObj.(*memContext)
         for i := range *m {
                 (*m)[i].applyTxn(c, txnCtx[i])
         }
 }
 
-// Use calls UseWithAppID with the appid of "dev~app"
+// Use calls UseWithAppID with the appid of "app"
 func Use(c context.Context) context.Context {
         return UseWithAppID(c, "dev~app")
 }
 
 // UseWithAppID adds implementations for the following gae services to the
 // context:
 //   * github.com/luci/gae/service/datastore
 //   * github.com/luci/gae/service/info
 //   * github.com/luci/gae/service/mail
 //   * github.com/luci/gae/service/memcache
 //   * github.com/luci/gae/service/taskqueue
 //   * github.com/luci/gae/service/user
 //   * github.com/luci/luci-go/common/logger (using memlogger)
 //
 // The application id wil be set to 'aid', and will not be modifiable in this
-// context.
+// context. If 'aid' contains a "~" character, it will be treated as the
+// fully-qualified App ID and the AppID will be the string following the "~".
 //
 // These can be retrieved with the gae.Get functions.
 //
 // The implementations are all backed by an in-memory implementation, and start
 // with an empty state.
 //
 // Using this more than once per context.Context will cause a panic.
 func UseWithAppID(c context.Context, aid string) context.Context {
         if c.Value(memContextKey) != nil {
                 panic(errors.New("memory.Use: called twice on the same Context"))
         }
         c = memlogger.Use(c)
 
-        memctx := newMemContext(aid)
+        fqAppID := aid
+        if parts := strings.SplitN(fqAppID, "~", 2); len(parts) == 2 {
+                aid = parts[1]
+        }
+
+        memctx := newMemContext(fqAppID)
         c = context.WithValue(c, memContextKey, memctx)
         c = context.WithValue(c, memContextNoTxnKey, memctx)
         c = useGID(c, func(mod *globalInfoData) {
-                mod.appid = aid
+                mod.appID = aid
+                mod.fqAppID = fqAppID
         })
         return useMod(useMail(useUser(useTQ(useRDS(useMC(useGI(c)))))))
 }
 
 func cur(c context.Context) (p *memContext) {
         p, _ = c.Value(memContextKey).(*memContext)
         return
 }
 
 func curNoTxn(c context.Context) (p *memContext) {
@@ skipping 60 matching lines @@
         if o != nil && o.Attempts != 0 {
                 attempts = o.Attempts
         }
         for attempt := 0; attempt < attempts; attempt++ {
                 if err := loopBody(attempt >= d.data.txnFakeRetry); err != ds.ErrConcurrentTransaction {
                         return err
                 }
         }
         return ds.ErrConcurrentTransaction
 }