Skip to content

Commit afd2985

Browse files
committed
refactor: remove MapSort from shared code
MapSort only exists in Spark 4.0+, not in 3.4/3.5
1 parent 3e9336a commit afd2985

2 files changed

Lines changed: 1 addition & 21 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ object QueryPlanSerde extends Logging with CometExprShim {
126126
classOf[MapKeys] -> CometMapKeys,
127127
classOf[MapEntries] -> CometMapEntries,
128128
classOf[MapValues] -> CometMapValues,
129-
classOf[MapFromArrays] -> CometMapFromArrays,
130-
classOf[MapSort] -> CometMapSort)
129+
classOf[MapFromArrays] -> CometMapFromArrays)
131130

132131
private val structExpressions: Map[Class[_ <: Expression], CometExpressionSerde[_]] = Map(
133132
classOf[CreateNamedStruct] -> CometCreateNamedStruct,

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.apache.comet.serde
2121

2222
import org.apache.spark.sql.catalyst.expressions._
23-
import org.apache.spark.sql.catalyst.expressions.objects.RowOrdering
2423
import org.apache.spark.sql.types.{ArrayType, MapType}
2524

2625
import org.apache.comet.CometSparkSessionExtensions.withInfo
@@ -91,21 +90,3 @@ object CometMapFromArrays extends CometExpressionSerde[MapFromArrays] {
9190
optExprWithInfo(mapFromArraysExpr, expr, expr.children: _*)
9291
}
9392
}
94-
95-
object CometMapSort extends CometExpressionSerde[MapSort] {
96-
97-
override def convert(
98-
expr: MapSort,
99-
inputs: Seq[Attribute],
100-
binding: Boolean): Option[ExprOuterClass.Expr] = {
101-
val keyType = expr.base.dataType.asInstanceOf[MapType].keyType
102-
if (!RowOrdering.isOrderable(keyType)) {
103-
withInfo(expr, s"map_sort requires orderable key type, got: $keyType")
104-
return None
105-
}
106-
107-
val childExpr = exprToProtoInternal(expr.base, inputs, binding)
108-
val mapSortScalarExpr = scalarFunctionExprToProto("map_sort", childExpr)
109-
optExprWithInfo(mapSortScalarExpr, expr, expr.children: _*)
110-
}
111-
}

0 commit comments

Comments
 (0)