From 464735f0a8976a4924de35aa595a4764405c564a Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Thu, 23 Jan 2025 23:44:51 -0800 Subject: [PATCH] migrate uses of legacy alias folly::io::StreamCodec Reviewed By: Skory, skrueger Differential Revision: D68536730 fbshipit-source-id: 4408bf3071dc2aff7a83d522b931b58343995f97 --- proxygen/lib/utils/ZstdStreamCompressor.cpp | 9 +++++---- proxygen/lib/utils/ZstdStreamCompressor.h | 4 ++-- proxygen/lib/utils/test/ZstdTests.cpp | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/proxygen/lib/utils/ZstdStreamCompressor.cpp b/proxygen/lib/utils/ZstdStreamCompressor.cpp index 8333f4b745..f014bf0204 100644 --- a/proxygen/lib/utils/ZstdStreamCompressor.cpp +++ b/proxygen/lib/utils/ZstdStreamCompressor.cpp @@ -19,7 +19,7 @@ ZstdStreamCompressor::ZstdStreamCompressor(int compressionLevel, independent_(independentChunks) { } -folly::io::StreamCodec& ZstdStreamCompressor::getCodec() { +folly::compression::StreamCodec& ZstdStreamCompressor::getCodec() { if (!codec_) { codec_ = folly::compression::getStreamCodec(folly::io::CodecType::ZSTD, compressionLevel_); @@ -45,8 +45,9 @@ std::unique_ptr ZstdStreamCompressor::compress( in = &clone; } - auto op = last || independent_ ? folly::io::StreamCodec::FlushOp::END - : folly::io::StreamCodec::FlushOp::FLUSH; + auto op = last || independent_ + ? folly::compression::StreamCodec::FlushOp::END + : folly::compression::StreamCodec::FlushOp::FLUSH; auto& codec = getCodec(); if (independent_) { codec.resetStream(in->length()); @@ -70,7 +71,7 @@ std::unique_ptr ZstdStreamCompressor::compress( out->append(outrange.begin() - out->tail()); - if (op == folly::io::StreamCodec::FlushOp::END) { + if (op == folly::compression::StreamCodec::FlushOp::END) { codec_.reset(); } diff --git a/proxygen/lib/utils/ZstdStreamCompressor.h b/proxygen/lib/utils/ZstdStreamCompressor.h index 082d31d2e0..9fe922e380 100644 --- a/proxygen/lib/utils/ZstdStreamCompressor.h +++ b/proxygen/lib/utils/ZstdStreamCompressor.h @@ -56,9 +56,9 @@ class ZstdStreamCompressor : public StreamCompressor { } private: - folly::io::StreamCodec& getCodec(); + folly::compression::StreamCodec& getCodec(); - std::unique_ptr codec_; + std::unique_ptr codec_; const int compressionLevel_; const bool independent_; bool error_ = false; diff --git a/proxygen/lib/utils/test/ZstdTests.cpp b/proxygen/lib/utils/test/ZstdTests.cpp index a4355f87eb..0fa2fec904 100644 --- a/proxygen/lib/utils/test/ZstdTests.cpp +++ b/proxygen/lib/utils/test/ZstdTests.cpp @@ -96,8 +96,8 @@ void compressThenDecompressPieces( size_t i = 0; for (const auto& piece : input_pieces) { const auto end = ++i == input_pieces.size(); - const auto op = end ? folly::io::StreamCodec::FlushOp::END - : folly::io::StreamCodec::FlushOp::FLUSH; + const auto op = end ? folly::compression::StreamCodec::FlushOp::END + : folly::compression::StreamCodec::FlushOp::FLUSH; auto irange = piece->coalesce(); if (!end && irange.size() == 0) { continue;