move to same package structure as Spark

Author: andygrove

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

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.comet.serde
+
+import org.apache.spark.sql.catalyst.expressions.{Attribute, BloomFilterMightContain}
+
+import org.apache.comet.CometSparkSessionExtensions.withInfo
+import org.apache.comet.serde.QueryPlanSerde.exprToProtoInternal
+
+object CometBloomFilterMightContain extends CometExpressionSerde[BloomFilterMightContain] {
+
+  override def convert(
+      expr: BloomFilterMightContain,
+      inputs: Seq[Attribute],
+      binding: Boolean): Option[ExprOuterClass.Expr] = {
+
+    val bloomFilter = expr.left
+    val value = expr.right
+    val bloomFilterExpr = exprToProtoInternal(bloomFilter, inputs, binding)
+    val valueExpr = exprToProtoInternal(value, inputs, binding)
+    if (bloomFilterExpr.isDefined && valueExpr.isDefined) {
+      val builder = ExprOuterClass.BloomFilterMightContain.newBuilder()
+      builder.setBloomFilter(bloomFilterExpr.get)
+      builder.setValue(valueExpr.get)
+      Some(
+        ExprOuterClass.Expr
+          .newBuilder()
+          .setBloomFilterMightContain(builder)
+          .build())
+    } else {
+      withInfo(expr, bloomFilter, value)
+      None
+    }
+  }
+}

…/scala/org/apache/comet/serde/misc.scala …e/comet/serde/contraintExpressions.scalaspark/src/main/scala/org/apache/comet/serde/misc.scala renamed to spark/src/main/scala/org/apache/comet/serde/contraintExpressions.scala spark/src/main/scala/org/apache/comet/serde/misc.scala renamed to spark/src/main/scala/org/apache/comet/serde/contraintExpressions.scala

@@ -19,19 +19,22 @@
 
 package org.apache.comet.serde
 
-import org.apache.spark.sql.catalyst.expressions.{Attribute, BloomFilterMightContain, KnownFloatingPointNormalized}
+import org.apache.spark.sql.catalyst.expressions.{Attribute, KnownFloatingPointNormalized}
 import org.apache.spark.sql.catalyst.optimizer.NormalizeNaNAndZero
 
 import org.apache.comet.CometSparkSessionExtensions.withInfo
-import org.apache.comet.serde.QueryPlanSerde.{exprToProtoInternal, serializeDataType}
+import org.apache.comet.serde.QueryPlanSerde.{exprToProtoInternal, optExprWithInfo, serializeDataType}
 
 object CometKnownFloatingPointNormalized
     extends CometExpressionSerde[KnownFloatingPointNormalized] {
 
   override def getSupportLevel(expr: KnownFloatingPointNormalized): SupportLevel = {
     expr.child match {
       case _: NormalizeNaNAndZero => Compatible()
-      case _ => Unsupported(Some("KnownFloatingPointNormalized only supports NormalizeNaNAndZero child expressions"))
+      case _ =>
+        Unsupported(
+          Some(
+            "KnownFloatingPointNormalized only supports NormalizeNaNAndZero child expressions"))
     }
   }
 
@@ -58,30 +61,3 @@ object CometKnownFloatingPointNormalized
     optExprWithInfo(optExpr, expr, wrapped)
   }
 }
-
-object CometBloomFilterMightContain extends CometExpressionSerde[BloomFilterMightContain] {
-
-  override def convert(
-      expr: BloomFilterMightContain,
-      inputs: Seq[Attribute],
-      binding: Boolean): Option[ExprOuterClass.Expr] = {
-
-    val bloomFilter = expr.left
-    val value = expr.right
-    val bloomFilterExpr = exprToProtoInternal(bloomFilter, inputs, binding)
-    val valueExpr = exprToProtoInternal(value, inputs, binding)
-    if (bloomFilterExpr.isDefined && valueExpr.isDefined) {
-      val builder = ExprOuterClass.BloomFilterMightContain.newBuilder()
-      builder.setBloomFilter(bloomFilterExpr.get)
-      builder.setValue(valueExpr.get)
-      Some(
-        ExprOuterClass.Expr
-          .newBuilder()
-          .setBloomFilterMightContain(builder)
-          .build())
-    } else {
-      withInfo(expr, bloomFilter, value)
-      None
-    }
-  }
-}