Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 3 insertions, 52 deletions

diff --git a/src/mongo/db/exec/document_value/document_metadata_fields.cpp b/src/mongo/db/exec/document_value/document_metadata_fields.cpp
index 27f64ef7286..90e15ef5c2a 100644
--- a/src/mongo/db/exec/document_value/document_metadata_fields.cpp
+++ b/src/mongo/db/exec/document_value/document_metadata_fields.cpp
@@ -46,7 +46,6 @@ DocumentMetadataFields::DocumentMetadataFields(const DocumentMetadataFields& oth
 
 DocumentMetadataFields& DocumentMetadataFields::operator=(const DocumentMetadataFields& other) {
     _holder = other._holder ? std::make_unique<MetadataHolder>(*other._holder) : nullptr;
-    _modified = true;
     return *this;
 }
 
@@ -55,7 +54,6 @@ DocumentMetadataFields::DocumentMetadataFields(DocumentMetadataFields&& other)
 
 DocumentMetadataFields& DocumentMetadataFields::operator=(DocumentMetadataFields&& other) {
     _holder = std::move(other._holder);
-    _modified = true;
     return *this;
 }
 
@@ -87,21 +85,12 @@ void DocumentMetadataFields::mergeWith(const DocumentMetadataFields& other) {
     if (!hasSearchScoreDetails() && other.hasSearchScoreDetails()) {
         setSearchScoreDetails(other.getSearchScoreDetails());
     }
-    if (!hasSearchSequenceToken() && other.hasSearchSequenceToken()) {
-        setSearchSequenceToken(other.getSearchSequenceToken());
-    }
     if (!hasTimeseriesBucketMinTime() && other.hasTimeseriesBucketMinTime()) {
         setTimeseriesBucketMinTime(other.getTimeseriesBucketMinTime());
     }
     if (!hasTimeseriesBucketMaxTime() && other.hasTimeseriesBucketMaxTime()) {
         setTimeseriesBucketMaxTime(other.getTimeseriesBucketMaxTime());
     }
-    if (!hasSearchSortValues() && other.hasSearchSortValues()) {
-        setSearchSortValues(other.getSearchSortValues());
-    }
-    if (!hasVectorSearchScore() && other.hasVectorSearchScore()) {
-        setVectorSearchScore(other.getVectorSearchScore());
-    }
 }
 
 void DocumentMetadataFields::copyFrom(const DocumentMetadataFields& other) {
@@ -132,21 +121,12 @@ void DocumentMetadataFields::copyFrom(const DocumentMetadataFields& other) {
     if (other.hasSearchScoreDetails()) {
         setSearchScoreDetails(other.getSearchScoreDetails());
     }
-    if (other.hasSearchSequenceToken()) {
-        setSearchSequenceToken(other.getSearchSequenceToken());
-    }
     if (other.hasTimeseriesBucketMinTime()) {
         setTimeseriesBucketMinTime(other.getTimeseriesBucketMinTime());
     }
     if (other.hasTimeseriesBucketMaxTime()) {
         setTimeseriesBucketMaxTime(other.getTimeseriesBucketMaxTime());
     }
-    if (other.hasSearchSortValues()) {
-        setSearchSortValues(other.getSearchSortValues());
-    }
-    if (other.hasVectorSearchScore()) {
-        setVectorSearchScore(other.getVectorSearchScore());
-    }
 }
 
 size_t DocumentMetadataFields::getApproximateSize() const {
@@ -168,8 +148,7 @@ size_t DocumentMetadataFields::getApproximateSize() const {
     size -= sizeof(_holder->searchHighlights);
     size += _holder->indexKey.objsize();
     size += _holder->searchScoreDetails.objsize();
-    size += _holder->searchSortValues.objsize();
-    size -= sizeof(_holder->searchSequenceToken);
+
     return size;
 }
 
@@ -217,10 +196,6 @@ void DocumentMetadataFields::serializeForSorter(BufBuilder& buf) const {
         buf.appendNum(static_cast<char>(MetaType::kSearchScoreDetails + 1));
         getSearchScoreDetails().appendSelfToBufBuilder(buf);
     }
-    if (hasSearchSequenceToken()) {
-        buf.appendNum(static_cast<char>(MetaType::kSearchSequenceToken + 1));
-        getSearchSequenceToken().serializeForSorter(buf);
-    }
     if (hasTimeseriesBucketMinTime()) {
         buf.appendNum(static_cast<char>(MetaType::kTimeseriesBucketMinTime + 1));
         buf.appendNum(getTimeseriesBucketMinTime().toMillisSinceEpoch());
@@ -229,14 +204,6 @@ void DocumentMetadataFields::serializeForSorter(BufBuilder& buf) const {
         buf.appendNum(static_cast<char>(MetaType::kTimeseriesBucketMaxTime + 1));
         buf.appendNum(getTimeseriesBucketMaxTime().toMillisSinceEpoch());
     }
-    if (hasSearchSortValues()) {
-        buf.appendNum(static_cast<char>(MetaType::kSearchSortValues + 1));
-        getSearchSortValues().appendSelfToBufBuilder(buf);
-    }
-    if (hasVectorSearchScore()) {
-        buf.appendNum(static_cast<char>(MetaType::kVectorSearchScore + 1));
-        buf.appendNum(getVectorSearchScore());
-    }
     buf.appendNum(static_cast<char>(0));
 }
 
@@ -269,19 +236,9 @@ void DocumentMetadataFields::deserializeForSorter(BufReader& buf, DocumentMetada
             out->setSearchScoreDetails(
                 BSONObj::deserializeForSorter(buf, BSONObj::SorterDeserializeSettings()));
         } else if (marker == static_cast<char>(MetaType::kTimeseriesBucketMinTime) + 1) {
-            out->setTimeseriesBucketMinTime(
-                Date_t::fromMillisSinceEpoch(buf.read<LittleEndian<long long>>()));
+            out->setTimeseriesBucketMinTime(Date_t::fromMillisSinceEpoch(buf.read<long long>()));
         } else if (marker == static_cast<char>(MetaType::kTimeseriesBucketMaxTime) + 1) {
-            out->setTimeseriesBucketMaxTime(
-                Date_t::fromMillisSinceEpoch(buf.read<LittleEndian<long long>>()));
-        } else if (marker == static_cast<char>(MetaType::kSearchSortValues) + 1) {
-            out->setSearchSortValues(
-                BSONObj::deserializeForSorter(buf, BSONObj::SorterDeserializeSettings()));
-        } else if (marker == static_cast<char>(MetaType::kVectorSearchScore) + 1) {
-            out->setVectorSearchScore(buf.read<LittleEndian<double>>());
-        } else if (marker == static_cast<char>(MetaType::kSearchSequenceToken) + 1) {
-            out->setSearchSequenceToken(
-                Value::deserializeForSorter(buf, Value::SorterDeserializeSettings()));
+            out->setTimeseriesBucketMaxTime(Date_t::fromMillisSinceEpoch(buf.read<long long>()));
         } else {
             uasserted(28744, "Unrecognized marker, unable to deserialize buffer");
         }
@@ -341,12 +298,6 @@ const char* DocumentMetadataFields::typeNameToDebugString(DocumentMetadataFields
             return "timeseries bucket min time";
         case DocumentMetadataFields::kTimeseriesBucketMaxTime:
             return "timeseries bucket max time";
-        case DocumentMetadataFields::kSearchSortValues:
-            return "$search sort values";
-        case DocumentMetadataFields::kSearchSequenceToken:
-            return "$search sequence token";
-        case DocumentMetadataFields::kVectorSearchScore:
-            return "$vectorSearch distance";
         default:
             MONGO_UNREACHABLE;
     }