diff options
| -rw-r--r-- | .version | 2 | ||||
| -rw-r--r-- | src/libstore/derivations.cc | 6 | ||||
| -rw-r--r-- | src/libstore/s3-binary-cache-store.cc | 7 | ||||
| -rw-r--r-- | src/libstore/s3-binary-cache-store.hh | 1 |
4 files changed, 6 insertions, 10 deletions
@@ -1 +1 @@ -2.4
\ No newline at end of file +3.0
\ No newline at end of file diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index c88bb3c6d..3fa93e24d 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -33,7 +33,7 @@ bool derivationIsCA(DerivationType dt) { }; // Since enums can have non-variant values, but making a `default:` would // disable exhaustiveness warnings. - abort(); + assert(false); } bool derivationIsFixed(DerivationType dt) { @@ -42,7 +42,7 @@ bool derivationIsFixed(DerivationType dt) { case DerivationType::CAFixed: return true; case DerivationType::CAFloating: return false; }; - abort(); + assert(false); } bool derivationIsImpure(DerivationType dt) { @@ -51,7 +51,7 @@ bool derivationIsImpure(DerivationType dt) { case DerivationType::CAFixed: return true; case DerivationType::CAFloating: return false; }; - abort(); + assert(false); } diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 1b7dff085..67935f3ba 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -343,13 +343,10 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1) .count(); - auto size = istream->tellg(); - - printInfo("uploaded 's3://%s/%s' (%d bytes) in %d ms", - bucketName, path, size, duration); + printInfo("uploaded 's3://%s/%s' in %d ms", + bucketName, path, duration); stats.putTimeMs += duration; - stats.putBytes += size; stats.put++; } diff --git a/src/libstore/s3-binary-cache-store.hh b/src/libstore/s3-binary-cache-store.hh index 4d43fe4d2..b2b75d498 100644 --- a/src/libstore/s3-binary-cache-store.hh +++ b/src/libstore/s3-binary-cache-store.hh @@ -19,7 +19,6 @@ public: struct Stats { std::atomic<uint64_t> put{0}; - std::atomic<uint64_t> putBytes{0}; std::atomic<uint64_t> putTimeMs{0}; std::atomic<uint64_t> get{0}; std::atomic<uint64_t> getBytes{0}; |