summaryrefslogtreecommitdiff
path: root/src/mongo/s/write_ops/batch_downconvert.cpp
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2015-04-06 09:10:57 -0400
committerEric Milkie <milkie@10gen.com>2015-04-07 16:25:34 -0400
commit0f58d1037bcbfbf932e73e623772c4f815c361ad (patch)
treeae7ea2cf29830f0dc39e326142ddc1b6bc468804 /src/mongo/s/write_ops/batch_downconvert.cpp
parent72543912dca4117e1deb45a56c599657a1bf747c (diff)
downloadmongo-0f58d1037bcbfbf932e73e623772c4f815c361ad.tar.gz
SERVER-17880 Rename OpTime to Timestamp
Diffstat (limited to 'src/mongo/s/write_ops/batch_downconvert.cpp')
-rw-r--r--src/mongo/s/write_ops/batch_downconvert.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/s/write_ops/batch_downconvert.cpp b/src/mongo/s/write_ops/batch_downconvert.cpp
index cc9736c4910..2a402748351 100644
--- a/src/mongo/s/write_ops/batch_downconvert.cpp
+++ b/src/mongo/s/write_ops/batch_downconvert.cpp
@@ -223,7 +223,7 @@ namespace mongo {
// Adds a wOpTime and a wElectionId field to a set of gle options
static BSONObj buildGLECmdWithOpTime( const BSONObj& gleOptions,
- const OpTime& opTime,
+ const Timestamp& opTime,
const OID& electionId ) {
BSONObjBuilder builder;
BSONObjIterator it( gleOptions );
@@ -241,7 +241,7 @@ namespace mongo {
builder.append( el );
}
- builder.appendTimestamp( "wOpTime", opTime.asDate() );
+ builder.append( "wOpTime", opTime );
builder.appendOID( "wElectionId", const_cast<OID*>(&electionId) );
return builder.obj();
}
@@ -261,7 +261,7 @@ namespace mongo {
const ConnectionString& shardEndpoint = it->first;
const HostOpTime hot = it->second;
- const OpTime& opTime = hot.opTime;
+ const Timestamp& opTime = hot.opTime;
const OID& electionId = hot.electionId;
LOG( 3 ) << "enforcing write concern " << options << " on " << shardEndpoint.toString()