From 3ba4dbfa7d0982a197137de4c201822373766d3b Mon Sep 17 00:00:00 2001 From: Chengcheng Jin Date: Wed, 18 Dec 2024 07:36:16 +0000 Subject: [PATCH] address comments --- velox/serializers/RowSerializer.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/velox/serializers/RowSerializer.h b/velox/serializers/RowSerializer.h index 84a7802e9ad2..ae062b658fd7 100644 --- a/velox/serializers/RowSerializer.h +++ b/velox/serializers/RowSerializer.h @@ -44,8 +44,8 @@ struct RowHeader { void write(OutputStream* out) { out->write(reinterpret_cast(&uncompressedSize), sizeof(int32_t)); out->write(reinterpret_cast(&compressedSize), sizeof(int32_t)); - char writeValue = compressed ? 1 : 0; - out->write(reinterpret_cast(&writeValue), sizeof(char)); + const char writeValue = compressed ? 1 : 0; + out->write(reinterpret_cast(&writeValue), sizeof(char)); } static size_t size() { @@ -55,8 +55,8 @@ struct RowHeader { std::string debugString() const { return fmt::format( "uncompressedSize: {}, compressedSize: {}, compressed: {}", - uncompressedSize, - compressedSize, + succinctBytes(uncompressedSize), + succinctBytes(compressedSize), compressed); } }; @@ -152,8 +152,8 @@ class RowSerializer : public IterativeVectorSerializer { return detail::RowHeader::size() + codec_->maxCompressedLength(size); } - // The serialization format is | uncompressedSize | compressedSize | - // compressed | data. + /// The serialization format is | uncompressedSize | compressedSize | + /// compressed | data. void flush(OutputStream* stream) override { constexpr int32_t kMaxCompressionAttemptsToSkip = 30; const auto size = uncompressedSize(); @@ -283,11 +283,11 @@ class RowDeserializer { ? VectorSerde::Options().compressionKind : options->compressionKind; while (!source->atEnd()) { - std::unique_ptr uncompressedBuf = nullptr; + std::unique_ptr uncompressedBuf; const auto header = detail::RowHeader::read(source); if (header.compressed) { - VELOX_DCHECK( - compressionKind != common::CompressionKind::CompressionKind_NONE); + VELOX_DCHECK_NE( + compressionKind, common::CompressionKind::CompressionKind_NONE); auto compressBuf = folly::IOBuf::create(header.compressedSize); source->readBytes(compressBuf->writableData(), header.compressedSize); compressBuf->append(header.compressedSize); @@ -297,8 +297,9 @@ class RowDeserializer { uncompressedBuf = codec->uncompress(compressBuf.get(), header.uncompressedSize); } + std::unique_ptr uncompressedStream; - ByteInputStream* uncompressedSource; + ByteInputStream* uncompressedSource{nullptr}; if (uncompressedBuf == nullptr) { uncompressedSource = source; } else {