fix: query tolerance= in SQL file tests now also asserts Comet native execution#3797
Open
andygrove wants to merge 5 commits intoapache:mainfrom
Open
fix: query tolerance= in SQL file tests now also asserts Comet native execution#3797andygrove wants to merge 5 commits intoapache:mainfrom
andygrove wants to merge 5 commits intoapache:mainfrom
Conversation
… execution The WithTolerance mode in CometSqlFileTestSuite called checkSparkAnswerWithTolerance, which hardcodes assertCometNative=false. This meant that all 50+ SQL test queries using 'query tolerance=...' (sin, cos, tan, stddev, avg, etc.) silently skipped the check that Comet actually executed the expression natively. Add checkSparkAnswerAndOperatorWithTolerance that combines tolerance- based result comparison with the native operator assertion, and use it in the WithTolerance case.
2 tasks
Maps Spark's Logarithm expression to DataFusion's log(base, value) function. Applies nullIfNegative to both base and value to match Spark's behavior of returning null when the result would be NaN (inputs <= 0).
martin-g
reviewed
Mar 29, 2026
| expr: Logarithm, | ||
| inputs: Seq[Attribute], | ||
| binding: Boolean): Option[ExprOuterClass.Expr] = { | ||
| // Spark's Logarithm(left=base, right=value) returns null when result is NaN, |
Member
There was a problem hiding this comment.
Spark 4.0.2:
spark-sql (default)> SELECT log(1, 1);
NaN
Time taken: 0.072 seconds, Fetched 1 row(s)
The result is not NULL but NaN.
| inputs: Seq[Attribute], | ||
| binding: Boolean): Option[ExprOuterClass.Expr] = { | ||
| // Spark's Logarithm(left=base, right=value) returns null when result is NaN, | ||
| // which happens when base <= 0 or value <= 0. Apply nullIfNegative to both. |
Member
There was a problem hiding this comment.
Both base<=0 or value<=0 lead to NULL results in Spark!
But value=0 actually leads to -Infinity, not NaN, so the comment is not accurate.
|
|
||
| /** | ||
| * Check that the query returns the correct results when Comet is enabled and that Comet | ||
| * replaced all possible operators. Use the provided `tol` when comparing floating-point |
Member
There was a problem hiding this comment.
tol - the name of the parameter is absTol
| protected def checkSparkAnswerAndOperatorWithTolerance( | ||
| query: String, | ||
| absTol: Double = 1e-6): (SparkPlan, SparkPlan) = { | ||
| internalCheckSparkAnswer(sql(query), assertCometNative = true, withTol = Some(absTol)) |
Member
There was a problem hiding this comment.
Another option is to delegate to checkSparkAnswerAndOperatorWithTol(=> DataFrame, Double) (line 252).
You could even overload the method name - checkSparkAnswerAndOperatorWithTol. Scala allows that.
Member
|
Neither log.sql, nor log10.sql nor log2.sql have any tests with |
- Fix inaccurate comment on CometLogarithm (base/value <= 0 returns null, not "returns null when result is NaN") - Fix doc reference tol -> absTol in checkSparkAnswerAndOperatorWithTolerance - Delegate to existing checkSparkAnswerAndOperatorWithTol method - Add <= 0 edge case test data to log.sql, log10.sql, log2.sql - Add custom spark_log Rust UDF to handle <= 0 -> null internally, fixing DataFusion's broken null propagation for two-arg log
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Which issue does this PR close?
Closes #.
Rationale for this change
CometSqlFileTestSuitesupports aquery tolerance=<value>directive for floating-point queries where small numeric differences are expected. However, theWithTolerancemode calledcheckSparkAnswerWithTolerance, which hardcodesassertCometNative = false. This meant that all 50+ queries using this directive (coveringsin,cos,tan,asin,acos,atan,atan2,sinh,cosh,tanh,exp,expm1,log,log2,log10,pow,sqrt,cot,stddev,variance,avg,sum,corr,covariance) were silently skipping the assertion that Comet actually executed the expression natively.What changes are included in this PR?
checkSparkAnswerAndOperatorWithTolerancetoCometTestBase, which combines tolerance-based result comparison withassertCometNative = true.WithTolerancecase inCometSqlFileTestSuiteto call the new method instead ofcheckSparkAnswerWithTolerance.tan.sqlto addallowIncompatibleconfig so the test runs natively.Logarithmexpression (two-arglog(base, value)), mapping it to DataFusion'slog(base, value)function.How are these changes tested?
The existing SQL file tests for all affected math and aggregate expressions now enforce native execution as part of their normal CI run.