Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(873)

Unified Diff: impl/memory/datastore_index.go

Issue 1369353003: Make impl/memory have an AppID. (Closed) Base URL: https://github.com/luci/gae.git@fix_consistent
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: impl/memory/datastore_index.go
diff --git a/impl/memory/datastore_index.go b/impl/memory/datastore_index.go
index db79a3b5ecb03c68d90d71c5ce497d9cc67cac3d..0126034d2bd2d610633528d16782e0f5742783a6 100644
--- a/impl/memory/datastore_index.go
+++ b/impl/memory/datastore_index.go
@@ -224,7 +224,7 @@ func mergeIndexes(ns string, store, oldIdx, newIdx *memStore) {
})
}
-func addIndexes(store *memStore, ns string, compIdx []*ds.IndexDefinition) {
+func addIndexes(store *memStore, aid, ns string, compIdx []*ds.IndexDefinition) {
normalized := make([]*ds.IndexDefinition, len(compIdx))
idxColl := store.SetCollection("idx", nil)
for i, idx := range compIdx {
@@ -234,10 +234,10 @@ func addIndexes(store *memStore, ns string, compIdx []*ds.IndexDefinition) {
if allEnts := store.GetCollection("ents:" + ns); allEnts != nil {
allEnts.VisitItemsAscend(nil, true, func(i *gkvlite.Item) bool {
- pm, err := rpmWoCtx(i.Val, ns)
+ pm, err := rpm(i.Val)
memoryCorruption(err)
- prop, err := serialize.ReadProperty(bytes.NewBuffer(i.Key), serialize.WithoutContext, globalAppID, ns)
+ prop, err := serialize.ReadProperty(bytes.NewBuffer(i.Key), serialize.WithoutContext, aid, ns)
memoryCorruption(err)
k := prop.Value().(*ds.Key)

Powered by Google App Engine
This is Rietveld 408576698