Skip to content

Commit 07d1013

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

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
@@ -131,8 +131,7 @@ object QueryPlanSerde extends Logging with CometExprShim {
131131
classOf[MapValues] -> CometMapValues,
132132
classOf[MapFromArrays] -> CometMapFromArrays,
133133
classOf[MapContainsKey] -> CometMapContainsKey,
134-
classOf[MapFromEntries] -> CometMapFromEntries,
135-
classOf[MapSort] -> CometMapSort)
134+
classOf[MapFromEntries] -> CometMapFromEntries)
136135

137136
private val structExpressions: Map[Class[_ <: Expression], CometExpressionSerde[_]] = Map(
138137
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._
2524

2625
import org.apache.comet.CometSparkSessionExtensions.withInfo
@@ -158,21 +157,3 @@ object CometMapFromEntries extends CometScalarFunction[MapFromEntries]("map_from
158157
Compatible(None)
159158
}
160159
}
161-
162-
object CometMapSort extends CometExpressionSerde[MapSort] {
163-
164-
override def convert(
165-
expr: MapSort,
166-
inputs: Seq[Attribute],
167-
binding: Boolean): Option[ExprOuterClass.Expr] = {
168-
val keyType = expr.base.dataType.asInstanceOf[MapType].keyType
169-
if (!RowOrdering.isOrderable(keyType)) {
170-
withInfo(expr, s"map_sort requires orderable key type, got: $keyType")
171-
return None
172-
}
173-
174-
val childExpr = exprToProtoInternal(expr.base, inputs, binding)
175-
val mapSortScalarExpr = scalarFunctionExprToProto("map_sort", childExpr)
176-
optExprWithInfo(mapSortScalarExpr, expr, expr.children: _*)
177-
}
178-
}

0 commit comments

Comments
 (0)