datastore: Fix AddIndexes with existing namespaces

impl/memory/datastore_index.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 (
         "bytes"
         "fmt"
         "sort"
@@ skipping 206 matching lines @@
                                 }
                         })
                 default:
                         impossible(fmt.Errorf("both values from gkvCollide were nil?"))
                 }
                 // TODO(riannucci): remove entries from idxColl and remove index collections
                 // when there are no index entries for that index any more.
         })
 }
 
-func addIndexes(store *memStore, aid, ns string, compIdx []*ds.IndexDefinition) {
+func addIndexes(store *memStore, aid string, compIdx []*ds.IndexDefinition) {
         normalized := make([]*ds.IndexDefinition, len(compIdx))
         idxColl := store.SetCollection("idx", nil)
         for i, idx := range compIdx {
                 normalized[i] = idx.Normalize()
                 idxColl.Set(serialize.ToBytes(*normalized[i].PrepForIdxTable()), []byte{})
         }
 
-        if allEnts := store.GetCollection("ents:" + ns); allEnts != nil {
-                allEnts.VisitItemsAscend(nil, true, func(i *gkvlite.Item) bool {
-                        pm, err := rpm(i.Val)
-                        memoryCorruption(err)
+        for _, ns := range namespaces(store) {
+                if allEnts := store.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)
-                        memoryCorruption(err)
+                                prop, err := serialize.ReadProperty(bytes.NewBuffer(i.Key), serialize.WithoutContext, aid, ns)
+                                memoryCorruption(err)
 
-                        k := prop.Value().(*ds.Key)
+                                k := prop.Value().(*ds.Key)
 
-                        sip := serialize.PropertyMapPartially(k, pm)
+                                sip := serialize.PropertyMapPartially(k, pm)
 
-                        mergeIndexes(ns, store,
-                                newMemStore(),
-                                indexEntries(sip, ns, normalized))
-                        return true
-                })
+                                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, nil, func(i *ds.IndexDefinition) bool {
                 compIdx = append(compIdx, i)
                 return true
         })
 
         mergeIndexes(key.Namespace(), store,
                 indexEntriesWithBuiltins(key, oldEnt, compIdx),
                 indexEntriesWithBuiltins(key, newEnt, compIdx))
 }