Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix Compression file check output error messages #12009

Closed
wants to merge 1 commit into from
Closed

fix: Fix Compression file check output error messages #12009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions velox/dwio/common/compression/Compression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ uint64_t LzoAndLz4DecompressorCommon::decompress(
DWIO_ENSURE_GE(
compressedSize,
dwio::common::INT_BYTE_SIZE,
"{} decompression failed, input len is too small: {}",
kind_,
::facebook::velox::common::compressionKindToString(kind_),
" decompression failed, input len is too small: ",
compressedSize);

uint32_t decompressedBlockSize =
Expand All @@ -258,11 +258,11 @@ uint64_t LzoAndLz4DecompressorCommon::decompress(
DWIO_ENSURE_GE(
remainingOutputSize,
decompressedBlockSize,
"{} decompression failed, remainingOutputSize is less than "
"decompressedBlockSize, remainingOutputSize: {}, "
"decompressedBlockSize: {}",
kind_,
::facebook::velox::common::compressionKindToString(kind_),
" decompression failed, remainingOutputSize is less than "
"decompressedBlockSize, remainingOutputSize: ",
remainingOutputSize,
", decompressedBlockSize: ",
decompressedBlockSize);

if (compressedSize <= 0) {
Expand All @@ -274,8 +274,8 @@ uint64_t LzoAndLz4DecompressorCommon::decompress(
DWIO_ENSURE_GE(
compressedSize,
dwio::common::INT_BYTE_SIZE,
"{} decompression failed, input len is too small: {}",
kind_,
::facebook::velox::common::compressionKindToString(kind_),
" decompression failed, input len is too small: ",
compressedSize);
// Read the length of the next lz4/lzo compressed block.
uint32_t compressedBlockSize =
Expand All @@ -286,14 +286,14 @@ uint64_t LzoAndLz4DecompressorCommon::decompress(
if (compressedBlockSize == 0) {
continue;
}

DWIO_ENSURE_LE(
compressedBlockSize,
compressedSize,
"{} decompression failed, compressedBlockSize is greater than compressedSize, "
"compressedBlockSize: {}, compressedSize: {}",
kind_,
::facebook::velox::common::compressionKindToString(kind_),
" decompression failed, compressedBlockSize is greater than "
"compressedSize, compressedBlockSize: ",
compressedBlockSize,
", compressedSize: ",
compressedSize);

// Decompress this block.
Expand All @@ -307,10 +307,11 @@ uint64_t LzoAndLz4DecompressorCommon::decompress(
DWIO_ENSURE_LE(
decompressedSize,
remainingOutputSize,
"{} decompression failed, decompressedSize is not less than or equal to remainingOutputSize, "
"decompressedSize: {}, remainingOutputSize: {}",
::facebook::velox::common::compressionKindToString(kind_),
" decompression failed, decompressedSize is not less than "
"or equal to remainingOutputSize, decompressedSize: ",
decompressedSize,
", remainingOutputSize: ",
remainingOutputSize);

outPtr += decompressedSize;
Expand All @@ -324,10 +325,11 @@ uint64_t LzoAndLz4DecompressorCommon::decompress(
DWIO_ENSURE_EQ(
decompressedTotalSize,
uncompressedSize,
"{} decompression failed, decompressedTotalSize is not equal to uncompressedSize, "
"decompressedTotalSize: {}, uncompressedSize: {}",
kind_,
::facebook::velox::common::compressionKindToString(kind_),
" decompression failed, decompressedTotalSize is not equal to "
"uncompressedSize, decompressedTotalSize: ",
decompressedTotalSize,
", uncompressedSize: ",
uncompressedSize);

return decompressedTotalSize;
Expand Down
Loading