Skip to content

Fix EqualNullSafe is not correct when column has null value. Bug[#6931] #6943

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.

Sign up for GitHub

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

Merged
JingsongLi merged 6 commits into from
Jan 4, 2026
Merged

Fix EqualNullSafe is not correct when column has null value. Bug[#6931] #6943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0e4813
Fix EqualNullSafe is not correct when column has null value. Bug[#6931]
venusMask Jan 2, 2026
936cedc
Trigger CI
venusMask Jan 2, 2026
7cf2e4a
Merge branch 'apache:master' into master
venusMask Jan 2, 2026
8891b0e
Add test for EQUAL_NULL_SAFE.
venusMask Jan 2, 2026
c4332b7
Trigger CI
venusMask Jan 2, 2026
f9fd682
Merge branch 'apache:master' into master
venusMask Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...k/paimon-spark-common/src/main/scala/org/apache/paimon/spark/SparkV2FilterConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ case class SparkV2FilterConverter(rowType: RowType) extends Logging {
if (literal == null) {
builder.isNull(transform)
} else {
builder.equal(transform, literal)
PredicateBuilder.and(builder.isNotNull(transform), builder.equal(transform, literal))
}
case _ =>
throw new UnsupportedOperationException(s"Convert $sparkPredicate is unsupported.")
Expand Down
18 changes: 18 additions & 0 deletions paimon-spark/paimon-spark-ut/src/test/scala/org/apache/paimon/spark/PaimonSourceTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,24 @@ class PaimonSourceTest extends PaimonSparkTestBase with StreamTest {

import testImplicits._

test("Paimon Source: EQUAL_NULL_SAFE") {
withTempDir {
_ =>
{
val TableSnapshotState(_, _, _, _, _) = prepareTableAndGetLocation(0, hasPk = true)
spark.sql("INSERT INTO T VALUES (1, CAST(null as string)), (2, CAST(null as string))")
val currentResult = () => spark.sql("SELECT * FROM T WHERE !(b <=> 'v_1')")
checkAnswer(currentResult(), Seq(Row(1, null), Row(2, null)))
spark.sql("INSERT INTO T VALUES (3, 'v_1'), (4, CAST(null as string))")
checkAnswer(currentResult(), Seq(Row(1, null), Row(2, null), Row(4, null)))
val valueDF = spark.sql("SELECT * FROM T WHERE b <=> 'v_1'")
checkAnswer(valueDF, Seq(Row(3, "v_1")))
val nullDF = spark.sql("SELECT * FROM T WHERE b <=> null")
checkAnswer(nullDF, Seq(Row(1, null), Row(2, null), Row(4, null)))
}
}
}

test("Paimon Source: default scan mode") {
withTempDir {
checkpointDir =>
Expand Down
2 changes: 1 addition & 1 deletion ...-spark-ut/src/test/scala/org/apache/paimon/spark/sql/SparkV2FilterConverterTestBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ abstract class SparkV2FilterConverterTestBase extends PaimonSparkTestBase {
test("V2Filter: EqualNullSafe") {
var filter = "int_col <=> 1"
var actual = converter.convert(v2Filter(filter)).get
assert(actual.equals(builder.equal(3, 1)))
assert(actual.equals(PredicateBuilder.and(builder.isNotNull(3), builder.equal(3, 1))))
checkAnswer(sql(s"SELECT int_col from test_tbl WHERE $filter ORDER BY int_col"), Seq(Row(1)))
assert(scanFilesCount(filter) == 1)

Expand Down