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, 28 deletions

diff --git a/src/mongo/db/stats/counters.cpp b/src/mongo/db/stats/counters.cpp
index 5f571640b5d..1f3f4c901bb 100644
--- a/src/mongo/db/stats/counters.cpp
+++ b/src/mongo/db/stats/counters.cpp
@@ -335,32 +335,7 @@ NetworkCounter networkCounter;
 AuthCounter authCounter;
 AggStageCounters aggStageCounters;
 DotsAndDollarsFieldsCounters dotsAndDollarsFieldsCounters;
-QueryFrameworkCounters queryFrameworkCounters;
-ValidatorCounters validatorCounters;
-
-OperatorCounters operatorCountersAggExpressions{"operatorCounters.expressions."};
-OperatorCounters operatorCountersMatchExpressions{"operatorCounters.match."};
-OperatorCounters operatorCountersGroupAccumulatorExpressions{"operatorCounters.groupAccumulators."};
-OperatorCounters operatorCountersWindowAccumulatorExpressions{
-    "operatorCounters.windowAccumulators."};
-
-Counter64 updateManyCount;
-ServerStatusMetricField<Counter64> displayUpdateManyCount("query.updateManyCount",
-                                                          &updateManyCount);
-Counter64 deleteManyCount;
-ServerStatusMetricField<Counter64> displayDeleteManyCount("query.deleteManyCount",
-                                                          &deleteManyCount);
-
-Counter64 internalRetryableWriteCount;
-ServerStatusMetricField<Counter64> displayInternalRetryableWriteCount(
-    "query.internalRetryableWriteCount", &internalRetryableWriteCount);
-
-Counter64 externalRetryableWriteCount;
-ServerStatusMetricField<Counter64> displayExternalRetryableWriteCount(
-    "query.externalRetryableWriteCount", &externalRetryableWriteCount);
-
-Counter64 retryableInternalTransactionCount;
-ServerStatusMetricField<Counter64> displayRetryableInternalTransactionCount(
-    "query.retryableInternalTransactionCount", &retryableInternalTransactionCount);
-
+QueryEngineCounters queryEngineCounters;
+OperatorCountersAggExpressions operatorCountersAggExpressions;
+OperatorCountersMatchExpressions operatorCountersMatchExpressions;
 }  // namespace mongo