Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Internal] Direct Package Upgrade: Refactors Code to Bump Up Cosmos.Direct Package to 3.31.2 #3918

Merged
5 commits merged into from
Jun 17, 2023
Merged

[Internal] Direct Package Upgrade: Refactors Code to Bump Up Cosmos.Direct Package to 3.31.2 #3918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4018104
Code changes to bump up the direct version.
kundadebdatta Jun 16, 2023
154c247
Code changes to mark the Israel Central region as public.
kundadebdatta Jun 16, 2023
ba32173
Code changes to update contracts.
kundadebdatta Jun 16, 2023
5b1d978
Code changes to fix test failure. Some clean ups.
kundadebdatta Jun 16, 2023
b29535d
Code changes to add detailed message for open channels count.
kundadebdatta Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ClientOfficialVersion>3.34.0</ClientOfficialVersion>
<ClientPreviewVersion>3.34.0</ClientPreviewVersion>
<ClientPreviewSuffixVersion>preview</ClientPreviewSuffixVersion>
<DirectVersion>3.31.1</DirectVersion>
<DirectVersion>3.31.2</DirectVersion>
kundadebdatta marked this conversation as resolved.
Show resolved Hide resolved
<EncryptionOfficialVersion>2.0.2</EncryptionOfficialVersion>
<EncryptionPreviewVersion>2.0.2</EncryptionPreviewVersion>
<EncryptionPreviewSuffixVersion>preview</EncryptionPreviewSuffixVersion>
Expand Down
5 changes: 5 additions & 0 deletions Microsoft.Azure.Cosmos/src/Regions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,5 +359,10 @@ public static class Regions
/// Name of the Azure Italy North region in the Azure Cosmos DB service.
/// </summary>
public const string ItalyNorth = "Italy North";

/// <summary>
/// Name of the Azure Israel Central region in the Azure Cosmos DB service.
/// </summary>
public const string IsraelCentral = "Israel Central";
}
}
10 changes: 7 additions & 3 deletions ....Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/ClientCreateAndInitializeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public async Task InitializeContainersAsync_WhenThrowsException_ShouldDisposeCos
public async Task CreateAndInitializeAsync_WithValidDatabaseAndContainer_ShouldOpenRntbdConnectionsToBackendReplicas()
{
// Arrange.
int httpCallsMade = 0;
int httpCallsMade = 0, maxRequestsPerConnection = 6;
HttpClientHandlerHelper httpClientHandlerHelper = new ()
{
RequestCallBack = (request, cancellationToken) =>
Expand All @@ -227,6 +227,7 @@ public async Task CreateAndInitializeAsync_WithValidDatabaseAndContainer_ShouldO
{
HttpClientFactory = () => new HttpClient(httpClientHandlerHelper),
ConnectionMode = ConnectionMode.Direct,
MaxRequestsPerTcpConnection = maxRequestsPerConnection,
};

// Act.
Expand Down Expand Up @@ -275,8 +276,11 @@ public async Task CreateAndInitializeAsync_WithValidDatabaseAndContainer_ShouldO
.GetValue(loadBalancingPartition);

Assert.IsNotNull(openChannels);
Assert.AreEqual(30, channelCapacity);
Assert.AreEqual(1, openChannels.Count);
Assert.AreEqual(48, openChannels.Count, "Here the expected value 48 rather explains how many time we call the" +
"LoadBalancingPartition.OpenChannelAsync(). The emulator by default returns 12 partitions, and each partition has 4 replicas," +
"and by behavior the emulator uses the same URI for eac of these replica, hence 12 * 4 = 48 times we call the OpenChannelAsync()." +
"In ideal world, the value should be 1, because for each unique URI, the OpenChannelAsync() call will just be 1.");
Assert.AreEqual(openChannels.Count * maxRequestsPerConnection, channelCapacity);

Documents.Rntbd.LbChannelState channelState = openChannels.First();

Expand Down
5 changes: 5 additions & 0 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetSDKAPI.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6680,6 +6680,11 @@
"Attributes": [],
"MethodInfo": "System.String GermanyWestCentral;IsInitOnly:False;IsStatic:True;"
},
"System.String IsraelCentral": {
"Type": "Field",
"Attributes": [],
"MethodInfo": "System.String IsraelCentral;IsInitOnly:False;IsStatic:True;"
},
"System.String ItalyNorth": {
"Type": "Field",
"Attributes": [],
Expand Down