Skip to content

[Fix](parquet-reader) Fix definition level rle decode dead loop in parquet-reader. (#39523) #39945

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

Merged
morningman merged 1 commit into from
Aug 27, 2024
Merged

[Fix](parquet-reader) Fix definition level rle decode dead loop in parquet-reader. (#39523) #39945

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions be/src/util/bit_stream_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ class BitReader {

bool is_initialized() const { return buffer_ != nullptr; }

const uint8_t* buffer() const { return buffer_; }

int max_bytes() const { return max_bytes_; }

private:
// Used by SeekToBit() and GetValue() to fetch the
// the next word into buffer_.
Expand Down
2 changes: 2 additions & 0 deletions be/src/util/rle_encoding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ class RleDecoder {
// Get current repeated value, make sure that count equals repeated_count()
T get_repeated_value(size_t count);

const BitReader& bit_reader() const { return bit_reader_; }

private:
bool ReadHeader();

Expand Down
4 changes: 3 additions & 1 deletion be/src/vec/exec/format/parquet/level_decoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ class LevelDecoder {

inline void rewind_one() { _rle_decoder.RewindOne(); }

const RleDecoder<level_t>& rle_decoder() const { return _rle_decoder; }

private:
tparquet::Encoding::type _encoding;
level_t _bit_width = 0;
Expand All @@ -65,4 +67,4 @@ class LevelDecoder {
BitReader _bit_packed_decoder;
};

} // namespace doris::vectorized
} // namespace doris::vectorized
20 changes: 18 additions & 2 deletions be/src/vec/exec/format/parquet/vparquet_column_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,15 @@ Status ScalarColumnReader::_skip_values(size_t num_values) {
level_t def_level = -1;
size_t loop_skip = def_decoder.get_next_run(&def_level, num_values - skipped);
if (loop_skip == 0) {
continue;
std::stringstream ss;
auto& bit_reader = def_decoder.rle_decoder().bit_reader();
ss << "def_decoder buffer (hex): ";
for (size_t i = 0; i < bit_reader.max_bytes(); ++i) {
ss << std::hex << std::setw(2) << std::setfill('0')
<< static_cast<int>(bit_reader.buffer()[i]) << " ";
}
LOG(WARNING) << ss.str();
return Status::InternalError("Failed to decode definition level.");
}
if (def_level == 0) {
null_size += loop_skip;
Expand Down Expand Up @@ -254,7 +262,15 @@ Status ScalarColumnReader::_read_values(size_t num_values, ColumnPtr& doris_colu
level_t def_level;
size_t loop_read = def_decoder.get_next_run(&def_level, num_values - has_read);
if (loop_read == 0) {
continue;
std::stringstream ss;
auto& bit_reader = def_decoder.rle_decoder().bit_reader();
ss << "def_decoder buffer (hex): ";
for (size_t i = 0; i < bit_reader.max_bytes(); ++i) {
ss << std::hex << std::setw(2) << std::setfill('0')
<< static_cast<int>(bit_reader.buffer()[i]) << " ";
}
LOG(WARNING) << ss.str();
return Status::InternalError("Failed to decode definition level.");
}
bool is_null = def_level == 0;
if (!(prev_is_null ^ is_null)) {
Expand Down