Skip to content

Commit

Permalink
apacheGH-44008: [C++][Parquet] Add support for arrow::ArrayStatistics…
Browse files Browse the repository at this point in the history
…: boolean
  • Loading branch information
kou committed Sep 9, 2024
1 parent d88dd19 commit 7dddc55
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
4 changes: 4 additions & 0 deletions cpp/src/parquet/arrow/arrow_statistics_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ void TestStatisticsReadArray(std::shared_ptr<::arrow::DataType> arrow_type) {
}
} // namespace

TEST(TestStatisticsRead, Boolean) {
TestStatisticsReadArray<::arrow::BooleanType, bool>(::arrow::boolean());
}

TEST(TestStatisticsRead, Int8) {
TestStatisticsReadArray<::arrow::Int8Type, int64_t>(::arrow::int8());
}
Expand Down
30 changes: 21 additions & 9 deletions cpp/src/parquet/arrow/reader_internal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,13 @@ void AttachStatistics(::arrow::ArrayData* data,
static_cast<::parquet::TypedStatistics<ParquetType>*>(statistics);
const ArrowCType min = typed_statistics->min();
const ArrowCType max = typed_statistics->max();
if (std::is_floating_point<ArrowCType>::value) {
if constexpr (std::is_same<ArrowCType, bool>::value) {
array_statistics->min = static_cast<bool>(min);
array_statistics->max = static_cast<bool>(max);
} else if constexpr (std::is_floating_point<ArrowCType>::value) {
array_statistics->min = static_cast<double>(min);
array_statistics->max = static_cast<double>(max);
} else if (std::is_signed<ArrowCType>::value) {
} else if constexpr (std::is_signed<ArrowCType>::value) {
array_statistics->min = static_cast<int64_t>(min);
array_statistics->max = static_cast<int64_t>(max);
} else {
Expand Down Expand Up @@ -414,11 +417,13 @@ std::shared_ptr<Array> TransferZeroCopy(
return ::arrow::MakeArray(std::move(data));
}

Status TransferBool(RecordReader* reader, bool nullable, MemoryPool* pool, Datum* out) {
Status TransferBool(RecordReader* reader,
std::unique_ptr<::parquet::ColumnChunkMetaData> metadata,
const ReaderContext* ctx, bool nullable, Datum* out) {
int64_t length = reader->values_written();

const int64_t buffer_size = bit_util::BytesForBits(length);
ARROW_ASSIGN_OR_RAISE(auto data, ::arrow::AllocateBuffer(buffer_size, pool));
ARROW_ASSIGN_OR_RAISE(auto data, ::arrow::AllocateBuffer(buffer_size, ctx->pool));

// Transfer boolean values to packed bitmap
auto values = reinterpret_cast<const bool*>(reader->values());
Expand All @@ -431,13 +436,19 @@ Status TransferBool(RecordReader* reader, bool nullable, MemoryPool* pool, Datum
}
}

std::shared_ptr<::arrow::ArrayData> array_data;
if (nullable) {
*out = std::make_shared<BooleanArray>(length, std::move(data),
reader->ReleaseIsValid(), reader->null_count());
array_data = ::arrow::ArrayData::Make(::arrow::boolean(), length,
{reader->ReleaseIsValid(), std::move(data)},
reader->null_count());
} else {
*out = std::make_shared<BooleanArray>(length, std::move(data),
/*null_bitmap=*/nullptr, /*null_count=*/0);
array_data = ::arrow::ArrayData::Make(::arrow::boolean(), length,
{/*null_bitmap=*/nullptr, std::move(data)},
/*null_count=*/0);
}
AttachStatistics<::arrow::BooleanType, BooleanType>(array_data.get(),
std::move(metadata), ctx);
*out = std::make_shared<BooleanArray>(std::move(array_data));
return Status::OK();
}

Expand Down Expand Up @@ -833,7 +844,8 @@ Status TransferColumnData(RecordReader* reader,
reader, std::move(metadata), ctx, value_field);
break;
case ::arrow::Type::BOOL:
RETURN_NOT_OK(TransferBool(reader, value_field->nullable(), pool, &result));
RETURN_NOT_OK(TransferBool(reader, std::move(metadata), ctx,
value_field->nullable(), &result));
break;
TRANSFER_INT32(UINT8, ::arrow::UInt8Type);
TRANSFER_INT32(INT8, ::arrow::Int8Type);
Expand Down

0 comments on commit 7dddc55

Please sign in to comment.