support getmore; support find with sort; cleanups

src/go/lib/tutil/util.go

@@ -62,6 +62,10 @@ func LoadBson(filename string, destination interface{}) error {
 	re := regexp.MustCompile(`" :`)
 	buf = re.ReplaceAll(buf, []byte(`":`))
 
+	// Using NumberLong is not supported
+	re = regexp.MustCompile(`NumberLong\((.*)\)`)
+	buf = re.ReplaceAll(buf, []byte(`$1`))
+
 	// Using regexp is not supported
 	// https://github.com/go-mgo/mgo/issues/363
 	re = regexp.MustCompile(`(/.*/)`)

src/go/mongolib/explain/explain_test.go

@@ -77,9 +77,11 @@ func TestExplain(t *testing.T) {
 		"distinct":         "<nil>",
 		"find_empty":       "<nil>",
 		"find":             "<nil>",
+		"find_with_sort":   "<nil>",
 		"find_andrii":      "<nil>",
 		"findandmodify":    "<nil>",
 		"geonear":          "Cannot explain cmd: geoNear",
+		"getmore":          "<nil>",
 		"group":            "<nil>",
 		"insert":           "Cannot explain cmd: insert",
 		"mapreduce":        "Cannot explain cmd: mapReduce",
@@ -104,6 +106,13 @@ func TestExplain(t *testing.T) {
 			}
 		}
 
+		for _, v := range versions {
+			// For versions < 3.4 parsing "getmore" is not supported and returns error
+			if ok, _ := Constraint("< 3.4", v); ok {
+				expectError["getmore_"+v] = "Cannot explain cmd: getMore"
+			}
+		}
+
 		// For versions >= 3.0, < 3.4 trying to explain "insert" returns different error
 		if ok, _ := Constraint(">= 3.0, < 3.4", bi.Version); ok {
 			for _, v := range versions {

src/go/mongolib/fingerprinter/fingerprinter.go

@@ -66,6 +66,15 @@ func (f *Fingerprinter) Fingerprint(doc proto.SystemProfile) (Fingerprint, error
 		}
 	}
 
+	// if there is a orderby clause in the query, we have to add all fields in the sort
+	// fields list that are not in the query keys list (retKeys)
+	if sortKeys, ok := query.Map()["orderby"]; ok {
+		if sortKeysMap, ok := sortKeys.(bson.M); ok {
+			sortKeys := keys(sortKeysMap, f.keyFilters)
+			retKeys = append(retKeys, sortKeys...)
+		}
+	}
+
 	// Extract operation, collection, database and namespace
 	op := ""
 	collection := ""
@@ -98,7 +107,7 @@ func (f *Fingerprinter) Fingerprint(doc proto.SystemProfile) (Fingerprint, error
 			break
 		}
 		op = "find"
-	default:
+	case "command":
 		if query.Len() == 0 {
 			break
 		}
@@ -149,6 +158,9 @@ func (f *Fingerprinter) Fingerprint(doc proto.SystemProfile) (Fingerprint, error
 			collection = ""
 			retKeys = []string{}
 		}
+	default:
+		op = doc.Op
+		retKeys = []string{}
 	}
 
 	sort.Strings(retKeys)

src/go/mongolib/fingerprinter/fingerprinter_test.go

@@ -50,6 +50,8 @@ func ExampleFingerprint() {
 
 func TestFingerprint(t *testing.T) {
 	doc := proto.SystemProfile{}
+	doc.Ns = "db.feedback"
+	doc.Op = "query"
 	doc.Query = proto.BsonD{
 		{"find", "feedback"},
 		{"filter", bson.M{
@@ -63,13 +65,12 @@ func TestFingerprint(t *testing.T) {
 
 	fp := NewFingerprinter(nil)
 	got, err := fp.Fingerprint(doc)
-
 	if err != nil {
 		t.Error("Error in fingerprint")
 	}
 
 	if got.Fingerprint != want {
-		t.Errorf("Invalid fingerprint. Got: %q, want %q", got, want)
+		t.Errorf("Invalid fingerprint. Got: %q, want %q", got.Fingerprint, want)
 	}
 }
 
@@ -128,16 +129,21 @@ func TestFingerprints(t *testing.T) {
 		"find_empty_3.2.16":       "FIND coll",
 		"find_empty_3.4.7":        "FIND coll",
 		"find_empty_3.5.11":       "FIND coll",
-		"find_2.6.12":             "FIND coll a",
-		"find_3.0.15":             "FIND coll a",
-		"find_3.2.16":             "FIND coll a",
-		"find_3.4.7":              "FIND coll a",
-		"find_3.5.11":             "FIND coll a",
+		"find_2.6.12":             "FIND coll k",
+		"find_3.0.15":             "FIND coll k",
+		"find_3.2.16":             "FIND coll k",
+		"find_3.4.7":              "FIND coll k",
+		"find_3.5.11":             "FIND coll k",
 		"find_andrii_2.6.12":      "FIND coll c,k,pad",
 		"find_andrii_3.0.15":      "FIND coll c,k,pad",
 		"find_andrii_3.2.16":      "FIND coll c,k,pad",
 		"find_andrii_3.4.7":       "FIND coll c,k,pad",
 		"find_andrii_3.5.11":      "FIND coll c,k,pad",
+		"find_with_sort_2.6.12":   "FIND coll b,c",
+		"find_with_sort_3.0.15":   "FIND coll b,c",
+		"find_with_sort_3.2.16":   "FIND coll b,c",
+		"find_with_sort_3.4.7":    "FIND coll b,c",
+		"find_with_sort_3.5.11":   "FIND coll b,c",
 		"findandmodify_2.6.12":    "FINDANDMODIFY coll a",
 		"findandmodify_3.0.15":    "FINDANDMODIFY coll a",
 		"findandmodify_3.2.16":    "FINDANDMODIFY coll a",
@@ -148,6 +154,11 @@ func TestFingerprints(t *testing.T) {
 		"geonear_3.2.16":          "GEONEAR coll",
 		"geonear_3.4.7":           "GEONEAR coll",
 		"geonear_3.5.11":          "GEONEAR coll",
+		"getmore_2.6.12":          "GETMORE coll",
+		"getmore_3.0.15":          "GETMORE coll",
+		"getmore_3.2.16":          "GETMORE coll",
+		"getmore_3.4.7":           "GETMORE coll",
+		"getmore_3.5.11":          "GETMORE coll",
 		"group_2.6.12":            "GROUP coll a,b",
 		"group_3.0.15":            "GROUP coll a,b",
 		"group_3.2.16":            "GROUP coll a,b",

src/go/mongolib/proto/system.profile.go

@@ -73,38 +73,41 @@ type SystemProfile struct {
 			} `bson:"acquireCount"`
 		} `bson:"MMAPV1Journal"`
 	} `bson:"locks"`
-	Millis         int       `bson:"millis"`
-	Nreturned      int       `bson:"nreturned"`
-	Ns             string    `bson:"ns"`
-	NumYield       int       `bson:"numYield"`
-	Op             string    `bson:"op"`
-	Protocol       string    `bson:"protocol"`
-	Query          BsonD     `bson:"query"`
-	UpdateObj      BsonD     `bson:"updateobj"`
-	Command        BsonD     `bson:"command"`
-	ResponseLength int       `bson:"responseLength"`
-	Ts             time.Time `bson:"ts"`
-	User           string    `bson:"user"`
-	WriteConflicts int       `bson:"writeConflicts"`
+	Millis             int       `bson:"millis"`
+	Nreturned          int       `bson:"nreturned"`
+	Ns                 string    `bson:"ns"`
+	NumYield           int       `bson:"numYield"`
+	Op                 string    `bson:"op"`
+	Protocol           string    `bson:"protocol"`
+	Query              BsonD     `bson:"query"`
+	UpdateObj          BsonD     `bson:"updateobj"`
+	Command            BsonD     `bson:"command"`
+	OriginatingCommand BsonD     `bson:"originatingCommand"`
+	ResponseLength     int       `bson:"responseLength"`
+	Ts                 time.Time `bson:"ts"`
+	User               string    `bson:"user"`
+	WriteConflicts     int       `bson:"writeConflicts"`
 }
 
 func NewExampleQuery(doc SystemProfile) ExampleQuery {
 	return ExampleQuery{
-		Ns:        doc.Ns,
-		Op:        doc.Op,
-		Query:     doc.Query,
-		Command:   doc.Command,
-		UpdateObj: doc.UpdateObj,
+		Ns:                 doc.Ns,
+		Op:                 doc.Op,
+		Query:              doc.Query,
+		Command:            doc.Command,
+		OriginatingCommand: doc.OriginatingCommand,
+		UpdateObj:          doc.UpdateObj,
 	}
 }
 
 // ExampleQuery is a subset of SystemProfile
 type ExampleQuery struct {
-	Ns        string `bson:"ns" json:"ns"`
-	Op        string `bson:"op" json:"op"`
-	Query     BsonD  `bson:"query,omitempty" json:"query,omitempty"`
-	Command   BsonD  `bson:"command,omitempty" json:"command,omitempty"`
-	UpdateObj BsonD  `bson:"updateobj,omitempty" json:"updateobj,omitempty"`
+	Ns                 string `bson:"ns" json:"ns"`
+	Op                 string `bson:"op" json:"op"`
+	Query              BsonD  `bson:"query,omitempty" json:"query,omitempty"`
+	Command            BsonD  `bson:"command,omitempty" json:"command,omitempty"`
+	OriginatingCommand BsonD  `bson:"originatingCommand,omitempty" json:"originatingCommand,omitempty"`
+	UpdateObj          BsonD  `bson:"updateobj,omitempty" json:"updateobj,omitempty"`
 }
 
 func (self ExampleQuery) Db() string {
@@ -218,6 +221,14 @@ func (self ExampleQuery) ExplainCmd() bson.D {
 				{"insert", coll},
 			}
 		}
+	case "getmore":
+		if self.OriginatingCommand.Len() > 0 {
+			cmd = self.OriginatingCommand
+		} else {
+			cmd = BsonD{
+				{Name: "getMore", Value: ""},
+			}
+		}
 	case "command":
 		if cmd.Len() == 0 || cmd[0].Name != "group" {
 			break

src/go/mongolib/util/util.go

@@ -273,40 +273,6 @@ func GetQueryField(doc proto.SystemProfile) (bson.M, error) {
 	//  	"query" : {
 	//  		"query" : {
 	//  			"$and" : [
-	//  				{
-	//  					"k" : {
-	//  						"$gt" : 1
-	//  					}
-	//  				},
-	//  				{
-	//  					"k" : {
-	//  						"$lt" : 2
-	//  					}
-	//  				},
-	//  				{
-	//  					"$or" : [
-	//  						{
-	//  							"c" : {
-	//  								"$in" : [
-	//  									/^0/,
-	//  									/^2/,
-	//  									/^4/,
-	//  									/^6/
-	//  								]
-	//  							}
-	//  						},
-	//  						{
-	//  							"pad" : {
-	//  								"$in" : [
-	//  									/9$/,
-	//  									/7$/,
-	//  									/5$/,
-	//  									/3$/
-	//  								]
-	//  							}
-	//  						}
-	//  					]
-	//  				}
 	//  			]
 	//  		},
 	//  		"orderby" : {

src/go/pt-mongodb-query-digest/main.go

@@ -136,8 +136,7 @@ func main() {
 		filters = append(filters, filter.NewFilterByCollection(opts.SkipCollections))
 	}
 
-	query := bson.M{"op": bson.M{"$nin": []string{"getmore"}}}
-	i := session.DB(di.Database).C("system.profile").Find(query).Sort("-$natural").Iter()
+	i := session.DB(di.Database).C("system.profile").Find(bson.M{}).Sort("-$natural").Iter()
 
 	fp := fingerprinter.NewFingerprinter(fingerprinter.DEFAULT_KEY_FILTERS)
 	s := stats.New(fp)

src/go/pt-mongodb-query-digest/main_test.go

@@ -12,6 +12,7 @@ import (
 	"reflect"
 	"regexp"
 	"runtime"
+	"sort"
 	"strings"
 	"testing"
 	"text/template"
@@ -263,6 +264,7 @@ func testAllOperationsTemplate(t *testing.T, data Data) {
 	for _, file := range files {
 		fs = append(fs, dir+file.Name())
 	}
+	sort.Strings(fs)
 	err = run(fs...)
 	if err != nil {
 		t.Fatalf("cannot execute queries: %s", err)
@@ -295,6 +297,12 @@ func testAllOperationsTemplate(t *testing.T, data Data) {
 			Operation:   "DROP",
 			Fingerprint: "DROP coll drop",
 		},
+		{
+			ID:          "db759bfd83441deecc71382323041ce6",
+			Namespace:   "test.coll",
+			Operation:   "GETMORE",
+			Fingerprint: "GETMORE coll",
+		},
 		{
 			ID:          "e72ad41302045bd6c2bcad76511f915a",
 			Namespace:   "test.coll",
@@ -307,12 +315,6 @@ func testAllOperationsTemplate(t *testing.T, data Data) {
 			Operation:   "AGGREGATE",
 			Fingerprint: "AGGREGATE coll a",
 		},
-		{
-			ID:          "e4122a58c99ab0a4020ce7d195c5a8cb",
-			Namespace:   "test.coll",
-			Operation:   "DISTINCT",
-			Fingerprint: "DISTINCT coll a,b",
-		},
 		{
 			ID:          "a6782ae38ef891d5506341a4b0ab2747",
 			Namespace:   "test",
@@ -331,6 +333,36 @@ func testAllOperationsTemplate(t *testing.T, data Data) {
 			Operation:   "FINDANDMODIFY",
 			Fingerprint: "FINDANDMODIFY coll a",
 		},
+		{
+			ID:          "2a639e77efe3e68399ef9482575b3421",
+			Namespace:   "test.coll",
+			Operation:   "FIND",
+			Fingerprint: "FIND coll",
+		},
+		{
+			ID:          "fe0bf975a044fe47fd32b835ceba612d",
+			Namespace:   "test.coll",
+			Operation:   "FIND",
+			Fingerprint: "FIND coll a",
+		},
+		{
+			ID:          "20fe80188ec82c9d3c3dcf3f4817f8f9",
+			Namespace:   "test.coll",
+			Operation:   "FIND",
+			Fingerprint: "FIND coll b,c",
+		},
+		{
+			ID:          "02104210d67fe680273784d833f86831",
+			Namespace:   "test.coll",
+			Operation:   "FIND",
+			Fingerprint: "FIND coll c,k,pad",
+		},
+		{
+			ID:          "5efe4738d807c74b3980de76c37a0870",
+			Namespace:   "test.coll",
+			Operation:   "FIND",
+			Fingerprint: "FIND coll k",
+		},
 		{
 			ID:          "798d7c1cd25b63cb6a307126a25910d6",
 			Namespace:   "test.system.js",
@@ -343,6 +375,12 @@ func testAllOperationsTemplate(t *testing.T, data Data) {
 			Operation:   "GEONEAR",
 			Fingerprint: "GEONEAR coll",
 		},
+		{
+			ID:          "e4122a58c99ab0a4020ce7d195c5a8cb",
+			Namespace:   "test.coll",
+			Operation:   "DISTINCT",
+			Fingerprint: "DISTINCT coll a,b",
+		},
 		{
 			ID:          "ca8bb19386488570447f5753741fb494",
 			Namespace:   "test.coll",
@@ -375,7 +413,8 @@ func testAllOperationsTemplate(t *testing.T, data Data) {
 		},
 	}
 
-	expected := `Profiler is disabled for the "test" database but there are 125 documents in the system.profile collection.
+	ndocs := "165"
+	expected := `Profiler is disabled for the "test" database but there are ` + ndocs + ` documents in the system.profile collection.
 Using those documents for the stats
 pt-mongodb-query-digest .+
 Host: ` + data.url + `
@@ -386,7 +425,7 @@ Skipping profiled queries on these collections: \[system\.profile\]
 # Ratio    [0-9\.]+  \(docs scanned/returned\)
 # Attribute            pct     total        min         max        avg         95%        stddev      median
 # ==================   ===   ========    ========    ========    ========    ========     =======    ========
-# Count \(docs\)                   125\s
+# Count \(docs\)                   ` + ndocs + `\s
 # Exec Time ms         (\s*[0-9]+){8}\s
 # Docs Scanned         (\s*[0-9\.]+){8}\s
 # Docs Returned        (\s*[0-9\.]+){8}\s

src/go/tests/doc/out/aggregate_2.6.12

@@ -20,12 +20,12 @@
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(154),
+			"r" : NumberLong(222),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(4),
-			"w" : NumberLong(2)
+			"r" : NumberLong(15),
+			"w" : NumberLong(6)
 		}
 	},
 	"responseLength" : 385,
@@ -33,7 +33,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:14.658Z"),
+	"ts" : ISODate("2017-10-15T01:54:08.661Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/aggregate_3.0.15

@@ -42,11 +42,11 @@
 		}
 	},
 	"responseLength" : 385,
-	"millis" : 2,
+	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:20.858Z"),
+	"ts" : ISODate("2017-10-15T01:54:18.509Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/aggregate_3.2.16

@@ -38,11 +38,11 @@
 	},
 	"responseLength" : 388,
 	"protocol" : "op_command",
-	"millis" : 2,
+	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:29.915Z"),
+	"ts" : ISODate("2017-10-15T01:54:31.293Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/aggregate_3.4.7

@@ -42,7 +42,7 @@
 	"protocol" : "op_command",
 	"millis" : 0,
 	"planSummary" : "IXSCAN { a: 1 }",
-	"ts" : ISODate("2017-08-20T15:39:36.711Z"),
+	"ts" : ISODate("2017-10-15T01:54:41.948Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/aggregate_3.5.11

@@ -43,7 +43,7 @@
 	"protocol" : "op_msg",
 	"millis" : 2,
 	"planSummary" : "IXSCAN { a: 1 }",
-	"ts" : ISODate("2017-08-20T15:39:47.203Z"),
+	"ts" : ISODate("2017-10-15T01:54:52.564Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/count_2.6.12

@@ -14,12 +14,12 @@
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(12),
+			"r" : NumberLong(33),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(2),
-			"w" : NumberLong(2)
+			"r" : NumberLong(3),
+			"w" : NumberLong(5)
 		}
 	},
 	"responseLength" : 48,
@@ -27,7 +27,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:14.823Z"),
+	"ts" : ISODate("2017-10-15T01:54:08.889Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/count_3.0.15

@@ -40,7 +40,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:20.982Z"),
+	"ts" : ISODate("2017-10-15T01:54:18.673Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/count_3.2.16

@@ -36,7 +36,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:30.094Z"),
+	"ts" : ISODate("2017-10-15T01:54:31.529Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/count_3.4.7

@@ -46,10 +46,10 @@
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"nCounted" : 20,
+		"nCounted" : 10,
 		"nSkipped" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:36.897Z"),
+	"ts" : ISODate("2017-10-15T01:54:42.157Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/count_3.5.11

@@ -47,10 +47,10 @@
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"nCounted" : 20,
+		"nCounted" : 10,
 		"nSkipped" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:47.396Z"),
+	"ts" : ISODate("2017-10-15T01:54:52.844Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/count_with_query_2.6.12

@@ -16,12 +16,12 @@
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(131),
+			"r" : NumberLong(75),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(3),
-			"w" : NumberLong(4)
+			"r" : NumberLong(6),
+			"w" : NumberLong(6)
 		}
 	},
 	"responseLength" : 48,
@@ -29,7 +29,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:14.971Z"),
+	"ts" : ISODate("2017-10-15T01:54:09.039Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/count_with_query_3.0.15

@@ -42,7 +42,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:21.124Z"),
+	"ts" : ISODate("2017-10-15T01:54:18.838Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/count_with_query_3.2.16

@@ -38,7 +38,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:30.251Z"),
+	"ts" : ISODate("2017-10-15T01:54:31.756Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/count_with_query_3.4.7

@@ -12,8 +12,8 @@
 			
 		}
 	},
-	"keysExamined" : 13,
-	"docsExamined" : 0,
+	"keysExamined" : 0,
+	"docsExamined" : 10,
 	"numYield" : 0,
 	"locks" : {
 		"Global" : {
@@ -35,59 +35,43 @@
 	"responseLength" : 29,
 	"protocol" : "op_command",
 	"millis" : 0,
-	"planSummary" : "COUNT_SCAN { a: 1 }",
+	"planSummary" : "COLLSCAN",
 	"execStats" : {
 		"stage" : "COUNT",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 13,
+		"works" : 12,
 		"advanced" : 0,
-		"needTime" : 12,
+		"needTime" : 11,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"nCounted" : 12,
+		"nCounted" : 4,
 		"nSkipped" : 0,
 		"inputStage" : {
-			"stage" : "COUNT_SCAN",
-			"nReturned" : 12,
+			"stage" : "COLLSCAN",
+			"filter" : {
+				"a" : {
+					"$gt" : 5
+				}
+			},
+			"nReturned" : 4,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 13,
-			"advanced" : 12,
-			"needTime" : 0,
+			"works" : 12,
+			"advanced" : 4,
+			"needTime" : 7,
 			"needYield" : 0,
 			"saveState" : 0,
 			"restoreState" : 0,
 			"isEOF" : 1,
 			"invalidates" : 0,
-			"keysExamined" : 13,
-			"keyPattern" : {
-				"a" : 1
-			},
-			"indexName" : "a_1",
-			"isMultiKey" : false,
-			"multiKeyPaths" : {
-				"a" : [ ]
-			},
-			"isUnique" : false,
-			"isSparse" : false,
-			"isPartial" : false,
-			"indexVersion" : 2,
-			"indexBounds" : {
-				"startKey" : {
-					"a" : 5
-				},
-				"startKeyInclusive" : false,
-				"endKey" : {
-					"a" : Infinity
-				},
-				"endKeyInclusive" : true
-			}
+			"direction" : "forward",
+			"docsExamined" : 10
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:37.077Z"),
+	"ts" : ISODate("2017-10-15T01:54:42.350Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/count_with_query_3.5.11

@@ -13,8 +13,8 @@
 		},
 		"$db" : "test"
 	},
-	"keysExamined" : 13,
-	"docsExamined" : 0,
+	"keysExamined" : 0,
+	"docsExamined" : 10,
 	"numYield" : 0,
 	"locks" : {
 		"Global" : {
@@ -36,59 +36,43 @@
 	"responseLength" : 29,
 	"protocol" : "op_msg",
 	"millis" : 0,
-	"planSummary" : "COUNT_SCAN { a: 1 }",
+	"planSummary" : "COLLSCAN",
 	"execStats" : {
 		"stage" : "COUNT",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 13,
+		"works" : 12,
 		"advanced" : 0,
-		"needTime" : 12,
+		"needTime" : 11,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"nCounted" : 12,
+		"nCounted" : 4,
 		"nSkipped" : 0,
 		"inputStage" : {
-			"stage" : "COUNT_SCAN",
-			"nReturned" : 12,
+			"stage" : "COLLSCAN",
+			"filter" : {
+				"a" : {
+					"$gt" : 5
+				}
+			},
+			"nReturned" : 4,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 13,
-			"advanced" : 12,
-			"needTime" : 0,
+			"works" : 12,
+			"advanced" : 4,
+			"needTime" : 7,
 			"needYield" : 0,
 			"saveState" : 0,
 			"restoreState" : 0,
 			"isEOF" : 1,
 			"invalidates" : 0,
-			"keysExamined" : 13,
-			"keyPattern" : {
-				"a" : 1
-			},
-			"indexName" : "a_1",
-			"isMultiKey" : false,
-			"multiKeyPaths" : {
-				"a" : [ ]
-			},
-			"isUnique" : false,
-			"isSparse" : false,
-			"isPartial" : false,
-			"indexVersion" : 2,
-			"indexBounds" : {
-				"startKey" : {
-					"a" : 5
-				},
-				"startKeyInclusive" : false,
-				"endKey" : {
-					"a" : Infinity
-				},
-				"endKeyInclusive" : true
-			}
+			"direction" : "forward",
+			"docsExamined" : 10
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:47.573Z"),
+	"ts" : ISODate("2017-10-15T01:54:53.078Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/delete_2.6.12

@@ -15,18 +15,18 @@
 	"lockStats" : {
 		"timeLockedMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(182)
+			"w" : NumberLong(144)
 		},
 		"timeAcquiringMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(4)
+			"w" : NumberLong(11)
 		}
 	},
 	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:15.126Z"),
+	"ts" : ISODate("2017-10-15T01:54:09.246Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/delete_3.0.15

@@ -40,7 +40,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:21.265Z"),
+	"ts" : ISODate("2017-10-15T01:54:19.034Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/delete_3.2.16

@@ -35,7 +35,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:30.543Z"),
+	"ts" : ISODate("2017-10-15T01:54:32.020Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/delete_3.4.7

@@ -9,8 +9,8 @@
 			"$gte" : 2
 		}
 	},
-	"keysExamined" : 4,
-	"docsExamined" : 4,
+	"keysExamined" : 1,
+	"docsExamined" : 1,
 	"ndeleted" : 1,
 	"keysDeleted" : 2,
 	"numYield" : 0,
@@ -38,9 +38,9 @@
 		"stage" : "DELETE",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 5,
+		"works" : 2,
 		"advanced" : 0,
-		"needTime" : 4,
+		"needTime" : 1,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
@@ -57,22 +57,22 @@
 			},
 			"nReturned" : 1,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 4,
+			"works" : 1,
 			"advanced" : 1,
-			"needTime" : 3,
+			"needTime" : 0,
 			"needYield" : 0,
 			"saveState" : 1,
 			"restoreState" : 1,
 			"isEOF" : 0,
 			"invalidates" : 0,
-			"docsExamined" : 4,
+			"docsExamined" : 1,
 			"alreadyHasObj" : 0,
 			"inputStage" : {
 				"stage" : "IXSCAN",
-				"nReturned" : 4,
+				"nReturned" : 1,
 				"executionTimeMillisEstimate" : 0,
-				"works" : 4,
-				"advanced" : 4,
+				"works" : 1,
+				"advanced" : 1,
 				"needTime" : 0,
 				"needYield" : 0,
 				"saveState" : 1,
@@ -97,7 +97,7 @@
 						"[2.0, inf.0]"
 					]
 				},
-				"keysExamined" : 4,
+				"keysExamined" : 1,
 				"seeks" : 1,
 				"dupsTested" : 0,
 				"dupsDropped" : 0,
@@ -105,7 +105,7 @@
 			}
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:37.279Z"),
+	"ts" : ISODate("2017-10-15T01:54:42.612Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/delete_3.5.11

@@ -12,8 +12,8 @@
 		},
 		"limit" : 1
 	},
-	"keysExamined" : 4,
-	"docsExamined" : 4,
+	"keysExamined" : 1,
+	"docsExamined" : 1,
 	"ndeleted" : 1,
 	"keysDeleted" : 2,
 	"numYield" : 0,
@@ -35,15 +35,15 @@
 			}
 		}
 	},
-	"millis" : 0,
+	"millis" : 1,
 	"planSummary" : "IXSCAN { a: 1 }",
 	"execStats" : {
 		"stage" : "DELETE",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 5,
+		"works" : 2,
 		"advanced" : 0,
-		"needTime" : 4,
+		"needTime" : 1,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
@@ -60,22 +60,22 @@
 			},
 			"nReturned" : 1,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 4,
+			"works" : 1,
 			"advanced" : 1,
-			"needTime" : 3,
+			"needTime" : 0,
 			"needYield" : 0,
 			"saveState" : 1,
 			"restoreState" : 1,
 			"isEOF" : 0,
 			"invalidates" : 0,
-			"docsExamined" : 4,
+			"docsExamined" : 1,
 			"alreadyHasObj" : 0,
 			"inputStage" : {
 				"stage" : "IXSCAN",
-				"nReturned" : 4,
+				"nReturned" : 1,
 				"executionTimeMillisEstimate" : 0,
-				"works" : 4,
-				"advanced" : 4,
+				"works" : 1,
+				"advanced" : 1,
 				"needTime" : 0,
 				"needYield" : 0,
 				"saveState" : 1,
@@ -100,7 +100,7 @@
 						"[2.0, inf.0]"
 					]
 				},
-				"keysExamined" : 4,
+				"keysExamined" : 1,
 				"seeks" : 1,
 				"dupsTested" : 0,
 				"dupsDropped" : 0,
@@ -108,7 +108,7 @@
 			}
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:47.745Z"),
+	"ts" : ISODate("2017-10-15T01:54:53.333Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/delete_all_2.6.12

@@ -9,24 +9,24 @@
 			"$gte" : 2
 		}
 	},
-	"ndeleted" : 15,
+	"ndeleted" : 8,
 	"keyUpdates" : 0,
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(238)
+			"w" : NumberLong(396)
 		},
 		"timeAcquiringMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(4)
+			"w" : NumberLong(12)
 		}
 	},
 	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-30T10:54:45.348Z"),
+	"ts" : ISODate("2017-10-15T01:54:09.463Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/delete_all_3.0.15

@@ -9,7 +9,7 @@
 			"$gte" : 2
 		}
 	},
-	"ndeleted" : 15,
+	"ndeleted" : 8,
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
 	"numYield" : 0,
@@ -22,7 +22,7 @@
 		},
 		"MMAPV1Journal" : {
 			"acquireCount" : {
-				"w" : NumberLong(16)
+				"w" : NumberLong(9)
 			}
 		},
 		"Database" : {
@@ -36,11 +36,11 @@
 			}
 		}
 	},
-	"millis" : 1,
+	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-30T10:54:52.821Z"),
+	"ts" : ISODate("2017-10-15T01:54:19.206Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/delete_all_3.2.16

@@ -9,7 +9,7 @@
 			"$gte" : 2
 		}
 	},
-	"ndeleted" : 15,
+	"ndeleted" : 8,
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
 	"numYield" : 0,
@@ -31,11 +31,11 @@
 			}
 		}
 	},
-	"millis" : 0,
+	"millis" : 1,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-30T10:55:02.238Z"),
+	"ts" : ISODate("2017-10-15T01:54:32.281Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/delete_all_3.4.7

@@ -9,10 +9,10 @@
 			"$gte" : 2
 		}
 	},
-	"keysExamined" : 39,
-	"docsExamined" : 39,
-	"ndeleted" : 15,
-	"keysDeleted" : 30,
+	"keysExamined" : 8,
+	"docsExamined" : 8,
+	"ndeleted" : 8,
+	"keysDeleted" : 16,
 	"numYield" : 0,
 	"locks" : {
 		"Global" : {
@@ -32,21 +32,21 @@
 			}
 		}
 	},
-	"millis" : 0,
+	"millis" : 1,
 	"planSummary" : "IXSCAN { a: 1 }",
 	"execStats" : {
 		"stage" : "DELETE",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 40,
+		"works" : 9,
 		"advanced" : 0,
-		"needTime" : 39,
+		"needTime" : 8,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"nWouldDelete" : 15,
+		"nWouldDelete" : 8,
 		"nInvalidateSkips" : 0,
 		"inputStage" : {
 			"stage" : "FETCH",
@@ -55,28 +55,28 @@
 					"$gte" : 2
 				}
 			},
-			"nReturned" : 15,
+			"nReturned" : 8,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 40,
-			"advanced" : 15,
-			"needTime" : 24,
+			"works" : 9,
+			"advanced" : 8,
+			"needTime" : 0,
 			"needYield" : 0,
-			"saveState" : 15,
-			"restoreState" : 15,
+			"saveState" : 8,
+			"restoreState" : 8,
 			"isEOF" : 1,
 			"invalidates" : 0,
-			"docsExamined" : 39,
+			"docsExamined" : 8,
 			"alreadyHasObj" : 0,
 			"inputStage" : {
 				"stage" : "IXSCAN",
-				"nReturned" : 39,
+				"nReturned" : 8,
 				"executionTimeMillisEstimate" : 0,
-				"works" : 40,
-				"advanced" : 39,
+				"works" : 9,
+				"advanced" : 8,
 				"needTime" : 0,
 				"needYield" : 0,
-				"saveState" : 15,
-				"restoreState" : 15,
+				"saveState" : 8,
+				"restoreState" : 8,
 				"isEOF" : 1,
 				"invalidates" : 0,
 				"keyPattern" : {
@@ -97,7 +97,7 @@
 						"[2.0, inf.0]"
 					]
 				},
-				"keysExamined" : 39,
+				"keysExamined" : 8,
 				"seeks" : 1,
 				"dupsTested" : 0,
 				"dupsDropped" : 0,
@@ -105,7 +105,7 @@
 			}
 		}
 	},
-	"ts" : ISODate("2017-08-30T10:55:09.833Z"),
+	"ts" : ISODate("2017-10-15T01:54:42.820Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/delete_all_3.5.11

@@ -12,10 +12,10 @@
 		},
 		"limit" : 0
 	},
-	"keysExamined" : 39,
-	"docsExamined" : 39,
-	"ndeleted" : 15,
-	"keysDeleted" : 30,
+	"keysExamined" : 8,
+	"docsExamined" : 8,
+	"ndeleted" : 8,
+	"keysDeleted" : 16,
 	"numYield" : 0,
 	"locks" : {
 		"Global" : {
@@ -35,21 +35,21 @@
 			}
 		}
 	},
-	"millis" : 0,
+	"millis" : 1,
 	"planSummary" : "IXSCAN { a: 1 }",
 	"execStats" : {
 		"stage" : "DELETE",
 		"nReturned" : 0,
-		"executionTimeMillisEstimate" : 0,
-		"works" : 40,
+		"executionTimeMillisEstimate" : 10,
+		"works" : 9,
 		"advanced" : 0,
-		"needTime" : 39,
+		"needTime" : 8,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"nWouldDelete" : 15,
+		"nWouldDelete" : 8,
 		"nInvalidateSkips" : 0,
 		"inputStage" : {
 			"stage" : "FETCH",
@@ -58,28 +58,28 @@
 					"$gte" : 2
 				}
 			},
-			"nReturned" : 15,
+			"nReturned" : 8,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 40,
-			"advanced" : 15,
-			"needTime" : 24,
+			"works" : 9,
+			"advanced" : 8,
+			"needTime" : 0,
 			"needYield" : 0,
-			"saveState" : 15,
-			"restoreState" : 15,
+			"saveState" : 8,
+			"restoreState" : 8,
 			"isEOF" : 1,
 			"invalidates" : 0,
-			"docsExamined" : 39,
+			"docsExamined" : 8,
 			"alreadyHasObj" : 0,
 			"inputStage" : {
 				"stage" : "IXSCAN",
-				"nReturned" : 39,
+				"nReturned" : 8,
 				"executionTimeMillisEstimate" : 0,
-				"works" : 40,
-				"advanced" : 39,
+				"works" : 9,
+				"advanced" : 8,
 				"needTime" : 0,
 				"needYield" : 0,
-				"saveState" : 15,
-				"restoreState" : 15,
+				"saveState" : 8,
+				"restoreState" : 8,
 				"isEOF" : 1,
 				"invalidates" : 0,
 				"keyPattern" : {
@@ -100,7 +100,7 @@
 						"[2.0, inf.0]"
 					]
 				},
-				"keysExamined" : 39,
+				"keysExamined" : 8,
 				"seeks" : 1,
 				"dupsTested" : 0,
 				"dupsDropped" : 0,
@@ -108,7 +108,7 @@
 			}
 		}
 	},
-	"ts" : ISODate("2017-08-30T10:55:19.142Z"),
+	"ts" : ISODate("2017-10-15T01:54:53.615Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/distinct_2.6.12

@@ -14,20 +14,20 @@
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(250),
+			"r" : NumberLong(362),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(2),
-			"w" : NumberLong(3)
+			"r" : NumberLong(6),
+			"w" : NumberLong(9341)
 		}
 	},
-	"responseLength" : 254,
+	"responseLength" : 199,
 	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:15.323Z"),
+	"ts" : ISODate("2017-10-15T01:54:09.687Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/distinct_3.0.15

@@ -35,12 +35,12 @@
 			}
 		}
 	},
-	"responseLength" : 261,
+	"responseLength" : 206,
 	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:21.392Z"),
+	"ts" : ISODate("2017-10-15T01:54:19.380Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/distinct_3.2.16

@@ -30,13 +30,13 @@
 			}
 		}
 	},
-	"responseLength" : 264,
+	"responseLength" : 209,
 	"protocol" : "op_command",
 	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:30.748Z"),
+	"ts" : ISODate("2017-10-15T01:54:32.523Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/distinct_3.4.7

@@ -10,8 +10,8 @@
 			}
 		}
 	},
-	"keysExamined" : 10,
-	"docsExamined" : 10,
+	"keysExamined" : 5,
+	"docsExamined" : 5,
 	"numYield" : 0,
 	"locks" : {
 		"Global" : {
@@ -30,30 +30,30 @@
 			}
 		}
 	},
-	"responseLength" : 145,
+	"responseLength" : 90,
 	"protocol" : "op_command",
 	"millis" : 0,
 	"planSummary" : "IXSCAN { b: 1 }",
 	"execStats" : {
 		"stage" : "FETCH",
-		"nReturned" : 10,
+		"nReturned" : 5,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 11,
-		"advanced" : 10,
+		"works" : 6,
+		"advanced" : 5,
 		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"docsExamined" : 10,
+		"docsExamined" : 5,
 		"alreadyHasObj" : 0,
 		"inputStage" : {
 			"stage" : "IXSCAN",
-			"nReturned" : 10,
+			"nReturned" : 5,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 11,
-			"advanced" : 10,
+			"works" : 6,
+			"advanced" : 5,
 			"needTime" : 0,
 			"needYield" : 0,
 			"saveState" : 0,
@@ -78,14 +78,14 @@
 					"[5.0, inf.0]"
 				]
 			},
-			"keysExamined" : 10,
+			"keysExamined" : 5,
 			"seeks" : 1,
 			"dupsTested" : 0,
 			"dupsDropped" : 0,
 			"seenInvalidated" : 0
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:37.511Z"),
+	"ts" : ISODate("2017-10-15T01:54:43.048Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/distinct_3.5.11

@@ -11,8 +11,8 @@
 		},
 		"$db" : "test"
 	},
-	"keysExamined" : 10,
-	"docsExamined" : 10,
+	"keysExamined" : 5,
+	"docsExamined" : 5,
 	"numYield" : 0,
 	"locks" : {
 		"Global" : {
@@ -31,30 +31,30 @@
 			}
 		}
 	},
-	"responseLength" : 145,
+	"responseLength" : 90,
 	"protocol" : "op_msg",
 	"millis" : 0,
 	"planSummary" : "IXSCAN { b: 1 }",
 	"execStats" : {
 		"stage" : "FETCH",
-		"nReturned" : 10,
+		"nReturned" : 5,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 11,
-		"advanced" : 10,
+		"works" : 6,
+		"advanced" : 5,
 		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"docsExamined" : 10,
+		"docsExamined" : 5,
 		"alreadyHasObj" : 0,
 		"inputStage" : {
 			"stage" : "IXSCAN",
-			"nReturned" : 10,
+			"nReturned" : 5,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 11,
-			"advanced" : 10,
+			"works" : 6,
+			"advanced" : 5,
 			"needTime" : 0,
 			"needYield" : 0,
 			"saveState" : 0,
@@ -79,14 +79,14 @@
 					"[5.0, inf.0]"
 				]
 			},
-			"keysExamined" : 10,
+			"keysExamined" : 5,
 			"seeks" : 1,
 			"dupsTested" : 0,
 			"dupsDropped" : 0,
 			"seenInvalidated" : 0
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:47.927Z"),
+	"ts" : ISODate("2017-10-15T01:54:53.874Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/eval_2.6.12

@@ -2,28 +2,28 @@
 	"op" : "command",
 	"ns" : "test.$cmd",
 	"command" : {
-		"$eval" : "db"
+		"$eval" : "1"
 	},
 	"keyUpdates" : 0,
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
 			"R" : NumberLong(0),
-			"W" : NumberLong(64994)
+			"W" : NumberLong(42972)
 		},
 		"timeAcquiringMicros" : {
 			"R" : NumberLong(0),
-			"W" : NumberLong(5),
+			"W" : NumberLong(8),
 			"r" : NumberLong(0),
-			"w" : NumberLong(7)
+			"w" : NumberLong(6)
 		}
 	},
-	"responseLength" : 108,
-	"millis" : 65,
+	"responseLength" : 53,
+	"millis" : 43,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-09-05T19:39:24.522Z"),
+	"ts" : ISODate("2017-10-15T01:54:09.890Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/eval_3.0.15

@@ -2,7 +2,7 @@
 	"op" : "command",
 	"ns" : "test.$cmd",
 	"command" : {
-		"$eval" : "db"
+		"$eval" : "1"
 	},
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
@@ -30,12 +30,12 @@
 			}
 		}
 	},
-	"responseLength" : 108,
-	"millis" : 35,
+	"responseLength" : 53,
+	"millis" : 37,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-09-05T19:39:32.054Z"),
+	"ts" : ISODate("2017-10-15T01:54:19.572Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/eval_3.2.16

@@ -2,7 +2,7 @@
 	"op" : "command",
 	"ns" : "test",
 	"command" : {
-		"$eval" : "db"
+		"$eval" : "1"
 	},
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
@@ -25,13 +25,13 @@
 			}
 		}
 	},
-	"responseLength" : 93,
+	"responseLength" : 38,
 	"protocol" : "op_command",
-	"millis" : 88,
+	"millis" : 56,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-09-05T19:39:41.581Z"),
+	"ts" : ISODate("2017-10-15T01:54:32.759Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/eval_3.4.7

@@ -2,7 +2,7 @@
 	"op" : "command",
 	"ns" : "test",
 	"command" : {
-		"$eval" : "db"
+		"$eval" : "1"
 	},
 	"numYield" : 0,
 	"locks" : {
@@ -23,10 +23,10 @@
 			}
 		}
 	},
-	"responseLength" : 93,
+	"responseLength" : 38,
 	"protocol" : "op_command",
-	"millis" : 91,
-	"ts" : ISODate("2017-09-05T19:39:48.888Z"),
+	"millis" : 48,
+	"ts" : ISODate("2017-10-15T01:54:43.273Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/eval_3.5.11

@@ -2,7 +2,7 @@
 	"op" : "command",
 	"ns" : "test",
 	"command" : {
-		"$eval" : "db",
+		"$eval" : "1",
 		"$db" : "test"
 	},
 	"numYield" : 0,
@@ -24,10 +24,10 @@
 			}
 		}
 	},
-	"responseLength" : 93,
+	"responseLength" : 38,
 	"protocol" : "op_msg",
-	"millis" : 47,
-	"ts" : ISODate("2017-09-05T19:40:00.171Z"),
+	"millis" : 40,
+	"ts" : ISODate("2017-10-15T01:54:54.085Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/explain_2.6.12

@@ -9,18 +9,18 @@
 	},
 	"ntoreturn" : 0,
 	"ntoskip" : 0,
-	"nscanned" : 44,
-	"nscannedObjects" : 44,
+	"nscanned" : 10,
+	"nscannedObjects" : 10,
 	"keyUpdates" : 0,
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(95),
+			"r" : NumberLong(101),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(14),
-			"w" : NumberLong(6)
+			"r" : NumberLong(6),
+			"w" : NumberLong(11)
 		}
 	},
 	"nreturned" : 1,
@@ -28,18 +28,18 @@
 	"millis" : 0,
 	"execStats" : {
 		"type" : "COLLSCAN",
-		"works" : 46,
+		"works" : 12,
 		"yields" : 0,
 		"unyields" : 0,
 		"invalidates" : 0,
-		"advanced" : 44,
+		"advanced" : 10,
 		"needTime" : 1,
 		"needFetch" : 0,
 		"isEOF" : 1,
-		"docsTested" : 44,
+		"docsTested" : 10,
 		"children" : [ ]
 	},
-	"ts" : ISODate("2017-09-05T19:39:24.666Z"),
+	"ts" : ISODate("2017-10-15T01:54:10.058Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/explain_3.0.15

@@ -43,7 +43,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-09-05T19:39:32.210Z"),
+	"ts" : ISODate("2017-10-15T01:54:19.722Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/explain_3.2.16

@@ -36,7 +36,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-09-05T19:39:41.753Z"),
+	"ts" : ISODate("2017-10-15T01:54:32.931Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/explain_3.4.7

@@ -31,7 +31,7 @@
 	"responseLength" : 328,
 	"protocol" : "op_command",
 	"millis" : 0,
-	"ts" : ISODate("2017-09-05T19:39:49.065Z"),
+	"ts" : ISODate("2017-10-15T01:54:43.427Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/explain_3.5.11

@@ -32,7 +32,7 @@
 	"responseLength" : 329,
 	"protocol" : "op_msg",
 	"millis" : 0,
-	"ts" : ISODate("2017-09-05T19:40:00.433Z"),
+	"ts" : ISODate("2017-10-15T01:54:54.257Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/find_2.6.12

@@ -2,34 +2,34 @@
 	"op" : "query",
 	"ns" : "test.coll",
 	"query" : {
-		"a" : 1
+		"k" : 1
 	},
 	"ntoreturn" : 0,
 	"ntoskip" : 0,
-	"nscanned" : 6,
-	"nscannedObjects" : 6,
+	"nscanned" : 2,
+	"nscannedObjects" : 2,
 	"keyUpdates" : 0,
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(231),
+			"r" : NumberLong(213),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(2),
-			"w" : NumberLong(26)
+			"r" : NumberLong(38),
+			"w" : NumberLong(3)
 		}
 	},
-	"nreturned" : 6,
-	"responseLength" : 251,
+	"nreturned" : 2,
+	"responseLength" : 86,
 	"millis" : 0,
 	"execStats" : {
 		"type" : "FETCH",
-		"works" : 7,
+		"works" : 3,
 		"yields" : 0,
 		"unyields" : 0,
 		"invalidates" : 0,
-		"advanced" : 6,
+		"advanced" : 2,
 		"needTime" : 0,
 		"needFetch" : 0,
 		"isEOF" : 1,
@@ -39,28 +39,28 @@
 		"children" : [
 			{
 				"type" : "IXSCAN",
-				"works" : 7,
+				"works" : 3,
 				"yields" : 0,
 				"unyields" : 0,
 				"invalidates" : 0,
-				"advanced" : 6,
+				"advanced" : 2,
 				"needTime" : 0,
 				"needFetch" : 0,
 				"isEOF" : 1,
-				"keyPattern" : "{ a: 1.0 }",
+				"keyPattern" : "{ k: 1.0 }",
 				"isMultiKey" : 0,
-				"boundsVerbose" : "field #0['a']: [1.0, 1.0]",
+				"boundsVerbose" : "field #0['k']: [1.0, 1.0]",
 				"yieldMovedCursor" : 0,
 				"dupsTested" : 0,
 				"dupsDropped" : 0,
 				"seenInvalidated" : 0,
 				"matchTested" : 0,
-				"keysExamined" : 6,
+				"keysExamined" : 2,
 				"children" : [ ]
 			}
 		]
 	},
-	"ts" : ISODate("2017-08-20T15:39:15.457Z"),
+	"ts" : ISODate("2017-10-15T01:54:10.277Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_3.0.15

@@ -2,12 +2,12 @@
 	"op" : "query",
 	"ns" : "test.coll",
 	"query" : {
-		"a" : 1
+		"k" : 1
 	},
 	"ntoreturn" : 0,
 	"ntoskip" : 0,
-	"nscanned" : 6,
-	"nscannedObjects" : 6,
+	"nscanned" : 2,
+	"nscannedObjects" : 2,
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
 	"numYield" : 0,
@@ -33,29 +33,29 @@
 			}
 		}
 	},
-	"nreturned" : 6,
-	"responseLength" : 251,
+	"nreturned" : 2,
+	"responseLength" : 86,
 	"millis" : 0,
 	"execStats" : {
 		"stage" : "FETCH",
-		"nReturned" : 6,
+		"nReturned" : 2,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 7,
-		"advanced" : 6,
+		"works" : 3,
+		"advanced" : 2,
 		"needTime" : 0,
 		"needFetch" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"docsExamined" : 6,
+		"docsExamined" : 2,
 		"alreadyHasObj" : 0,
 		"inputStage" : {
 			"stage" : "IXSCAN",
-			"nReturned" : 6,
+			"nReturned" : 2,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 7,
-			"advanced" : 6,
+			"works" : 3,
+			"advanced" : 2,
 			"needTime" : 0,
 			"needFetch" : 0,
 			"saveState" : 0,
@@ -63,24 +63,24 @@
 			"isEOF" : 1,
 			"invalidates" : 0,
 			"keyPattern" : {
-				"a" : 1
+				"k" : 1
 			},
-			"indexName" : "a_1",
+			"indexName" : "k_1",
 			"isMultiKey" : false,
 			"direction" : "forward",
 			"indexBounds" : {
-				"a" : [
+				"k" : [
 					"[1.0, 1.0]"
 				]
 			},
-			"keysExamined" : 6,
+			"keysExamined" : 2,
 			"dupsTested" : 0,
 			"dupsDropped" : 0,
 			"seenInvalidated" : 0,
 			"matchTested" : 0
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:21.515Z"),
+	"ts" : ISODate("2017-10-15T01:54:19.953Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_3.2.16

@@ -4,11 +4,11 @@
 	"query" : {
 		"find" : "coll",
 		"filter" : {
-			"a" : 1
+			"k" : 1
 		}
 	},
-	"keysExamined" : 6,
-	"docsExamined" : 6,
+	"keysExamined" : 2,
+	"docsExamined" : 2,
 	"cursorExhausted" : true,
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
@@ -30,30 +30,30 @@
 			}
 		}
 	},
-	"nreturned" : 6,
-	"responseLength" : 349,
+	"nreturned" : 2,
+	"responseLength" : 172,
 	"protocol" : "op_command",
-	"millis" : 0,
+	"millis" : 1,
 	"execStats" : {
 		"stage" : "FETCH",
-		"nReturned" : 6,
+		"nReturned" : 2,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 7,
-		"advanced" : 6,
+		"works" : 3,
+		"advanced" : 2,
 		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"docsExamined" : 6,
+		"docsExamined" : 2,
 		"alreadyHasObj" : 0,
 		"inputStage" : {
 			"stage" : "IXSCAN",
-			"nReturned" : 6,
+			"nReturned" : 2,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 7,
-			"advanced" : 6,
+			"works" : 3,
+			"advanced" : 2,
 			"needTime" : 0,
 			"needYield" : 0,
 			"saveState" : 0,
@@ -61,9 +61,9 @@
 			"isEOF" : 1,
 			"invalidates" : 0,
 			"keyPattern" : {
-				"a" : 1
+				"k" : 1
 			},
-			"indexName" : "a_1",
+			"indexName" : "k_1",
 			"isMultiKey" : false,
 			"isUnique" : false,
 			"isSparse" : false,
@@ -71,17 +71,17 @@
 			"indexVersion" : 1,
 			"direction" : "forward",
 			"indexBounds" : {
-				"a" : [
+				"k" : [
 					"[1.0, 1.0]"
 				]
 			},
-			"keysExamined" : 6,
+			"keysExamined" : 2,
 			"dupsTested" : 0,
 			"dupsDropped" : 0,
 			"seenInvalidated" : 0
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:30.913Z"),
+	"ts" : ISODate("2017-10-15T01:54:33.179Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_3.4.7

@@ -4,11 +4,11 @@
 	"query" : {
 		"find" : "coll",
 		"filter" : {
-			"a" : 1
+			"k" : 1
 		}
 	},
-	"keysExamined" : 6,
-	"docsExamined" : 6,
+	"keysExamined" : 2,
+	"docsExamined" : 2,
 	"cursorExhausted" : true,
 	"numYield" : 0,
 	"locks" : {
@@ -28,31 +28,31 @@
 			}
 		}
 	},
-	"nreturned" : 6,
-	"responseLength" : 331,
+	"nreturned" : 2,
+	"responseLength" : 154,
 	"protocol" : "op_command",
 	"millis" : 0,
-	"planSummary" : "IXSCAN { a: 1 }",
+	"planSummary" : "IXSCAN { k: 1 }",
 	"execStats" : {
 		"stage" : "FETCH",
-		"nReturned" : 6,
+		"nReturned" : 2,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 7,
-		"advanced" : 6,
+		"works" : 3,
+		"advanced" : 2,
 		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"docsExamined" : 6,
+		"docsExamined" : 2,
 		"alreadyHasObj" : 0,
 		"inputStage" : {
 			"stage" : "IXSCAN",
-			"nReturned" : 6,
+			"nReturned" : 2,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 7,
-			"advanced" : 6,
+			"works" : 3,
+			"advanced" : 2,
 			"needTime" : 0,
 			"needYield" : 0,
 			"saveState" : 0,
@@ -60,12 +60,12 @@
 			"isEOF" : 1,
 			"invalidates" : 0,
 			"keyPattern" : {
-				"a" : 1
+				"k" : 1
 			},
-			"indexName" : "a_1",
+			"indexName" : "k_1",
 			"isMultiKey" : false,
 			"multiKeyPaths" : {
-				"a" : [ ]
+				"k" : [ ]
 			},
 			"isUnique" : false,
 			"isSparse" : false,
@@ -73,18 +73,18 @@
 			"indexVersion" : 2,
 			"direction" : "forward",
 			"indexBounds" : {
-				"a" : [
+				"k" : [
 					"[1.0, 1.0]"
 				]
 			},
-			"keysExamined" : 6,
+			"keysExamined" : 2,
 			"seeks" : 1,
 			"dupsTested" : 0,
 			"dupsDropped" : 0,
 			"seenInvalidated" : 0
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:37.660Z"),
+	"ts" : ISODate("2017-10-15T01:54:43.713Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/find_3.5.11

@@ -4,12 +4,12 @@
 	"command" : {
 		"find" : "coll",
 		"filter" : {
-			"a" : 1
+			"k" : 1
 		},
 		"$db" : "test"
 	},
-	"keysExamined" : 6,
-	"docsExamined" : 6,
+	"keysExamined" : 2,
+	"docsExamined" : 2,
 	"cursorExhausted" : true,
 	"numYield" : 0,
 	"locks" : {
@@ -29,31 +29,31 @@
 			}
 		}
 	},
-	"nreturned" : 6,
-	"responseLength" : 331,
+	"nreturned" : 2,
+	"responseLength" : 154,
 	"protocol" : "op_msg",
-	"millis" : 1,
-	"planSummary" : "IXSCAN { a: 1 }",
+	"millis" : 0,
+	"planSummary" : "IXSCAN { k: 1 }",
 	"execStats" : {
 		"stage" : "FETCH",
-		"nReturned" : 6,
+		"nReturned" : 2,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 7,
-		"advanced" : 6,
+		"works" : 3,
+		"advanced" : 2,
 		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
 		"invalidates" : 0,
-		"docsExamined" : 6,
+		"docsExamined" : 2,
 		"alreadyHasObj" : 0,
 		"inputStage" : {
 			"stage" : "IXSCAN",
-			"nReturned" : 6,
+			"nReturned" : 2,
 			"executionTimeMillisEstimate" : 0,
-			"works" : 7,
-			"advanced" : 6,
+			"works" : 3,
+			"advanced" : 2,
 			"needTime" : 0,
 			"needYield" : 0,
 			"saveState" : 0,
@@ -61,12 +61,12 @@
 			"isEOF" : 1,
 			"invalidates" : 0,
 			"keyPattern" : {
-				"a" : 1
+				"k" : 1
 			},
-			"indexName" : "a_1",
+			"indexName" : "k_1",
 			"isMultiKey" : false,
 			"multiKeyPaths" : {
-				"a" : [ ]
+				"k" : [ ]
 			},
 			"isUnique" : false,
 			"isSparse" : false,
@@ -74,18 +74,18 @@
 			"indexVersion" : 2,
 			"direction" : "forward",
 			"indexBounds" : {
-				"a" : [
+				"k" : [
 					"[1.0, 1.0]"
 				]
 			},
-			"keysExamined" : 6,
+			"keysExamined" : 2,
 			"seeks" : 1,
 			"dupsTested" : 0,
 			"dupsDropped" : 0,
 			"seenInvalidated" : 0
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:48.107Z"),
+	"ts" : ISODate("2017-10-15T01:54:54.507Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/find_andrii_2.6.12

@@ -46,100 +46,27 @@
 	},
 	"ntoreturn" : 100,
 	"ntoskip" : 0,
-	"nscanned" : 98,
-	"nscannedObjects" : 98,
+	"nscanned" : 0,
+	"nscannedObjects" : 0,
 	"keyUpdates" : 0,
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(951),
+			"r" : NumberLong(298),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(3),
-			"w" : NumberLong(2)
+			"r" : NumberLong(5),
+			"w" : NumberLong(50)
 		}
 	},
 	"nreturned" : 0,
 	"responseLength" : 20,
 	"millis" : 0,
 	"execStats" : {
-		"type" : "OR",
-		"works" : 106,
-		"yields" : 0,
-		"unyields" : 0,
-		"invalidates" : 0,
-		"advanced" : 0,
-		"needTime" : 105,
-		"needFetch" : 0,
-		"isEOF" : 1,
-		"dupsTested" : 0,
-		"dupsDropped" : 0,
-		"locsForgotten" : 0,
-		"matchTested_0" : 0,
-		"matchTested_1" : 0,
-		"children" : [
-			{
-				"type" : "SORT",
-				"works" : 53,
-				"yields" : 0,
-				"unyields" : 0,
-				"invalidates" : 0,
-				"advanced" : 0,
-				"needTime" : 51,
-				"needFetch" : 0,
-				"isEOF" : 1,
-				"forcedFetches" : 0,
-				"memUsage" : 0,
-				"memLimit" : 33554432,
-				"children" : [
-					{
-						"type" : "COLLSCAN",
-						"works" : 51,
-						"yields" : 0,
-						"unyields" : 0,
-						"invalidates" : 0,
-						"advanced" : 0,
-						"needTime" : 50,
-						"needFetch" : 0,
-						"isEOF" : 1,
-						"docsTested" : 49,
-						"children" : [ ]
-					}
-				]
-			},
-			{
-				"type" : "SORT",
-				"works" : 53,
-				"yields" : 0,
-				"unyields" : 0,
-				"invalidates" : 0,
-				"advanced" : 0,
-				"needTime" : 51,
-				"needFetch" : 0,
-				"isEOF" : 1,
-				"forcedFetches" : 0,
-				"memUsage" : 0,
-				"memLimit" : 33554432,
-				"children" : [
-					{
-						"type" : "COLLSCAN",
-						"works" : 51,
-						"yields" : 0,
-						"unyields" : 0,
-						"invalidates" : 0,
-						"advanced" : 0,
-						"needTime" : 50,
-						"needFetch" : 0,
-						"isEOF" : 1,
-						"docsTested" : 49,
-						"children" : [ ]
-					}
-				]
-			}
-		]
+		
 	},
-	"ts" : ISODate("2017-08-20T15:39:15.616Z"),
+	"ts" : ISODate("2017-10-15T01:54:10.474Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_andrii_3.0.15

@@ -47,8 +47,7 @@
 	"ntoreturn" : 100,
 	"ntoskip" : 0,
 	"nscanned" : 0,
-	"nscannedObjects" : 98,
-	"scanAndOrder" : true,
+	"nscannedObjects" : 0,
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
 	"numYield" : 0,
@@ -78,169 +77,19 @@
 	"responseLength" : 20,
 	"millis" : 0,
 	"execStats" : {
-		"stage" : "OR",
+		"stage" : "EOF",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 106,
+		"works" : 1,
 		"advanced" : 0,
-		"needTime" : 105,
+		"needTime" : 0,
 		"needFetch" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
-		"invalidates" : 0,
-		"dupsTested" : 0,
-		"dupsDropped" : 0,
-		"locsForgotten" : 0,
-		"matchTested_0" : 0,
-		"matchTested_1" : 0,
-		"inputStages" : [
-			{
-				"stage" : "SORT",
-				"nReturned" : 0,
-				"executionTimeMillisEstimate" : 0,
-				"works" : 53,
-				"advanced" : 0,
-				"needTime" : 51,
-				"needFetch" : 0,
-				"saveState" : 0,
-				"restoreState" : 0,
-				"isEOF" : 1,
-				"invalidates" : 0,
-				"sortPattern" : {
-					"k" : -1
-				},
-				"memUsage" : 0,
-				"memLimit" : 33554432,
-				"limitAmount" : 100,
-				"inputStage" : {
-					"stage" : "COLLSCAN",
-					"filter" : {
-						"$and" : [
-							{
-								"$or" : [
-									{
-										"c" : {
-											"$in" : [
-												/^0/,
-												/^2/,
-												/^4/,
-												/^6/
-											]
-										}
-									},
-									{
-										"pad" : {
-											"$in" : [
-												/9$/,
-												/7$/,
-												/5$/,
-												/3$/
-											]
-										}
-									}
-								]
-							},
-							{
-								"k" : {
-									"$lt" : 2
-								}
-							},
-							{
-								"k" : {
-									"$gt" : 1
-								}
-							}
-						]
-					},
-					"nReturned" : 0,
-					"executionTimeMillisEstimate" : 0,
-					"works" : 51,
-					"advanced" : 0,
-					"needTime" : 50,
-					"needFetch" : 0,
-					"saveState" : 0,
-					"restoreState" : 0,
-					"isEOF" : 1,
-					"invalidates" : 0,
-					"direction" : "forward",
-					"docsExamined" : 49
-				}
-			},
-			{
-				"stage" : "SORT",
-				"nReturned" : 0,
-				"executionTimeMillisEstimate" : 0,
-				"works" : 53,
-				"advanced" : 0,
-				"needTime" : 51,
-				"needFetch" : 0,
-				"saveState" : 0,
-				"restoreState" : 0,
-				"isEOF" : 1,
-				"invalidates" : 0,
-				"sortPattern" : {
-					"k" : -1
-				},
-				"memUsage" : 0,
-				"memLimit" : 33554432,
-				"inputStage" : {
-					"stage" : "COLLSCAN",
-					"filter" : {
-						"$and" : [
-							{
-								"$or" : [
-									{
-										"c" : {
-											"$in" : [
-												/^0/,
-												/^2/,
-												/^4/,
-												/^6/
-											]
-										}
-									},
-									{
-										"pad" : {
-											"$in" : [
-												/9$/,
-												/7$/,
-												/5$/,
-												/3$/
-											]
-										}
-									}
-								]
-							},
-							{
-								"k" : {
-									"$lt" : 2
-								}
-							},
-							{
-								"k" : {
-									"$gt" : 1
-								}
-							}
-						]
-					},
-					"nReturned" : 0,
-					"executionTimeMillisEstimate" : 0,
-					"works" : 51,
-					"advanced" : 0,
-					"needTime" : 50,
-					"needFetch" : 0,
-					"saveState" : 0,
-					"restoreState" : 0,
-					"isEOF" : 1,
-					"invalidates" : 0,
-					"direction" : "forward",
-					"docsExamined" : 49
-				}
-			}
-		]
+		"invalidates" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:21.656Z"),
+	"ts" : ISODate("2017-10-15T01:54:20.111Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_andrii_3.2.16

@@ -48,8 +48,7 @@
 		}
 	},
 	"keysExamined" : 0,
-	"docsExamined" : 49,
-	"hasSortStage" : true,
+	"docsExamined" : 0,
 	"cursorExhausted" : true,
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
@@ -76,91 +75,19 @@
 	"protocol" : "op_command",
 	"millis" : 0,
 	"execStats" : {
-		"stage" : "SORT",
+		"stage" : "EOF",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 53,
+		"works" : 0,
 		"advanced" : 0,
-		"needTime" : 52,
+		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
-		"invalidates" : 0,
-		"sortPattern" : {
-			"k" : -1
-		},
-		"memUsage" : 0,
-		"memLimit" : 33554432,
-		"limitAmount" : 100,
-		"inputStage" : {
-			"stage" : "SORT_KEY_GENERATOR",
-			"nReturned" : 0,
-			"executionTimeMillisEstimate" : 0,
-			"works" : 52,
-			"advanced" : 0,
-			"needTime" : 51,
-			"needYield" : 0,
-			"saveState" : 0,
-			"restoreState" : 0,
-			"isEOF" : 1,
-			"invalidates" : 0,
-			"inputStage" : {
-				"stage" : "COLLSCAN",
-				"filter" : {
-					"$and" : [
-						{
-							"$or" : [
-								{
-									"c" : {
-										"$in" : [
-											/^0/,
-											/^2/,
-											/^4/,
-											/^6/
-										]
-									}
-								},
-								{
-									"pad" : {
-										"$in" : [
-											/9$/,
-											/7$/,
-											/5$/,
-											/3$/
-										]
-									}
-								}
-							]
-						},
-						{
-							"k" : {
-								"$lt" : 2
-							}
-						},
-						{
-							"k" : {
-								"$gt" : 1
-							}
-						}
-					]
-				},
-				"nReturned" : 0,
-				"executionTimeMillisEstimate" : 0,
-				"works" : 51,
-				"advanced" : 0,
-				"needTime" : 50,
-				"needYield" : 0,
-				"saveState" : 0,
-				"restoreState" : 0,
-				"isEOF" : 1,
-				"invalidates" : 0,
-				"direction" : "forward",
-				"docsExamined" : 49
-			}
-		}
+		"invalidates" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:31.085Z"),
+	"ts" : ISODate("2017-10-15T01:54:33.358Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_andrii_3.4.7

@@ -48,8 +48,7 @@
 		}
 	},
 	"keysExamined" : 0,
-	"docsExamined" : 49,
-	"hasSortStage" : true,
+	"docsExamined" : 0,
 	"cursorExhausted" : true,
 	"numYield" : 0,
 	"locks" : {
@@ -73,93 +72,21 @@
 	"responseLength" : 82,
 	"protocol" : "op_command",
 	"millis" : 0,
-	"planSummary" : "COLLSCAN",
+	"planSummary" : "EOF",
 	"execStats" : {
-		"stage" : "SORT",
+		"stage" : "EOF",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 53,
+		"works" : 0,
 		"advanced" : 0,
-		"needTime" : 52,
+		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
-		"invalidates" : 0,
-		"sortPattern" : {
-			"k" : -1
-		},
-		"memUsage" : 0,
-		"memLimit" : 33554432,
-		"limitAmount" : 100,
-		"inputStage" : {
-			"stage" : "SORT_KEY_GENERATOR",
-			"nReturned" : 0,
-			"executionTimeMillisEstimate" : 0,
-			"works" : 52,
-			"advanced" : 0,
-			"needTime" : 51,
-			"needYield" : 0,
-			"saveState" : 0,
-			"restoreState" : 0,
-			"isEOF" : 1,
-			"invalidates" : 0,
-			"inputStage" : {
-				"stage" : "COLLSCAN",
-				"filter" : {
-					"$and" : [
-						{
-							"$or" : [
-								{
-									"c" : {
-										"$in" : [
-											/^0/,
-											/^2/,
-											/^4/,
-											/^6/
-										]
-									}
-								},
-								{
-									"pad" : {
-										"$in" : [
-											/9$/,
-											/7$/,
-											/5$/,
-											/3$/
-										]
-									}
-								}
-							]
-						},
-						{
-							"k" : {
-								"$lt" : 2
-							}
-						},
-						{
-							"k" : {
-								"$gt" : 1
-							}
-						}
-					]
-				},
-				"nReturned" : 0,
-				"executionTimeMillisEstimate" : 0,
-				"works" : 51,
-				"advanced" : 0,
-				"needTime" : 50,
-				"needYield" : 0,
-				"saveState" : 0,
-				"restoreState" : 0,
-				"isEOF" : 1,
-				"invalidates" : 0,
-				"direction" : "forward",
-				"docsExamined" : 49
-			}
-		}
+		"invalidates" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:37.823Z"),
+	"ts" : ISODate("2017-10-15T01:54:43.922Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/find_andrii_3.5.11

@@ -49,8 +49,7 @@
 		"$db" : "test"
 	},
 	"keysExamined" : 0,
-	"docsExamined" : 49,
-	"hasSortStage" : true,
+	"docsExamined" : 0,
 	"cursorExhausted" : true,
 	"numYield" : 0,
 	"locks" : {
@@ -74,93 +73,21 @@
 	"responseLength" : 82,
 	"protocol" : "op_msg",
 	"millis" : 0,
-	"planSummary" : "COLLSCAN",
+	"planSummary" : "EOF",
 	"execStats" : {
-		"stage" : "SORT",
+		"stage" : "EOF",
 		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 53,
+		"works" : 0,
 		"advanced" : 0,
-		"needTime" : 52,
+		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
-		"invalidates" : 0,
-		"sortPattern" : {
-			"k" : -1
-		},
-		"memUsage" : 0,
-		"memLimit" : 33554432,
-		"limitAmount" : 100,
-		"inputStage" : {
-			"stage" : "SORT_KEY_GENERATOR",
-			"nReturned" : 0,
-			"executionTimeMillisEstimate" : 0,
-			"works" : 52,
-			"advanced" : 0,
-			"needTime" : 51,
-			"needYield" : 0,
-			"saveState" : 0,
-			"restoreState" : 0,
-			"isEOF" : 1,
-			"invalidates" : 0,
-			"inputStage" : {
-				"stage" : "COLLSCAN",
-				"filter" : {
-					"$and" : [
-						{
-							"$or" : [
-								{
-									"c" : {
-										"$in" : [
-											/^0/,
-											/^2/,
-											/^4/,
-											/^6/
-										]
-									}
-								},
-								{
-									"pad" : {
-										"$in" : [
-											/9$/,
-											/7$/,
-											/5$/,
-											/3$/
-										]
-									}
-								}
-							]
-						},
-						{
-							"k" : {
-								"$lt" : 2
-							}
-						},
-						{
-							"k" : {
-								"$gt" : 1
-							}
-						}
-					]
-				},
-				"nReturned" : 0,
-				"executionTimeMillisEstimate" : 0,
-				"works" : 51,
-				"advanced" : 0,
-				"needTime" : 50,
-				"needYield" : 0,
-				"saveState" : 0,
-				"restoreState" : 0,
-				"isEOF" : 1,
-				"invalidates" : 0,
-				"direction" : "forward",
-				"docsExamined" : 49
-			}
-		}
+		"invalidates" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:48.277Z"),
+	"ts" : ISODate("2017-10-15T01:54:54.693Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/find_empty_2.6.12

@@ -6,37 +6,27 @@
 	},
 	"ntoreturn" : 0,
 	"ntoskip" : 0,
-	"nscanned" : 49,
-	"nscannedObjects" : 49,
+	"nscanned" : 0,
+	"nscannedObjects" : 0,
 	"keyUpdates" : 0,
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(65),
+			"r" : NumberLong(189),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(9),
-			"w" : NumberLong(2)
+			"r" : NumberLong(14),
+			"w" : NumberLong(9)
 		}
 	},
-	"nreturned" : 49,
-	"responseLength" : 1846,
+	"nreturned" : 0,
+	"responseLength" : 20,
 	"millis" : 0,
 	"execStats" : {
-		"type" : "COLLSCAN",
-		"works" : 51,
-		"yields" : 0,
-		"unyields" : 0,
-		"invalidates" : 0,
-		"advanced" : 49,
-		"needTime" : 1,
-		"needFetch" : 0,
-		"isEOF" : 1,
-		"docsTested" : 49,
-		"children" : [ ]
+		
 	},
-	"ts" : ISODate("2017-08-20T15:39:15.750Z"),
+	"ts" : ISODate("2017-10-15T01:54:10.630Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_empty_3.0.15

@@ -7,7 +7,7 @@
 	"ntoreturn" : 0,
 	"ntoskip" : 0,
 	"nscanned" : 0,
-	"nscannedObjects" : 49,
+	"nscannedObjects" : 0,
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
 	"numYield" : 0,
@@ -33,28 +33,23 @@
 			}
 		}
 	},
-	"nreturned" : 49,
-	"responseLength" : 1846,
+	"nreturned" : 0,
+	"responseLength" : 20,
 	"millis" : 0,
 	"execStats" : {
-		"stage" : "COLLSCAN",
-		"filter" : {
-			"$and" : [ ]
-		},
-		"nReturned" : 49,
+		"stage" : "EOF",
+		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 51,
-		"advanced" : 49,
-		"needTime" : 1,
+		"works" : 1,
+		"advanced" : 0,
+		"needTime" : 0,
 		"needFetch" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
-		"invalidates" : 0,
-		"direction" : "forward",
-		"docsExamined" : 49
+		"invalidates" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:21.769Z"),
+	"ts" : ISODate("2017-10-15T01:54:20.246Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_empty_3.2.16

@@ -8,7 +8,7 @@
 		}
 	},
 	"keysExamined" : 0,
-	"docsExamined" : 49,
+	"docsExamined" : 0,
 	"cursorExhausted" : true,
 	"keyUpdates" : 0,
 	"writeConflicts" : 0,
@@ -30,29 +30,24 @@
 			}
 		}
 	},
-	"nreturned" : 49,
-	"responseLength" : 2112,
+	"nreturned" : 0,
+	"responseLength" : 100,
 	"protocol" : "op_command",
 	"millis" : 0,
 	"execStats" : {
-		"stage" : "COLLSCAN",
-		"filter" : {
-			"$and" : [ ]
-		},
-		"nReturned" : 49,
+		"stage" : "EOF",
+		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 51,
-		"advanced" : 49,
-		"needTime" : 1,
+		"works" : 0,
+		"advanced" : 0,
+		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
-		"invalidates" : 0,
-		"direction" : "forward",
-		"docsExamined" : 49
+		"invalidates" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:31.294Z"),
+	"ts" : ISODate("2017-10-15T01:54:33.530Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/find_empty_3.4.7

@@ -8,7 +8,7 @@
 		}
 	},
 	"keysExamined" : 0,
-	"docsExamined" : 49,
+	"docsExamined" : 0,
 	"cursorExhausted" : true,
 	"numYield" : 0,
 	"locks" : {
@@ -28,27 +28,25 @@
 			}
 		}
 	},
-	"nreturned" : 49,
-	"responseLength" : 2094,
+	"nreturned" : 0,
+	"responseLength" : 82,
 	"protocol" : "op_command",
 	"millis" : 0,
-	"planSummary" : "COLLSCAN",
+	"planSummary" : "EOF",
 	"execStats" : {
-		"stage" : "COLLSCAN",
-		"nReturned" : 49,
+		"stage" : "EOF",
+		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 51,
-		"advanced" : 49,
-		"needTime" : 1,
+		"works" : 0,
+		"advanced" : 0,
+		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
-		"invalidates" : 0,
-		"direction" : "forward",
-		"docsExamined" : 49
+		"invalidates" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:37.964Z"),
+	"ts" : ISODate("2017-10-15T01:54:44.129Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/find_empty_3.5.11

@@ -9,7 +9,7 @@
 		"$db" : "test"
 	},
 	"keysExamined" : 0,
-	"docsExamined" : 49,
+	"docsExamined" : 0,
 	"cursorExhausted" : true,
 	"numYield" : 0,
 	"locks" : {
@@ -29,27 +29,25 @@
 			}
 		}
 	},
-	"nreturned" : 49,
-	"responseLength" : 2094,
+	"nreturned" : 0,
+	"responseLength" : 82,
 	"protocol" : "op_msg",
 	"millis" : 0,
-	"planSummary" : "COLLSCAN",
+	"planSummary" : "EOF",
 	"execStats" : {
-		"stage" : "COLLSCAN",
-		"nReturned" : 49,
+		"stage" : "EOF",
+		"nReturned" : 0,
 		"executionTimeMillisEstimate" : 0,
-		"works" : 51,
-		"advanced" : 49,
-		"needTime" : 1,
+		"works" : 0,
+		"advanced" : 0,
+		"needTime" : 0,
 		"needYield" : 0,
 		"saveState" : 0,
 		"restoreState" : 0,
 		"isEOF" : 1,
-		"invalidates" : 0,
-		"direction" : "forward",
-		"docsExamined" : 49
+		"invalidates" : 0
 	},
-	"ts" : ISODate("2017-08-20T15:39:48.429Z"),
+	"ts" : ISODate("2017-10-15T01:54:54.870Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/find_with_sort_2.6.12

@@ -0,0 +1,102 @@
+{
+	"op" : "query",
+	"ns" : "test.coll",
+	"query" : {
+		"query" : {
+			"c" : 1
+		},
+		"orderby" : {
+			"b" : -1
+		}
+	},
+	"ntoreturn" : 0,
+	"ntoskip" : 0,
+	"nscanned" : 2,
+	"nscannedObjects" : 2,
+	"scanAndOrder" : true,
+	"keyUpdates" : 0,
+	"numYield" : 0,
+	"lockStats" : {
+		"timeLockedMicros" : {
+			"r" : NumberLong(508),
+			"w" : NumberLong(0)
+		},
+		"timeAcquiringMicros" : {
+			"r" : NumberLong(19),
+			"w" : NumberLong(38)
+		}
+	},
+	"nreturned" : 2,
+	"responseLength" : 108,
+	"millis" : 0,
+	"execStats" : {
+		"type" : "SORT",
+		"works" : 7,
+		"yields" : 0,
+		"unyields" : 0,
+		"invalidates" : 0,
+		"advanced" : 2,
+		"needTime" : 3,
+		"needFetch" : 0,
+		"isEOF" : 1,
+		"forcedFetches" : 0,
+		"memUsage" : 104,
+		"memLimit" : 33554432,
+		"children" : [
+			{
+				"type" : "KEEP_MUTATIONS",
+				"works" : 3,
+				"yields" : 0,
+				"unyields" : 0,
+				"invalidates" : 0,
+				"advanced" : 2,
+				"needTime" : 0,
+				"needFetch" : 0,
+				"isEOF" : 1,
+				"children" : [
+					{
+						"type" : "FETCH",
+						"works" : 3,
+						"yields" : 0,
+						"unyields" : 0,
+						"invalidates" : 0,
+						"advanced" : 2,
+						"needTime" : 0,
+						"needFetch" : 0,
+						"isEOF" : 1,
+						"alreadyHasObj" : 0,
+						"forcedFetches" : 0,
+						"matchTested" : 0,
+						"children" : [
+							{
+								"type" : "IXSCAN",
+								"works" : 3,
+								"yields" : 0,
+								"unyields" : 0,
+								"invalidates" : 0,
+								"advanced" : 2,
+								"needTime" : 0,
+								"needFetch" : 0,
+								"isEOF" : 1,
+								"keyPattern" : "{ c: 1.0 }",
+								"isMultiKey" : 0,
+								"boundsVerbose" : "field #0['c']: [1.0, 1.0]",
+								"yieldMovedCursor" : 0,
+								"dupsTested" : 0,
+								"dupsDropped" : 0,
+								"seenInvalidated" : 0,
+								"matchTested" : 0,
+								"keysExamined" : 2,
+								"children" : [ ]
+							}
+						]
+					}
+				]
+			}
+		]
+	},
+	"ts" : ISODate("2017-10-15T01:54:10.817Z"),
+	"client" : "127.0.0.1",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/find_with_sort_3.0.15

@@ -0,0 +1,124 @@
+{
+	"op" : "query",
+	"ns" : "test.coll",
+	"query" : {
+		"query" : {
+			"c" : 1
+		},
+		"orderby" : {
+			"b" : -1
+		}
+	},
+	"ntoreturn" : 0,
+	"ntoskip" : 0,
+	"nscanned" : 2,
+	"nscannedObjects" : 2,
+	"scanAndOrder" : true,
+	"keyUpdates" : 0,
+	"writeConflicts" : 0,
+	"numYield" : 0,
+	"locks" : {
+		"Global" : {
+			"acquireCount" : {
+				"r" : NumberLong(2)
+			}
+		},
+		"MMAPV1Journal" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Database" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Collection" : {
+			"acquireCount" : {
+				"R" : NumberLong(1)
+			}
+		}
+	},
+	"nreturned" : 2,
+	"responseLength" : 108,
+	"millis" : 0,
+	"execStats" : {
+		"stage" : "SORT",
+		"nReturned" : 2,
+		"executionTimeMillisEstimate" : 0,
+		"works" : 7,
+		"advanced" : 2,
+		"needTime" : 3,
+		"needFetch" : 0,
+		"saveState" : 0,
+		"restoreState" : 0,
+		"isEOF" : 1,
+		"invalidates" : 0,
+		"sortPattern" : {
+			"b" : -1
+		},
+		"memUsage" : 104,
+		"memLimit" : 33554432,
+		"inputStage" : {
+			"stage" : "KEEP_MUTATIONS",
+			"nReturned" : 2,
+			"executionTimeMillisEstimate" : 0,
+			"works" : 3,
+			"advanced" : 2,
+			"needTime" : 0,
+			"needFetch" : 0,
+			"saveState" : 0,
+			"restoreState" : 0,
+			"isEOF" : 1,
+			"invalidates" : 0,
+			"inputStage" : {
+				"stage" : "FETCH",
+				"nReturned" : 2,
+				"executionTimeMillisEstimate" : 0,
+				"works" : 3,
+				"advanced" : 2,
+				"needTime" : 0,
+				"needFetch" : 0,
+				"saveState" : 0,
+				"restoreState" : 0,
+				"isEOF" : 1,
+				"invalidates" : 0,
+				"docsExamined" : 2,
+				"alreadyHasObj" : 0,
+				"inputStage" : {
+					"stage" : "IXSCAN",
+					"nReturned" : 2,
+					"executionTimeMillisEstimate" : 0,
+					"works" : 3,
+					"advanced" : 2,
+					"needTime" : 0,
+					"needFetch" : 0,
+					"saveState" : 0,
+					"restoreState" : 0,
+					"isEOF" : 1,
+					"invalidates" : 0,
+					"keyPattern" : {
+						"c" : 1
+					},
+					"indexName" : "c_1",
+					"isMultiKey" : false,
+					"direction" : "forward",
+					"indexBounds" : {
+						"c" : [
+							"[1.0, 1.0]"
+						]
+					},
+					"keysExamined" : 2,
+					"dupsTested" : 0,
+					"dupsDropped" : 0,
+					"seenInvalidated" : 0,
+					"matchTested" : 0
+				}
+			}
+		}
+	},
+	"ts" : ISODate("2017-10-15T01:54:20.410Z"),
+	"client" : "127.0.0.1",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/find_with_sort_3.2.16

@@ -0,0 +1,123 @@
+{
+	"op" : "query",
+	"ns" : "test.coll",
+	"query" : {
+		"find" : "coll",
+		"filter" : {
+			"c" : 1
+		},
+		"sort" : {
+			"b" : -1
+		}
+	},
+	"keysExamined" : 2,
+	"docsExamined" : 2,
+	"hasSortStage" : true,
+	"cursorExhausted" : true,
+	"keyUpdates" : 0,
+	"writeConflicts" : 0,
+	"numYield" : 0,
+	"locks" : {
+		"Global" : {
+			"acquireCount" : {
+				"r" : NumberLong(2)
+			}
+		},
+		"Database" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Collection" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		}
+	},
+	"nreturned" : 2,
+	"responseLength" : 194,
+	"protocol" : "op_command",
+	"millis" : 0,
+	"execStats" : {
+		"stage" : "SORT",
+		"nReturned" : 2,
+		"executionTimeMillisEstimate" : 0,
+		"works" : 7,
+		"advanced" : 2,
+		"needTime" : 4,
+		"needYield" : 0,
+		"saveState" : 0,
+		"restoreState" : 0,
+		"isEOF" : 1,
+		"invalidates" : 0,
+		"sortPattern" : {
+			"b" : -1
+		},
+		"memUsage" : 104,
+		"memLimit" : 33554432,
+		"inputStage" : {
+			"stage" : "SORT_KEY_GENERATOR",
+			"nReturned" : 0,
+			"executionTimeMillisEstimate" : 0,
+			"works" : 4,
+			"advanced" : 0,
+			"needTime" : 1,
+			"needYield" : 0,
+			"saveState" : 0,
+			"restoreState" : 0,
+			"isEOF" : 1,
+			"invalidates" : 0,
+			"inputStage" : {
+				"stage" : "FETCH",
+				"nReturned" : 2,
+				"executionTimeMillisEstimate" : 0,
+				"works" : 3,
+				"advanced" : 2,
+				"needTime" : 0,
+				"needYield" : 0,
+				"saveState" : 0,
+				"restoreState" : 0,
+				"isEOF" : 1,
+				"invalidates" : 0,
+				"docsExamined" : 2,
+				"alreadyHasObj" : 0,
+				"inputStage" : {
+					"stage" : "IXSCAN",
+					"nReturned" : 2,
+					"executionTimeMillisEstimate" : 0,
+					"works" : 3,
+					"advanced" : 2,
+					"needTime" : 0,
+					"needYield" : 0,
+					"saveState" : 0,
+					"restoreState" : 0,
+					"isEOF" : 1,
+					"invalidates" : 0,
+					"keyPattern" : {
+						"c" : 1
+					},
+					"indexName" : "c_1",
+					"isMultiKey" : false,
+					"isUnique" : false,
+					"isSparse" : false,
+					"isPartial" : false,
+					"indexVersion" : 1,
+					"direction" : "forward",
+					"indexBounds" : {
+						"c" : [
+							"[1.0, 1.0]"
+						]
+					},
+					"keysExamined" : 2,
+					"dupsTested" : 0,
+					"dupsDropped" : 0,
+					"seenInvalidated" : 0
+				}
+			}
+		}
+	},
+	"ts" : ISODate("2017-10-15T01:54:33.762Z"),
+	"client" : "127.0.0.1",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/find_with_sort_3.4.7

@@ -0,0 +1,127 @@
+{
+	"op" : "query",
+	"ns" : "test.coll",
+	"query" : {
+		"find" : "coll",
+		"filter" : {
+			"c" : 1
+		},
+		"sort" : {
+			"b" : -1
+		}
+	},
+	"keysExamined" : 2,
+	"docsExamined" : 2,
+	"hasSortStage" : true,
+	"cursorExhausted" : true,
+	"numYield" : 0,
+	"locks" : {
+		"Global" : {
+			"acquireCount" : {
+				"r" : NumberLong(2)
+			}
+		},
+		"Database" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Collection" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		}
+	},
+	"nreturned" : 2,
+	"responseLength" : 176,
+	"protocol" : "op_command",
+	"millis" : 0,
+	"planSummary" : "IXSCAN { c: 1 }",
+	"execStats" : {
+		"stage" : "SORT",
+		"nReturned" : 2,
+		"executionTimeMillisEstimate" : 0,
+		"works" : 7,
+		"advanced" : 2,
+		"needTime" : 4,
+		"needYield" : 0,
+		"saveState" : 0,
+		"restoreState" : 0,
+		"isEOF" : 1,
+		"invalidates" : 0,
+		"sortPattern" : {
+			"b" : -1
+		},
+		"memUsage" : 104,
+		"memLimit" : 33554432,
+		"inputStage" : {
+			"stage" : "SORT_KEY_GENERATOR",
+			"nReturned" : 2,
+			"executionTimeMillisEstimate" : 0,
+			"works" : 4,
+			"advanced" : 2,
+			"needTime" : 1,
+			"needYield" : 0,
+			"saveState" : 0,
+			"restoreState" : 0,
+			"isEOF" : 1,
+			"invalidates" : 0,
+			"inputStage" : {
+				"stage" : "FETCH",
+				"nReturned" : 2,
+				"executionTimeMillisEstimate" : 0,
+				"works" : 3,
+				"advanced" : 2,
+				"needTime" : 0,
+				"needYield" : 0,
+				"saveState" : 0,
+				"restoreState" : 0,
+				"isEOF" : 1,
+				"invalidates" : 0,
+				"docsExamined" : 2,
+				"alreadyHasObj" : 0,
+				"inputStage" : {
+					"stage" : "IXSCAN",
+					"nReturned" : 2,
+					"executionTimeMillisEstimate" : 0,
+					"works" : 3,
+					"advanced" : 2,
+					"needTime" : 0,
+					"needYield" : 0,
+					"saveState" : 0,
+					"restoreState" : 0,
+					"isEOF" : 1,
+					"invalidates" : 0,
+					"keyPattern" : {
+						"c" : 1
+					},
+					"indexName" : "c_1",
+					"isMultiKey" : false,
+					"multiKeyPaths" : {
+						"c" : [ ]
+					},
+					"isUnique" : false,
+					"isSparse" : false,
+					"isPartial" : false,
+					"indexVersion" : 2,
+					"direction" : "forward",
+					"indexBounds" : {
+						"c" : [
+							"[1.0, 1.0]"
+						]
+					},
+					"keysExamined" : 2,
+					"seeks" : 1,
+					"dupsTested" : 0,
+					"dupsDropped" : 0,
+					"seenInvalidated" : 0
+				}
+			}
+		}
+	},
+	"ts" : ISODate("2017-10-15T01:54:44.423Z"),
+	"client" : "127.0.0.1",
+	"appName" : "MongoDB Shell",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/find_with_sort_3.5.11

@@ -0,0 +1,128 @@
+{
+	"op" : "query",
+	"ns" : "test.coll",
+	"command" : {
+		"find" : "coll",
+		"filter" : {
+			"c" : 1
+		},
+		"sort" : {
+			"b" : -1
+		},
+		"$db" : "test"
+	},
+	"keysExamined" : 2,
+	"docsExamined" : 2,
+	"hasSortStage" : true,
+	"cursorExhausted" : true,
+	"numYield" : 0,
+	"locks" : {
+		"Global" : {
+			"acquireCount" : {
+				"r" : NumberLong(2)
+			}
+		},
+		"Database" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Collection" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		}
+	},
+	"nreturned" : 2,
+	"responseLength" : 176,
+	"protocol" : "op_msg",
+	"millis" : 0,
+	"planSummary" : "IXSCAN { c: 1 }",
+	"execStats" : {
+		"stage" : "SORT",
+		"nReturned" : 2,
+		"executionTimeMillisEstimate" : 0,
+		"works" : 7,
+		"advanced" : 2,
+		"needTime" : 4,
+		"needYield" : 0,
+		"saveState" : 0,
+		"restoreState" : 0,
+		"isEOF" : 1,
+		"invalidates" : 0,
+		"sortPattern" : {
+			"b" : -1
+		},
+		"memUsage" : 104,
+		"memLimit" : 33554432,
+		"inputStage" : {
+			"stage" : "SORT_KEY_GENERATOR",
+			"nReturned" : 2,
+			"executionTimeMillisEstimate" : 0,
+			"works" : 4,
+			"advanced" : 2,
+			"needTime" : 1,
+			"needYield" : 0,
+			"saveState" : 0,
+			"restoreState" : 0,
+			"isEOF" : 1,
+			"invalidates" : 0,
+			"inputStage" : {
+				"stage" : "FETCH",
+				"nReturned" : 2,
+				"executionTimeMillisEstimate" : 0,
+				"works" : 3,
+				"advanced" : 2,
+				"needTime" : 0,
+				"needYield" : 0,
+				"saveState" : 0,
+				"restoreState" : 0,
+				"isEOF" : 1,
+				"invalidates" : 0,
+				"docsExamined" : 2,
+				"alreadyHasObj" : 0,
+				"inputStage" : {
+					"stage" : "IXSCAN",
+					"nReturned" : 2,
+					"executionTimeMillisEstimate" : 0,
+					"works" : 3,
+					"advanced" : 2,
+					"needTime" : 0,
+					"needYield" : 0,
+					"saveState" : 0,
+					"restoreState" : 0,
+					"isEOF" : 1,
+					"invalidates" : 0,
+					"keyPattern" : {
+						"c" : 1
+					},
+					"indexName" : "c_1",
+					"isMultiKey" : false,
+					"multiKeyPaths" : {
+						"c" : [ ]
+					},
+					"isUnique" : false,
+					"isSparse" : false,
+					"isPartial" : false,
+					"indexVersion" : 2,
+					"direction" : "forward",
+					"indexBounds" : {
+						"c" : [
+							"[1.0, 1.0]"
+						]
+					},
+					"keysExamined" : 2,
+					"seeks" : 1,
+					"dupsTested" : 0,
+					"dupsDropped" : 0,
+					"seenInvalidated" : 0
+				}
+			}
+		}
+	},
+	"ts" : ISODate("2017-10-15T01:54:55.111Z"),
+	"client" : "127.0.0.1",
+	"appName" : "MongoDB Shell",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/findandmodify_2.6.12

@@ -26,19 +26,19 @@
 	"lockStats" : {
 		"timeLockedMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(155)
+			"w" : NumberLong(465)
 		},
 		"timeAcquiringMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(5)
+			"w" : NumberLong(18)
 		}
 	},
 	"responseLength" : 131,
-	"millis" : 0,
+	"millis" : 6,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:15.903Z"),
+	"ts" : ISODate("2017-10-15T01:54:11.011Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/findandmodify_3.0.15

@@ -52,7 +52,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:21.902Z"),
+	"ts" : ISODate("2017-10-15T01:54:20.581Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/findandmodify_3.2.16

@@ -44,11 +44,11 @@
 	},
 	"responseLength" : 116,
 	"protocol" : "op_command",
-	"millis" : 0,
+	"millis" : 1,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:31.548Z"),
+	"ts" : ISODate("2017-10-15T01:54:34.011Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/findandmodify_3.4.7

@@ -44,7 +44,7 @@
 	},
 	"responseLength" : 116,
 	"protocol" : "op_command",
-	"millis" : 0,
+	"millis" : 1,
 	"planSummary" : "COLLSCAN",
 	"execStats" : {
 		"stage" : "UPDATE",
@@ -84,7 +84,7 @@
 			"docsExamined" : 3
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:38.196Z"),
+	"ts" : ISODate("2017-10-15T01:54:44.656Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/findandmodify_3.5.11

@@ -40,7 +40,7 @@
 	},
 	"responseLength" : 116,
 	"protocol" : "op_msg",
-	"millis" : 0,
+	"millis" : 1,
 	"planSummary" : "COLLSCAN",
 	"execStats" : {
 		"stage" : "UPDATE",
@@ -80,7 +80,7 @@
 			"docsExamined" : 3
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:48.636Z"),
+	"ts" : ISODate("2017-10-15T01:54:55.391Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/geonear_2.6.12

@@ -16,12 +16,12 @@
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(1851),
+			"r" : NumberLong(1945),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(3),
-			"w" : NumberLong(3)
+			"r" : NumberLong(10),
+			"w" : NumberLong(10)
 		}
 	},
 	"responseLength" : 1406,
@@ -29,7 +29,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:16.061Z"),
+	"ts" : ISODate("2017-10-15T01:54:11.181Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/geonear_3.0.15

@@ -38,11 +38,11 @@
 		}
 	},
 	"responseLength" : 1398,
-	"millis" : 3,
+	"millis" : 2,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:22.055Z"),
+	"ts" : ISODate("2017-10-15T01:54:20.751Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/geonear_3.2.16

@@ -34,11 +34,11 @@
 	},
 	"responseLength" : 1401,
 	"protocol" : "op_command",
-	"millis" : 8,
+	"millis" : 10,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:31.797Z"),
+	"ts" : ISODate("2017-10-15T01:54:34.270Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/geonear_3.4.7

@@ -34,12 +34,12 @@
 	},
 	"responseLength" : 1383,
 	"protocol" : "op_command",
-	"millis" : 11,
+	"millis" : 13,
 	"planSummary" : "GEO_NEAR_2DSPHERE { loc: \"2dsphere\" }",
 	"execStats" : {
 		"stage" : "LIMIT",
 		"nReturned" : 10,
-		"executionTimeMillisEstimate" : 0,
+		"executionTimeMillisEstimate" : 10,
 		"works" : 139,
 		"advanced" : 10,
 		"needTime" : 128,
@@ -52,7 +52,7 @@
 		"inputStage" : {
 			"stage" : "PROJECTION",
 			"nReturned" : 10,
-			"executionTimeMillisEstimate" : 0,
+			"executionTimeMillisEstimate" : 10,
 			"works" : 139,
 			"advanced" : 10,
 			"needTime" : 128,
@@ -72,7 +72,7 @@
 			"inputStage" : {
 				"stage" : "GEO_NEAR_2DSPHERE",
 				"nReturned" : 10,
-				"executionTimeMillisEstimate" : 0,
+				"executionTimeMillisEstimate" : 10,
 				"works" : 139,
 				"advanced" : 10,
 				"needTime" : 128,
@@ -3557,7 +3557,7 @@
 			}
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:38.432Z"),
+	"ts" : ISODate("2017-10-15T01:54:44.873Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/geonear_3.5.11

@@ -35,7 +35,7 @@
 	},
 	"responseLength" : 1383,
 	"protocol" : "op_msg",
-	"millis" : 7,
+	"millis" : 11,
 	"planSummary" : "GEO_NEAR_2DSPHERE { loc: \"2dsphere\" }",
 	"execStats" : {
 		"stage" : "LIMIT",
@@ -73,7 +73,7 @@
 			"inputStage" : {
 				"stage" : "GEO_NEAR_2DSPHERE",
 				"nReturned" : 10,
-				"executionTimeMillisEstimate" : 10,
+				"executionTimeMillisEstimate" : 0,
 				"works" : 139,
 				"advanced" : 10,
 				"needTime" : 128,
@@ -3558,7 +3558,7 @@
 			}
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:48.842Z"),
+	"ts" : ISODate("2017-10-15T01:54:55.701Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/getmore_2.6.12

@@ -0,0 +1,33 @@
+{
+	"op" : "getmore",
+	"ns" : "test.coll",
+	"query" : {
+		"a" : {
+			"$gt" : 0
+		}
+	},
+	"cursorid" : 73529665157,
+	"ntoreturn" : 2,
+	"keyUpdates" : 0,
+	"numYield" : 0,
+	"lockStats" : {
+		"timeLockedMicros" : {
+			"r" : NumberLong(29),
+			"w" : NumberLong(0)
+		},
+		"timeAcquiringMicros" : {
+			"r" : NumberLong(5),
+			"w" : NumberLong(4)
+		}
+	},
+	"nreturned" : 2,
+	"responseLength" : 86,
+	"millis" : 0,
+	"execStats" : {
+		
+	},
+	"ts" : ISODate("2017-10-15T01:54:11.360Z"),
+	"client" : "127.0.0.1",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/getmore_3.0.15

@@ -0,0 +1,46 @@
+{
+	"op" : "getmore",
+	"ns" : "test.coll",
+	"query" : {
+		"a" : {
+			"$gt" : 0
+		}
+	},
+	"cursorid" : 77879406118,
+	"ntoreturn" : 2,
+	"keyUpdates" : 0,
+	"writeConflicts" : 0,
+	"numYield" : 0,
+	"locks" : {
+		"Global" : {
+			"acquireCount" : {
+				"r" : NumberLong(2)
+			}
+		},
+		"MMAPV1Journal" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Database" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Collection" : {
+			"acquireCount" : {
+				"R" : NumberLong(1)
+			}
+		}
+	},
+	"nreturned" : 0,
+	"responseLength" : 20,
+	"millis" : 0,
+	"execStats" : {
+		
+	},
+	"ts" : ISODate("2017-10-15T01:54:20.995Z"),
+	"client" : "127.0.0.1",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/getmore_3.2.16

@@ -0,0 +1,44 @@
+{
+	"op" : "getmore",
+	"ns" : "test.coll",
+	"query" : {
+		"getMore" : NumberLong("62137702161"),
+		"collection" : "coll",
+		"batchSize" : 2
+	},
+	"cursorid" : 62137702161,
+	"keysExamined" : 0,
+	"docsExamined" : 0,
+	"cursorExhausted" : true,
+	"keyUpdates" : 0,
+	"writeConflicts" : 0,
+	"numYield" : 0,
+	"locks" : {
+		"Global" : {
+			"acquireCount" : {
+				"r" : NumberLong(2)
+			}
+		},
+		"Database" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Collection" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		}
+	},
+	"nreturned" : 0,
+	"responseLength" : 81,
+	"protocol" : "op_command",
+	"millis" : 0,
+	"execStats" : {
+		
+	},
+	"ts" : ISODate("2017-10-15T01:54:34.569Z"),
+	"client" : "127.0.0.1",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/getmore_3.4.7

@@ -0,0 +1,103 @@
+{
+	"op" : "getmore",
+	"ns" : "test.coll",
+	"query" : {
+		"getMore" : NumberLong("66029137874"),
+		"collection" : "coll",
+		"batchSize" : 2
+	},
+	"originatingCommand" : {
+		"find" : "coll",
+		"filter" : {
+			"a" : {
+				"$gt" : 0
+			}
+		},
+		"batchSize" : 2,
+		"sort" : {
+			"a" : 1
+		}
+	},
+	"cursorid" : 66029137874,
+	"keysExamined" : 2,
+	"docsExamined" : 2,
+	"numYield" : 0,
+	"locks" : {
+		"Global" : {
+			"acquireCount" : {
+				"r" : NumberLong(2)
+			}
+		},
+		"Database" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Collection" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		}
+	},
+	"nreturned" : 2,
+	"responseLength" : 153,
+	"protocol" : "op_command",
+	"millis" : 0,
+	"planSummary" : "IXSCAN { a: 1 }",
+	"execStats" : {
+		"stage" : "FETCH",
+		"nReturned" : 8,
+		"executionTimeMillisEstimate" : 0,
+		"works" : 8,
+		"advanced" : 8,
+		"needTime" : 0,
+		"needYield" : 0,
+		"saveState" : 3,
+		"restoreState" : 3,
+		"isEOF" : 0,
+		"invalidates" : 0,
+		"docsExamined" : 8,
+		"alreadyHasObj" : 0,
+		"inputStage" : {
+			"stage" : "IXSCAN",
+			"nReturned" : 8,
+			"executionTimeMillisEstimate" : 0,
+			"works" : 8,
+			"advanced" : 8,
+			"needTime" : 0,
+			"needYield" : 0,
+			"saveState" : 3,
+			"restoreState" : 3,
+			"isEOF" : 0,
+			"invalidates" : 0,
+			"keyPattern" : {
+				"a" : 1
+			},
+			"indexName" : "a_1",
+			"isMultiKey" : false,
+			"multiKeyPaths" : {
+				"a" : [ ]
+			},
+			"isUnique" : false,
+			"isSparse" : false,
+			"isPartial" : false,
+			"indexVersion" : 2,
+			"direction" : "forward",
+			"indexBounds" : {
+				"a" : [
+					"(0.0, inf.0]"
+				]
+			},
+			"keysExamined" : 8,
+			"seeks" : 1,
+			"dupsTested" : 0,
+			"dupsDropped" : 0,
+			"seenInvalidated" : 0
+		}
+	},
+	"ts" : ISODate("2017-10-15T01:54:45.251Z"),
+	"client" : "127.0.0.1",
+	"appName" : "MongoDB Shell",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/getmore_3.5.11

@@ -0,0 +1,106 @@
+{
+	"op" : "getmore",
+	"ns" : "test.coll",
+	"command" : {
+		"getMore" : NumberLong("62495713089"),
+		"collection" : "coll",
+		"batchSize" : 2,
+		"$db" : "test"
+	},
+	"originatingCommand" : {
+		"find" : "coll",
+		"filter" : {
+			"a" : {
+				"$gt" : 0
+			}
+		},
+		"batchSize" : 2,
+		"sort" : {
+			"a" : 1
+		},
+		"$db" : "test"
+	},
+	"cursorid" : 62495713089,
+	"keysExamined" : 0,
+	"docsExamined" : 0,
+	"cursorExhausted" : true,
+	"numYield" : 0,
+	"locks" : {
+		"Global" : {
+			"acquireCount" : {
+				"r" : NumberLong(2)
+			}
+		},
+		"Database" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		},
+		"Collection" : {
+			"acquireCount" : {
+				"r" : NumberLong(1)
+			}
+		}
+	},
+	"nreturned" : 0,
+	"responseLength" : 81,
+	"protocol" : "op_msg",
+	"millis" : 0,
+	"planSummary" : "IXSCAN { a: 1 }",
+	"execStats" : {
+		"stage" : "FETCH",
+		"nReturned" : 8,
+		"executionTimeMillisEstimate" : 0,
+		"works" : 9,
+		"advanced" : 8,
+		"needTime" : 0,
+		"needYield" : 0,
+		"saveState" : 4,
+		"restoreState" : 4,
+		"isEOF" : 1,
+		"invalidates" : 0,
+		"docsExamined" : 8,
+		"alreadyHasObj" : 0,
+		"inputStage" : {
+			"stage" : "IXSCAN",
+			"nReturned" : 8,
+			"executionTimeMillisEstimate" : 0,
+			"works" : 9,
+			"advanced" : 8,
+			"needTime" : 0,
+			"needYield" : 0,
+			"saveState" : 4,
+			"restoreState" : 4,
+			"isEOF" : 1,
+			"invalidates" : 0,
+			"keyPattern" : {
+				"a" : 1
+			},
+			"indexName" : "a_1",
+			"isMultiKey" : false,
+			"multiKeyPaths" : {
+				"a" : [ ]
+			},
+			"isUnique" : false,
+			"isSparse" : false,
+			"isPartial" : false,
+			"indexVersion" : 2,
+			"direction" : "forward",
+			"indexBounds" : {
+				"a" : [
+					"(0.0, inf.0]"
+				]
+			},
+			"keysExamined" : 8,
+			"seeks" : 1,
+			"dupsTested" : 0,
+			"dupsDropped" : 0,
+			"seenInvalidated" : 0
+		}
+	},
+	"ts" : ISODate("2017-10-15T01:54:56.186Z"),
+	"client" : "127.0.0.1",
+	"appName" : "MongoDB Shell",
+	"allUsers" : [ ],
+	"user" : ""
+}

src/go/tests/doc/out/group_2.6.12

@@ -21,20 +21,20 @@
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(77899),
+			"r" : NumberLong(36629),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(3),
-			"w" : NumberLong(2075)
+			"r" : NumberLong(6),
+			"w" : NumberLong(6)
 		}
 	},
 	"responseLength" : 135,
-	"millis" : 77,
+	"millis" : 36,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:16.325Z"),
+	"ts" : ISODate("2017-10-15T01:54:11.599Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/group_3.0.15

@@ -43,11 +43,11 @@
 		}
 	},
 	"responseLength" : 139,
-	"millis" : 54,
+	"millis" : 26,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:22.271Z"),
+	"ts" : ISODate("2017-10-15T01:54:21.188Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/group_3.2.16

@@ -39,11 +39,11 @@
 	},
 	"responseLength" : 142,
 	"protocol" : "op_command",
-	"millis" : 74,
+	"millis" : 31,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:32.101Z"),
+	"ts" : ISODate("2017-10-15T01:54:34.867Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/group_3.4.7

@@ -41,12 +41,12 @@
 	},
 	"responseLength" : 124,
 	"protocol" : "op_command",
-	"millis" : 77,
+	"millis" : 31,
 	"planSummary" : "IXSCAN { b: -1 }",
 	"execStats" : {
 		"stage" : "GROUP",
 		"nReturned" : 1,
-		"executionTimeMillisEstimate" : 75,
+		"executionTimeMillisEstimate" : 31,
 		"works" : 4,
 		"advanced" : 1,
 		"needTime" : 3,
@@ -108,7 +108,7 @@
 			}
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:38.886Z"),
+	"ts" : ISODate("2017-10-15T01:54:45.500Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/group_3.5.11

@@ -42,12 +42,12 @@
 	},
 	"responseLength" : 124,
 	"protocol" : "op_msg",
-	"millis" : 68,
+	"millis" : 24,
 	"planSummary" : "IXSCAN { b: -1 }",
 	"execStats" : {
 		"stage" : "GROUP",
 		"nReturned" : 1,
-		"executionTimeMillisEstimate" : 64,
+		"executionTimeMillisEstimate" : 25,
 		"works" : 4,
 		"advanced" : 1,
 		"needTime" : 3,
@@ -109,7 +109,7 @@
 			}
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:49.276Z"),
+	"ts" : ISODate("2017-10-15T01:54:56.478Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/insert_2.6.12

@@ -10,18 +10,18 @@
 	"lockStats" : {
 		"timeLockedMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(90)
+			"w" : NumberLong(362)
 		},
 		"timeAcquiringMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(4)
+			"w" : NumberLong(11)
 		}
 	},
 	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:16.473Z"),
+	"ts" : ISODate("2017-10-15T01:54:11.737Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/insert_3.0.15

@@ -11,31 +11,37 @@
 	"locks" : {
 		"Global" : {
 			"acquireCount" : {
-				"r" : NumberLong(1),
-				"w" : NumberLong(1)
+				"r" : NumberLong(2),
+				"w" : NumberLong(2)
 			}
 		},
 		"MMAPV1Journal" : {
 			"acquireCount" : {
-				"w" : NumberLong(2)
+				"w" : NumberLong(4)
 			}
 		},
 		"Database" : {
 			"acquireCount" : {
-				"w" : NumberLong(1)
+				"w" : NumberLong(1),
+				"W" : NumberLong(1)
 			}
 		},
 		"Collection" : {
 			"acquireCount" : {
-				"W" : NumberLong(1)
+				"W" : NumberLong(2)
+			}
+		},
+		"Metadata" : {
+			"acquireCount" : {
+				"W" : NumberLong(2)
 			}
 		}
 	},
-	"millis" : 0,
+	"millis" : 4,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:22.409Z"),
+	"ts" : ISODate("2017-10-15T01:54:21.346Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/insert_3.2.16

@@ -17,28 +17,30 @@
 	"locks" : {
 		"Global" : {
 			"acquireCount" : {
-				"r" : NumberLong(1),
-				"w" : NumberLong(1)
+				"r" : NumberLong(2),
+				"w" : NumberLong(2)
 			}
 		},
 		"Database" : {
 			"acquireCount" : {
-				"w" : NumberLong(1)
+				"w" : NumberLong(1),
+				"W" : NumberLong(1)
 			}
 		},
 		"Collection" : {
 			"acquireCount" : {
-				"w" : NumberLong(1)
+				"w" : NumberLong(1),
+				"W" : NumberLong(1)
 			}
 		}
 	},
 	"responseLength" : 25,
 	"protocol" : "op_command",
-	"millis" : 0,
+	"millis" : 11,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:32.303Z"),
+	"ts" : ISODate("2017-10-15T01:54:35.088Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/insert_3.4.7

@@ -11,30 +11,31 @@
 		"ordered" : true
 	},
 	"ninserted" : 1,
-	"keysInserted" : 2,
+	"keysInserted" : 1,
 	"numYield" : 0,
 	"locks" : {
 		"Global" : {
 			"acquireCount" : {
-				"r" : NumberLong(1),
-				"w" : NumberLong(1)
+				"r" : NumberLong(3),
+				"w" : NumberLong(3)
 			}
 		},
 		"Database" : {
 			"acquireCount" : {
-				"w" : NumberLong(1)
+				"w" : NumberLong(2),
+				"W" : NumberLong(1)
 			}
 		},
 		"Collection" : {
 			"acquireCount" : {
-				"w" : NumberLong(1)
+				"w" : NumberLong(2)
 			}
 		}
 	},
 	"responseLength" : 29,
 	"protocol" : "op_command",
-	"millis" : 0,
-	"ts" : ISODate("2017-08-20T15:39:39.023Z"),
+	"millis" : 11,
+	"ts" : ISODate("2017-10-15T01:54:45.681Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/insert_3.5.11

@@ -7,30 +7,31 @@
 		"$db" : "test"
 	},
 	"ninserted" : 1,
-	"keysInserted" : 2,
+	"keysInserted" : 1,
 	"numYield" : 0,
 	"locks" : {
 		"Global" : {
 			"acquireCount" : {
-				"r" : NumberLong(1),
-				"w" : NumberLong(1)
+				"r" : NumberLong(3),
+				"w" : NumberLong(3)
 			}
 		},
 		"Database" : {
 			"acquireCount" : {
-				"w" : NumberLong(1)
+				"w" : NumberLong(2),
+				"W" : NumberLong(1)
 			}
 		},
 		"Collection" : {
 			"acquireCount" : {
-				"w" : NumberLong(1)
+				"w" : NumberLong(2)
 			}
 		}
 	},
 	"responseLength" : 29,
 	"protocol" : "op_msg",
-	"millis" : 0,
-	"ts" : ISODate("2017-08-20T15:39:49.440Z"),
+	"millis" : 11,
+	"ts" : ISODate("2017-10-15T01:54:56.693Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/mapreduce_2.6.12

@@ -22,20 +22,20 @@
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
-			"r" : NumberLong(226),
+			"r" : NumberLong(650),
 			"w" : NumberLong(0)
 		},
 		"timeAcquiringMicros" : {
-			"r" : NumberLong(4),
-			"w" : NumberLong(13)
+			"r" : NumberLong(17),
+			"w" : NumberLong(15)
 		}
 	},
 	"responseLength" : 233,
-	"millis" : 33,
+	"millis" : 29,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:16.701Z"),
+	"ts" : ISODate("2017-10-15T01:54:11.959Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/mapreduce_3.0.15

@@ -49,11 +49,11 @@
 		}
 	},
 	"responseLength" : 233,
-	"millis" : 26,
+	"millis" : 21,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:22.582Z"),
+	"ts" : ISODate("2017-10-15T01:54:21.559Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/mapreduce_3.2.16

@@ -49,11 +49,11 @@
 	},
 	"responseLength" : 218,
 	"protocol" : "op_command",
-	"millis" : 31,
+	"millis" : 41,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:32.572Z"),
+	"ts" : ISODate("2017-10-15T01:54:35.348Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/mapreduce_3.4.7

@@ -20,11 +20,11 @@
 	},
 	"keysExamined" : 3,
 	"docsExamined" : 3,
-	"numYield" : 0,
+	"numYield" : 1,
 	"locks" : {
 		"Global" : {
 			"acquireCount" : {
-				"r" : NumberLong(11),
+				"r" : NumberLong(13),
 				"w" : NumberLong(1)
 			}
 		},
@@ -32,7 +32,7 @@
 			"acquireCount" : {
 				"r" : NumberLong(3),
 				"w" : NumberLong(1),
-				"R" : NumberLong(2)
+				"R" : NumberLong(3)
 			}
 		},
 		"Collection" : {
@@ -49,18 +49,18 @@
 	},
 	"responseLength" : 218,
 	"protocol" : "op_command",
-	"millis" : 43,
+	"millis" : 21,
 	"planSummary" : "IXSCAN { a: 1 }",
 	"execStats" : {
 		"stage" : "FETCH",
 		"nReturned" : 3,
-		"executionTimeMillisEstimate" : 0,
+		"executionTimeMillisEstimate" : 11,
 		"works" : 4,
 		"advanced" : 3,
 		"needTime" : 0,
 		"needYield" : 0,
-		"saveState" : 0,
-		"restoreState" : 0,
+		"saveState" : 1,
+		"restoreState" : 1,
 		"isEOF" : 1,
 		"invalidates" : 0,
 		"docsExamined" : 3,
@@ -68,13 +68,13 @@
 		"inputStage" : {
 			"stage" : "IXSCAN",
 			"nReturned" : 3,
-			"executionTimeMillisEstimate" : 0,
+			"executionTimeMillisEstimate" : 11,
 			"works" : 4,
 			"advanced" : 3,
 			"needTime" : 0,
 			"needYield" : 0,
-			"saveState" : 0,
-			"restoreState" : 0,
+			"saveState" : 1,
+			"restoreState" : 1,
 			"isEOF" : 1,
 			"invalidates" : 0,
 			"keyPattern" : {
@@ -102,7 +102,7 @@
 			"seenInvalidated" : 0
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:39.249Z"),
+	"ts" : ISODate("2017-10-15T01:54:45.925Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/mapreduce_3.5.11

@@ -50,7 +50,7 @@
 	},
 	"responseLength" : 218,
 	"protocol" : "op_msg",
-	"millis" : 35,
+	"millis" : 26,
 	"planSummary" : "IXSCAN { a: 1 }",
 	"execStats" : {
 		"stage" : "FETCH",
@@ -103,7 +103,7 @@
 			"seenInvalidated" : 0
 		}
 	},
-	"ts" : ISODate("2017-08-20T15:39:49.680Z"),
+	"ts" : ISODate("2017-10-15T01:54:56.951Z"),
 	"client" : "127.0.0.1",
 	"appName" : "MongoDB Shell",
 	"allUsers" : [ ],

src/go/tests/doc/out/update_2.6.12

@@ -16,27 +16,25 @@
 	},
 	"nscanned" : 1,
 	"nscannedObjects" : 1,
-	"moved" : true,
-	"nmoved" : 1,
 	"nMatched" : 1,
 	"nModified" : 1,
-	"keyUpdates" : 0,
+	"keyUpdates" : 1,
 	"numYield" : 0,
 	"lockStats" : {
 		"timeLockedMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(285)
+			"w" : NumberLong(241)
 		},
 		"timeAcquiringMicros" : {
 			"r" : NumberLong(0),
-			"w" : NumberLong(4)
+			"w" : NumberLong(16)
 		}
 	},
 	"millis" : 0,
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:16.921Z"),
+	"ts" : ISODate("2017-10-15T01:54:12.161Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""

src/go/tests/doc/out/update_3.0.15

@@ -16,11 +16,9 @@
 	},
 	"nscanned" : 1,
 	"nscannedObjects" : 1,
-	"moved" : true,
-	"nmoved" : 1,
 	"nMatched" : 1,
 	"nModified" : 1,
-	"keyUpdates" : 0,
+	"keyUpdates" : 1,
 	"writeConflicts" : 0,
 	"numYield" : 0,
 	"locks" : {
@@ -50,7 +48,7 @@
 	"execStats" : {
 		
 	},
-	"ts" : ISODate("2017-08-20T15:39:22.788Z"),
+	"ts" : ISODate("2017-10-15T01:54:21.803Z"),
 	"client" : "127.0.0.1",
 	"allUsers" : [ ],
 	"user" : ""