Set limit to -1 for Collection.FindOne

Divjot Arora · Divjot Arora · commit 2edf2a22890f · 2019-06-05T12:49:24.000-04:00
GODRIVER-1112 Change-Id: I9f7b5b9c4a49bb54099b47422b605073f9790540
diff --git a/mongo/collection.go b/mongo/collection.go
@@ -991,6 +991,9 @@ func (coll *Collection) FindOne(ctx context.Context, filter interface{},
 			Sort:                opt.Sort,
 		}
 	}
+	// Unconditionally send a limit to make sure only one document is returned and the cursor is not kept open
+	// by the server.
+	findOpts = append(findOpts, options.Find().SetLimit(-1))
 
 	batchCursor, err := driver.Find(
 		ctx, cmd,

Original file line number	Diff line number	Diff line change
`@@ -991,6 +991,9 @@ func (coll *Collection) FindOne(ctx context.Context, filter interface{},`
`991`	`991`	`Sort: opt.Sort,`
`992`	`992`	`}`
`993`	`993`	`}`
	`994`	`+ // Unconditionally send a limit to make sure only one document is returned and the cursor is not kept open`
	`995`	`+ // by the server.`
	`996`	`+ findOpts = append(findOpts, options.Find().SetLimit(-1))`
`994`	`997`
`995`	`998`	`batchCursor, err := driver.Find(`
`996`	`999`	`ctx, cmd,`