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

[WIP] Entity Framework Core 7 Providers #8654

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[WIP] Entity Framework Core 7 Providers #8654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a1c569
EFCore Cluster and Storage providers
galvesribeiro Oct 3, 2023
ffe2255
EFCore Reminders
galvesribeiro Oct 3, 2023
95b6cca
EFCore Grain Directory
galvesribeiro Oct 3, 2023
ff5d7c7
EFCore Hosting extensions
galvesribeiro Oct 4, 2023
32257bb
Sql Server support + Migrations
galvesribeiro Oct 5, 2023
659aa2b
EFCore Sql Server tests
galvesribeiro Oct 6, 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
35 changes: 35 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,41 @@ jobs:
path: |
**/TestResults/*
**/logs/*
test-efcore-sqlserver:
name: Microsoft Entity Framework Core SQL Server provider tests
runs-on: ubuntu-latest
strategy:
matrix:
provider: [ "EFCore-SqlServer" ]
services:
mssql:
image: mcr.microsoft.com/mssql/server:latest
ports:
- 1433:1433
env:
ACCEPT_EULA: "Y"
MSSQL_PID: "Developer"
# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="False positive")]
SA_PASSWORD: "yourStrong(!)Password"
steps:
- uses: actions/checkout@v2
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
3.1.x
7.0.x
- name: Test
run: dotnet test --filter "Category=${{ matrix.provider }}&(Category=BVT|Category=SlowBVT|Category=Functional)" --blame-hang-timeout 10m --logger "trx" -- -parallel none -noshadow
- name: Archive Test Results
if: always()
uses: actions/upload-artifact@v3
with:
name: test_output
retention-days: 1
path: |
**/TestResults/*
**/logs/*
test-sqlserver:
name: Microsoft SQL Server provider tests
runs-on: ubuntu-latest
Expand Down
6 changes: 5 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
<!-- Microsoft packages -->
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.34.0" />
<PackageVersion Include="Microsoft.Build" Version="17.3.2" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
Expand Down Expand Up @@ -51,6 +54,7 @@
<PackageVersion Include="Azure.Storage.Blobs" Version="12.14.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.12.0" />
<!-- 3rd party packages -->
<PackageVersion Include="MySql.EntityFrameworkCore" Version="7.0.5" />
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.5.16" />
<PackageVersion Include="AWSSDK.SQS" Version="3.7.2.119" />
<PackageVersion Include="Consul" Version="1.6.10.7" />
Expand Down Expand Up @@ -99,4 +103,4 @@
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(SourceLinkVersion)" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="$(SourceLinkVersion)" />
</ItemGroup>
</Project>
</Project>
76 changes: 76 additions & 0 deletions Orleans.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,31 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tester.Redis", "test\Extens
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Serialization.Protobuf", "src\Serializers\Orleans.Serialization.Protobuf\Orleans.Serialization.Protobuf.csproj", "{A073C0EE-8732-42F9-A22E-D47034E25076}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EFCore", "EFCore", "{616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}"
ProjectSection(SolutionItems) = preProject
src\EFCore\Readme.md = src\EFCore\Readme.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Clustering.EntityFrameworkCore", "src\EFCore\Orleans.Clustering.EntityFrameworkCore\Orleans.Clustering.EntityFrameworkCore.csproj", "{3DE92182-011E-4518-AE68-78C6547FFFCF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Persistence.EntityFrameworkCore", "src\EFCore\Orleans.Persistence.EntityFrameworkCore\Orleans.Persistence.EntityFrameworkCore.csproj", "{7E395297-508D-4287-A5AF-FBC9F2B25DCA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Reminders.EntityFrameworkCore", "src\EFCore\Orleans.Reminders.EntityFrameworkCore\Orleans.Reminders.EntityFrameworkCore.csproj", "{084715C6-2A31-452B-8AFF-FAC7E6F70445}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.GrainDirectory.EntityFrameworkCore", "src\EFCore\Orleans.GrainDirectory.EntityFrameworkCore\Orleans.GrainDirectory.EntityFrameworkCore.csproj", "{D772413C-B6EC-4CBC-8D1E-714176A81F26}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tester.EFCore", "test\Extensions\Tester.EFCore\Tester.EFCore.csproj", "{638B4CAA-856E-43CE-9888-A8F021350AE0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Clustering.EntityFrameworkCore.SqlServer", "src\EFCore\Orleans.Clustering.EntityFrameworkCore.SqlServer\Orleans.Clustering.EntityFrameworkCore.SqlServer.csproj", "{C02CCF05-CBA0-4C1C-8622-50BD01928502}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.GrainDirectory.EntityFrameworkCore.SqlServer", "src\EFCore\Orleans.GrainDirectory.EntityFrameworkCore.SqlServer\Orleans.GrainDirectory.EntityFrameworkCore.SqlServer.csproj", "{54F742D9-B721-4B2D-98F1-B2EDA8E8C70F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Persistence.EntityFrameworkCore.SqlServer", "src\EFCore\Orleans.Persistence.EntityFrameworkCore.SqlServer\Orleans.Persistence.EntityFrameworkCore.SqlServer.csproj", "{95F5EC32-BEFC-4FBA-8BEA-857007AEB9C6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Reminders.EntityFrameworkCore.SqlServer", "src\EFCore\Orleans.Reminders.EntityFrameworkCore.SqlServer\Orleans.Reminders.EntityFrameworkCore.SqlServer.csproj", "{CC8ECC81-4160-47E9-B9D7-E578BAC424F7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Clustering.EntityFrameworkCore.MySql", "src\EFCore\Orleans.Clustering.EntityFrameworkCore.MySql\Orleans.Clustering.EntityFrameworkCore.MySql.csproj", "{AA369C0C-9941-469E-BD5C-E5E5DB632431}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -593,6 +618,46 @@ Global
{A073C0EE-8732-42F9-A22E-D47034E25076}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A073C0EE-8732-42F9-A22E-D47034E25076}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A073C0EE-8732-42F9-A22E-D47034E25076}.Release|Any CPU.Build.0 = Release|Any CPU
{3DE92182-011E-4518-AE68-78C6547FFFCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3DE92182-011E-4518-AE68-78C6547FFFCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DE92182-011E-4518-AE68-78C6547FFFCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3DE92182-011E-4518-AE68-78C6547FFFCF}.Release|Any CPU.Build.0 = Release|Any CPU
{7E395297-508D-4287-A5AF-FBC9F2B25DCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E395297-508D-4287-A5AF-FBC9F2B25DCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7E395297-508D-4287-A5AF-FBC9F2B25DCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7E395297-508D-4287-A5AF-FBC9F2B25DCA}.Release|Any CPU.Build.0 = Release|Any CPU
{084715C6-2A31-452B-8AFF-FAC7E6F70445}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{084715C6-2A31-452B-8AFF-FAC7E6F70445}.Debug|Any CPU.Build.0 = Debug|Any CPU
{084715C6-2A31-452B-8AFF-FAC7E6F70445}.Release|Any CPU.ActiveCfg = Release|Any CPU
{084715C6-2A31-452B-8AFF-FAC7E6F70445}.Release|Any CPU.Build.0 = Release|Any CPU
{D772413C-B6EC-4CBC-8D1E-714176A81F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D772413C-B6EC-4CBC-8D1E-714176A81F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D772413C-B6EC-4CBC-8D1E-714176A81F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D772413C-B6EC-4CBC-8D1E-714176A81F26}.Release|Any CPU.Build.0 = Release|Any CPU
{638B4CAA-856E-43CE-9888-A8F021350AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{638B4CAA-856E-43CE-9888-A8F021350AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{638B4CAA-856E-43CE-9888-A8F021350AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{638B4CAA-856E-43CE-9888-A8F021350AE0}.Release|Any CPU.Build.0 = Release|Any CPU
{C02CCF05-CBA0-4C1C-8622-50BD01928502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C02CCF05-CBA0-4C1C-8622-50BD01928502}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C02CCF05-CBA0-4C1C-8622-50BD01928502}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C02CCF05-CBA0-4C1C-8622-50BD01928502}.Release|Any CPU.Build.0 = Release|Any CPU
{54F742D9-B721-4B2D-98F1-B2EDA8E8C70F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{54F742D9-B721-4B2D-98F1-B2EDA8E8C70F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{54F742D9-B721-4B2D-98F1-B2EDA8E8C70F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{54F742D9-B721-4B2D-98F1-B2EDA8E8C70F}.Release|Any CPU.Build.0 = Release|Any CPU
{95F5EC32-BEFC-4FBA-8BEA-857007AEB9C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{95F5EC32-BEFC-4FBA-8BEA-857007AEB9C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95F5EC32-BEFC-4FBA-8BEA-857007AEB9C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95F5EC32-BEFC-4FBA-8BEA-857007AEB9C6}.Release|Any CPU.Build.0 = Release|Any CPU
{CC8ECC81-4160-47E9-B9D7-E578BAC424F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC8ECC81-4160-47E9-B9D7-E578BAC424F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC8ECC81-4160-47E9-B9D7-E578BAC424F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC8ECC81-4160-47E9-B9D7-E578BAC424F7}.Release|Any CPU.Build.0 = Release|Any CPU
{AA369C0C-9941-469E-BD5C-E5E5DB632431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA369C0C-9941-469E-BD5C-E5E5DB632431}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA369C0C-9941-469E-BD5C-E5E5DB632431}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA369C0C-9941-469E-BD5C-E5E5DB632431}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -702,6 +767,17 @@ Global
{8FC6457C-6273-4338-AD2A-ECAA8FE2C5D7} = {082D25DB-70CA-48F4-93E0-EC3455F494B8}
{F13247A0-70C9-4200-9CB1-2002CB8105E0} = {082D25DB-70CA-48F4-93E0-EC3455F494B8}
{A073C0EE-8732-42F9-A22E-D47034E25076} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8} = {FE2E08C6-9C3B-4AEE-AE07-CCA387580D7A}
{3DE92182-011E-4518-AE68-78C6547FFFCF} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
{7E395297-508D-4287-A5AF-FBC9F2B25DCA} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
{084715C6-2A31-452B-8AFF-FAC7E6F70445} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
{D772413C-B6EC-4CBC-8D1E-714176A81F26} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
{638B4CAA-856E-43CE-9888-A8F021350AE0} = {082D25DB-70CA-48F4-93E0-EC3455F494B8}
{C02CCF05-CBA0-4C1C-8622-50BD01928502} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
{54F742D9-B721-4B2D-98F1-B2EDA8E8C70F} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
{95F5EC32-BEFC-4FBA-8BEA-857007AEB9C6} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
{CC8ECC81-4160-47E9-B9D7-E578BAC424F7} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
{AA369C0C-9941-469E-BD5C-E5E5DB632431} = {616ECAC3-2EA7-4819-9A05-EF4F4D8DDFA8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7BFB3429-B5BB-4DB1-95B4-67D77A864952}
Expand Down
63 changes: 63 additions & 0 deletions src/EFCore/Orleans.Clustering.EntityFrameworkCore.MySql/Clustering.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` (
`MigrationId` varchar(150) NOT NULL,
`ProductVersion` varchar(32) NOT NULL,
PRIMARY KEY (`MigrationId`)
);

START TRANSACTION;

IF NOT EXISTS(SELECT * FROM `__EFMigrationsHistory` WHERE `MigrationId` = '20231007024046_InitialClusteringSchema')
BEGIN
CREATE TABLE `Clusters` (
`Id` varchar(255) NOT NULL,
`Timestamp` datetime(6) NOT NULL,
`Version` int NOT NULL,
`ETag` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
PRIMARY KEY (`Id`)
);
END;

IF NOT EXISTS(SELECT * FROM `__EFMigrationsHistory` WHERE `MigrationId` = '20231007024046_InitialClusteringSchema')
BEGIN
CREATE TABLE `Silos` (
`ClusterId` varchar(255) NOT NULL,
`Address` varchar(45) NOT NULL,
`Port` int NOT NULL,
`Generation` int NOT NULL,
`Name` varchar(150) NOT NULL,
`HostName` varchar(150) NOT NULL,
`Status` int NOT NULL,
`ProxyPort` int NULL,
`SuspectingTimes` longtext NULL,
`SuspectingSilos` longtext NULL,
`StartTime` datetime(6) NOT NULL,
`IAmAliveTime` datetime(6) NOT NULL,
`ETag` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
PRIMARY KEY (`ClusterId`, `Address`, `Port`, `Generation`),
CONSTRAINT `FK_Silos_Clusters_ClusterId` FOREIGN KEY (`ClusterId`) REFERENCES `Clusters` (`Id`) ON DELETE CASCADE
);
END;

IF NOT EXISTS(SELECT * FROM `__EFMigrationsHistory` WHERE `MigrationId` = '20231007024046_InitialClusteringSchema')
BEGIN
CREATE INDEX `IDX_Silo_ClusterId` ON `Silos` (`ClusterId`);
END;

IF NOT EXISTS(SELECT * FROM `__EFMigrationsHistory` WHERE `MigrationId` = '20231007024046_InitialClusteringSchema')
BEGIN
CREATE INDEX `IDX_Silo_ClusterId_Status` ON `Silos` (`ClusterId`, `Status`);
END;

IF NOT EXISTS(SELECT * FROM `__EFMigrationsHistory` WHERE `MigrationId` = '20231007024046_InitialClusteringSchema')
BEGIN
CREATE INDEX `IDX_Silo_ClusterId_Status_IAmAlive` ON `Silos` (`ClusterId`, `Status`, `IAmAliveTime`);
END;

IF NOT EXISTS(SELECT * FROM `__EFMigrationsHistory` WHERE `MigrationId` = '20231007024046_InitialClusteringSchema')
BEGIN
INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
VALUES ('20231007024046_InitialClusteringSchema', '7.0.11');
END;

COMMIT;

128 changes: 128 additions & 0 deletions ...ityFrameworkCore.MySql/Data/Migrations/20231007024046_InitialClusteringSchema.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading