fix

Author: andygrove

spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala

@@ -23,7 +23,7 @@ import scala.collection.JavaConverters._
 
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.catalyst.expressions._
-import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, Average, BitAndAgg, BitOrAgg, BitXorAgg, Complete, Corr, Count, CovPopulation, CovSample, Final, First, Last, Max, Min, Partial, StddevPop, StddevSamp, Sum, VariancePop, VarianceSamp}
+import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, Average, BitAndAgg, BitOrAgg, BitXorAgg, BloomFilterAggregate, Complete, Corr, Count, CovPopulation, CovSample, Final, First, Last, Max, Min, Partial, StddevPop, StddevSamp, Sum, VariancePop, VarianceSamp}
 import org.apache.spark.sql.catalyst.expressions.objects.StaticInvoke
 import org.apache.spark.sql.catalyst.optimizer.{BuildLeft, BuildRight, NormalizeNaNAndZero}
 import org.apache.spark.sql.catalyst.plans._
@@ -370,6 +370,7 @@ object QueryPlanSerde extends Logging with ShimQueryPlanSerde with CometExprShim
       case _: StddevSamp => CometStddevSamp
       case _: StddevPop => CometStddevPop
       case _: Corr => CometCorr
+      case _: BloomFilterAggregate => CometBloomFilterAggregate
       case fn =>
         val msg = s"unsupported Spark aggregate function: ${fn.prettyName}"
         emitWarning(msg)

spark/src/main/scala/org/apache/comet/serde/aggregates.scala

@@ -659,16 +659,16 @@ object CometBloomFilterAggregate extends CometAggregateExpressionSerde {
       numItemsExpr.isDefined &&
       numBitsExpr.isDefined &&
       dataType.isDefined) {
-      val bloomFilterAggBuilder = ExprOuterClass.BloomFilterAgg.newBuilder()
-      bloomFilterAggBuilder.setChild(childExpr.get)
-      bloomFilterAggBuilder.setNumItems(numItemsExpr.get)
-      bloomFilterAggBuilder.setNumBits(numBitsExpr.get)
-      bloomFilterAggBuilder.setDatatype(dataType.get)
+      val builder = ExprOuterClass.BloomFilterAgg.newBuilder()
+      builder.setChild(childExpr.get)
+      builder.setNumItems(numItemsExpr.get)
+      builder.setNumBits(numBitsExpr.get)
+      builder.setDatatype(dataType.get)
 
       Some(
         ExprOuterClass.AggExpr
           .newBuilder()
-          .setBloomFilterAgg(bloomFilterAggBuilder)
+          .setBloomFilterAgg(builder)
           .build())
     } else {
       withInfo(