SERVER-19855 Parsing/serialization logic for OpTime

This change pulls the OpTime serialization/deserialization logic to be
part of the class.

1 files changed, 32 insertions, 0 deletions

diff --git a/src/mongo/db/repl/optime.cpp b/src/mongo/db/repl/optime.cpp
index 87cf966c1ef..31d83d91e4f 100644
--- a/src/mongo/db/repl/optime.cpp
+++ b/src/mongo/db/repl/optime.cpp
@@ -31,10 +31,18 @@
 #include <string>
 #include <utility>
 
+#include "mongo/bson/bsonobjbuilder.h"
+#include "mongo/bson/util/bson_extract.h"
 #include "mongo/db/repl/optime.h"
 
 namespace mongo {
 namespace repl {
+namespace {
+
+const char* kTimestampFieldName = "ts";
+const char* kTermFieldName = "t";
+
+}  // namespace
 
 OpTime::OpTime(Timestamp ts, long long term) : _timestamp(std::move(ts)), _term(term) {}
 
@@ -54,6 +62,30 @@ bool OpTime::isNull() const {
     return _timestamp.isNull();
 }
 
+void OpTime::append(BSONObjBuilder* builder) const {
+    builder->append(kTimestampFieldName, _timestamp);
+
+    // Don't add term in protocol version 0.
+    if (_term != kProtocolVersionV0Term) {
+        builder->append(kTermFieldName, _term);
+    }
+}
+
+StatusWith<OpTime> OpTime::parseFromBSON(const BSONObj& obj) {
+    Timestamp ts;
+    Status status = bsonExtractTimestampField(obj, kTimestampFieldName, &ts);
+    if (!status.isOK())
+        return status;
+
+    // Default to -1 if the term is absent.
+    long long term;
+    status = bsonExtractIntegerFieldWithDefault(obj, kTermFieldName, kProtocolVersionV0Term, &term);
+    if (!status.isOK())
+        return status;
+
+    return OpTime(ts, term);
+}
+
 std::string OpTime::toString() const {
     std::stringstream ss;
     ss << "(term: " << _term << ", timestamp: " << _timestamp.toStringPretty() << ")";