address some comments

mapleFU · Feb 7, 2025 · 26c2d07 · 26c2d07
1 parent d57ceea
commit 26c2d07
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/cpp/src/parquet/bloom_filter_builder.cc b/cpp/src/parquet/bloom_filter_builder.cc
@@ -99,7 +99,7 @@ BloomFilter* BloomFilterBuilderImpl::GetOrCreateBloomFilter(int32_t column_ordin
   if (bloom_filter_options_opt == std::nullopt) {
     return nullptr;
   }
-  BloomFilterOptions bloom_filter_options = *bloom_filter_options_opt;
+  const BloomFilterOptions& bloom_filter_options = *bloom_filter_options_opt;
   // CheckState() should have checked that file_bloom_filters_ is not empty.
   DCHECK(!file_bloom_filters_.empty());
   RowGroupBloomFilters& row_group_bloom_filter = *file_bloom_filters_.back();

diff --git a/cpp/src/parquet/bloom_filter_builder.h b/cpp/src/parquet/bloom_filter_builder.h
@@ -20,14 +20,7 @@
 #include "arrow/io/type_fwd.h"
 #include "parquet/types.h"
 
-namespace parquet {
-
-class BloomFilter;
-class SchemaDescriptor;
-struct BloomFilterOptions;
-struct BloomFilterLocation;
-
-namespace internal {
+namespace parquet::internal {
 
 /// \brief Interface for collecting bloom filter of a parquet file.
 ///
@@ -83,6 +76,4 @@ class PARQUET_EXPORT BloomFilterBuilder {
   virtual ~BloomFilterBuilder() = default;
 };
 
-}  // namespace internal
-
-}  // namespace parquet
+}  // namespace parquet::internal
diff --git a/cpp/src/parquet/column_writer.cc b/cpp/src/parquet/column_writer.cc
@@ -2541,7 +2541,9 @@ void TypedColumnWriterImpl<BooleanType>::UpdateBloomFilterSpaced(const bool*, in
                                                                  int64_t) {
   // BooleanType does not have a bloom filter currently,
   // so bloom_filter_ should always be nullptr.
-  DCHECK(bloom_filter_ == nullptr);
+  if (UNLIKELY(bloom_filter_ == nullptr)) {
+    throw ParquetException("BooleanType does not support bloom filters");
+  }
 }
 
 template <>

diff --git a/cpp/src/parquet/type_fwd.h b/cpp/src/parquet/type_fwd.h
@@ -90,6 +90,9 @@ class Statistics;
 struct SizeStatistics;
 
 class BloomFilter;
+struct BloomFilterOptions;
+struct BloomFilterLocation;
+
 class ColumnIndex;
 class OffsetIndex;