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

Fix bug in TeeSource

Browse source 
We use this to simplify `LocalStore::addToStoreFromDump`.

Also, hope I fixed build error with old clang (used in Darwin CI).
This commit is contained in:
John Ericson 2020-07-16 13:39:03 +00:00
parent 5602637d9e
commit 3dcca18c30
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/local-store.cc
View file

@ -1047,11 +1047,12 @@ StorePath LocalStore::addToStore(const string & name, const Path & _srcPath,
} }
StorePath LocalStore::addToStoreFromDump(Source & source, const string & name, StorePath LocalStore::addToStoreFromDump(Source & source0, const string & name,
FileIngestionMethod method, HashType hashAlgo, RepairFlag repair) FileIngestionMethod method, HashType hashAlgo, RepairFlag repair)
{ {
/* For computing the store path. */ /* For computing the store path. */
auto hashSink = std::make_unique<HashSink>(hashAlgo); auto hashSink = std::make_unique<HashSink>(hashAlgo);
TeeSource source { source0, *hashSink };
/* Read the source path into memory, but only if it's up to /* Read the source path into memory, but only if it's up to
narBufferSize bytes. If it's larger, write it to a temporary narBufferSize bytes. If it's larger, write it to a temporary
@ -1078,8 +1079,6 @@ StorePath LocalStore::addToStoreFromDump(Source & source, const string & name,
inMemory = true; inMemory = true;
break; break;
} }
/* Start hashing as we get data */
(*hashSink)((const uint8_t *) dump.data() + oldSize, got);
dump.resize(oldSize + got); dump.resize(oldSize + got);
} }
@ -1087,14 +1086,9 @@ StorePath LocalStore::addToStoreFromDump(Source & source, const string & name,
Path tempPath; Path tempPath;
if (!inMemory) { if (!inMemory) {
/* Drain what we pulled so far, and then keep on pulling */
StringSource dumpSource { dump }; StringSource dumpSource { dump };
TeeSource rest { source, *hashSink }; ChainSource bothSource { dumpSource, source };
ChainSource bothSource {
.source1 = dumpSource,
/* Continue hashing what's left, but don't rehash what we
already did. */
.source2 = rest,
};
auto tempDir = createTempDir(realStoreDir, "add"); auto tempDir = createTempDir(realStoreDir, "add");
delTempDir = std::make_unique<AutoDelete>(tempDir); delTempDir = std::make_unique<AutoDelete>(tempDir);

2
src/libutil/serialise.hh
View file

@ -189,7 +189,7 @@ struct TeeSource : Source
size_t read(unsigned char * data, size_t len) size_t read(unsigned char * data, size_t len)
{ {
size_t n = orig.read(data, len); size_t n = orig.read(data, len);
sink(data, len); sink(data, n);
return n; return n;
} }
}; };