Merge pull request #519 from rogpeppe/168-more-indexes

internal/charmstore: add more indexes

This should solve some performance issues.

Author: jujugui

internal/charmstore/store.go

@@ -390,9 +390,19 @@ func (s *Store) ensureIndexes() error {
 	}, {
 		s.DB.Entities(),
 		mgo.Index{Key: []string{"bundlecharms"}},
+	}, {
+		s.DB.Entities(),
+		mgo.Index{Key: []string{"name", "development", "-promulgated-revision", "-supportedseries"}},
+	}, {
+		s.DB.Entities(),
+		mgo.Index{Key: []string{"name", "development", "user", "-revision", "-supportedseries"}},
 	}, {
 		s.DB.BaseEntities(),
 		mgo.Index{Key: []string{"name"}},
+	}, {
+		// TODO this index should be created by the mgo gridfs code.
+		s.DB.C("entitystore.files"),
+		mgo.Index{Key: []string{"filename"}},
 	}}
 	for _, idx := range indexes {
 		err := idx.c.EnsureIndex(idx.i)

internal/charmstore/store_test.go

@@ -1542,7 +1542,7 @@ func (s *StoreSuite) TestCollections(c *gc.C) {
 	}
 	// Check that all created collections are mentioned in Collections.
 	for _, name := range names {
-		if name == "system.indexes" || name == "managedStoredResources" {
+		if name == "system.indexes" || name == "managedStoredResources" || name == "entitystore.files" {
 			continue
 		}
 		found := false