Rename

papafe · papafe · commit 843cfdf88e11 · 2026-03-04T11:02:59.000+01:00
diff --git a/src/MongoDB.Driver/Core/Operations/RetryableReadContext.cs b/src/MongoDB.Driver/Core/Operations/RetryableReadContext.cs
@@ -52,7 +52,7 @@ public void Dispose()
             }
         }
 
-        public ServerDescription DoServerSelection(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
+        public ServerDescription SelectServer(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
         {
             try
             {
@@ -68,7 +68,7 @@ public ServerDescription DoServerSelection(OperationContext operationContext, IR
             }
         }
 
-        public async Task<ServerDescription> DoServerSelectionAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
+        public async Task<ServerDescription> SelectServerAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
         {
             try
             {
@@ -85,7 +85,7 @@ public async Task<ServerDescription> DoServerSelectionAsync(OperationContext ope
             }
         }
 
-        public void DoChannelAcquisition(OperationContext operationContext)
+        public void AcquireChannel(OperationContext operationContext)
         {
             try
             {
@@ -104,7 +104,7 @@ public void DoChannelAcquisition(OperationContext operationContext)
             }
         }
 
-        public async Task DoChannelAcquisitionAsync(OperationContext operationContext)
+        public async Task AcquireChannelAsync(OperationContext operationContext)
         {
             try
             {
@@ -123,18 +123,6 @@ public async Task DoChannelAcquisitionAsync(OperationContext operationContext)
             }
         }
 
-        public void AcquireOrReplaceChannel(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
-        {
-            DoServerSelection(operationContext, deprioritizedServers);
-            DoChannelAcquisition(operationContext);
-        }
-
-        public async Task AcquireOrReplaceChannelAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
-        {
-            await DoServerSelectionAsync(operationContext, deprioritizedServers).ConfigureAwait(false);
-            await DoChannelAcquisitionAsync(operationContext).ConfigureAwait(false);
-        }
-
         private void ReplaceChannel(IChannelHandle channel)
         {
             Ensure.IsNotNull(channel, nameof(channel));
diff --git a/src/MongoDB.Driver/Core/Operations/RetryableReadOperationExecutor.cs b/src/MongoDB.Driver/Core/Operations/RetryableReadOperationExecutor.cs
@@ -37,8 +37,8 @@ public static TResult Execute<TResult>(OperationContext operationContext, IRetry
 
                 try
                 {
-                    server = context.DoServerSelection(operationContext, deprioritizedServers);
-                    context.DoChannelAcquisition(operationContext);
+                    server = context.SelectServer(operationContext, deprioritizedServers);
+                    context.AcquireChannel(operationContext);
 
                     return operation.ExecuteAttempt(operationContext, context, totalAttempts, transactionNumber: null);
                 }
@@ -69,8 +69,8 @@ public static async Task<TResult> ExecuteAsync<TResult>(OperationContext operati
 
                 try
                 {
-                    server = await context.DoServerSelectionAsync(operationContext, deprioritizedServers).ConfigureAwait(false);
-                    await context.DoChannelAcquisitionAsync(operationContext).ConfigureAwait(false);
+                    server = await context.SelectServerAsync(operationContext, deprioritizedServers).ConfigureAwait(false);
+                    await context.AcquireChannelAsync(operationContext).ConfigureAwait(false);
 
                     return await operation.ExecuteAttemptAsync(operationContext, context, totalAttempts, transactionNumber: null).ConfigureAwait(false);
                 }
diff --git a/src/MongoDB.Driver/Core/Operations/RetryableWriteContext.cs b/src/MongoDB.Driver/Core/Operations/RetryableWriteContext.cs
@@ -52,7 +52,7 @@ public void Dispose()
             }
         }
 
-        public ServerDescription DoServerSelection(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
+        public ServerDescription SelectServer(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
         {
             try
             {
@@ -68,7 +68,7 @@ public ServerDescription DoServerSelection(OperationContext operationContext, IR
             }
         }
 
-        public async Task<ServerDescription> DoServerSelectionAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
+        public async Task<ServerDescription> SelectServerAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
         {
             try
             {
@@ -85,7 +85,7 @@ public async Task<ServerDescription> DoServerSelectionAsync(OperationContext ope
             }
         }
 
-        public void DoChannelAcquisition(OperationContext operationContext)
+        public void AcquireChannel(OperationContext operationContext)
         {
             try
             {
@@ -104,7 +104,7 @@ public void DoChannelAcquisition(OperationContext operationContext)
             }
         }
 
-        public async Task DoChannelAcquisitionAsync(OperationContext operationContext)
+        public async Task AcquireChannelAsync(OperationContext operationContext)
         {
             try
             {
@@ -123,18 +123,6 @@ public async Task DoChannelAcquisitionAsync(OperationContext operationContext)
             }
         }
 
-        public void AcquireOrReplaceChannel(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
-        {
-            DoServerSelection(operationContext, deprioritizedServers);
-            DoChannelAcquisition(operationContext);
-        }
-
-        public async Task AcquireOrReplaceChannelAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)
-        {
-            await DoServerSelectionAsync(operationContext, deprioritizedServers).ConfigureAwait(false);
-            await DoChannelAcquisitionAsync(operationContext).ConfigureAwait(false);
-        }
-
         private void ReplaceChannel(IChannelHandle channel)
         {
             Ensure.IsNotNull(channel, nameof(channel));
diff --git a/src/MongoDB.Driver/Core/Operations/RetryableWriteOperationExecutor.cs b/src/MongoDB.Driver/Core/Operations/RetryableWriteOperationExecutor.cs
@@ -1,4 +1,4 @@
-﻿/* Copyright 2010-present MongoDB Inc.
+/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -48,8 +48,8 @@ public static TResult Execute<TResult>(OperationContext operationContext, IRetry
 
                 try
                 {
-                    server = context.DoServerSelection(operationContext, deprioritizedServers);
-                    context.DoChannelAcquisition(operationContext);
+                    server = context.SelectServer(operationContext, deprioritizedServers);
+                    context.AcquireChannel(operationContext);
                     channelAcquisitionSuccessful = true;
 
                     transactionNumber ??= AreRetriesAllowed(operation.WriteConcern, context, server) ? context.Binding.Session.AdvanceTransactionNumber() : null;
@@ -94,8 +94,8 @@ public static async Task<TResult> ExecuteAsync<TResult>(OperationContext operati
 
                 try
                 {
-                    server = await context.DoServerSelectionAsync(operationContext, deprioritizedServers).ConfigureAwait(false);
-                    await context.DoChannelAcquisitionAsync(operationContext).ConfigureAwait(false);
+                    server = await context.SelectServerAsync(operationContext, deprioritizedServers).ConfigureAwait(false);
+                    await context.AcquireChannelAsync(operationContext).ConfigureAwait(false);
                     channelAcquisitionSuccessful = true;
 
                     transactionNumber ??= AreRetriesAllowed(operation.WriteConcern, context, server) ? context.Binding.Session.AdvanceTransactionNumber() : null;
diff --git a/tests/MongoDB.Driver.Tests/Core/LoadBalancingIntergationTests.cs b/tests/MongoDB.Driver.Tests/Core/LoadBalancingIntergationTests.cs
@@ -647,11 +647,13 @@ private RetryableReadContext CreateRetryableReadContext(IReadBindingHandle readB
             var retryableContext = new RetryableReadContext(readBindingHandle, retryRequested: false);
             if (async)
             {
-                retryableContext.AcquireOrReplaceChannelAsync(OperationContext.NoTimeout, null).GetAwaiter().GetResult();
+                retryableContext.SelectServerAsync(OperationContext.NoTimeout, null).GetAwaiter().GetResult();
+                retryableContext.AcquireChannelAsync(OperationContext.NoTimeout).GetAwaiter().GetResult();
             }
             else
             {
-                retryableContext.AcquireOrReplaceChannel(OperationContext.NoTimeout, null);
+                retryableContext.SelectServer(OperationContext.NoTimeout, null);
+                retryableContext.AcquireChannel(OperationContext.NoTimeout);
             }
             return retryableContext;
         }
@@ -671,11 +673,13 @@ private RetryableWriteContext CreateRetryableWriteContext(IReadWriteBindingHandl
             var retryableContext = new RetryableWriteContext(readWriteBindingHandle, retryRequested: false);
             if (async)
             {
-                retryableContext.AcquireOrReplaceChannelAsync(OperationContext.NoTimeout, null).GetAwaiter().GetResult();
+                retryableContext.SelectServerAsync(OperationContext.NoTimeout, null).GetAwaiter().GetResult();
+                retryableContext.AcquireChannelAsync(OperationContext.NoTimeout).GetAwaiter().GetResult();
             }
             else
             {
-                retryableContext.AcquireOrReplaceChannel(OperationContext.NoTimeout, null);
+                retryableContext.SelectServer(OperationContext.NoTimeout, null);
+                retryableContext.AcquireChannel(OperationContext.NoTimeout);
             }
             return retryableContext;
         }
diff --git a/tests/MongoDB.Driver.Tests/Core/Operations/RetryableWriteOperationExecutorTests.cs b/tests/MongoDB.Driver.Tests/Core/Operations/RetryableWriteOperationExecutorTests.cs
@@ -119,7 +119,8 @@ private RetryableWriteContext CreateContext(bool retryRequested, bool areRetryab
         {
             var binding = CreateBinding(areRetryableWritesSupported, hasSessionId, isInTransaction);
             var context = new RetryableWriteContext(binding, retryRequested);
-            context.AcquireOrReplaceChannel(OperationContext.NoTimeout, null);
+            context.SelectServer(OperationContext.NoTimeout, null);
+            context.AcquireChannel(OperationContext.NoTimeout);
             return context;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public void Dispose()`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- public ServerDescription DoServerSelection(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)`
	`55`	`+ public ServerDescription SelectServer(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)`
`56`	`56`	`{`
`57`	`57`	`try`
`58`	`58`	`{`
`@@ -68,7 +68,7 @@ public ServerDescription DoServerSelection(OperationContext operationContext, IR`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- public async Task<ServerDescription> DoServerSelectionAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)`
	`71`	`+ public async Task<ServerDescription> SelectServerAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)`
`72`	`72`	`{`
`73`	`73`	`try`
`74`	`74`	`{`
`@@ -85,7 +85,7 @@ public async Task<ServerDescription> DoServerSelectionAsync(OperationContext ope`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`- public void DoChannelAcquisition(OperationContext operationContext)`
	`88`	`+ public void AcquireChannel(OperationContext operationContext)`
`89`	`89`	`{`
`90`	`90`	`try`
`91`	`91`	`{`
`@@ -104,7 +104,7 @@ public void DoChannelAcquisition(OperationContext operationContext)`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`- public async Task DoChannelAcquisitionAsync(OperationContext operationContext)`
	`107`	`+ public async Task AcquireChannelAsync(OperationContext operationContext)`
`108`	`108`	`{`
`109`	`109`	`try`
`110`	`110`	`{`
`@@ -123,18 +123,6 @@ public async Task DoChannelAcquisitionAsync(OperationContext operationContext)`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`- public void AcquireOrReplaceChannel(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)`
`127`		`- {`
`128`		`- DoServerSelection(operationContext, deprioritizedServers);`
`129`		`- DoChannelAcquisition(operationContext);`
`130`		`- }`
`131`		`-`
`132`		`- public async Task AcquireOrReplaceChannelAsync(OperationContext operationContext, IReadOnlyCollection<ServerDescription> deprioritizedServers)`
`133`		`- {`
`134`		`- await DoServerSelectionAsync(operationContext, deprioritizedServers).ConfigureAwait(false);`
`135`		`- await DoChannelAcquisitionAsync(operationContext).ConfigureAwait(false);`
`136`		`- }`
`137`		`-`
`138`	`126`	`private void ReplaceChannel(IChannelHandle channel)`
`139`	`127`	`{`
`140`	`128`	`Ensure.IsNotNull(channel, nameof(channel));`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ public static TResult Execute<TResult>(OperationContext operationContext, IRetry`
`37`	`37`
`38`	`38`	`try`
`39`	`39`	`{`
`40`		`- server = context.DoServerSelection(operationContext, deprioritizedServers);`
`41`		`- context.DoChannelAcquisition(operationContext);`
	`40`	`+ server = context.SelectServer(operationContext, deprioritizedServers);`
	`41`	`+ context.AcquireChannel(operationContext);`
`42`	`42`
`43`	`43`	`return operation.ExecuteAttempt(operationContext, context, totalAttempts, transactionNumber: null);`
`44`	`44`	`}`
`@@ -69,8 +69,8 @@ public static async Task<TResult> ExecuteAsync<TResult>(OperationContext operati`
`69`	`69`
`70`	`70`	`try`
`71`	`71`	`{`
`72`		`- server = await context.DoServerSelectionAsync(operationContext, deprioritizedServers).ConfigureAwait(false);`
`73`		`- await context.DoChannelAcquisitionAsync(operationContext).ConfigureAwait(false);`
	`72`	`+ server = await context.SelectServerAsync(operationContext, deprioritizedServers).ConfigureAwait(false);`
	`73`	`+ await context.AcquireChannelAsync(operationContext).ConfigureAwait(false);`
`74`	`74`
`75`	`75`	`return await operation.ExecuteAttemptAsync(operationContext, context, totalAttempts, transactionNumber: null).ConfigureAwait(false);`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -647,11 +647,13 @@ private RetryableReadContext CreateRetryableReadContext(IReadBindingHandle readB`
`647`	`647`	`var retryableContext = new RetryableReadContext(readBindingHandle, retryRequested: false);`
`648`	`648`	`if (async)`
`649`	`649`	`{`
`650`		`- retryableContext.AcquireOrReplaceChannelAsync(OperationContext.NoTimeout, null).GetAwaiter().GetResult();`
	`650`	`+ retryableContext.SelectServerAsync(OperationContext.NoTimeout, null).GetAwaiter().GetResult();`
	`651`	`+ retryableContext.AcquireChannelAsync(OperationContext.NoTimeout).GetAwaiter().GetResult();`
`651`	`652`	`}`
`652`	`653`	`else`
`653`	`654`	`{`
`654`		`- retryableContext.AcquireOrReplaceChannel(OperationContext.NoTimeout, null);`
	`655`	`+ retryableContext.SelectServer(OperationContext.NoTimeout, null);`
	`656`	`+ retryableContext.AcquireChannel(OperationContext.NoTimeout);`
`655`	`657`	`}`
`656`	`658`	`return retryableContext;`
`657`	`659`	`}`
`@@ -671,11 +673,13 @@ private RetryableWriteContext CreateRetryableWriteContext(IReadWriteBindingHandl`
`671`	`673`	`var retryableContext = new RetryableWriteContext(readWriteBindingHandle, retryRequested: false);`
`672`	`674`	`if (async)`
`673`	`675`	`{`
`674`		`- retryableContext.AcquireOrReplaceChannelAsync(OperationContext.NoTimeout, null).GetAwaiter().GetResult();`
	`676`	`+ retryableContext.SelectServerAsync(OperationContext.NoTimeout, null).GetAwaiter().GetResult();`
	`677`	`+ retryableContext.AcquireChannelAsync(OperationContext.NoTimeout).GetAwaiter().GetResult();`
`675`	`678`	`}`
`676`	`679`	`else`
`677`	`680`	`{`
`678`		`- retryableContext.AcquireOrReplaceChannel(OperationContext.NoTimeout, null);`
	`681`	`+ retryableContext.SelectServer(OperationContext.NoTimeout, null);`
	`682`	`+ retryableContext.AcquireChannel(OperationContext.NoTimeout);`
`679`	`683`	`}`
`680`	`684`	`return retryableContext;`
`681`	`685`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,8 @@ private RetryableWriteContext CreateContext(bool retryRequested, bool areRetryab`
`119`	`119`	`{`
`120`	`120`	`var binding = CreateBinding(areRetryableWritesSupported, hasSessionId, isInTransaction);`
`121`	`121`	`var context = new RetryableWriteContext(binding, retryRequested);`
`122`		`- context.AcquireOrReplaceChannel(OperationContext.NoTimeout, null);`
	`122`	`+ context.SelectServer(OperationContext.NoTimeout, null);`
	`123`	`+ context.AcquireChannel(OperationContext.NoTimeout);`
`123`	`124`	`return context;`
`124`	`125`	`}`
`125`	`126`