Have Update() and Remove() return ChangeInfo

gridfs.go

@@ -336,7 +336,7 @@ func (gfs *GridFS) Find(query interface{}) *Query {
 
 // RemoveId deletes the file with the provided id from the GridFS.
 func (gfs *GridFS) RemoveId(id interface{}) error {
-	err := gfs.Files.Remove(bson.M{"_id": id})
+	_, err := gfs.Files.Remove(bson.M{"_id": id})
 	if err != nil {
 		return err
 	}

session.go

@@ -1293,7 +1293,7 @@ func (db *Database) UpsertUser(user *User) error {
 		}
 	}
 	users := db.C("system.users")
-	err = users.Update(bson.D{{Name: "user", Value: user.Username}}, bson.D{{Name: "$unset", Value: unset}, {Name: "$set", Value: set}})
+	_, err = users.Update(bson.D{{Name: "user", Value: user.Username}}, bson.D{{Name: "$unset", Value: unset}, {Name: "$set", Value: set}})
 	if err == ErrNotFound {
 		set = append(set, bson.DocElem{Name: "user", Value: user.Username})
 		if user.Roles == nil && user.OtherDBRoles == nil {
@@ -1394,7 +1394,8 @@ func (db *Database) RemoveUser(user string) error {
 	err := db.Run(bson.D{{Name: "dropUser", Value: user}}, nil)
 	if isNoCmd(err) {
 		users := db.C("system.users")
-		return users.Remove(bson.M{"user": user})
+		_, err := users.Remove(bson.M{"user": user})
+		return err
 	}
 	if isNotFound(err) {
 		return ErrNotFound
@@ -2912,7 +2913,6 @@ func (p *Pipe) SetMaxTime(d time.Duration) *Pipe {
 	return p
 }
 
-
 // Collation allows to specify language-specific rules for string comparison,
 // such as rules for lettercase and accent marks.
 // When specifying collation, the locale field is mandatory; all other collation
@@ -3013,7 +3013,7 @@ func (c *Collection) Insert(docs ...interface{}) error {
 //     http://www.mongodb.org/display/DOCS/Updating
 //     http://www.mongodb.org/display/DOCS/Atomic+Operations
 //
-func (c *Collection) Update(selector interface{}, update interface{}) error {
+func (c *Collection) Update(selector interface{}, update interface{}) (info *ChangeInfo, err error) {
 	if selector == nil {
 		selector = bson.D{}
 	}
@@ -3024,17 +3024,20 @@ func (c *Collection) Update(selector interface{}, update interface{}) error {
 	}
 	lerr, err := c.writeOp(&op, true)
 	if err == nil && lerr != nil && !lerr.UpdatedExisting {
-		return ErrNotFound
+		return &ChangeInfo{}, ErrNotFound
 	}
-	return err
+	if err == nil && lerr != nil {
+		info = &ChangeInfo{Updated: lerr.modified, Matched: lerr.N}
+	}
+	return info, err
 }
 
 // UpdateId is a convenience helper equivalent to:
 //
-//     err := collection.Update(bson.M{"_id": id}, update)
+//     changeInfo, err := collection.Update(bson.M{"_id": id}, update)
 //
 // See the Update method for more details.
-func (c *Collection) UpdateId(id interface{}, update interface{}) error {
+func (c *Collection) UpdateId(id interface{}, update interface{}) (*ChangeInfo, error) {
 	return c.Update(bson.D{{Name: "_id", Value: id}}, update)
 }
 
@@ -3143,23 +3146,26 @@ func (c *Collection) UpsertId(id interface{}, update interface{}) (info *ChangeI
 //
 //     http://www.mongodb.org/display/DOCS/Removing
 //
-func (c *Collection) Remove(selector interface{}) error {
+func (c *Collection) Remove(selector interface{}) (info *ChangeInfo, err error) {
 	if selector == nil {
 		selector = bson.D{}
 	}
 	lerr, err := c.writeOp(&deleteOp{c.FullName, selector, 1, 1}, true)
 	if err == nil && lerr != nil && lerr.N == 0 {
-		return ErrNotFound
+		return &ChangeInfo{}, ErrNotFound
 	}
-	return err
+	if err == nil && lerr != nil {
+		info = &ChangeInfo{Updated: lerr.modified, Matched: lerr.N}
+	}
+	return info, err
 }
 
 // RemoveId is a convenience helper equivalent to:
 //
-//     err := collection.Remove(bson.M{"_id": id})
+//    changeInfo, err := collection.Remove(bson.M{"_id": id})
 //
 // See the Remove method for more details.
-func (c *Collection) RemoveId(id interface{}) error {
+func (c *Collection) RemoveId(id interface{}) (*ChangeInfo, error) {
 	return c.Remove(bson.D{{Name: "_id", Value: id}})
 }
 

session_test.go

@@ -882,7 +882,7 @@ func (s *S) TestRemove(c *C) {
 		c.Assert(err, IsNil)
 	}
 
-	err = coll.Remove(M{"n": M{"$gt": 42}})
+	_, err = coll.Remove(M{"n": M{"$gt": 42}})
 	c.Assert(err, IsNil)
 
 	result := &struct{ N int }{}
@@ -1556,7 +1556,7 @@ func (s *S) TestView(c *C) {
 	err = view.Insert(bson.M{"_id": 5, "nm": "b"})
 	c.Assert(err, NotNil)
 
-	err = view.Remove(bson.M{"_id": 2})
+	_, err = view.Remove(bson.M{"_id": 2})
 	c.Assert(err, NotNil)
 
 	err = view.Update(bson.M{"_id": 2}, bson.M{"$set": bson.M{"d": true}})
@@ -5030,7 +5030,7 @@ func (s *S) TestBypassValidation(c *C) {
 	c.Assert(err, IsNil)
 
 	// Ensure this still works. Shouldn't be affected.
-	err = coll.Remove(M{"n": 1})
+	_, err = coll.Remove(M{"n": 1})
 	c.Assert(err, IsNil)
 
 	var result struct{ N int }

txn/flusher.go

@@ -432,7 +432,7 @@ func (f *flusher) unstashToken(tt token, dkey docKey) error {
 	chaos("")
 	if err := f.sc.Update(qdoc, udoc); err == nil {
 		chaos("")
-		err = f.sc.Remove(bson.D{{Name: "_id", Value: dkey}, {Name: "txn-queue", Value: bson.D{}}})
+		_, err = f.sc.Remove(bson.D{{Name: "_id", Value: dkey}, {Name: "txn-queue", Value: bson.D{}}})
 	} else if err != mgo.ErrNotFound {
 		return err
 	}
@@ -878,7 +878,7 @@ func (f *flusher) apply(t *transaction, pull map[bson.ObjectId]*transaction) err
 					} else {
 						f.debugf("Stash for document %v was up-to-date", dkey)
 					}
-					err = c.Remove(qdoc)
+					_, err = c.Remove(qdoc)
 				}
 			}
 		case op.Insert != nil:
@@ -913,7 +913,7 @@ func (f *flusher) apply(t *transaction, pull map[bson.ObjectId]*transaction) err
 							f.debugf("Document %v already existed", dkey)
 						}
 						chaos("")
-						if err = f.sc.Remove(qdoc); err == nil {
+						if _, err = f.sc.Remove(qdoc); err == nil {
 							f.debugf("Stash for document %v removed", dkey)
 						}
 					}