CSHARP-5998: RawBsonDocument refactoring/removal - #2085
Open
sanych-sun wants to merge 2 commits into
Open
Conversation
sanych-sun
requested review from
BorisDog and
papafe
and removed request for
papafe
July 28, 2026 21:44
sanych-sun
added
the
improvement
Contributor
There was a problem hiding this comment.
Pull request overview
Removes RawBsonDocument usage from the Change Streams core operation/cursor path by having the aggregate operation return typed results (TResult) directly, and updates the associated unit tests to match.
Changes:
- Refactor
ChangeStreamOperation<TResult>to create/executeAggregateOperation<TResult>using_resultSerializerinstead ofRawBsonDocumentSerializer. - Refactor
ChangeStreamCursor<TDocument>to wrapIAsyncCursor<TDocument>directly (removing raw BSON deserialization/disposal and the per-document resume token field). - Update Change Streams operation/cursor tests to align with the new typed cursor/serializer behavior.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
src/MongoDB.Driver/Core/Operations/ChangeStreamOperation.cs |
Switches change stream aggregation/resume to operate on TResult cursors and uses the configured result serializer. |
src/MongoDB.Driver/Core/Operations/ChangeStreamCursor.cs |
Updates cursor implementation to consume IAsyncCursor<TDocument> directly and simplifies batch processing/token tracking. |
tests/MongoDB.Driver.Tests/Core/Operations/ChangeStreamOperationTests.cs |
Adjusts expectations/reflector types to match the new aggregate result serializer and generic operation type. |
tests/MongoDB.Driver.Tests/Core/Operations/ChangeStreamCursorTests.cs |
Partially updates tests for the new cursor constructor/signature and removes raw-deserialization-based assertions. |
Comments suppressed due to low confidence (4)
tests/MongoDB.Driver.Tests/Core/Operations/ChangeStreamCursorTests.cs:137
- This test still constructs
IAsyncCursor<RawBsonDocument>, but the updatedChangeStreamCursor<BsonDocument>constructor requiresIAsyncCursor<BsonDocument>.
var cursor = new Mock<IAsyncCursor<RawBsonDocument>>().Object;
tests/MongoDB.Driver.Tests/Core/Operations/ChangeStreamCursorTests.cs:152
- This test still constructs
IAsyncCursor<RawBsonDocument>, but the updatedChangeStreamCursor<BsonDocument>constructor requiresIAsyncCursor<BsonDocument>.
var cursor = new Mock<IAsyncCursor<RawBsonDocument>>().Object;
tests/MongoDB.Driver.Tests/Core/Operations/ChangeStreamCursorTests.cs:167
- This test still constructs
IAsyncCursor<RawBsonDocument>, but the updatedChangeStreamCursor<BsonDocument>constructor requiresIAsyncCursor<BsonDocument>.
var cursor = new Mock<IAsyncCursor<RawBsonDocument>>().Object;
tests/MongoDB.Driver.Tests/Core/Operations/ChangeStreamCursorTests.cs:496
CreateSubjectnow takesIAsyncCursor<BsonDocument>, but several tests in this file still create/passMock<IAsyncCursor<RawBsonDocument>>(e.g., in the Dispose/DisposeAsync tests). Those call sites will not compile after the cursor type change and should be updated toIAsyncCursor<BsonDocument>.
private ChangeStreamCursor<BsonDocument> CreateSubject(
IAsyncCursor<BsonDocument> cursor = null,
IReadBinding binding = null,
ICoreSessionHandle session = null,
IChangeStreamOperation<BsonDocument> changeStreamOperation = null,
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| @@ -86,7 +81,6 @@ public void ChangeStreamOperation_should_have_expected_change_stream_operation_o | |||
| public void constructor_should_initialize_instance() | |||
| { | |||
| var cursor = new Mock<IAsyncCursor<RawBsonDocument>>().Object; | |||
Comment on lines
+433
to
436
| var firstDocument = BsonDocument.Parse("{ _id : { resumeToken : 1 }, operationType : 'insert', ns : { db : 'db', coll : 'coll' }, documentKey : { _id : 1 }, fullDocument : { _id : 1 } }"); | ||
| var firstBatch = new[] { ToRawDocument(firstDocument) }; | ||
| mockCursor.Setup(c => c.MoveNext(It.IsAny<CancellationToken>())).Returns(true); | ||
| mockCursor.SetupGet(c => c.Current).Returns(firstBatch); |
Comment on lines
198
to
202
| if (hasMore) | ||
| { | ||
| try | ||
| { | ||
| _current = DeserializeDocuments(_cursor.Current); | ||
| } | ||
| finally | ||
| { | ||
| foreach (var rawDocument in _cursor.Current) | ||
| { | ||
| rawDocument.Dispose(); | ||
| } | ||
| } | ||
| _current = _cursor.Current; | ||
| _postBatchResumeToken = ((ICursorBatchInfo)_cursor).PostBatchResumeToken; | ||
| } |
Comment on lines
564
to
565
| public static ChangeStreamCursor<TDocument>.ResumeValues GetResumeValues<TDocument>(this IChangeStreamCursor<TDocument> cursor) => | ||
| (ChangeStreamCursor<TDocument>.ResumeValues)Reflector.Invoke(cursor, nameof(GetResumeValues)); |
BorisDog
approved these changes
Jul 28, 2026
BorisDog
left a comment
BorisDog
left a comment
Contributor
There was a problem hiding this comment.
LGTM, just need to double check that PostBatchResumeToken is always present.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part 2 of the RawBsonDocument deprecation work: remove RawBsonDocument from ChangeStreams.