chore: Move all array_* serde to new framework, use correct INCOMPAT config #1349
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,11 +19,11 @@ | |
|
|
||
| package org.apache.comet.serde | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions.{ArrayJoin, ArrayRemove, Attribute, Expression} | ||
| import org.apache.spark.sql.types.{ArrayType, DataType, DataTypes, DecimalType, StructType} | ||
|
|
||
| import org.apache.comet.CometSparkSessionExtensions.withInfo | ||
| import org.apache.comet.serde.QueryPlanSerde.{createBinaryExpr, exprToProto} | ||
| import org.apache.comet.shims.CometExprShim | ||
|
|
||
| object CometArrayRemove extends CometExpressionSerde with CometExprShim { | ||
|
|
@@ -65,3 +65,103 @@ object CometArrayRemove extends CometExpressionSerde with CometExprShim { | |
| (builder, binaryExpr) => builder.setArrayRemove(binaryExpr)) | ||
| } | ||
| } | ||
|
|
||
| object CometArrayAppend extends CometExpressionSerde with IncompatExpr { | ||
| override def convert( | ||
| expr: Expression, | ||
| inputs: Seq[Attribute], | ||
| binding: Boolean): Option[ExprOuterClass.Expr] = { | ||
| createBinaryExpr( | ||
| expr, | ||
| expr.children(0), | ||
| expr.children(1), | ||
| inputs, | ||
| binding, | ||
| (builder, binaryExpr) => builder.setArrayAppend(binaryExpr)) | ||
| } | ||
| } | ||
|
|
||
| object CometArrayContains extends CometExpressionSerde with IncompatExpr { | ||
| override def convert( | ||
| expr: Expression, | ||
| inputs: Seq[Attribute], | ||
| binding: Boolean): Option[ExprOuterClass.Expr] = { | ||
| createBinaryExpr( | ||
| expr, | ||
| expr.children(0), | ||
| expr.children(1), | ||
| inputs, | ||
| binding, | ||
| (builder, binaryExpr) => builder.setArrayContains(binaryExpr)) | ||
| } | ||
| } | ||
|
|
||
| object CometArrayIntersect extends CometExpressionSerde with IncompatExpr { | ||
| override def convert( | ||
| expr: Expression, | ||
| inputs: Seq[Attribute], | ||
| binding: Boolean): Option[ExprOuterClass.Expr] = { | ||
| createBinaryExpr( | ||
| expr, | ||
| expr.children(0), | ||
| expr.children(1), | ||
| inputs, | ||
| binding, | ||
| (builder, binaryExpr) => builder.setArrayIntersect(binaryExpr)) | ||
| } | ||
| } | ||
|
|
||
| object CometArraysOverlap extends CometExpressionSerde with IncompatExpr { | ||
| override def convert( | ||
| expr: Expression, | ||
| inputs: Seq[Attribute], | ||
| binding: Boolean): Option[ExprOuterClass.Expr] = { | ||
| createBinaryExpr( | ||
| expr, | ||
| expr.children(0), | ||
| expr.children(1), | ||
| inputs, | ||
| binding, | ||
| (builder, binaryExpr) => builder.setArraysOverlap(binaryExpr)) | ||
| } | ||
| } | ||
|
|
||
| object CometArrayJoin extends CometExpressionSerde with IncompatExpr { | ||
| override def convert( | ||
| expr: Expression, | ||
| inputs: Seq[Attribute], | ||
| binding: Boolean): Option[ExprOuterClass.Expr] = { | ||
| val arrayExpr = expr.asInstanceOf[ArrayJoin] | ||
| val arrayExprProto = exprToProto(arrayExpr.array, inputs, binding) | ||
| val delimiterExprProto = exprToProto(arrayExpr.delimiter, inputs, binding) | ||
|
|
||
| if (arrayExprProto.isDefined && delimiterExprProto.isDefined) { | ||
| val arrayJoinBuilder = arrayExpr.nullReplacement match { | ||
| case Some(nrExpr) => | ||
| val nullReplacementExprProto = exprToProto(nrExpr, inputs, binding) | ||
| ExprOuterClass.ArrayJoin | ||
| .newBuilder() | ||
| .setArrayExpr(arrayExprProto.get) | ||
| .setDelimiterExpr(delimiterExprProto.get) | ||
| .setNullReplacementExpr(nullReplacementExprProto.get) | ||
| case None => | ||
| ExprOuterClass.ArrayJoin | ||
| .newBuilder() | ||
| .setArrayExpr(arrayExprProto.get) | ||
| .setDelimiterExpr(delimiterExprProto.get) | ||
| } | ||
| Some( | ||
| ExprOuterClass.Expr | ||
| .newBuilder() | ||
| .setArrayJoin(arrayJoinBuilder) | ||
| .build()) | ||
| } else { | ||
| val exprs: List[Expression] = arrayExpr.nullReplacement match { | ||
| case Some(nrExpr) => List(arrayExpr, arrayExpr.delimiter, nrExpr) | ||
| case None => List(arrayExpr, arrayExpr.delimiter) | ||
| } | ||
| withInfo(expr, "unsupported arguments for ArrayJoin", exprs: _*) | ||
| None | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a blocker but looks like the compatibility guide does not mention about the array related issues
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. I had updated this locally but forgot that these changes have to go in
compatibility-template.mdinstead ofcompatibility,md. 🤦♂️I have added them now.