Skip to content

Fix duplicate versions upload for different forks #1

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
Lokilife merged 1 commit into from
Oct 13, 2025
Merged

Fix duplicate versions upload for different forks #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion Robust.Cdn/Jobs/IngestNewCdnContentJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public async Task Execute(IJobExecutionContext context)
finally
{
transaction.Dispose();
logger.LogInformation("Ingestion for fork \"{Fork}\" finished", fork);
}

await QueueManifestAvailable(fork, newVersions);
Expand Down Expand Up @@ -111,6 +112,10 @@ private void IngestNewVersions(
try
{
var versionIdx = 0;

if (newVersions.Count < 1)
logger.LogWarning("No versions provided to ingest");

foreach (var version in newVersions)
{
if (versionIdx % 5 == 0)
Expand Down Expand Up @@ -335,7 +340,8 @@ private void IngestNewVersions(

private List<string> FindNewVersions(string fork, SqliteConnection con)
{
using var stmtCheckVersion = con.Handle!.Prepare("SELECT 1 FROM ContentVersion WHERE Version = ?");
var forkId = EnsureForkCreated(fork, con);
using var stmtCheckVersion = con.Handle!.Prepare("SELECT 1 FROM ContentVersion WHERE Version = ? AND ForkId = ?");

var newVersions = new List<(string, DateTime)>();

Expand All @@ -353,6 +359,7 @@ private List<string> FindNewVersions(string fork, SqliteConnection con)

stmtCheckVersion.Reset();
stmtCheckVersion.BindString(1, version);
stmtCheckVersion.BindInt(2, forkId);

if (stmtCheckVersion.Step() == raw.SQLITE_ROW)
{
Expand Down