CSHARP-5560: CSOT: Refactor IOperationExecutor to use operation context #1676
+1,451
−1,566
Conversation
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
sanych-sun
requested review from
BorisDog and
adelinowona
and removed request for
a team
adelinowona
reviewed
Apr 29, 2025
| { | ||
| return operation.Execute(binding, cancellationToken); | ||
| bool isOwnSession = session == null; |
There was a problem hiding this comment.
nit: use var?
here and other methods in this file
adelinowona
reviewed
Apr 29, 2025
| { | ||
| return _client.StartImplicitSessionAsync(cancellationToken); | ||
| var options = new ClientSessionOptions { CausalConsistency = false, Snapshot = false }; | ||
| ICoreSessionHandle coreSession = _client.GetClusterInternal().StartSession(options.ToCore(isImplicit: true)); |
adelinowona
reviewed
Apr 29, 2025
|
|
||
| namespace MongoDB.Driver | ||
| { | ||
| internal record class ReadOperationOptions(ReadPreference ExplicitReadPreference = null, ReadPreference DefaultReadPreference = null); |
There was a problem hiding this comment.
no need for specifying class? I believe record is equivalent to record class
adelinowona
reviewed
Apr 29, 2025
Comment on lines
-225
to
+200
| return UsingImplicitSession(session => BulkWrite(session, requests, options, cancellationToken), cancellationToken); | ||
| using var session = OperationExecutor.StartImplicitSession(cancellationToken); | ||
| return BulkWrite(session, requests, options, cancellationToken); |
There was a problem hiding this comment.
I noticed that for some of the other methods above (like AggregateToCollection) you did not use OperationExecutor to create the implicit session and just used the existing UsingImplicitSession mechanism. Should we update all those use cases as well? or am I missing something?
adelinowona
requested changes
Apr 29, 2025
BorisDog
requested changes
Apr 29, 2025
|
|
||
| var lastStage = renderedPipeline.Documents.LastOrDefault(); | ||
| var lastStageName = lastStage?.GetElement(0).Name; | ||
| isAggregateToCollection = lastStage != null && (lastStageName == "$out" || lastStageName == "$merge"); |
There was a problem hiding this comment.
nit: lastStage != null check is redundant?
| @@ -66,6 +67,9 @@ public MongoClient(MongoClientSettings settings) | |||
|
|
|||
| _cluster = _settings.ClusterSource.Get(_settings.ToClusterKey()); | |||
| _operationExecutor = new OperationExecutor(this); | |||
| _readOperationOptions = new ReadOperationOptions(DefaultReadPreference: _settings.ReadPreference); | |||
| _writeOperationOptions = new WriteOperationOptions(); | |||
|
|
|||
There was a problem hiding this comment.
nit: consider
_readOperationOptions = new (DefaultReadPreference: _settings.ReadPreference);
_writeOperationOptions = new WriteOperationOptions();
| @@ -117,8 +121,6 @@ internal MongoClient(IOperationExecutor operationExecutor, MongoClientSettings s | |||
| // internal methods | |||
| internal void ConfigureAutoEncryptionMessageEncoderSettings(MessageEncoderSettings messageEncoderSettings) | |||
| { | |||
| ThrowIfDisposed(); | |||
| { | ||
| return operation.Execute(binding, cancellationToken); | ||
| bool isOwnSession = session == null; |
| @@ -94,160 +98,117 @@ public override MongoCollectionSettings Settings | |||
| } | |||
|
|
|||
| // public methods | |||
| public override IAsyncCursor<TResult> Aggregate<TResult>(PipelineDefinition<TDocument, TResult> pipeline, AggregateOptions options, CancellationToken cancellationToken = default(CancellationToken)) | |||
| public override IAsyncCursor<TResult> Aggregate<TResult>(PipelineDefinition<TDocument, TResult> pipeline, AggregateOptions options, CancellationToken cancellationToken = default) | |||
| { | |||
| return UsingImplicitSession(session => Aggregate(session, pipeline, options, cancellationToken), cancellationToken); | |||
There was a problem hiding this comment.
Do we want to reuse the newer pattern without UsingImplicitSession here (like in MongoDatabase)?
| } | ||
|
|
||
| // public properties | ||
| public IMongoClient Client => _client; | ||
| public DatabaseNamespace DatabaseNamespace => _databaseNamespace; | ||
| private IOperationExecutor OperationExecutor => _operationExecutor; |
| return UsingImplicitSession(session => ListCollectionNames(session, options, cancellationToken), cancellationToken); | ||
| var cursor = OperationExecutor.ExecuteReadOperation(CreateListCollectionNamesOperation(options), | ||
| _readOperationOptions with { DefaultReadPreference = ReadPreference.Primary }, | ||
| null, cancellationToken); |
There was a problem hiding this comment.
minor: New line for each param?
| @@ -778,9 +717,10 @@ private async Task<IWriteOperation<BsonDocument>> CreateDropCollectionOperationA | |||
| }); | |||
| } | |||
|
|
|||
| private ListCollectionsOperation CreateListCollectionNamesOperation(ListCollectionNamesOptions options, RenderArgs<BsonDocument> renderArgs) | |||
| private ListCollectionsOperation CreateListCollectionNamesOperation(ListCollectionNamesOptions options) | |||
There was a problem hiding this comment.
Maybe refactoring to
CreateDropCollectionOperation
GetEncryptedFieldsMap
GetEncryptedFieldsMapAsync
Would be cleaner.
|
|
||
| namespace MongoDB.Driver.Tests | ||
| { | ||
| public class ReadOperationOptionsTests |
|
|
||
| [Theory] | ||
| [MemberData(nameof(ImplicitSessionTestCases))] | ||
| public async Task ExecuteReadOperationShouldStartAndDisposeImplicitSessionIfNeeded(bool shouldCreateSession, bool isAsync, IClientSessionHandle session) |
There was a problem hiding this comment.
Don't we use this format:
ExecuteReadOperation_should_start_and.. ?
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.
No description provided.