Skip to content

Repository navigation

Feature/package upgrades #16

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

Merged
SolidArcSoftware merged 3 commits into from
Oct 5, 2026
Merged

Feature/package upgrades #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c1691c
DataArc Version 2 rpackages release
pierriemostert Oct 5, 2026
754eeda
Include appsettings file intentionally
pierriemostert Oct 5, 2026
26245ae
.zip docs removal, updated nuget.config
pierriemostert Oct 5, 2026
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
43 changes: 5 additions & 38 deletions DataArc.EntityFrameworkCore.Demo.Benchmark/DataArc.EntityFrameworkCore.Demo.Benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,19 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
<TargetFramework>net10.0</TargetFramework>
<NuGetAudit>false</NuGetAudit>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<StartupObject>Program</StartupObject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.0,7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.0,7.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="[6.0.0,7.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="[6.0.0,7.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7.0.0,8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.0,8.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="[7.0.0,8.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="[7.0.0,8.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.0,9.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[8.0.0,9.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0,9.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="[8.0.0,9.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[9.0.0,10.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[9.0.0,10.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0,10.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="[9.0.0,10.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[10.0.0,11.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[10.0.0,11.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="[10.0.0,11.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="[10.0.0,11.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
193 changes: 137 additions & 56 deletions DataArc.EntityFrameworkCore.Demo.Benchmark/ProcessEmployeeFinanceDataBenchmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.DependencyInjection;

using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Columns;
using BenchmarkDotNet.Configs;
using BenchmarkDotNet.Diagnosers;
using BenchmarkDotNet.Reports;
using BenchmarkDotNet.Running;

using DataArc.Core;
using DataArc.EntityFrameworkCore.Demo.Persistence;
using DataArc.EntityFrameworkCore.Demo.Persistence.Database.Creator;
using DataArc.EntityFrameworkCore.Demo.Persistence.Database.DBContexts;
using DataArc.EntityFrameworkCore.Demo.Persistence.Database.DBModels;
using DataArc.EntityFrameworkCore.Demo.Persistence.Utils;
using DataArc.EntityFrameworkCore.Demo.Persistence.Contracts;

using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;

namespace DataArc.EntityFrameworkCore.Demo.Benchmark
{
Expand All @@ -30,11 +29,20 @@ public class RawEmployeeBulkDataBenchmark
private const int MaxRecordCount = 1_000_000;

private IServiceProvider? _serviceProvider;
private IReadOnlyCollection<IDatabaseCreator> _databaseCreators = new List<IDatabaseCreator>();
private ICommandFactory? _commandFactory;

private List<Employee> _allEmployees = new List<Employee>();
private List<Employee> _benchmarkEmployees = new List<Employee>();
private IReadOnlyCollection<IDatabaseCreator> _databaseCreators =
new List<IDatabaseCreator>();

private IDbContextFactory<GoogleDbContext>? _googleDbContextFactory;
private IDbContextFactory<MicrosoftDbContext>? _microsoftDbContextFactory;
private IDbContextFactory<OpenAIDbContext>? _openAiDbContextFactory;
private IDbContextFactory<SolidArcDbContext>? _solidArcDbContextFactory;

private List<Employer> _allEmployers = new();
private List<Employee> _allEmployees = new();

private List<Employer> _benchmarkEmployers = new();
private List<Employee> _benchmarkEmployees = new();

[Params(62_500, 125_000, 250_000)]
public int RecordCount { get; set; }
Expand All @@ -45,11 +53,13 @@ public class RawEmployeeBulkDataBenchmark
public void GlobalSetup()
{
var configurationManager = new ConfigurationManager();

configurationManager
.AddJsonFile("appsettings.json", optional: false)
.Build();

_serviceProvider = new ServiceCollection()
.AddDataArcCore()
.AddPersistence(configurationManager)
.BuildServiceProvider();

Expand All @@ -61,33 +71,50 @@ public void GlobalSetup()
_serviceProvider.GetRequiredService<ISASDbCreator>()
};

_commandFactory = _serviceProvider.GetRequiredService<ICommandFactory>();
_googleDbContextFactory =
_serviceProvider.GetRequiredService<
IDbContextFactory<GoogleDbContext>>();

_allEmployees = SeedDataGenerator
.GenerateHrSeedData(MaxRecordCount)
.ToList();
_microsoftDbContextFactory =
_serviceProvider.GetRequiredService<
IDbContextFactory<MicrosoftDbContext>>();

_openAiDbContextFactory =
_serviceProvider.GetRequiredService<
IDbContextFactory<OpenAIDbContext>>();

_solidArcDbContextFactory =
_serviceProvider.GetRequiredService<
IDbContextFactory<SolidArcDbContext>>();

var seedData =
SeedDataGenerator.GenerateHrSeedData(MaxRecordCount);

_allEmployers = seedData.Employers;
_allEmployees = seedData.Employees;
}

[IterationSetup]
public void IterationSetup()
{
if (_databaseCreators.Count == 0)
throw new InvalidOperationException("Benchmark database creators were not resolved.");
throw new InvalidOperationException(
"Benchmark database creators were not resolved.");

foreach (var databaseCreator in _databaseCreators)
{
if (!databaseCreator.EnsureDeleted())
throw new InvalidOperationException(
$"Failed to delete benchmark database using {databaseCreator.GetType().Name}.");
databaseCreator.EnsureDeleted();
}

foreach (var databaseCreator in _databaseCreators)
{
if (!databaseCreator.EnsureCreated())
throw new InvalidOperationException(
$"Failed to create benchmark database using {databaseCreator.GetType().Name}.");
databaseCreator.EnsureCreated();
}

_benchmarkEmployers = _allEmployers
.Take(RecordCount)
.ToList();

_benchmarkEmployees = _allEmployees
.Take(RecordCount)
.ToList();
Expand All @@ -96,43 +123,67 @@ public void IterationSetup()
[Benchmark]
public async Task<int> ExecuteParallelBulkInsertAsync()
{
if (_commandFactory == null)
throw new InvalidOperationException($"{nameof(ICommandFactory)} was not resolved.");
if (_googleDbContextFactory == null)
throw new InvalidOperationException(
$"{nameof(_googleDbContextFactory)} was not resolved.");

if (_benchmarkEmployees.Count == 0)
throw new InvalidOperationException("Benchmark employee data was not generated.");
if (_microsoftDbContextFactory == null)
throw new InvalidOperationException(
$"{nameof(_microsoftDbContextFactory)} was not resolved.");

var commandBuilder = await _commandFactory.CreateCommandBuilderAsync();
if (_openAiDbContextFactory == null)
throw new InvalidOperationException(
$"{nameof(_openAiDbContextFactory)} was not resolved.");

if (commandBuilder == null)
throw new InvalidOperationException($"{nameof(commandBuilder)} was not resolved.");
if (_solidArcDbContextFactory == null)
throw new InvalidOperationException(
$"{nameof(_solidArcDbContextFactory)} was not resolved.");

commandBuilder
.UseDbExecutionContext<IGoogleDbContext>()
.AddBulk(_benchmarkEmployees, BulkBatchSize);
if (_benchmarkEmployers.Count == 0 ||
_benchmarkEmployees.Count == 0)
{
throw new InvalidOperationException(
"Benchmark data was not generated.");
}

commandBuilder
.UseDbExecutionContext<IOpenAIDbContext>()
.AddBulk(_benchmarkEmployees, BulkBatchSize);
await using var googleDbContext =
await _googleDbContextFactory.CreateDbContextAsync();

commandBuilder
.UseDbExecutionContext<IMicrosoftDbContext>()
.AddBulk(_benchmarkEmployees, BulkBatchSize);
await using var microsoftDbContext =
await _microsoftDbContextFactory.CreateDbContextAsync();

commandBuilder
.UseDbExecutionContext<ISolidArcDbContext>()
.AddBulk(_benchmarkEmployees, BulkBatchSize);
await using var openAiDbContext =
await _openAiDbContextFactory.CreateDbContextAsync();

var command = await commandBuilder.BuildAsync();
var commandResult = await command.ExecuteParallelAsync();
await using var solidArcDbContext =
await _solidArcDbContextFactory.CreateDbContextAsync();

if (!commandResult.Success)
{
throw new InvalidOperationException(
$"Failed to execute raw employee bulk insert benchmark. {commandResult.Exception?.Message}");
}
var results = await Task.WhenAll(
googleDbContext
.AsParallel()
.AddBulk(_benchmarkEmployers, BulkBatchSize)
.AddBulk(_benchmarkEmployees, BulkBatchSize)
.SaveChangesParallelAsync(),

microsoftDbContext
.AsParallel()
.AddBulk(_benchmarkEmployers, BulkBatchSize)
.AddBulk(_benchmarkEmployees, BulkBatchSize)
.SaveChangesParallelAsync(),

openAiDbContext
.AsParallel()
.AddBulk(_benchmarkEmployers, BulkBatchSize)
.AddBulk(_benchmarkEmployees, BulkBatchSize)
.SaveChangesParallelAsync(),

solidArcDbContext
.AsParallel()
.AddBulk(_benchmarkEmployers, BulkBatchSize)
.AddBulk(_benchmarkEmployees, BulkBatchSize)
.SaveChangesParallelAsync());

return commandResult.TotalAffected;
return results.Sum();
}

[GlobalCleanup]
Expand All @@ -148,47 +199,77 @@ public sealed class BenchmarkConfig : ManualConfig
{
public BenchmarkConfig()
{
AddColumn(new TotalInsertedRecordsColumn(destinationContextCount: 4));
AddColumn(
new TotalInsertedRecordsColumn(
destinationContextCount: 4,
bulkOperationCountPerContext: 2));
}
}

public sealed class TotalInsertedRecordsColumn : IColumn
{
private readonly int _destinationContextCount;
public TotalInsertedRecordsColumn(int destinationContextCount)
private readonly int _bulkOperationCountPerContext;

public TotalInsertedRecordsColumn(
int destinationContextCount,
int bulkOperationCountPerContext)
{
_destinationContextCount = destinationContextCount;
_bulkOperationCountPerContext = bulkOperationCountPerContext;
}

public string Id => nameof(TotalInsertedRecordsColumn);

public string ColumnName => "Total Inserted Records";

public bool AlwaysShow => true;

public ColumnCategory Category => ColumnCategory.Params;

public int PriorityInCategory => 0;

public bool IsNumeric => true;

public UnitType UnitType => UnitType.Dimensionless;
public string Legend => "Total records inserted across all participating DbContexts.";
public string GetValue(Summary summary, BenchmarkCase benchmarkCase)

public string Legend =>
"Total records inserted across all bulk operations and participating DbContexts.";

public string GetValue(
Summary summary,
BenchmarkCase benchmarkCase)
{
var recordCountParameter = benchmarkCase.Parameters.Items
.Single(parameter => parameter.Name == "RecordCount");

var recordCount = Convert.ToInt32(recordCountParameter.Value);
var totalInsertedRecords = recordCount * _destinationContextCount;
var recordCount =
Convert.ToInt32(recordCountParameter.Value);

var totalInsertedRecords =
recordCount *
_destinationContextCount *
_bulkOperationCountPerContext;

return totalInsertedRecords.ToString("N0");
}

public string GetValue(
Summary summary,
BenchmarkCase benchmarkCase,
SummaryStyle style)
{
return GetValue(summary, benchmarkCase);
}

public bool IsAvailable(Summary summary)
{
return true;
}
public bool IsDefault(Summary summary, BenchmarkCase benchmarkCase)

public bool IsDefault(
Summary summary,
BenchmarkCase benchmarkCase)
{
return false;
}
Expand Down
10 changes: 10 additions & 0 deletions ...tion/Modules/Features/SalaryAdjustments/Services/ITransactionalSalaryAdjustmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace DataArc.EntityFrameworkCore.Demo.Contracts.Application.Modules.Features.SalaryAdjustments.Services
{
public interface ITransactionalSalaryAdjustmentService
{
Task<int> ProcessEmployeeSalaryAdjustmentsAsync(
decimal salaryAdjustmentBaseRate,
decimal salaryThreshold,
int batchSize);
}
}
Loading
Loading