-
Notifications
You must be signed in to change notification settings - Fork 684
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.
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
Mysql storage #777
Open
Shamus03
wants to merge
6
commits into
loic-sharma:main
Choose a base branch
from
Shamus03:mysql-storage
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Mysql storage #777
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
833d048
Implement MySql storage for package contents
Shamus03 f56a58e
Add migration
Shamus03 e79e65c
fix migration; add valid storage type
Shamus03 d77ef4d
error handling
Shamus03 b96b0f8
Use conflict
Shamus03 23fbe04
addmysqlstorage
Shamus03 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
using Microsoft.EntityFrameworkCore; | ||
|
||
namespace BaGet.Core | ||
{ | ||
public interface IPackageContentsContext | ||
{ | ||
DbSet<PackageContents> PackageContents { get; set; } | ||
|
||
Task<int> SaveChangesAsync(CancellationToken cancellationToken); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
namespace BaGet.Core | ||
{ | ||
public class PackageContents | ||
{ | ||
public int Key { get; set; } | ||
|
||
public string Path { get; set; } | ||
|
||
public byte[] Data { get; set; } | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
using System.Linq; | ||
using System; | ||
using System.IO; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
using Microsoft.EntityFrameworkCore; | ||
|
||
namespace BaGet.Core | ||
{ | ||
public class DatabaseStorageService : IStorageService | ||
{ | ||
private readonly IPackageContentsContext _context; | ||
|
||
public DatabaseStorageService(IPackageContentsContext context) | ||
{ | ||
if (context == null) throw new ArgumentException(nameof(context)); | ||
|
||
_context = context; | ||
} | ||
|
||
public async Task DeleteAsync(string path, CancellationToken cancellationToken = default) | ||
{ | ||
var contents = await _context.PackageContents.SingleOrDefaultAsync(p => p.Path == path, cancellationToken); | ||
if (contents != null) | ||
{ | ||
_context.PackageContents.Remove(contents); | ||
await _context.SaveChangesAsync(cancellationToken); | ||
} | ||
} | ||
|
||
public async Task<Stream> GetAsync(string path, CancellationToken cancellationToken = default) | ||
{ | ||
var contents = await _context.PackageContents.SingleOrDefaultAsync(p => p.Path == path, cancellationToken); | ||
if (contents == null) | ||
{ | ||
throw new Exception($"PackageContents record not found for path: {path}"); | ||
} | ||
var ms = new MemoryStream(contents.Data); | ||
return ms; | ||
} | ||
|
||
public Task<Uri> GetDownloadUriAsync(string path, CancellationToken cancellationToken = default) | ||
{ | ||
throw new NotImplementedException(); | ||
} | ||
|
||
public async Task<StoragePutResult> PutAsync(string path, Stream content, string contentType, CancellationToken cancellationToken = default) | ||
{ | ||
byte[] newData; | ||
using (var binaryReader = new BinaryReader(content)) | ||
{ | ||
newData = binaryReader.ReadBytes((int)content.Length); | ||
} | ||
|
||
var existingContents = await _context.PackageContents.SingleOrDefaultAsync(p => p.Path == path, cancellationToken); | ||
if (existingContents != null) | ||
{ | ||
return existingContents.Data.SequenceEqual(newData) | ||
? StoragePutResult.AlreadyExists | ||
: StoragePutResult.Conflict; | ||
} | ||
|
||
_context.PackageContents.Add(new PackageContents | ||
{ | ||
Path = path, | ||
Data = newData, | ||
}); | ||
await _context.SaveChangesAsync(cancellationToken); | ||
|
||
return StoragePutResult.Success; | ||
} | ||
} | ||
} |
260 changes: 260 additions & 0 deletions
260
src/BaGet.Database.MySql/Migrations/20230710152239_CreatePackageContentsTable.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I realized this should perhaps be "database" not "mysql". What do you think @loic-sharma?