Revert "SERVER-33455 SERVER-33452 - Add history to the chunk type and update move/split/merge methods."

This reverts commit 5b42a86b74380953db29455dc68e133166c81005.

1 files changed, 5 insertions, 25 deletions

diff --git a/src/mongo/s/request_types/merge_chunk_request_type.cpp b/src/mongo/s/request_types/merge_chunk_request_type.cpp
index abace857a99..64200b85460 100644
--- a/src/mongo/s/request_types/merge_chunk_request_type.cpp
+++ b/src/mongo/s/request_types/merge_chunk_request_type.cpp
@@ -40,19 +40,17 @@ const char kConfigsvrMergeChunk[] = "_configsvrCommitChunkMerge";
 const char kCollEpoch[] = "collEpoch";
 const char kChunkBoundaries[] = "chunkBoundaries";
 const char kShardName[] = "shard";
-const char kValidAfter[] = "validAfter";
+
 }  // namespace
 
 MergeChunkRequest::MergeChunkRequest(NamespaceString nss,
                                      std::string shardName,
                                      OID epoch,
-                                     std::vector<BSONObj> chunkBoundaries,
-                                     boost::optional<Timestamp> validAfter)
+                                     std::vector<BSONObj> chunkBoundaries)
     : _nss(std::move(nss)),
       _epoch(std::move(epoch)),
       _chunkBoundaries(std::move(chunkBoundaries)),
-      _shardName(std::move(shardName)),
-      _validAfter(validAfter) {}
+      _shardName(std::move(shardName)) {}
 
 StatusWith<MergeChunkRequest> MergeChunkRequest::parseFromConfigCommand(const BSONObj& cmdObj) {
     std::string ns;
@@ -105,24 +103,8 @@ StatusWith<MergeChunkRequest> MergeChunkRequest::parseFromConfigCommand(const BS
         }
     }
 
-    boost::optional<Timestamp> validAfter = boost::none;
-    {
-        Timestamp ts{0};
-        auto status = bsonExtractTimestampField(cmdObj, kValidAfter, &ts);
-        if (!status.isOK() && status != ErrorCodes::NoSuchKey) {
-            return status;
-        }
-
-        if (status.isOK()) {
-            validAfter = ts;
-        }
-    }
-
-    return MergeChunkRequest(std::move(nss),
-                             std::move(shardName),
-                             std::move(epoch),
-                             std::move(chunkBoundaries),
-                             validAfter);
+    return MergeChunkRequest(
+        std::move(nss), std::move(shardName), std::move(epoch), std::move(chunkBoundaries));
 }
 
 BSONObj MergeChunkRequest::toConfigCommandBSON(const BSONObj& writeConcern) {
@@ -145,8 +127,6 @@ void MergeChunkRequest::appendAsConfigCommand(BSONObjBuilder* cmdBuilder) {
         }
     }
     cmdBuilder->append(kShardName, _shardName);
-    invariant(_validAfter.is_initialized());
-    cmdBuilder->append(kValidAfter, _validAfter.get());
 }
 
 }  // namespace mongo