diff options
author | Andreas Nilsson <andreas.nilsson@mongodb.com> | 2016-07-08 10:42:34 -0400 |
---|---|---|
committer | Andreas Nilsson <andreas.nilsson@mongodb.com> | 2016-07-08 10:42:34 -0400 |
commit | 2cd04c5db2c127409388b51829306d129ddb3344 (patch) | |
tree | e6ae8df68c304a991c0c12713704782f4b114604 /src/mongo/db | |
parent | 79a6ca14abdf9b3f86040f70210122007276e33b (diff) | |
download | mongo-2cd04c5db2c127409388b51829306d129ddb3344.tar.gz |
Revert "SERVER-24840 - Remove unnecessary parameters to BSONObj::toString"
This reverts commit 1d8c2e70a6c62b3a706b9c6657b3e7cc7e491db3.
Diffstat (limited to 'src/mongo/db')
-rw-r--r-- | src/mongo/db/curop.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/ops/update_driver.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp index 5c4e4ce118e..c76ba86105a 100644 --- a/src/mongo/db/curop.cpp +++ b/src/mongo/db/curop.cpp @@ -311,7 +311,9 @@ void appendAsObjOrString(StringData name, } else { // Generate an abbreviated serialization for the object, by passing false as the // "full" argument to obj.toString(). - std::string objToString = obj.toString(); + const bool isArray = false; + const bool full = false; + std::string objToString = obj.toString(isArray, full); if (objToString.size() <= maxSize) { builder->append(name, objToString); } else { diff --git a/src/mongo/db/ops/update_driver.cpp b/src/mongo/db/ops/update_driver.cpp index e5a63d64ccb..d3232d297a5 100644 --- a/src/mongo/db/ops/update_driver.cpp +++ b/src/mongo/db/ops/update_driver.cpp @@ -387,7 +387,7 @@ BSONObj UpdateDriver::makeOplogEntryQuery(const BSONObj& doc, bool multi) const uassert(16980, str::stream() << "Multi-update operations require all documents to " "have an '_id' field. " - << doc.toString(), + << doc.toString(false, false), !multi); return doc; } |