summaryrefslogtreecommitdiff
path: root/src/mongo/s/catalog/type_chunk.cpp
diff options
context:
space:
mode:
authorJoanna Huang <joannahuang@Joannas-MacBook-Pro.local>2017-06-22 11:53:50 -0400
committerJoanna Huang <joannahuang@Joannas-MacBook-Pro.local>2017-06-23 13:45:12 -0400
commitc06d3b251425973d905ff660bbf16b2ee035844c (patch)
treee53f809468c36510a7943ea9b8d011e10fa54ea5 /src/mongo/s/catalog/type_chunk.cpp
parent7f0caad1b2e62bd8a1533f865fab220c8e853464 (diff)
downloadmongo-c06d3b251425973d905ff660bbf16b2ee035844c.tar.gz
SERVER-27723 Undeprecate ChunkType::DEPRECATED_epoch and ChunkType::DEPRECATED_lastmod
Diffstat (limited to 'src/mongo/s/catalog/type_chunk.cpp')
-rw-r--r--src/mongo/s/catalog/type_chunk.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/s/catalog/type_chunk.cpp b/src/mongo/s/catalog/type_chunk.cpp
index ca4e3cb85ed..aac416dcde4 100644
--- a/src/mongo/s/catalog/type_chunk.cpp
+++ b/src/mongo/s/catalog/type_chunk.cpp
@@ -52,8 +52,8 @@ const BSONField<BSONObj> ChunkType::min("min");
const BSONField<BSONObj> ChunkType::max("max");
const BSONField<std::string> ChunkType::shard("shard");
const BSONField<bool> ChunkType::jumbo("jumbo");
-const BSONField<Date_t> ChunkType::DEPRECATED_lastmod("lastmod");
-const BSONField<OID> ChunkType::DEPRECATED_epoch("lastmodEpoch");
+const BSONField<Date_t> ChunkType::lastmod("lastmod");
+const BSONField<OID> ChunkType::epoch("lastmodEpoch");
namespace {
@@ -271,8 +271,8 @@ StatusWith<ChunkType> ChunkType::fromShardBSON(const BSONObj& source, const OID&
}
{
- auto statusWithChunkVersion = ChunkVersion::parseFromBSONWithFieldAndSetEpoch(
- source, DEPRECATED_lastmod.name(), epoch);
+ auto statusWithChunkVersion =
+ ChunkVersion::parseFromBSONWithFieldAndSetEpoch(source, lastmod.name(), epoch);
if (!statusWithChunkVersion.isOK()) {
return statusWithChunkVersion.getStatus();
}
@@ -291,7 +291,7 @@ BSONObj ChunkType::toShardBSON() const {
builder.append(minShardID.name(), getMin());
builder.append(max.name(), getMax());
builder.append(shard.name(), getShard().toString());
- builder.appendTimestamp(DEPRECATED_lastmod.name(), _version->toLong());
+ builder.appendTimestamp(lastmod.name(), _version->toLong());
return builder.obj();
}