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

Add support for Cloudera CDS-3.3.2 #9396

Merged
merged 4 commits into from
Oct 16, 2023
Merged

Add support for Cloudera CDS-3.3.2 #9396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d3348c
Add support for Cloudera CDS-3.3.2
sririshindra Oct 6, 2023
4b7d2ae
Address Review comments
Oct 12, 2023
8720a49
Remove repetition of cloudera repository settings in the pom.xml file.
Oct 14, 2023
34c5f7a
Merge remote-tracking branch 'origin/branch-23.12' into branch-23.12-…
Oct 14, 2023
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
23 changes: 23 additions & 0 deletions aggregator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,29 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>release332cdh</id>
<activation>
<property>
<name>buildver</name>
<value>332cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-delta-21x_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<classifier>${spark.version.classifier}</classifier>
</dependency>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-delta-22x_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<classifier>${spark.version.classifier}</classifier>
</dependency>
</dependencies>
</profile>
<profile>
<id>release330db</id>
<activation>
Expand Down
1 change: 1 addition & 0 deletions .../src/main/spark320/scala/org/apache/spark/sql/tests/datagen/datagen/DataGenExprBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
{"spark": "330db"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "332db"}
{"spark": "333"}
{"spark": "340"}
Expand Down
18 changes: 18 additions & 0 deletions integration_tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,24 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>release332cdh</id>
<activation>
<property>
<name>buildver</name>
<value>332cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<!--
Note that we are using the Spark version for all of the Databricks dependencies as well.
Expand Down
5 changes: 4 additions & 1 deletion integration_tests/src/main/python/spark_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,11 @@ def is_spark_321cdh():
def is_spark_330cdh():
return "3.3.0.3.3.718" in spark_version()

def is_spark_332cdh():
return "3.3.2.3.3.719" in spark_version()

def is_spark_cdh():
return is_spark_321cdh() or is_spark_330cdh()
return is_spark_321cdh() or is_spark_330cdh() or is_spark_332cdh()

def is_databricks_version_or_later(major, minor):
spark = get_spark_i_know_what_i_am_doing()
Expand Down
83 changes: 47 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,25 +189,8 @@
<spark.version>${spark321cdh.version}</spark.version>
<spark.test.version>${spark321cdh.version}</spark.test.version>
<parquet.hadoop.version>1.10.1</parquet.hadoop.version>
<cloudera.repo.enabled>true</cloudera.repo.enabled>
</properties>
<repositories>
<repository>
<id>cloudera-repo</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>cloudera-repo</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
</pluginRepository>
</pluginRepositories>
<modules>
<module>shim-deps/cloudera</module>
<module>delta-lake/delta-20x</module>
Expand Down Expand Up @@ -433,25 +416,30 @@
<spark.test.version>${spark330cdh.version}</spark.test.version>
<parquet.hadoop.version>1.10.99.7.1.8.0-801</parquet.hadoop.version>
<iceberg.version>${spark330.iceberg.version}</iceberg.version>
<cloudera.repo.enabled>true</cloudera.repo.enabled>
</properties>
<modules>
<module>shim-deps/cloudera</module>
<module>delta-lake/delta-21x</module>
<module>delta-lake/delta-22x</module>
</modules>
</profile>
<profile>
<id>release332cdh</id>
<activation>
<property>
<name>buildver</name>
<value>332cdh</value>
</property>
</activation>
<properties>
<buildver>332cdh</buildver>
<spark.version>${spark332cdh.version}</spark.version>
<spark.test.version>${spark332cdh.version}</spark.test.version>
<parquet.hadoop.version>1.10.99.7.1.9.0-387</parquet.hadoop.version>
tgravescs marked this conversation as resolved.
Show resolved Hide resolved
<iceberg.version>${spark330.iceberg.version}</iceberg.version>
<cloudera.repo.enabled>true</cloudera.repo.enabled>
</properties>
<repositories>
<repository>
<id>cloudera-repo</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>cloudera-repo</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
</pluginRepository>
</pluginRepositories>
<modules>
<module>shim-deps/cloudera</module>
<module>delta-lake/delta-21x</module>
Expand Down Expand Up @@ -654,6 +642,7 @@
<spark340.version>3.4.0</spark340.version>
<spark341.version>3.4.1</spark341.version>
<spark330cdh.version>3.3.0.3.3.7180.0-274</spark330cdh.version>
<spark332cdh.version>3.3.2.3.3.7190.0-91</spark332cdh.version>
<spark330db.version>3.3.0-databricks</spark330db.version>
<spark332db.version>3.3.2-databricks</spark332db.version>
<spark350.version>3.5.0</spark350.version>
Expand Down Expand Up @@ -699,6 +688,7 @@
332,
333,
330cdh,
332cdh,
340,
341,
350
Expand Down Expand Up @@ -760,6 +750,7 @@
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
-Djdk.reflect.useDirectMethodHandle=false
</extraJavaTestArgs>
<cloudera.repo.enabled>false</cloudera.repo.enabled>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -1411,6 +1402,16 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>cloudera-repo</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
<releases>
<enabled>${cloudera.repo.enabled}</enabled>
</releases>
<snapshots>
<enabled>${cloudera.repo.enabled}</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Expand All @@ -1420,5 +1421,15 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>cloudera-repo</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
<releases>
<enabled>${cloudera.repo.enabled}</enabled>
</releases>
<snapshots>
<enabled>${cloudera.repo.enabled}</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>
18 changes: 18 additions & 0 deletions sql-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,24 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>release332cdh</id>
<activation>
<property>
<name>buildver</name>
<value>332cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>release330db</id>
<activation>
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/AQEUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
{"spark": "340"}
{"spark": "341"}
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/AggregationTagging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
{"spark": "340"}
{"spark": "341"}
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/AnsiCastShim.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
package com.nvidia.spark.rapids.shims
Expand Down
2 changes: 1 addition & 1 deletion sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/BloomFilterShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{"spark": "320"}
{"spark": "321"}
{"spark": "321cdh"}
{"spark": "321db" }
{"spark": "321db"}
{"spark": "322"}
{"spark": "323"}
{"spark": "324"}
Expand Down
2 changes: 1 addition & 1 deletion sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/CastCheckShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/


/*** spark-rapids-shim-json-lines
{"spark": "311"}
{"spark": "312"}
Expand All @@ -26,7 +27,6 @@
{"spark": "323"}
{"spark": "324"}
spark-rapids-shim-json-lines ***/

package com.nvidia.spark.rapids.shims

import com.nvidia.spark.rapids.TypeSig
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/CastingConfigShim.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
package com.nvidia.spark.rapids.shims
Expand Down
1 change: 1 addition & 0 deletions ...1/scala/com/nvidia/spark/rapids/shims/CreateDataSourceTableAsSelectCommandMetaShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
{"spark": "330db"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
package com.nvidia.spark.rapids.shims
Expand Down
1 change: 1 addition & 0 deletions ...in/src/main/spark311/scala/com/nvidia/spark/rapids/shims/DecimalArithmeticOverrides.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
package com.nvidia.spark.rapids.shims
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/DeltaLakeUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
{"spark": "340"}
{"spark": "341"}
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/FileIndexOptionsShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
{"spark": "330db"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
package com.nvidia.spark.rapids.shims
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/GetMapValueMeta.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
package com.nvidia.spark.rapids.shims
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/GlobalLimitShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
{"spark": "330db"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "332db"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
Expand Down
1 change: 1 addition & 0 deletions .../src/main/spark311/scala/com/nvidia/spark/rapids/shims/GpuAggregateInPandasExecMeta.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
{"spark": "330db"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "332db"}
{"spark": "333"}
{"spark": "340"}
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/GpuBroadcastJoinMeta.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
package com.nvidia.spark.rapids.shims
Expand Down
3 changes: 2 additions & 1 deletion sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/GpuCastShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/


/*** spark-rapids-shim-json-lines
{"spark": "311"}
{"spark": "312"}
Expand All @@ -29,9 +30,9 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/

package com.nvidia.spark.rapids.shims

import ai.rapids.cudf.{ColumnVector, ColumnView}
Expand Down
1 change: 1 addition & 0 deletions ...n/src/main/spark311/scala/com/nvidia/spark/rapids/shims/GpuFileFormatDataWriterShim.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
{"spark": "330db"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
{"spark": "340"}
{"spark": "341"}
Expand Down
1 change: 1 addition & 0 deletions ...scala/com/nvidia/spark/rapids/shims/GpuOptimizedCreateHiveTableAsSelectCommandShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
{"spark": "330db"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
spark-rapids-shim-json-lines ***/
package com.nvidia.spark.rapids.shims
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/spark311/scala/com/nvidia/spark/rapids/shims/GpuWindowInPandasExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
{"spark": "330cdh"}
{"spark": "331"}
{"spark": "332"}
{"spark": "332cdh"}
{"spark": "333"}
{"spark": "340"}
{"spark": "341"}
Expand Down
Loading