Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: support array_except function #1343

Open
wants to merge 11 commits into
base: main
Choose a base branch
from

Conversation

kazantsev-maksim
Copy link

Which issue does this PR close?

Related to Epic: #1042
array_except: SELECT array_except(array(1, 2, 3), array(1, 3, 5)) => array(2)
DataFusion' s array_except has same behavior with Spark 's array_except function
Spark: https://docs.databricks.com/en/sql/language-manual/functions/array_except.html
DataFusion: https://datafusion.apache.org/user-guide/sql/scalar_functions.html#array-except

Rationale for this change

Defined under Epic: #1042

What changes are included in this PR?

planner.rs: Maps Spark 's array_except function to DataFusion array_except_udf physical expression from Spark physical expression
expr.proto: array_except array_except has been added,
QueryPlanSerde.scala: arrays_except pattern matching case has been added,
CometExpressionSuite.scala: A new UT has been added for array_except function.

How are these changes tested?

A new UT has been added.

@codecov-commenter
Copy link

codecov-commenter commented Jan 27, 2025

Codecov Report

Attention: Patch coverage is 90.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 57.45%. Comparing base (f09f8af) to head (41a9804).
Report is 19 commits behind head on main.

Files with missing lines Patch % Lines
.../scala/org/apache/comet/serde/QueryPlanSerde.scala 50.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1343      +/-   ##
============================================
+ Coverage     56.12%   57.45%   +1.32%     
  Complexity      976      976              
============================================
  Files           119      121       +2     
  Lines         11743    11931     +188     
  Branches       2251     2254       +3     
============================================
+ Hits           6591     6855     +264     
+ Misses         4012     3917      -95     
- Partials       1140     1159      +19     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Kazantsev Maksim added 3 commits January 28, 2025 19:53
# Conflicts:
#	native/core/src/execution/planner.rs
#	native/proto/src/proto/expr.proto
#	spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala
#	spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
Copy link
Member

@andygrove andygrove left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kazantsev Maksim added 5 commits January 30, 2025 19:23
# Conflicts:
#	spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala
#	spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
Copy link
Member

@andygrove andygrove left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @kazantsev-maksim

sql("SELECT array_except(array(_2, _3, _4), array(_3, _4)) from t1"))
checkSparkAnswerAndOperator(sql("SELECT array_except(array(_18), array(_19)) from t1"))
checkSparkAnswerAndOperator(spark.sql(
"SELECT array_except((CASE WHEN _2 = _3 THEN array(_2, _3, _4) END), array(_4)) FROM t1"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_2 = _3 would be always true?

@@ -126,6 +126,21 @@ object CometArraysOverlap extends CometExpressionSerde with IncompatExpr {
}
}

object CometArrayExcept extends CometExpressionSerde with CometExprShim {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason for using CometExprShim?
Also not sure how ready this is regarding Spark compatibility although it seems the test coverage is good. Adding IncompatExpr might be an option.

@@ -2387,6 +2387,8 @@ object QueryPlanSerde extends Logging with ShimQueryPlanSerde with CometExprShim
case _: ArrayIntersect => convert(CometArrayIntersect)
case _: ArrayJoin => convert(CometArrayJoin)
case _: ArraysOverlap => convert(CometArraysOverlap)
case _ if expr.prettyName == "array_except" =>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is ArrayExcept available only for newer version?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants