From 1f6d2cda4551ed9f9b4828d2288606b1785588a2 Mon Sep 17 00:00:00 2001 From: emadum Date: Tue, 19 Jan 2021 16:21:09 -0500 Subject: [PATCH 1/3] fix(find): correctly translate timeout option into noCursorTimeout --- src/cmap/connection.ts | 2 +- src/operations/find.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmap/connection.ts b/src/cmap/connection.ts index 1a93d1b77f7..bc6189e651c 100644 --- a/src/cmap/connection.ts +++ b/src/cmap/connection.ts @@ -439,7 +439,7 @@ export class Connection extends EventEmitter { } if (typeof options.timeout === 'boolean') { - query.noCursorTimeout = options.timeout; + query.noCursorTimeout = !options.timeout; } else if (typeof options.noCursorTimeout === 'boolean') { query.noCursorTimeout = options.noCursorTimeout; } diff --git a/src/operations/find.ts b/src/operations/find.ts index 643ba6b3b70..93864c89488 100644 --- a/src/operations/find.ts +++ b/src/operations/find.ts @@ -264,7 +264,7 @@ function makeFindCommand(ns: MongoDBNamespace, filter: Document, options: FindOp } if (typeof options.timeout === 'boolean') { - findCommand.noCursorTimeout = options.timeout; + findCommand.noCursorTimeout = !options.timeout; } else if (typeof options.noCursorTimeout === 'boolean') { findCommand.noCursorTimeout = options.noCursorTimeout; } From 8db6dab5e8e9ea81192b0a7f6d6dc3660ddf1c3e Mon Sep 17 00:00:00 2001 From: emadum Date: Tue, 19 Jan 2021 17:28:35 -0500 Subject: [PATCH 2/3] fix test --- test/functional/find.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/find.test.js b/test/functional/find.test.js index c3cbb12eaef..b6161a2f7d9 100644 --- a/test/functional/find.test.js +++ b/test/functional/find.test.js @@ -1131,7 +1131,7 @@ describe('Find', function () { const db = client.db(this.configuration.db); db.createCollection('cursor_timeout_false_0', (err, collection) => { expect(err).to.not.exist; - const cursor = collection.find({}, { timeout: true }); + const cursor = collection.find({}, { timeout: false }); cursor.toArray(err => { expect(err).to.not.exist; expect(events[0]).nested.property('command.noCursorTimeout').to.equal(true); From ddf17fbf48c7c386237229d4c0774bae7ed14aad Mon Sep 17 00:00:00 2001 From: emadum Date: Tue, 19 Jan 2021 17:56:25 -0500 Subject: [PATCH 3/3] trigger ci