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 parquet endian issue for s390x #40

Closed
wants to merge 2 commits into from
Closed

Fix parquet endian issue for s390x #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2a1ef7
Fix parquet endian issue
HarryLeeIBM Aug 11, 2023
8a72a09
Merge pull request #1 from ClibMouse/hlee-s390x-par
HarryLeeIBM Aug 11, 2023
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
2 changes: 1 addition & 1 deletion cpp/src/parquet/column_reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ int LevelDecoder::SetData(Encoding::type encoding, int16_t max_level,
if (data_size < 4) {
throw ParquetException("Received invalid levels (corrupt data page?)");
}
num_bytes = ::arrow::util::SafeLoadAs<int32_t>(data);
num_bytes = ::arrow::bit_util::ToLittleEndian(::arrow::util::SafeLoadAs<int32_t>(data));
if (num_bytes < 0 || num_bytes > data_size - 4) {
throw ParquetException("Received invalid number of bytes (corrupt data page?)");
}
Expand Down
22 changes: 16 additions & 6 deletions cpp/src/parquet/encoding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ int PlainDecoder<DType>::DecodeArrow(
VisitNullBitmapInline(
valid_bits, valid_bits_offset, num_values, null_count,
[&]() {
builder->UnsafeAppend(::arrow::util::SafeLoadAs<value_type>(data_));
builder->UnsafeAppend(::arrow::bit_util::ToLittleEndian(::arrow::util::SafeLoadAs<value_type>(data_)));
data_ += sizeof(value_type);
},
[&]() { builder->UnsafeAppendNull(); });
Expand Down Expand Up @@ -1047,7 +1047,7 @@ int PlainDecoder<DType>::DecodeArrow(
valid_bits, valid_bits_offset, num_values, null_count,
[&]() {
PARQUET_THROW_NOT_OK(
builder->Append(::arrow::util::SafeLoadAs<value_type>(data_)));
builder->Append(::arrow::bit_util::ToLittleEndian(::arrow::util::SafeLoadAs<value_type>(data_))));
data_ += sizeof(value_type);
},
[&]() { PARQUET_THROW_NOT_OK(builder->AppendNull()); });
Expand All @@ -1067,7 +1067,17 @@ inline int DecodePlain(const uint8_t* data, int64_t data_size, int num_values,
}
// If bytes_to_decode == 0, data could be null
if (bytes_to_decode > 0) {
#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
for (size_t i = 0; i < num_values; ++i)
{
memcpy(out + i, data + sizeof(T) * i, sizeof(T));
auto begin = reinterpret_cast<uint8_t*>(out + i);
auto end = begin + sizeof(T);
std::reverse(begin, end);
}
#else
memcpy(out, data, bytes_to_decode);
#endif
}
return static_cast<int>(bytes_to_decode);
}
Expand All @@ -1090,7 +1100,7 @@ static inline int64_t ReadByteArray(const uint8_t* data, int64_t data_size,
if (ARROW_PREDICT_FALSE(data_size < 4)) {
ParquetException::EofException();
}
const int32_t len = ::arrow::util::SafeLoadAs<int32_t>(data);
const int32_t len = ::arrow::bit_util::ToLittleEndian(::arrow::util::SafeLoadAs<int32_t>(data));
if (len < 0) {
throw ParquetException("Invalid BYTE_ARRAY value");
}
Expand Down Expand Up @@ -1379,7 +1389,7 @@ class PlainByteArrayDecoder : public PlainDecoder<ByteArrayType>,
if (ARROW_PREDICT_FALSE(len_ < 4)) {
ParquetException::EofException();
}
auto value_len = ::arrow::util::SafeLoadAs<int32_t>(data_);
auto value_len = ::arrow::bit_util::ToLittleEndian(::arrow::util::SafeLoadAs<int32_t>(data_));
if (ARROW_PREDICT_FALSE(value_len < 0 || value_len > INT32_MAX - 4)) {
return Status::Invalid("Invalid or corrupted value_len '", value_len, "'");
}
Expand Down Expand Up @@ -1425,7 +1435,7 @@ class PlainByteArrayDecoder : public PlainDecoder<ByteArrayType>,
if (ARROW_PREDICT_FALSE(len_ < 4)) {
ParquetException::EofException();
}
auto value_len = ::arrow::util::SafeLoadAs<int32_t>(data_);
auto value_len = ::arrow::bit_util::ToLittleEndian(::arrow::util::SafeLoadAs<int32_t>(data_));
if (ARROW_PREDICT_FALSE(value_len < 0 || value_len > INT32_MAX - 4)) {
return Status::Invalid("Invalid or corrupted value_len '", value_len, "'");
}
Expand Down Expand Up @@ -2984,7 +2994,7 @@ int ByteStreamSplitDecoder<DType>::DecodeArrow(
const size_t byte_index = b * num_values_in_buffer_ + offset;
gathered_byte_data[b] = data[byte_index];
}
builder->UnsafeAppend(::arrow::util::SafeLoadAs<T>(&gathered_byte_data[0]));
builder->UnsafeAppend(::arrow::bit_util::ToLittleEndian(::arrow::util::SafeLoadAs<T>(&gathered_byte_data[0])));
++offset;
},
[&]() { builder->UnsafeAppendNull(); });
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/parquet/file_reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,9 @@ class SerializedFile : public ParquetFileReader::Contents {
"is not a parquet file.");
}
// Both encrypted/unencrypted footers have the same footer length check.
uint32_t metadata_len = ::arrow::util::SafeLoadAs<uint32_t>(
uint32_t metadata_len = ::arrow::bit_util::FromLittleEndian(::arrow::util::SafeLoadAs<uint32_t>(
reinterpret_cast<const uint8_t*>(footer_buffer->data()) + footer_read_size -
kFooterSize);
kFooterSize));
if (metadata_len > source_size_ - kFooterSize) {
throw ParquetInvalidOrCorruptedFileException(
"Parquet file size is ", source_size_,
Expand Down