Skip to content

[spark] Fix RowTrackingTable reading by add _ROW_ID existing check before adding _ROW_ID #7606

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 3 commits into from
Apr 9, 2026
Merged

[spark] Fix RowTrackingTable reading by add _ROW_ID existing check before adding _ROW_ID #7606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d771a4
[spark] Add _ROW_ID existing check before adding _ROW_ID
littlecoder04 Apr 7, 2026
ffa5a71
add query row_tracking system table with filter test
littlecoder04 Apr 8, 2026
7df1e36
optimize test case name
littlecoder04 Apr 8, 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
5 changes: 4 additions & 1 deletion ...rk/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonBaseScanBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ abstract class PaimonBaseScanBuilder
val postScan = mutable.ArrayBuffer.empty[SparkPredicate]

var newRowType = rowType
if (coreOptions.rowTrackingEnabled() && coreOptions.dataEvolutionEnabled()) {
if (
coreOptions.rowTrackingEnabled() && coreOptions
.dataEvolutionEnabled() && !rowType.containsField(SpecialFields.ROW_ID.name())
) {
newRowType = SpecialFields.rowTypeWithRowTracking(newRowType);
}
val converter = SparkV2FilterConverter(newRowType)
Expand Down
5 changes: 4 additions & 1 deletion paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/read/BaseScan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ trait BaseScan extends Scan with SupportsReportStatistics with Logging {
val coreOptions: CoreOptions = CoreOptions.fromMap(table.options())

lazy val tableRowType: RowType = {
if (coreOptions.rowTrackingEnabled()) {
if (
coreOptions
.rowTrackingEnabled() && !table.rowType().containsField(SpecialFields.ROW_ID.name())
) {
SpecialFields.rowTypeWithRowTracking(table.rowType())
} else {
table.rowType()
Expand Down
17 changes: 17 additions & 0 deletions ...park/paimon-spark-ut/src/test/scala/org/apache/paimon/spark/sql/RowTrackingTestBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,22 @@ abstract class RowTrackingTestBase extends PaimonSparkTestBase {
}
}

test("Row Tracking: query row_tracking system table with filter pushdown") {
withTable("t") {
sql("CREATE TABLE t (a INT, b INT) TBLPROPERTIES ('row-tracking.enabled' = 'true')")
sql("INSERT INTO t VALUES (1, 10), (2, 20), (3, 30)")

val query = s"SELECT a, b FROM `t$$row_tracking` WHERE a > 1 ORDER BY a"
checkAnswer(sql(query), Seq(Row(2, 20), Row(3, 30)))

val scan = getScan(query)
assert(
scan.description().contains("DataFilters"),
s"Expected predicate pushdown (DataFilters) in scan description, but got: ${scan.description()}"
)
}
}

test("Data Evolution: compact fields action") {
withTable("s", "t") {
sql("CREATE TABLE s (id INT, b INT)")
Expand Down Expand Up @@ -952,4 +968,5 @@ abstract class RowTrackingTestBase extends PaimonSparkTestBase {
assert(!indexEntries.exists(entry => entry.partition().getString(0).toString.equals("p1")))
}
}

}