Skip to content

Commit 04e6c89

Browse files
committed
pr
1 parent 409c8be commit 04e6c89

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/MongoDB.Driver/Core/Bindings/CoreSession.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ void ICoreSessionInternal.CommitTransaction(CommitTransactionOptions options, Ca
317317

318318
try
319319
{
320-
var firstAttempt = CreateCommitTransactionOperation(operationContext,IsFirstCommitAttemptRetry());
320+
var firstAttempt = CreateCommitTransactionOperation(operationContext, IsFirstCommitAttemptRetry());
321321
ExecuteEndTransactionOnPrimary(operationContext, firstAttempt);
322322
return;
323323
}
@@ -327,7 +327,7 @@ void ICoreSessionInternal.CommitTransaction(CommitTransactionOptions options, Ca
327327
TransactionHelper.UnpinServerIfNeededOnRetryableCommitException(_currentTransaction, exception);
328328
}
329329

330-
var secondAttempt = CreateCommitTransactionOperation(operationContext,isCommitRetry: true);
330+
var secondAttempt = CreateCommitTransactionOperation(operationContext, isCommitRetry: true);
331331
ExecuteEndTransactionOnPrimary(operationContext, secondAttempt);
332332
}
333333
finally

src/MongoDB.Driver/Core/Compression/SnappyCompressor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void Compress(Stream input, Stream output)
3434
{
3535
var uncompressedSize = (int)(input.Length - input.Position);
3636
var uncompressedBytes = new byte[uncompressedSize]; // does not include uncompressed message headers
37-
input.ReadBytes(OperationContext.NoTimeout, uncompressedBytes, offset: 0, count: uncompressedSize, Timeout.InfiniteTimeSpan);
37+
input.ReadBytes(OperationContext.NoTimeout, uncompressedBytes, offset: 0, count: uncompressedSize, socketTimeout: Timeout.InfiniteTimeSpan);
3838
var maxCompressedSize = Snappy.GetMaxCompressedLength(uncompressedSize);
3939
var compressedBytes = new byte[maxCompressedSize];
4040
var compressedSize = Snappy.Compress(uncompressedBytes, compressedBytes);
@@ -50,7 +50,7 @@ public void Decompress(Stream input, Stream output)
5050
{
5151
var compressedSize = (int)(input.Length - input.Position);
5252
var compressedBytes = new byte[compressedSize];
53-
input.ReadBytes(OperationContext.NoTimeout, compressedBytes, offset: 0, count: compressedSize, Timeout.InfiniteTimeSpan);
53+
input.ReadBytes(OperationContext.NoTimeout, compressedBytes, offset: 0, count: compressedSize, socketTimeout: Timeout.InfiniteTimeSpan);
5454
var uncompressedSize = Snappy.GetUncompressedLength(compressedBytes);
5555
var decompressedBytes = new byte[uncompressedSize];
5656
var decompressedSize = Snappy.Decompress(compressedBytes, decompressedBytes);

tests/MongoDB.Driver.Tests/Specifications/UnifiedTestSpecRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void ClientSideOperationsTimeout(JsonDrivenTestCase testCase)
6969
SkipNotSupportedTestCases("timeoutMS applies to whole operation, not individual attempts"); // blocked by DRIVERS-3247
7070
SkipNotSupportedTestCases("WaitQueueTimeoutError does not clear the pool"); // TODO: CSOT: TimeoutMS is not implemented yet for runCommand
7171
SkipNotSupportedTestCases("write concern error MaxTimeMSExpired is transformed"); // TODO: CSOT: investigate error transformation, implementing the requirement might be breaking change
72-
SkipNotSupportedTestCases("operation succeeds after one socket timeout - listDatabases on client"); // TODO: listDatabases is not retryable in CSharp Driver, NEED TICKET!!!
72+
SkipNotSupportedTestCases("operation succeeds after one socket timeout - listDatabases on client"); // TODO: listDatabases is not retryable in CSharp Driver, CSHARP-5714
7373

7474
Run(testCase);
7575

tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedWithTransactionOperation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public UnifiedWithTransactionOperation Build(string targetSessionId, BsonDocumen
122122
maxCommitTime = TimeSpan.FromMilliseconds(argument.Value.AsInt32);
123123
break;
124124
case "readConcern":
125-
readConcern =ReadConcern.FromBsonDocument(argument.Value.AsBsonDocument);
125+
readConcern = ReadConcern.FromBsonDocument(argument.Value.AsBsonDocument);
126126
break;
127127
case "readPreference":
128128
readPreference = ReadPreference.FromBsonDocument(argument.Value.AsBsonDocument);

0 commit comments

Comments
 (0)