lix-project/hydra
3
0
Fork 6
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

Update Lix to latest revision #8

Open
ma27 wants to merge 2 commits from ma27/hydra:lix-update into main
pull from: ma27/hydra:lix-update
merge into: lix-project:main
Conversation 1 Commits 2 Files changed 3 +42 -39
ma27 commented 2024-09-26 13:03:44 +00:00
Member
Copy link

cc @delroth @leo60228

cc @jade who authored the related Lix change. Would be nice if you could double-check if I didn't mess anything up in e92ac734e6 :)

cc @delroth @leo60228 cc @jade who authored the related Lix change. Would be nice if you could double-check if I didn't mess anything up in e92ac734e6 :)
ma27 added 2 commits 2024-09-26 13:03:49 +00:00 
Flake lock file updates:

• Updated input 'lix':
    'git+https://git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=02eb07cfd539c34c080cb1baf042e5e780c1fcc2' (2024-09-01)
  → 'git+https://git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=31954b51367737defbae87fba053b068897416fb' (2024-09-26)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6e99f2a27d600612004fbd2c3282d614bfee6421' (2024-08-30)
  → 'github:NixOS/nixpkgs/759537f06e6999e141588ff1c9be7f3a5c060106' (2024-09-25)
Since ca1dc3f70bf98e2424b7b2666ee2180675b67451, the NAR parser has moved
the preallocate & receive steps into the file handle class to remove the
assumption that only one file can be handled at a time.
jade reviewed 2024-09-26 17:03:23 +00:00
jade left a comment
Owner
Copy link

i mean there's really nothing wrong with this code but there's a couple things you could make a bit better

i mean there's really nothing wrong with this code but there's a couple things you could make a bit better
src/hydra-queue-runner/nar-extractor.cc
@ -12,0 +18,4 @@
public:
MyFileHandle(NarMemberData * memberData, uint64_t size) : memberData(memberData)
{
expectedSize = size;
jade commented 2024-09-26 16:58:24 +00:00
Owner
Copy link

should be in the initializer above rather than in the function itself

should be in the initializer above rather than in the function itself
src/hydra-queue-runner/nar-extractor.cc
@ -12,0 +19,4 @@
MyFileHandle(NarMemberData * memberData, uint64_t size) : memberData(memberData)
{
expectedSize = size;
hashSink = std::make_unique<HashSink>(HashType::SHA256);
jade commented 2024-09-26 16:59:14 +00:00
Owner
Copy link

does this actually have to be behind a pointer? only reason i can see that it would is being big but i don't think it's big.

edit: oh, it might be the reset() maybe? so that it becomes null and crashes if you put extra data in it?

does this actually have to be behind a pointer? only reason i can see that it would is being big but i don't think it's big. edit: oh, it might be the reset() maybe? so that it becomes null and crashes if you put extra data in it?
src/hydra-queue-runner/nar-extractor.cc
@ -32,2 +60,3 @@
std::unique_ptr<FileHandle> createRegularFile(const Path & path, uint64_t size, bool executable) override
{
curMember = &members.insert_or_assign(prefix + path, NarMemberData {
auto memberData = &members.insert_or_assign(prefix + path, NarMemberData {
jade commented 2024-09-26 17:01:51 +00:00
Owner
Copy link

probably should be auto * right?

or you could refactor it into being a reference now that the field doesn't need to be reassigned; either way.

probably should be `auto *` right? or you could refactor it into being a reference now that the field doesn't need to be reassigned; either way.
ma27 commented 2024-09-28 10:48:29 +00:00
Author
Member
Copy link

i mean there's really nothing wrong with this code but there's a couple things you could make a bit better

To be clear, that's also helpful for me!

I mostly do C++ because I'm interested in hacking on Lix & Hydra, so getting input on how to do things better is very valuable to me. Thank you!

I'll try to get back to you this weekend for that.

> i mean there's really nothing wrong with this code but there's a couple things you could make a bit better To be clear, that's also helpful for me! I mostly do C++ because I'm interested in hacking on Lix & Hydra, so getting input on how to do things better is very valuable to me. Thank you! I'll try to get back to you this weekend for that.
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u lix-update:ma27-lix-update
git checkout ma27-lix-update

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff ma27-lix-update
git checkout main
git merge --ff-only ma27-lix-update
git checkout ma27-lix-update
git rebase main
git checkout main
git merge --no-ff ma27-lix-update
git checkout main
git merge --squash ma27-lix-update
git checkout main
git merge --ff-only ma27-lix-update
git checkout main
git merge ma27-lix-update
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: lix-project/hydra#8
No description provided.
Delete branch "ma27/hydra:lix-update"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?