Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 0 insertions, 58 deletions

diff --git a/src/mongo/s/query/cluster_cursor_manager.cpp b/src/mongo/s/query/cluster_cursor_manager.cpp
index 4452e6a8811..1209d709e22 100644
--- a/src/mongo/s/query/cluster_cursor_manager.cpp
+++ b/src/mongo/s/query/cluster_cursor_manager.cpp
@@ -41,7 +41,6 @@
 #include "mongo/db/kill_sessions_common.h"
 #include "mongo/db/logical_session_cache.h"
 #include "mongo/db/query/query_knobs_gen.h"
-#include "mongo/db/query/query_stats/query_stats.h"
 #include "mongo/logv2/log.h"
 #include "mongo/util/clock_source.h"
 #include "mongo/util/str.h"
@@ -247,7 +246,6 @@ StatusWith<ClusterCursorManager::PinnedCursor> ClusterCursorManager::checkOutCur
     cursorGuard->reattachToOperationContext(opCtx);
 
     CurOp::get(opCtx)->debug().queryHash = cursorGuard->getQueryHash();
-    CurOp::get(opCtx)->debug().queryStatsInfo.keyHash = cursorGuard->getQueryStatsKeyHash();
 
     return PinnedCursor(this, std::move(cursorGuard), entry->getNamespace(), cursorId);
 }
@@ -576,60 +574,4 @@ StatusWith<ClusterClientCursorGuard> ClusterCursorManager::_detachCursor(WithLoc
 
     return std::move(cursor);
 }
-
-void collectQueryStatsMongos(OperationContext* opCtx, std::unique_ptr<query_stats::Key> key) {
-    // If we haven't registered a cursor to prepare for getMore requests, we record
-    // queryStats directly.
-    auto&& opDebug = CurOp::get(opCtx)->debug();
-    int64_t execTime = opDebug.additiveMetrics.executionTime.value_or(Microseconds{0}).count();
-    query_stats::writeQueryStats(opCtx,
-                                 opDebug.queryStatsInfo.keyHash,
-                                 std::move(key),
-                                 execTime,
-                                 execTime,
-                                 opDebug.additiveMetrics.nreturned.value_or(0));
-}
-
-void collectQueryStatsMongos(OperationContext* opCtx, ClusterClientCursorGuard& cursor) {
-    cursor->incrementCursorMetrics(CurOp::get(opCtx)->debug().additiveMetrics);
-
-    // For a change stream query that never ends, we want to collect query stats on the initial
-    // query and each getMore. Here we record the initial query.
-    // TODO SERVER-89058 Modify comment to include tailable cursors.
-    if (cursor->getQueryStatsWillNeverExhaust()) {
-        auto& opDebug = CurOp::get(opCtx)->debug();
-
-        int64_t execTime = opDebug.additiveMetrics.executionTime.value_or(Microseconds{0}).count();
-
-        query_stats::writeQueryStats(opCtx,
-                                     opDebug.queryStatsInfo.keyHash,
-                                     cursor->takeKey(),
-                                     execTime,
-                                     execTime,
-                                     opDebug.additiveMetrics.nreturned.value_or(0),
-                                     cursor->getQueryStatsWillNeverExhaust());
-    }
-}
-
-void collectQueryStatsMongos(OperationContext* opCtx, ClusterCursorManager::PinnedCursor& cursor) {
-    cursor->incrementCursorMetrics(CurOp::get(opCtx)->debug().additiveMetrics);
-
-    // For a change stream query that never ends, we want to update query stats for every getMore on
-    // the cursor.
-    // TODO SERVER-89058 Modify comment to include tailable cursors.
-    if (cursor->getQueryStatsWillNeverExhaust()) {
-        auto& opDebug = CurOp::get(opCtx)->debug();
-
-        int64_t execTime = opDebug.additiveMetrics.executionTime.value_or(Microseconds{0}).count();
-
-        query_stats::writeQueryStats(opCtx,
-                                     opDebug.queryStatsInfo.keyHash,
-                                     nullptr,
-                                     execTime,
-                                     execTime,
-                                     opDebug.additiveMetrics.nreturned.value_or(0),
-                                     cursor->getQueryStatsWillNeverExhaust());
-    }
-}
-
 }  // namespace mongo