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.

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

Jump to bottom

Databricks build fixes for missing shouldFailDivOverflow and removal of needed imports #3466

Merged
merged 2 commits into from
Sep 13, 2021
Merged

Databricks build fixes for missing shouldFailDivOverflow and removal of needed imports #3466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b12f210
Databricks build fixes for missing shouldFailDivOverflow and removal of
tgravescs Sep 13, 2021
f0842ed
Fix scalastyle running
tgravescs Sep 13, 2021
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
6 changes: 6 additions & 0 deletions shims/spark301db/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@
<version>${spark301db.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>JsonAST</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
3 changes: 2 additions & 1 deletion ...s/spark301db/src/main/scala/com/nvidia/spark/rapids/shims/spark301db/SparkBaseShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ import org.apache.spark.sql.execution.python._
import org.apache.spark.sql.execution.window.WindowExecBase
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.rapids.{GpuFileSourceScanExec, GpuStringReplace, GpuTimeSub, ShuffleManagerShimBase}
import org.apache.spark.sql.rapids.execution.{GpuBroadcastExchangeExecBase, GpuBroadcastNestedLoopJoinExecBase, GpuShuffleExchangeExecBase, JoinTypeChecks}
import org.apache.spark.sql.rapids.execution.{GpuBroadcastExchangeExecBase, GpuBroadcastNestedLoopJoinExecBase, GpuShuffleExchangeExecBase, JoinTypeChecks, TrampolineUtil}
import org.apache.spark.sql.rapids.execution.python.{GpuFlatMapGroupsInPandasExecMeta, GpuPythonUDF}
import org.apache.spark.sql.rapids.execution.python.shims.spark301db._
import org.apache.spark.sql.rapids.shims.spark301db._
import org.apache.spark.sql.sources.BaseRelation
import org.apache.spark.sql.types._
Expand Down
6 changes: 6 additions & 0 deletions shims/spark311db/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,11 @@
<version>${spark311db.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>JsonAST</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
2 changes: 2 additions & 0 deletions sql-plugin/src/main/301db/scala/com/nvidia/spark/rapids/shims/v2/Spark30XShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,6 @@ trait Spark30XShims extends SparkShims {
override def leafNodeDefaultParallelism(ss: SparkSession): Int = {
ss.sparkContext.defaultParallelism
}

override def shouldFailDivOverflow(): Boolean = false
}
2 changes: 2 additions & 0 deletions sql-plugin/src/main/311db/scala/com/nvidia/spark/rapids/shims/v2/Spark30XShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,6 @@ trait Spark30XShims extends SparkShims {
override def leafNodeDefaultParallelism(ss: SparkSession): Int = {
ss.sparkContext.defaultParallelism
}

override def shouldFailDivOverflow(): Boolean = false
}
6 changes: 6 additions & 0 deletions udf-compiler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>JsonAST</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-unsafe_${scala.binary.version}</artifactId>
Expand Down