Interface update, per-method Contexts.

impl/memory/datastore_index.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 memory
 
 import (
         "bytes"
         "fmt"
         "sort"
@@ skipping 222 matching lines @@
                 normalized[i] = idx.Normalize()
                 idxColl.Set(serialize.ToBytes(*normalized[i].PrepForIdxTable()), []byte{})
         }
 
         for _, ns := range namespaces(store) {
                 if allEnts := store.Snapshot().GetCollection("ents:" + ns); allEnts != nil {
                         allEnts.VisitItemsAscend(nil, true, func(i *gkvlite.Item) bool {
                                 pm, err := rpm(i.Val)
                                 memoryCorruption(err)
 
-                                prop, err := serialize.ReadProperty(bytes.NewBuffer(i.Key), serialize.WithoutContext, aid, ns)
+                                prop, err := serialize.ReadProperty(bytes.NewBuffer(i.Key), serialize.WithoutContext, ds.KeyContext{aid, ns})
                                 memoryCorruption(err)
 
                                 k := prop.Value().(*ds.Key)
 
                                 sip := serialize.PropertyMapPartially(k, pm)
 
                                 mergeIndexes(ns, store,
                                         newMemStore(),
                                         indexEntries(sip, ns, normalized))
                                 return true
                         })
                 }
         }
 }
 
 func updateIndexes(store memStore, key *ds.Key, oldEnt, newEnt ds.PropertyMap) {
         // load all current complex query index definitions.
         compIdx := []*ds.IndexDefinition{}
         walkCompIdxs(store.Snapshot(), nil, func(i *ds.IndexDefinition) bool {
                 compIdx = append(compIdx, i)
                 return true
         })
 
         mergeIndexes(key.Namespace(), store,
                 indexEntriesWithBuiltins(key, oldEnt, compIdx),
                 indexEntriesWithBuiltins(key, newEnt, compIdx))
 }