Skip to content

Commit 554c799

Browse files
CSHARP-4364: Bump maxWireVersion for MongoDB 6.1. (#903)
1 parent 627b791 commit 554c799

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

Diff for: src/MongoDB.Driver.Core/Core/Misc/WireVersion.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ internal static class WireVersion
8888
/// Wire version 17.
8989
/// </summary>
9090
public const int Server60 = 17;
91+
/// <summary>
92+
/// Wire version 18.
93+
/// </summary>
94+
public const int Server61 = 18;
9195

9296
#region static
9397
private static List<WireVersionInfo> __knownWireVersions = new()
@@ -114,10 +118,11 @@ internal static class WireVersion
114118
new WireVersionInfo(wireVersion: 14, major: 5, minor: 1),
115119
new WireVersionInfo(wireVersion: 15, major: 5, minor: 2),
116120
new WireVersionInfo(wireVersion: 16, major: 5, minor: 3),
117-
new WireVersionInfo(wireVersion: 17, major: 6, minor: 0)
121+
new WireVersionInfo(wireVersion: 17, major: 6, minor: 0),
122+
new WireVersionInfo(wireVersion: 18, major: 6, minor: 1)
118123
};
119124

120-
private static Range<int> __supportedWireVersionRange = CreateSupportedWireVersionRange(minWireVersion: 6, maxWireVersion: 17);
125+
private static Range<int> __supportedWireVersionRange = CreateSupportedWireVersionRange(minWireVersion: 6, maxWireVersion: 18);
121126

122127
private static Range<int> CreateSupportedWireVersionRange(int minWireVersion, int maxWireVersion)
123128
{

Diff for: tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void SupportedWireVersionRange_should_return_expected_result()
6363
{
6464
var result = Cluster.SupportedWireVersionRange;
6565

66-
result.Should().Be(new Range<int>(6, 17));
66+
result.Should().Be(new Range<int>(6, 18));
6767
}
6868

6969
[Fact]
@@ -328,8 +328,8 @@ public void SelectServer_should_throw_if_the_matched_server_cannot_be_found_and_
328328
[Theory]
329329
[InlineData(0, 0, false)]
330330
[InlineData(0, 0, true)]
331-
[InlineData(18, 19, false)]
332-
[InlineData(18, 19, true)]
331+
[InlineData(19, 20, false)]
332+
[InlineData(19, 20, true)]
333333
public void SelectServer_should_throw_if_any_servers_are_incompatible(int min, int max, bool async)
334334
{
335335
var subject = CreateSubject();

Diff for: tests/MongoDB.Driver.Core.Tests/Core/Misc/WireVersionTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void Server_maxWireVersion_should_be_in_supported_range()
3232

3333
var isOverlaped = WireVersion.SupportedWireVersionRange.Overlaps(new Range<int>(serverMaxWireVersion, serverMaxWireVersion));
3434

35-
isOverlaped.Should().BeTrue();
35+
isOverlaped.Should().BeTrue($"Server MaxWireVersion: {serverMaxWireVersion} is not in supported range for the driver: {WireVersion.SupportedWireVersionRange}");
3636
}
3737

3838
[Theory]
@@ -46,7 +46,7 @@ public void GetServerVersionForErrorMessage_should_return_expected_serverVersion
4646
[Fact]
4747
public void SupportedWireRange_should_be_correct()
4848
{
49-
WireVersion.SupportedWireVersionRange.Should().Be(new Range<int>(6, 17));
49+
WireVersion.SupportedWireVersionRange.Should().Be(new Range<int>(6, 18));
5050
}
5151

5252
[Fact]
@@ -60,7 +60,7 @@ public void ToServerVersion_should_throw_if_wireVersion_less_than_0()
6060
[Theory]
6161
[InlineData(99, null, null)]
6262
[InlineData(19, null, null)]
63-
[InlineData(18, null, null)]
63+
[InlineData(18, 6, 1)]
6464
[InlineData(17, 6, 0)]
6565
[InlineData(16, 5, 3)]
6666
[InlineData(15, 5, 2)]

Diff for: tests/MongoDB.Driver.Core.Tests/Core/Servers/ServerDescriptionTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ public void Equals_should_return_true_when_all_fields_are_equal()
278278
[InlineData(new[] { 14, 15 }, true)]
279279
[InlineData(new[] { 15, 16 }, true)]
280280
[InlineData(new[] { 16, 17 }, true)]
281-
[InlineData(new[] { 18, 19 }, false)]
281+
[InlineData(new[] { 18, 19 }, true)]
282+
[InlineData(new[] { 19, 20 }, false)]
282283
public void IsCompatibleWithDriver_should_return_expected_result(int[] minMaxWireVersions, bool expectedResult)
283284
{
284285
var clusterId = new ClusterId(1);

0 commit comments

Comments
 (0)