SERVER-19566 convert OP_QUERY profiler entries to look like the find command

Includes the following changes to profiler entries for queries:

-- The query field will contain find command parameters, e.g.
{find: <coll>, filter: {...}}.
-- Renames 'nscanned' to 'keysExamined' and 'nscannedObjects' to 'docsExamined'.
-- Renames 'scanAndOrder' to 'hasSortStage'.
-- Removes the top-level ntoreturn and ntoskip fields. Skip, limit, and
batchSize info will be present in the 'query' field instead.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mongo/db/curop_metrics.cpp b/src/mongo/db/curop_metrics.cpp
index 1319c481ede..595ad75514c 100644
--- a/src/mongo/db/curop_metrics.cpp
+++ b/src/mongo/db/curop_metrics.cpp
@@ -72,14 +72,14 @@ void recordCurOpMetrics(OperationContext* opCtx) {
         updatedCounter.increment(debug.nMatched);
     if (debug.ndeleted > 0)
         deletedCounter.increment(debug.ndeleted);
-    if (debug.nscanned > 0)
-        scannedCounter.increment(debug.nscanned);
-    if (debug.nscannedObjects > 0)
-        scannedObjectCounter.increment(debug.nscannedObjects);
+    if (debug.keysExamined > 0)
+        scannedCounter.increment(debug.keysExamined);
+    if (debug.docsExamined > 0)
+        scannedObjectCounter.increment(debug.docsExamined);
 
     if (debug.idhack)
         idhackCounter.increment();
-    if (debug.scanAndOrder)
+    if (debug.hasSortStage)
         scanAndOrderCounter.increment();
     if (debug.fastmod)
         fastmodCounter.increment();