refactor: drop rvalue-ref compress overload

This commit is contained in:
Marcus Holland-Moritz 2025-03-29 15:04:07 +01:00
parent 501f5c38f4
commit a19145388c
8 changed files with 1 additions and 54 deletions

View File

@ -65,20 +65,11 @@ class block_compressor {
return impl_->compress(data, nullptr); return impl_->compress(data, nullptr);
} }
std::vector<uint8_t> compress(std::vector<uint8_t>&& data) const {
return impl_->compress(std::move(data), nullptr);
}
std::vector<uint8_t> std::vector<uint8_t>
compress(std::span<uint8_t const> data, std::string const& metadata) const { compress(std::span<uint8_t const> data, std::string const& metadata) const {
return impl_->compress(data, &metadata); return impl_->compress(data, &metadata);
} }
std::vector<uint8_t>
compress(std::vector<uint8_t>&& data, std::string const& metadata) const {
return impl_->compress(std::move(data), &metadata);
}
compression_type type() const { return impl_->type(); } compression_type type() const { return impl_->type(); }
std::string describe() const { return impl_->describe(); } std::string describe() const { return impl_->describe(); }
@ -103,9 +94,6 @@ class block_compressor {
virtual std::vector<uint8_t> virtual std::vector<uint8_t>
compress(std::span<uint8_t const> data, compress(std::span<uint8_t const> data,
std::string const* metadata) const = 0; std::string const* metadata) const = 0;
virtual std::vector<uint8_t>
compress(std::vector<uint8_t>&& data,
std::string const* metadata) const = 0;
virtual compression_type type() const = 0; virtual compression_type type() const = 0;
virtual std::string describe() const = 0; virtual std::string describe() const = 0;

View File

@ -69,12 +69,6 @@ class brotli_block_compressor final : public block_compressor::impl {
return compressed; return compressed;
} }
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
std::vector<uint8_t> compress(std::vector<uint8_t>&& data,
std::string const* metadata) const override {
return compress(data, metadata);
}
compression_type type() const override { return compression_type::BROTLI; } compression_type type() const override { return compression_type::BROTLI; }
std::string describe() const override { std::string describe() const override {

View File

@ -344,12 +344,6 @@ class flac_block_compressor final : public block_compressor::impl {
return compressed; return compressed;
} }
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
std::vector<uint8_t> compress(std::vector<uint8_t>&& data,
std::string const* metadata) const override {
return compress(data, metadata);
}
compression_type type() const override { return compression_type::FLAC; } compression_type type() const override { return compression_type::FLAC; }
std::string describe() const override { std::string describe() const override {

View File

@ -91,12 +91,6 @@ class lz4_block_compressor final : public block_compressor::impl {
return compressed; return compressed;
} }
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
std::vector<uint8_t> compress(std::vector<uint8_t>&& data,
std::string const* metadata) const override {
return compress(data, metadata);
}
compression_type type() const override { return compression_type::LZ4; } compression_type type() const override { return compression_type::LZ4; }
std::string describe() const override { return Policy::describe(level_); } std::string describe() const override { return Policy::describe(level_); }

View File

@ -114,12 +114,6 @@ class lzma_block_compressor final : public block_compressor::impl {
std::vector<uint8_t> compress(std::span<uint8_t const> data, std::vector<uint8_t> compress(std::span<uint8_t const> data,
std::string const* metadata) const override; std::string const* metadata) const override;
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
std::vector<uint8_t> compress(std::vector<uint8_t>&& data,
std::string const* metadata) const override {
return compress(data, metadata);
}
compression_type type() const override { return compression_type::LZMA; } compression_type type() const override { return compression_type::LZMA; }
std::string describe() const override { return description_; } std::string describe() const override { return description_; }

View File

@ -41,18 +41,13 @@ class null_block_compressor final : public block_compressor::impl {
return std::make_unique<null_block_compressor>(*this); return std::make_unique<null_block_compressor>(*this);
} }
// TODO: we should not have to copy the data here...
std::vector<uint8_t> std::vector<uint8_t>
compress(std::span<uint8_t const> data, compress(std::span<uint8_t const> data,
std::string const* /*metadata*/) const override { std::string const* /*metadata*/) const override {
return std::vector<uint8_t>(data.begin(), data.end()); return std::vector<uint8_t>(data.begin(), data.end());
} }
std::vector<uint8_t>
compress(std::vector<uint8_t>&& data,
std::string const* /*metadata*/) const override {
return std::move(data);
}
compression_type type() const override { return compression_type::NONE; } compression_type type() const override { return compression_type::NONE; }
std::string describe() const override { return "null"; } std::string describe() const override { return "null"; }

View File

@ -130,12 +130,6 @@ class ricepp_block_compressor final : public block_compressor::impl {
return compressed; return compressed;
} }
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
std::vector<uint8_t> compress(std::vector<uint8_t>&& data,
std::string const* metadata) const override {
return compress(data, metadata);
}
compression_type type() const override { return compression_type::RICEPP; } compression_type type() const override { return compression_type::RICEPP; }
std::string describe() const override { std::string describe() const override {

View File

@ -57,12 +57,6 @@ class zstd_block_compressor final : public block_compressor::impl {
std::vector<uint8_t> compress(std::span<uint8_t const> data, std::vector<uint8_t> compress(std::span<uint8_t const> data,
std::string const* metadata) const override; std::string const* metadata) const override;
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
std::vector<uint8_t> compress(std::vector<uint8_t>&& data,
std::string const* metadata) const override {
return compress(data, metadata);
}
compression_type type() const override { return compression_type::ZSTD; } compression_type type() const override { return compression_type::ZSTD; }
std::string describe() const override { std::string describe() const override {