Factor out MemorySourceAccessor, implement missing features
#9283
Conversation
github-actions
bot
added
the
fetching
Ericson2314
force-pushed
the
mememory-source-accessor
branch
from
a2507d7
to
414927b
Compare
|
|
||
| namespace nix { | ||
|
|
||
| struct MemoryInputAccessorImpl : MemoryInputAccessor | ||
| { | ||
| std::map<CanonPath, std::string> files; | ||
| MemorySourceAccessor a; |
There was a problem hiding this comment.
Can't we just make MemoryInputAccessorImpl a subclass of MemorySourceAccessor and InputAccessor? Then we don't need all these forwarding methods.
There was a problem hiding this comment.
@edolstra I we'll need to make the base SourceAccessors virtual but then yes we can.
The new `MemorySourceAccessor` rather than being a slightly lossy flat map is a complete in-memory model of file system objects. Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
Ericson2314
force-pushed
the
mememory-source-accessor
branch
from
c84aee5
to
9b880e3
Compare
| return r->contents; | ||
| else | ||
| throw Error("file '%s' is not a regular file", path); | ||
| } |
There was a problem hiding this comment.
No symlink support.
Maybe the source accessor virtual methods should not even be responsible for that behavior. Or at least, symlink resolution should be implemented once, as a mix-in or an adapter.
(Also applies to other methods)
There was a problem hiding this comment.
Yeah I actually think this is right and its PosixSourceAccessor that needs to be fixed.
There was a problem hiding this comment.
#9306 partially fixes PosixSourceAccesor and documents this in the methods.
|
Triaged in Nix team meeting:
|
| * `MemorySourceAccessor`, this has a side benefit of nicely | ||
| * defining what a "file system object" is in Nix. | ||
| */ | ||
| struct File { |
There was a problem hiding this comment.
Perhaps:
| struct File { | |
| struct FileSystemObject { |
I don't like the idea that a directory would be a file.
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2023-11-06-nix-team-meeting-minutes-101/35247/1 |
Motivation
The new
MemorySourceAccessorrather than being a slightly lossy flat map is a complete in-memory model of file system objects.Context
I need this to write more unit tests for #8918
Priorities
Add 👍 to pull requests you find important.