Skip to content
This repository was archived by the owner on Aug 15, 2024. It is now read-only.

Arne/sqlstreamsfixing #536

Draft
ArneSchoonvliet wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

Arne/sqlstreamsfixing #536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
194045f
Working on fixing sqlstreamstore pgsql
Oct 13, 2021
ab54933
Hacked solution for high cocurrent load
Oct 13, 2021
1750a2c
Wip
Feb 2, 2022
c3f9eea
WIP fixing it
Feb 2, 2022
dd5aca4
Version bumps
Feb 3, 2022
2b278cc
Upgrade to .net 6 and all nuget dependencies to latest version (#1)
ArneSchoonvliet Feb 15, 2022
31fbee3
Push to correct new feedz
Feb 15, 2022
c380e16
Upgrade nuget packages (#2)
ArneSchoonvliet Mar 2, 2022
a38b683
Replace functions in migration to have correct type (#3)
ArneSchoonvliet Mar 3, 2022
f5376cf
WIP
Apr 20, 2022
a02ffa9
Merge remote-tracking branch 'arneremote/master' into arne/sqlstreams…
Apr 20, 2022
2bf0931
WIP
Apr 20, 2022
ffafbf6
Make tests work
Apr 20, 2022
87da711
WIP
Apr 20, 2022
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
Prev Previous commit
Next Next commit
Version bumps
  • Loading branch information
Arne Schoonvliet
Arne Schoonvliet committed Feb 3, 2022
commit dd5aca420a2cb92a7d6d6251b94f09ebbac142c5
3 changes: 2 additions & 1 deletion src/LoadTests/LoadTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
<ItemGroup>
<PackageReference Include="EasyConsoleStd" Version="2.0.0" />
<PackageReference Include="MartinCostello.SqlLocalDb" Version="3.0.0" />
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
Expand Down
3 changes: 2 additions & 1 deletion src/LoadTests/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
using System.Threading.Tasks;
using EasyConsole;
using Serilog;
using Serilog.Events;

internal class Program
{
static async Task Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
.WriteTo
.File("LoadTests.txt")
.Console(LogEventLevel.Information)
.CreateLogger();

var cts = new CancellationTokenSource();
Expand Down
16 changes: 8 additions & 8 deletions src/SqlStreamStore.Postgres/PostgresStreamStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,14 @@ public string GetSchemaCreationScript()

// // TODO: FIXIT
// // Check for gap between last page and this.
// if (page.Messages[0].Position != fromPositionInclusive)
// {
// Logger.DebugFormat("Gap detected at lower page boundary. Potentially could have lost {lostMessageCount} events if the gap is transient", page.Messages[0].Position - fromPositionInclusive);
// page = await HandleGap(page, fromPositionInclusive, maxCount, prefetchJsonData, cancellationToken);
// //if (!page.IsEnd || page.Messages.Length == 1)
// // Logger.DebugFormat("Gap detected at lower page boundary. Potentially could have lost {lostMessageCount} events if the gap is transient", page.Messages[0].Position - fromPositionInclusive);
// //page = await ReloadAfterDelay(fromPositionInclusive, maxCount, prefetchJsonData, ReadNext, cancellationToken);
// }
// //if (page.Messages[0].Position != fromPositionInclusive)
// //{
// // Logger.InfoFormat("Gap detected at lower page boundary. Potentially could have lost {lostMessageCount} events if the gap is transient", page.Messages[0].Position - fromPositionInclusive);
// // page = await HandleGap(page, fromPositionInclusive, maxCount, prefetchJsonData, cancellationToken);
// // //if (!page.IsEnd || page.Messages.Length == 1)
// // // Logger.DebugFormat("Gap detected at lower page boundary. Potentially could have lost {lostMessageCount} events if the gap is transient", page.Messages[0].Position - fromPositionInclusive);
// // //page = await ReloadAfterDelay(fromPositionInclusive, maxCount, prefetchJsonData, ReadNext, cancellationToken);
// //}

// // check for gap in messages collection
// for (int i = 0; i < page.Messages.Length - 1; i++)
Expand Down
2 changes: 1 addition & 1 deletion src/SqlStreamStore.TestUtils/Postgres/LibLogNpgsqlLogProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public LibLogNpgsqlLogger(ILog logger, string name)
_name = name;
}

public override bool IsEnabled(NpgsqlLogLevel level) => true;
public override bool IsEnabled(NpgsqlLogLevel level) => false;

public override void Log(NpgsqlLogLevel level, int connectorId, string msg, Exception exception = null)
=> _logger.Info($@"[{level:G}] [{_name}] (Connector Id: {connectorId}); {msg}; {FormatOptionalException(exception)}");
Expand Down
3 changes: 2 additions & 1 deletion src/SqlStreamStore.TestUtils/Postgres/PostgresContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class PostgresContainer : PostgresDatabaseManager
public PostgresContainer(string databaseName)
: base(databaseName)
{

_containerService = new Builder()
.UseContainer()
.WithName(ContainerName)
Expand Down Expand Up @@ -58,7 +59,7 @@ await Policy
Host = "localhost",
Pooling = true,
MaxPoolSize = 1024,
IncludeErrorDetails = true
IncludeErrorDetails = false
};
}
}
4 changes: 2 additions & 2 deletions src/SqlStreamStore.TestUtils/Postgres/PostgresDatabaseManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public abstract class PostgresDatabaseManager
static PostgresDatabaseManager()
{
#if DEBUG
NpgsqlLogManager.IsParameterLoggingEnabled = true;
NpgsqlLogManager.Provider = new LibLogNpgsqlLogProvider();
NpgsqlLogManager.IsParameterLoggingEnabled = false;
//NpgsqlLogManager.Provider = new LibLogNpgsqlLogProvider();
#endif
}

Expand Down
22 changes: 13 additions & 9 deletions src/SqlStreamStore.TestUtils/SqlStreamStore.TestUtils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<IsTestProject>false</IsTestProject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Docker.DotNet" Version="3.125.4" />
<PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="MySqlConnector" Version="1.0.1" />
<PackageReference Include="Docker.DotNet" Version="3.125.5" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.44" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="MySqlConnector" Version="2.1.5" />
<PackageReference Include="Npgsql" Version="4.1.5" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Observable" Version="2.0.2" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="System.Reactive" Version="4.4.1" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -25,4 +25,8 @@
<ItemGroup>
<ProjectReference Include="..\..\src\SqlStreamStore\SqlStreamStore.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageReference Update="MinVer" Version="2.5.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
Expand Down