Skip to content

[AURON #2253] Support insert-only Iceberg changelog native scan #2254

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

Open
weimingdiit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[AURON #2253] Support insert-only Iceberg changelog native scan #2254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion spark-extension/src/main/scala/org/apache/spark/sql/auron/AuronConvertStrategy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ object AuronConvertStrategy extends Logging {
exec.setTagValue(convertStrategyTag, NeverConvert)
exec.setTagValue(
neverConvertReasonTag,
s"${exec.getClass.getSimpleName} is not supported yet.")
converted
.getTagValue(neverConvertReasonTag)
.getOrElse(s"${exec.getClass.getSimpleName} is not supported yet."))
}
danglingChildren = newDangling :+ converted
}
Expand Down
3 changes: 3 additions & 0 deletions spark-extension/src/main/scala/org/apache/spark/sql/auron/AuronConverters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import org.apache.spark.sql.execution.auron.plan.NativeSortBase
import org.apache.spark.sql.execution.auron.plan.NativeUnionBase
import org.apache.spark.sql.execution.auron.plan.Util
import org.apache.spark.sql.execution.command.DataWritingCommandExec
import org.apache.spark.sql.execution.datasources.v2.BatchScanExec
import org.apache.spark.sql.execution.exchange.BroadcastExchangeExec
import org.apache.spark.sql.execution.exchange.ShuffleExchangeExec
import org.apache.spark.sql.execution.joins._
Expand Down Expand Up @@ -402,6 +403,8 @@ object AuronConverters extends Logging {
} else {
s"Falling back exec: ${exec.getClass.getSimpleName}: ${e.getMessage}"
}
case _: BatchScanExec =>
s"${e.getMessage.replaceFirst("^assertion failed: ?", "")}"
case _ =>
s"Falling back exec: ${exec.getClass.getSimpleName}: ${e.getMessage}"
}
Expand Down
8 changes: 6 additions & 2 deletions ...on-iceberg/src/main/scala/org/apache/spark/sql/auron/iceberg/IcebergConvertProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class IcebergConvertProvider extends AuronConvertProvider with Logging {

override def isSupported(exec: SparkPlan): Boolean = {
exec match {
case e: BatchScanExec => IcebergScanSupport.plan(e).nonEmpty
case e: BatchScanExec if IcebergScanSupport.isIcebergScan(e.scan) =>
IcebergScanSupport.plan(e).nonEmpty || IcebergScanSupport.fallbackReason(e).nonEmpty
case _ => false
}
}
Expand All @@ -56,7 +57,10 @@ class IcebergConvertProvider extends AuronConvertProvider with Logging {
case Some(plan) =>
AuronConverters.addRenameColumnsExec(NativeIcebergTableScanExec(e, plan))
case None =>
exec
IcebergScanSupport.fallbackReason(e) match {
case Some(reason) => throw new AssertionError(reason)
case None => exec
}
}
case _ => exec
}
Expand Down
Loading
Loading