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

Use classic score in total score processor #157

Merged
merged 5 commits into from
Oct 4, 2023
Merged

Use classic score in total score processor #157

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
84c371f
Merge branch 'split-legacy-scoring-attribs' into total-score-classic
bdach Sep 28, 2023
622df85
Use classic score in total score processor
bdach Sep 28, 2023
8d4aaed
Merge branch 'master' into total-score-classic
peppy Sep 29, 2023
b80d274
Update packages
peppy Oct 4, 2023
93a1b26
Remove weird nullability on `MySqlConnection`
peppy Oct 4, 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
5 changes: 5 additions & 0 deletions osu.Server.Queues.ScoreStatisticsProcessor.Tests/DatabaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ public static ScoreItem CreateTestScore(int? rulesetId = null, int? beatmapId =
{ HitResult.Perfect, 5 },
{ HitResult.LargeBonus, 0 }
},
MaximumStatistics =
{
{ HitResult.Perfect, 5 },
{ HitResult.LargeBonus, 2 }
},
Passed = true
};

Expand Down
8 changes: 4 additions & 4 deletions osu.Server.Queues.ScoreStatisticsProcessor.Tests/TotalScoreProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ public void TestTotalScoreIncrease()
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", (int?)null, CancellationToken);

PushToQueueAndWaitForProcess(CreateTestScore());
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 100000, CancellationToken);
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 10081, CancellationToken);

PushToQueueAndWaitForProcess(CreateTestScore());
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 200000, CancellationToken);
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 20162, CancellationToken);
}

[Fact]
Expand Down Expand Up @@ -45,12 +45,12 @@ public void TestTotalScoreReprocessDoesntIncrease()
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", (int?)null, CancellationToken);

PushToQueueAndWaitForProcess(score);
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 100000, CancellationToken);
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 10081, CancellationToken);

score.MarkProcessed();

PushToQueueAndWaitForProcess(score);
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 100000, CancellationToken);
WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 10081, CancellationToken);
}
}
}
6 changes: 4 additions & 2 deletions osu.Server.Queues.ScoreStatisticsProcessor/Processors/TotalScoreProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
using JetBrains.Annotations;
using MySqlConnector;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring.Legacy;
using osu.Server.Queues.ScoreStatisticsProcessor.Models;

namespace osu.Server.Queues.ScoreStatisticsProcessor.Processors
Expand All @@ -19,12 +21,12 @@ public class TotalScoreProcessor : IProcessor
public void RevertFromUserStats(SoloScoreInfo score, UserStats userStats, int previousVersion, MySqlConnection conn, MySqlTransaction transaction)
{
if (previousVersion >= 2)
userStats.total_score -= score.TotalScore;
userStats.total_score -= score.GetDisplayScore(ScoringMode.Classic);
}

public void ApplyToUserStats(SoloScoreInfo score, UserStats userStats, MySqlConnection conn, MySqlTransaction transaction)
{
userStats.total_score += score.TotalScore;
userStats.total_score += score.GetDisplayScore(ScoringMode.Classic);
}

public void ApplyGlobal(SoloScoreInfo score, MySqlConnection conn)
Expand Down
2 changes: 1 addition & 1 deletion osu.Server.Queues.ScoreStatisticsProcessor/Stores/BeatmapStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private BeatmapStore(IEnumerable<KeyValuePair<BlacklistEntry, byte>> blacklist)
/// <param name="connection">The <see cref="MySqlConnection"/>.</param>
/// <param name="transaction">An existing transaction.</param>
/// <returns>The created <see cref="BeatmapStore"/>.</returns>
public static async Task<BeatmapStore> CreateAsync(MySqlConnection? connection, MySqlTransaction? transaction = null)
public static async Task<BeatmapStore> CreateAsync(MySqlConnection connection, MySqlTransaction? transaction = null)
{
var dbBlacklist = await connection.QueryAsync<PerformanceBlacklistEntry>("SELECT * FROM osu_beatmap_performance_blacklist", transaction: transaction);

Expand Down
2 changes: 1 addition & 1 deletion osu.Server.Queues.ScoreStatisticsProcessor/Stores/BuildStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private BuildStore(IEnumerable<KeyValuePair<int, Build>> builds)
/// <param name="connection">The <see cref="MySqlConnection"/>.</param>
/// <param name="transaction">An existing transaction.</param>
/// <returns>The created <see cref="BuildStore"/>.</returns>
public static async Task<BuildStore> CreateAsync(MySqlConnection? connection, MySqlTransaction? transaction = null)
public static async Task<BuildStore> CreateAsync(MySqlConnection connection, MySqlTransaction? transaction = null)
{
var dbBuilds = await connection.QueryAsync<Build>("SELECT * FROM osu_builds WHERE `allow_ranking` = TRUE OR `allow_performance` = TRUE", transaction: transaction);

Expand Down
12 changes: 6 additions & 6 deletions osu.Server.Queues.ScoreStatisticsProcessor/osu.Server.Queues.ScoreStatisticsProcessor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.151" />
<PackageReference Include="Dapper" Version="2.1.4" />
<PackageReference Include="Dapper.Contrib" Version="2.0.78" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
<PackageReference Include="ppy.osu.Game" Version="2023.928.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.928.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.928.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.928.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.928.0" />
<PackageReference Include="ppy.osu.Game" Version="2023.1004.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.1004.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.1004.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.1004.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.1004.0" />
<PackageReference Include="ppy.osu.Server.OsuQueueProcessor" Version="2023.822.0" />
</ItemGroup>

Expand Down