Azure
/
azure-cosmos-dotnet-v3
зеркало из https://github.com/Azure/azure-cosmos-dotnet-v3.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[Internal] Direct Package: Adds Support for Direct package version 3.33.0 (#4353) 

* upgraded direct package version

* added Taiwan regions

* update contracts

* fix contracts

* fixed more contracts

* contracts change

* contract change remove

* changed baseline files

* added space

* added region name check test for future verification

* nits

---------

Co-authored-by: Sourabh Jain <sourabhjain@microsoft.com>
This commit is contained in:
Nalu Tripician 2024-04-03 12:27:00 -07:00 коммит произвёл GitHub
Родитель 1106cd7cfe
Коммит 80647baea2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
6 изменённых файлов: 76 добавлений и 43 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Directory.Build.props
Просмотреть файл

@ -3,7 +3,7 @@
<ClientOfficialVersion>3.38.1</ClientOfficialVersion>
<ClientPreviewVersion>3.39.0</ClientPreviewVersion>
<ClientPreviewSuffixVersion>preview.1</ClientPreviewSuffixVersion>
<DirectVersion>3.32.1</DirectVersion>
<DirectVersion>3.33.0</DirectVersion>
<EncryptionOfficialVersion>2.0.4</EncryptionOfficialVersion>
<EncryptionPreviewVersion>2.1.0</EncryptionPreviewVersion>
<EncryptionPreviewSuffixVersion>preview4</EncryptionPreviewSuffixVersion>

10
Microsoft.Azure.Cosmos/src/Regions.cs
Просмотреть файл

@ -374,5 +374,15 @@ namespace Microsoft.Azure.Cosmos
/// Name of the Azure Spain Central region in the Azure Cosmos DB service.
/// </summary>
public const string SpainCentral = "Spain Central";
/// <summary>
/// Name of the Azure Taiwan North region in the Azure Cosmos DB service.
/// </summary>
public const string TaiwanNorth = "Taiwan North";
/// <summary>
/// Name of the Azure Taiwan Northwest region in the Azure Cosmos DB service.
/// </summary>
public const string TaiwanNorthwest = "Taiwan Northwest";
}
}

36
Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/BaselineTest/TestBaseline/QueryPlanBaselineTests.GroupBy.xml
Просмотреть файл

@ -311,14 +311,6 @@ GROUP BY c.age, c.name]]></RewrittenQuery>
<OrderByExpressions />
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>min_age</Alias>
<AggregateOperator>Min</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>max_age</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>count</Alias>
<AggregateOperator>Count</AggregateOperator>
@ -331,6 +323,14 @@ GROUP BY c.age, c.name]]></RewrittenQuery>
<Alias>team</Alias>
<AggregateOperator>null</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>min_age</Alias>
<AggregateOperator>Min</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>max_age</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>avg_age</Alias>
<AggregateOperator>Average</AggregateOperator>
@ -504,10 +504,6 @@ GROUP BY UPPER(c.name), SUBSTRING(c.address.city, 0, 3)]]></RewrittenQuery>
<OrderByExpressions />
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>group_name</Alias>
<AggregateOperator>null</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>count</Alias>
<AggregateOperator>Count</AggregateOperator>
@ -516,6 +512,10 @@ GROUP BY UPPER(c.name), SUBSTRING(c.address.city, 0, 3)]]></RewrittenQuery>
<Alias>info</Alias>
<AggregateOperator>null</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>group_name</Alias>
<AggregateOperator>null</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
<GroupByAliases>
<Alias>info</Alias>
@ -718,17 +718,13 @@ GROUP BY c.name]]></RewrittenQuery>
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>max_age</Alias>
<AggregateOperator>Max</AggregateOperator>
<Alias>count</Alias>
<AggregateOperator>Count</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>name</Alias>
<AggregateOperator>null</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>count</Alias>
<AggregateOperator>Count</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>$1</Alias>
<AggregateOperator>Min</AggregateOperator>
@ -741,6 +737,10 @@ GROUP BY c.name]]></RewrittenQuery>
<Alias>$2</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>max_age</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>avg_age</Alias>
<AggregateOperator>Average</AggregateOperator>

44
Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/BaselineTest/TestBaseline/QueryPlanBaselineTests.NonValueAggregates.xml
Просмотреть файл

@ -509,11 +509,11 @@ FROM c]]></RewrittenQuery>
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>min_blah2</Alias>
<Alias>min_blah</Alias>
<AggregateOperator>Min</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>min_blah</Alias>
<Alias>min_blah2</Alias>
<AggregateOperator>Min</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
@ -557,11 +557,11 @@ FROM c]]></RewrittenQuery>
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>max_blah</Alias>
<Alias>max_blah2</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>max_blah2</Alias>
<Alias>max_blah</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
@ -605,11 +605,11 @@ FROM c]]></RewrittenQuery>
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>avg_blah2</Alias>
<Alias>avg_blah</Alias>
<AggregateOperator>Average</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>avg_blah</Alias>
<Alias>avg_blah2</Alias>
<AggregateOperator>Average</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
@ -989,11 +989,11 @@ FROM c]]></RewrittenQuery>
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>$1</Alias>
<Alias>count_blah</Alias>
<AggregateOperator>Count</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>count_blah</Alias>
<Alias>$1</Alias>
<AggregateOperator>Count</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
@ -1181,11 +1181,11 @@ FROM c]]></RewrittenQuery>
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>max_blah</Alias>
<Alias>$1</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>$1</Alias>
<Alias>max_blah</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
@ -1229,11 +1229,11 @@ FROM c]]></RewrittenQuery>
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>max_blah</Alias>
<Alias>$1</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>$1</Alias>
<Alias>max_blah</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
@ -1427,10 +1427,6 @@ FROM c]]></RewrittenQuery>
<OrderByExpressions />
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>$1</Alias>
<AggregateOperator>Count</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>count_blah</Alias>
<AggregateOperator>Count</AggregateOperator>
@ -1439,6 +1435,10 @@ FROM c]]></RewrittenQuery>
<Alias>count_blah2</Alias>
<AggregateOperator>Count</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>$1</Alias>
<AggregateOperator>Count</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
<GroupByAliases>
<Alias>count_blah</Alias>
@ -1486,11 +1486,11 @@ FROM c]]></RewrittenQuery>
<AggregateOperator>Min</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>min_blah2</Alias>
<Alias>min_blah</Alias>
<AggregateOperator>Min</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>min_blah</Alias>
<Alias>min_blah2</Alias>
<AggregateOperator>Min</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
@ -1536,7 +1536,7 @@ FROM c]]></RewrittenQuery>
<Aggregates />
<GroupByAliasToAggregateType>
<AliasToAggregateType>
<Alias>max_blah</Alias>
<Alias>$1</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
@ -1544,7 +1544,7 @@ FROM c]]></RewrittenQuery>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>$1</Alias>
<Alias>max_blah</Alias>
<AggregateOperator>Max</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>
@ -1594,11 +1594,11 @@ FROM c]]></RewrittenQuery>
<AggregateOperator>Average</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>avg_blah2</Alias>
<Alias>avg_blah</Alias>
<AggregateOperator>Average</AggregateOperator>
</AliasToAggregateType>
<AliasToAggregateType>
<Alias>avg_blah</Alias>
<Alias>avg_blah2</Alias>
<AggregateOperator>Average</AggregateOperator>
</AliasToAggregateType>
</GroupByAliasToAggregateType>

17
Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DirectContractTests.cs
Просмотреть файл

@ -10,13 +10,11 @@ namespace Microsoft.Azure.Cosmos.Contracts
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using Microsoft.Azure.Cosmos.Query.Core.Monads;
using Microsoft.Azure.Cosmos.Query.Core.QueryPlan;
using Microsoft.Azure.Documents;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json;
[TestCategory("Windows")]
[TestClass]
@ -81,6 +79,21 @@ namespace Microsoft.Azure.Cosmos.Contracts
CollectionAssert.AreEquivalent(locationNames, cosmosRegions);
}
[TestMethod]
public void RegionValueCheck()
{
string[] cosmosRegions = typeof(Regions)
.GetMembers(BindingFlags.Static | BindingFlags.Public)
.Select(e => e.Name)
.ToArray();
foreach (string region in cosmosRegions)
{
string locationNameValue = typeof(LocationNames).GetField(region).GetValue(null).ToString();
string regionNameValue = typeof(Regions).GetField(region).GetValue(null).ToString();
Assert.AreEqual(locationNameValue, regionNameValue);
}
}
[TestMethod]
public void RMContractTest()
{

10
Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetSDKAPI.json
Просмотреть файл

@ -7100,6 +7100,16 @@
"Attributes": [],
"MethodInfo": "System.String SwitzerlandWest;IsInitOnly:False;IsStatic:True;"
},
"System.String TaiwanNorth": {
"Type": "Field",
"Attributes": [],
"MethodInfo": "System.String TaiwanNorth;IsInitOnly:False;IsStatic:True;"
},
"System.String TaiwanNorthwest": {
"Type": "Field",
"Attributes": [],
"MethodInfo": "System.String TaiwanNorthwest;IsInitOnly:False;IsStatic:True;"
},
"System.String UAECentral": {
"Type": "Field",
"Attributes": [],