From ea80c97e4094c5b5733406cec4872047e316355e Mon Sep 17 00:00:00 2001
From: Xianjin YE <xianjin@apache.org>
Date: Sun, 10 Mar 2024 02:06:56 +0800
Subject: [PATCH] fix build issues

---
 .../expressions/bloom_filter_might_contain.rs          | 10 ++++------
 .../execution/datafusion/util/spark_bloom_filter.rs    |  7 +------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs b/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
index c08ed5e3a6..150f61bd77 100644
--- a/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
+++ b/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
@@ -24,7 +24,6 @@ use arrow_schema::DataType;
 use datafusion::{common::Result, physical_plan::ColumnarValue};
 use datafusion_common::{internal_err, DataFusionError, Result as DataFusionResult, ScalarValue};
 use datafusion_physical_expr::{aggregate::utils::down_cast_any_ref, PhysicalExpr};
-use log::info;
 use once_cell::sync::OnceCell;
 use std::{
     any::Any,
@@ -99,7 +98,6 @@ impl PhysicalExpr for BloomFilterMightContain {
                     );
                 }
                 ColumnarValue::Scalar(ScalarValue::Binary(v)) => {
-                    info!("init for bloom filter");
                     let filter = v.map(|v| SparkBloomFilter::new_from_buf(v.as_bytes()));
                     self.bloom_filter.get_or_init(|| filter);
                 }
@@ -112,9 +110,9 @@ impl PhysicalExpr for BloomFilterMightContain {
         let lazy_filter = self.bloom_filter.get().unwrap();
         if lazy_filter.is_none() {
             // when the bloom filter is null, we should return a boolean array with all nulls
-            return Ok(ColumnarValue::Array(Arc::new(BooleanArray::new_null(
+            Ok(ColumnarValue::Array(Arc::new(BooleanArray::new_null(
                 num_rows,
-            ))));
+            ))))
         } else {
             let spark_filter = lazy_filter.as_ref().unwrap();
             let values = self.value_expr.evaluate(batch)?;
@@ -134,9 +132,9 @@ impl PhysicalExpr for BloomFilterMightContain {
                         Ok(ColumnarValue::Scalar(ScalarValue::Boolean(result)))
                     }
                     _ => {
-                        return internal_err!(
+                        internal_err!(
                             "value_expr must be evaluated as an int64 array or a int64 scalar"
-                        );
+                        )
                     }
                 },
             }
diff --git a/core/src/execution/datafusion/util/spark_bloom_filter.rs b/core/src/execution/datafusion/util/spark_bloom_filter.rs
index 46c975db07..e71d62db9b 100644
--- a/core/src/execution/datafusion/util/spark_bloom_filter.rs
+++ b/core/src/execution/datafusion/util/spark_bloom_filter.rs
@@ -106,12 +106,7 @@ impl SparkBloomFilter {
     pub fn might_contain_longs(&self, items: &Int64Array) -> CometResult<BooleanArray> {
         Ok(items
             .iter()
-            .map(|v| {
-                v.and_then(|v| {
-                    let might_contain = self.might_contain_long(v);
-                    Some(might_contain)
-                })
-            })
+            .map(|v| v.map(|x| self.might_contain_long(x)))
             .collect())
     }
 }