Skip to content

Commit d609154

Browse files
committed
fix: restore ConcatWs import removed in base64 change
1 parent 1314e59 commit d609154

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ object CometStaticInvoke extends CometExpressionSerde[StaticInvoke] {
5757
}
5858

5959
/**
60-
* Handler for Base64.encode StaticInvoke (Spark 3.5+, where Base64 is RuntimeReplaceable).
61-
* Maps to DataFusion's built-in encode(input, 'base64') function.
60+
* Handler for Base64.encode StaticInvoke (Spark 3.5+, where Base64 is RuntimeReplaceable). Maps
61+
* to DataFusion's built-in encode(input, 'base64') function.
6262
*/
6363
private object CometBase64Encode extends CometExpressionSerde[StaticInvoke] {
6464

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package org.apache.comet.serde
2121

2222
import java.util.Locale
2323

24-
import org.apache.spark.sql.catalyst.expressions.{Attribute, Base64, Cast, Concat, Expression, If, InitCap, IsNull, Left, Length, Like, Literal, Lower, RegExpReplace, Right, RLike, StringLPad, StringRepeat, StringRPad, StringSplit, Substring, Upper}
24+
import org.apache.spark.sql.catalyst.expressions.{Attribute, Base64, Cast, Concat, ConcatWs, Expression, If, InitCap, IsNull, Left, Length, Like, Literal, Lower, RegExpReplace, Right, RLike, StringLPad, StringRepeat, StringRPad, StringSplit, Substring, Upper}
2525
import org.apache.spark.sql.types.{BinaryType, DataTypes, LongType, StringType}
2626
import org.apache.spark.unsafe.types.UTF8String
2727

@@ -32,8 +32,8 @@ import org.apache.comet.serde.ExprOuterClass.Expr
3232
import org.apache.comet.serde.QueryPlanSerde.{createBinaryExpr, exprToProtoInternal, optExprWithInfo, scalarFunctionExprToProto, scalarFunctionExprToProtoWithReturnType}
3333

3434
/**
35-
* Handler for Base64 as a direct expression (Spark 3.4 where it is not RuntimeReplaceable).
36-
* In Spark 3.5+, Base64 is RuntimeReplaceable and handled via CometBase64Encode in statics.scala.
35+
* Handler for Base64 as a direct expression (Spark 3.4 where it is not RuntimeReplaceable). In
36+
* Spark 3.5+, Base64 is RuntimeReplaceable and handled via CometBase64Encode in statics.scala.
3737
*/
3838
object CometBase64 extends CometExpressionSerde[Base64] {
3939

0 commit comments

Comments
 (0)