Legacy operations bug fixes.

GODRIVER-1322

Change-Id: I63682138c3238986534cfe6b420c67a169a2e7bd

Author: Divjot Arora

mongo/operation_legacy_test.go

@@ -259,11 +259,10 @@ func TestOperationLegacy(t *testing.T) {
 			{"hint", "hintFoo"},
 			{"limit", int64(5)},
 			{"max", maxDoc},
-			{"maxScan", int64(100)},
 			{"maxTimeMS", int64(10000)},
 			{"min", minDoc},
 			{"noCursorTimeout", true},
-			{"oplogReply", true},
+			{"oplogReplay", true},
 			{"projection", projection},
 			{"returnKey", false},
 			{"showRecordId", false},
@@ -287,7 +286,6 @@ func TestOperationLegacy(t *testing.T) {
 			{"$comment", "hello"},
 			{"$hint", "hintFoo"},
 			{"$max", maxDoc},
-			{"$maxScan", int64(100)},
 			{"$maxTimeMS", int64(10000)},
 			{"$min", minDoc},
 			{"$returnKey", false},

mongo/options/indexoptions.go

@@ -105,6 +105,9 @@ func MergeListIndexesOptions(opts ...*ListIndexesOptions) *ListIndexesOptions {
 		if opt == nil {
 			continue
 		}
+		if opt.BatchSize != nil {
+			c.BatchSize = opt.BatchSize
+		}
 		if opt.MaxTime != nil {
 			c.MaxTime = opt.MaxTime
 		}

x/mongo/driver/operation_legacy.go

@@ -107,8 +107,6 @@ func (op Operation) createLegacyFindWireMessage(dst []byte, desc description.Sel
 			optsElems = bsoncore.AppendValueElement(optsElems, "$hint", elem.Value())
 		case "comment":
 			optsElems = bsoncore.AppendValueElement(optsElems, "$comment", elem.Value())
-		case "maxScan":
-			optsElems = bsoncore.AppendValueElement(optsElems, "$maxScan", elem.Value())
 		case "max":
 			optsElems = bsoncore.AppendValueElement(optsElems, "$max", elem.Value())
 		case "min":
@@ -141,7 +139,7 @@ func (op Operation) createLegacyFindWireMessage(dst []byte, desc description.Sel
 			flags |= wiremessage.TailableCursor
 		case "awaitData":
 			flags |= wiremessage.AwaitData
-		case "oplogReply":
+		case "oplogReplay":
 			flags |= wiremessage.OplogReplay
 		case "noCursorTimeout":
 			flags |= wiremessage.NoCursorTimeout
@@ -560,8 +558,12 @@ func (op Operation) createLegacyListIndexesWiremessage(dst []byte, desc descript
 		switch elem.Key() {
 		case "listIndexes":
 			filterCollName = elem.Value().StringValue()
-		case "batchSize":
-			batchSize = elem.Value().Int32()
+		case "cursor":
+			// the batchSize option is embedded in a cursor subdocument
+			cursorDoc := elem.Value().Document()
+			if val, err := cursorDoc.LookupErr("batchSize"); err == nil {
+				batchSize = val.Int32()
+			}
 		case "maxTimeMS":
 			optsElems = bsoncore.AppendValueElement(optsElems, "$maxTimeMS", elem.Value())
 		}