diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2014-05-09 16:05:05 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2014-05-12 13:10:16 -0400 |
| commit | a2ca3a5dc694e17525717f0e78024cc5bb9e16ae (patch) | |
| tree | c422a6d5924d538c0dd19950f064ded8ad8d18c9 /src | |
| parent | 71c1f9ce39e6ba4af19a454febeb164a9b91fc1f (diff) | |
| download | mongo-a2ca3a5dc694e17525717f0e78024cc5bb9e16ae.tar.gz | |
SERVER-13896 Stop passing unconsulted "fullObj" parameter to logOp().
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/db/ops/update.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/repl/oplog.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/repl/oplog.h | 3 | ||||
| -rw-r--r-- | src/mongo/s/d_logic.h | 1 | ||||
| -rw-r--r-- | src/mongo/s/d_migrate.cpp | 2 |
5 files changed, 5 insertions, 10 deletions
diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp index 8b0d7a506fe..0e8bec14944 100644 --- a/src/mongo/db/ops/update.cpp +++ b/src/mongo/db/ops/update.cpp @@ -769,7 +769,7 @@ namespace mongo { if (request.shouldCallLogOp() && !logObj.isEmpty()) { BSONObj idQuery = driver->makeOplogEntryQuery(newObj, request.isMulti()); logOp(txn, "u", nsString.ns().c_str(), logObj , &idQuery, - NULL, request.isFromMigration(), &newObj); + NULL, request.isFromMigration()); } // Only record doc modifications if they wrote (exclude no-ops) @@ -883,7 +883,7 @@ namespace mongo { uassertStatusOK(newLoc.getStatus()); if (request.shouldCallLogOp()) { logOp(txn, "i", nsString.ns().c_str(), newObj, - NULL, NULL, request.isFromMigration(), &newObj); + NULL, NULL, request.isFromMigration()); } opDebug->nMatched = 1; diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp index b07ad891c8b..0be9d7a9bd6 100644 --- a/src/mongo/db/repl/oplog.cpp +++ b/src/mongo/db/repl/oplog.cpp @@ -416,13 +416,12 @@ namespace mongo { const BSONObj& obj, BSONObj* patt, bool* b, - bool fromMigrate, - const BSONObj* fullObj) { + bool fromMigrate) { if ( replSettings.master ) { _logOp(txn, opstr, ns, 0, obj, patt, b, fromMigrate); } - logOpForSharding(opstr, ns, obj, patt, fullObj, fromMigrate); + logOpForSharding(opstr, ns, obj, patt, fromMigrate); logOpForDbHash(ns); getGlobalAuthorizationManager()->logOp(opstr, ns, obj, patt, b); diff --git a/src/mongo/db/repl/oplog.h b/src/mongo/db/repl/oplog.h index 2e4a1830b17..f64828bef0d 100644 --- a/src/mongo/db/repl/oplog.h +++ b/src/mongo/db/repl/oplog.h @@ -74,8 +74,7 @@ namespace mongo { const BSONObj& obj, BSONObj *patt = NULL, bool *b = NULL, - bool fromMigrate = false, - const BSONObj* fullObj = NULL ); + bool fromMigrate = false); // Log an empty no-op operation to the local oplog void logKeepalive(); diff --git a/src/mongo/s/d_logic.h b/src/mongo/s/d_logic.h index d13e15d67bc..ca4a77636bc 100644 --- a/src/mongo/s/d_logic.h +++ b/src/mongo/s/d_logic.h @@ -374,7 +374,6 @@ namespace mongo { const char * ns, const BSONObj& obj, BSONObj * patt, - const BSONObj* fullObj, bool forMigrateCleanup ); } diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp index e23a1e2c071..5b498bb5be6 100644 --- a/src/mongo/s/d_migrate.cpp +++ b/src/mongo/s/d_migrate.cpp @@ -702,9 +702,7 @@ namespace mongo { const char * ns, const BSONObj& obj, BSONObj * patt, - const BSONObj* fullObj, bool notInActiveChunk) { - // TODO: include fullObj? migrateFromStatus.logOp(opstr, ns, obj, patt, notInActiveChunk); } |