summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hernandez <scotthernandez@gmail.com>2013-03-08 18:13:45 -0500
committerScott Hernandez <scotthernandez@gmail.com>2013-03-08 18:14:49 -0500
commit3018a05958ccfba1cd08b476fdcd103835e3fde8 (patch)
treefe445ac5746bf729296fad27db46e22d2016679f
parent08da87aa68a489dab7f24e059916b1ba2aa33452 (diff)
downloadmongo-3018a05958ccfba1cd08b476fdcd103835e3fde8.tar.gz
SERVER-8914: rename document.scanned metric
-rw-r--r--jstests/find1.js6
-rw-r--r--src/mongo/db/curop.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/jstests/find1.js b/jstests/find1.js
index 928f9bb0a0f..cffe6c0366a 100644
--- a/jstests/find1.js
+++ b/jstests/find1.js
@@ -5,14 +5,14 @@ lookAtDocumentMetrics = false;
if ( db.serverStatus().metrics ) {
var ss = db.serverStatus();
- lookAtDocumentMetrics = ss.metrics.document != null && ss.metrics.document.scanned != null;
+ lookAtDocumentMetrics = ss.metrics.document != null && ss.metrics.queryExecutor.scanned != null;
}
print( "lookAtDocumentMetrics: " + lookAtDocumentMetrics );
if ( lookAtDocumentMetrics ) {
// ignore mongos
- nscannedStart = db.serverStatus().metrics.document.scanned
+ nscannedStart = db.serverStatus().metrics.queryExecutor.scanned
}
@@ -47,6 +47,6 @@ assert(t.validate().valid,"not valid");
if ( lookAtDocumentMetrics ) {
// ignore mongos
- nscannedEnd = db.serverStatus().metrics.document.scanned
+ nscannedEnd = db.serverStatus().metrics.queryExecutor.scanned
assert.lte( nscannedStart + 16, nscannedEnd );
}
diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index c815f7b5623..68e24e2b171 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -213,7 +213,7 @@ namespace mongo {
static ServerStatusMetricField<Counter64> displayUpdated( "document.updated", &updatedCounter );
static ServerStatusMetricField<Counter64> displayInserted( "document.inserted", &insertedCounter );
static ServerStatusMetricField<Counter64> displayDeleted( "document.deleted", &deletedCounter );
- static ServerStatusMetricField<Counter64> displayScanned( "document.scanned", &scannedCounter );
+ static ServerStatusMetricField<Counter64> displayScanned( "queryExecutor.scanned", &scannedCounter );
static Counter64 idhackCounter;
static Counter64 scanAndOrderCounter;