emilytrau/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Organize content-address.hh a bit better

Browse source
This commit is contained in:
John Ericson 2020-10-13 03:30:14 +00:00
parent a0f369aa3f
commit 39c11c5c01
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/libstore/content-address.hh
View file

@ -7,7 +7,7 @@
namespace nix { namespace nix {
/* /*
* Mini content address * Content addressing method
*/ */
enum struct FileIngestionMethod : uint8_t { enum struct FileIngestionMethod : uint8_t {
@ -15,6 +15,34 @@ enum struct FileIngestionMethod : uint8_t {
Recursive = true Recursive = true
}; };
/*
We only have one way to hash text with references, so this is single-value
type is only useful in std::variant.
*/
struct TextHashMethod { };
struct FixedOutputHashMethod {
FileIngestionMethod fileIngestionMethod;
HashType hashType;
};
/* Compute the prefix to the hash algorithm which indicates how the files were
ingested. */
std::string makeFileIngestionPrefix(const FileIngestionMethod m);
typedef std::variant<
TextHashMethod,
FixedOutputHashMethod
> ContentAddressMethod;
ContentAddressMethod parseContentAddressMethod(std::string_view rawCaMethod);
std::string renderContentAddressMethod(ContentAddressMethod caMethod);
/*
* Mini content address
*/
struct TextHash { struct TextHash {
Hash hash; Hash hash;
@ -43,10 +71,6 @@ typedef std::variant<
FixedOutputHash // for path computed by makeFixedOutputPath FixedOutputHash // for path computed by makeFixedOutputPath
> ContentAddress; > ContentAddress;
/* Compute the prefix to the hash algorithm which indicates how the files were
ingested. */
std::string makeFileIngestionPrefix(const FileIngestionMethod m);
std::string renderContentAddress(ContentAddress ca); std::string renderContentAddress(ContentAddress ca);
std::string renderContentAddress(std::optional<ContentAddress> ca); std::string renderContentAddress(std::optional<ContentAddress> ca);
@ -57,25 +81,6 @@ std::optional<ContentAddress> parseContentAddressOpt(std::string_view rawCaOpt);
Hash getContentAddressHash(const ContentAddress & ca); Hash getContentAddressHash(const ContentAddress & ca);
/*
We only have one way to hash text with references, so this is single-value
type is only useful in std::variant.
*/
struct TextHashMethod { };
struct FixedOutputHashMethod {
FileIngestionMethod fileIngestionMethod;
HashType hashType;
};
typedef std::variant<
TextHashMethod,
FixedOutputHashMethod
> ContentAddressMethod;
ContentAddressMethod parseContentAddressMethod(std::string_view rawCaMethod);
std::string renderContentAddressMethod(ContentAddressMethod caMethod);
/* /*
* References set * References set
*/ */