Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 2 insertions, 18 deletions

diff --git a/src/mongo/db/catalog/collection_impl.h b/src/mongo/db/catalog/collection_impl.h
index 58662679df1..d3379568d22 100644
--- a/src/mongo/db/catalog/collection_impl.h
+++ b/src/mongo/db/catalog/collection_impl.h
@@ -329,11 +329,7 @@ public:
     void setTimeseriesBucketsMayHaveMixedSchemaData(OperationContext* opCtx,
                                                     boost::optional<bool> setting) final;
 
-    StatusWith<bool> doesTimeseriesBucketsDocContainMixedSchemaData(
-        const BSONObj& bucketsDoc) const final;
-
-    bool getRequiresTimeseriesExtendedRangeSupport() const final;
-    void setRequiresTimeseriesExtendedRangeSupport(OperationContext* opCtx) const final;
+    bool doesTimeseriesBucketsDocContainMixedSchemaData(const BSONObj& bucketsDoc) const final;
 
     /**
      * isClustered() relies on the object returned from getClusteredInfo(). If
@@ -450,7 +446,7 @@ public:
                                     StringData idxName,
                                     bool prepareUnique) final;
 
-    std::vector<std::string> repairInvalidIndexOptions(OperationContext* opCtx) final;
+    std::vector<std::string> removeInvalidIndexOptions(OperationContext* opCtx) final;
 
     void setIsTemp(OperationContext* opCtx, bool isTemp) final;
 
@@ -583,18 +579,6 @@ private:
 
         AtomicWord<bool> _committed{true};
 
-        // Time-series collections are allowed to contain measurements with arbitrary dates;
-        // however, many of our query optimizations only work properly with dates that can be stored
-        // as an offset in seconds from the Unix epoch within 31 bits (roughly 1970-2038). When this
-        // flag is set to true, these optimizations will be disabled. It must be set to true if the
-        // collection contains any measurements with dates outside this normal range.
-        //
-        // This is set from the write path where we only hold an IX lock, so we want to be able to
-        // set it from a const method on the Collection. In order to do this, we need to make it
-        // mutable. Given that the value may only transition from false to true, but never back
-        // again, and that we store and retrieve it atomically, this should be safe.
-        mutable AtomicWord<bool> _requiresTimeseriesExtendedRangeSupport{false};
-
         // Capped information.
         const bool _isCapped;