Skip to content

GH-48877: [C++][Parquet] Fix writer not to throw for bloom filter on disabled bool column #48878

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

Open
wgtmac wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −6
Open

GH-48877: [C++][Parquet] Fix writer not to throw for bloom filter on disabled bool column #48878

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
12 changes: 8 additions & 4 deletions cpp/src/parquet/bloom_filter_reader_writer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ TEST(BloomFilterBuilder, BasicRoundTrip) {
TEST(BloomFilterBuilder, InvalidOperations) {
SchemaDescriptor schema;
schema::NodePtr root = schema::GroupNode::Make(
"schema", Repetition::REPEATED, {schema::ByteArray("c1"), schema::Boolean("c2")});
"schema", Repetition::REPEATED,
{schema::ByteArray("c1"), schema::Boolean("c2"), schema::Boolean("c3")});
schema.Init(root);

WriterProperties::Builder properties_builder;
Expand All @@ -173,17 +174,20 @@ TEST(BloomFilterBuilder, InvalidOperations) {

// Column ordinal is out of bound.
bloom_filter_builder->AppendRowGroup();
EXPECT_THROW_THAT([&]() { bloom_filter_builder->CreateBloomFilter(2); },
EXPECT_THROW_THAT([&]() { bloom_filter_builder->CreateBloomFilter(3); },
ParquetException,
::testing::Property(&ParquetException::what,
::testing::HasSubstr("Invalid column ordinal")));
::testing::Property(
&ParquetException::what,
::testing::HasSubstr("Invalid Column Index: 3 Num columns: 3")));

// Boolean type is not supported.
EXPECT_THROW_THAT(
[&]() { bloom_filter_builder->CreateBloomFilter(1); }, ParquetException,
::testing::Property(
&ParquetException::what,
::testing::HasSubstr("BloomFilterBuilder does not support boolean type")));
// Null should be returned instead of throwing exception for non-enabled boolean type.
EXPECT_EQ(bloom_filter_builder->CreateBloomFilter(2), nullptr);

// Create a created bloom filter should throw.
ASSERT_NO_THROW(bloom_filter_builder->CreateBloomFilter(0));
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/parquet/bloom_filter_writer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,13 @@ void BloomFilterBuilderImpl::AppendRowGroup() {
}

BloomFilter* BloomFilterBuilderImpl::CreateBloomFilter(int32_t column_ordinal) {
CheckState(column_ordinal);

auto opts = properties_->bloom_filter_options(schema_->Column(column_ordinal)->path());
if (!opts.has_value()) {
return nullptr;
}

CheckState(column_ordinal);

auto& curr_rg_bfs = *bloom_filters_.rbegin();
if (curr_rg_bfs.find(column_ordinal) != curr_rg_bfs.cend()) {
std::stringstream ss;
Expand Down
Loading