-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Spark: Add Spark 3.2 copy on top of Spark 3.3 #5094
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,268 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| String sparkVersion = '3.3.0' | ||
| String sparkMajorVersion = '3.3' | ||
| String scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion") | ||
|
|
||
| def sparkProjects = [ | ||
| project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}"), | ||
| project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}"), | ||
| project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}"), | ||
| ] | ||
|
|
||
| project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") { | ||
| apply plugin: 'scala' | ||
| apply plugin: 'com.github.alisiikh.scalastyle' | ||
|
|
||
| sourceSets { | ||
| main { | ||
| scala.srcDirs = ['src/main/scala', 'src/main/java'] | ||
| java.srcDirs = [] | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow') | ||
| api project(':iceberg-api') | ||
| implementation project(':iceberg-common') | ||
| implementation project(':iceberg-core') | ||
| implementation project(':iceberg-data') | ||
| implementation project(':iceberg-orc') | ||
| implementation project(':iceberg-parquet') | ||
| implementation project(':iceberg-arrow') | ||
| implementation("org.scala-lang.modules:scala-collection-compat_${scalaVersion}") | ||
|
|
||
| compileOnly "com.google.errorprone:error_prone_annotations" | ||
| compileOnly "org.apache.avro:avro" | ||
| compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${sparkVersion}") { | ||
| exclude group: 'org.apache.avro', module: 'avro' | ||
| exclude group: 'org.apache.arrow' | ||
| exclude group: 'org.apache.parquet' | ||
| // to make sure io.netty.buffer only comes from project(':iceberg-arrow') | ||
| exclude group: 'io.netty', module: 'netty-buffer' | ||
| exclude group: 'org.roaringbitmap' | ||
| } | ||
|
|
||
| implementation("org.apache.parquet:parquet-column") | ||
| implementation("org.apache.parquet:parquet-hadoop") | ||
|
|
||
| implementation("org.apache.orc:orc-core::nohive") { | ||
| exclude group: 'org.apache.hadoop' | ||
| exclude group: 'commons-lang' | ||
| // These artifacts are shaded and included in the orc-core fat jar | ||
| exclude group: 'com.google.protobuf', module: 'protobuf-java' | ||
| exclude group: 'org.apache.hive', module: 'hive-storage-api' | ||
| } | ||
|
|
||
| implementation("org.apache.arrow:arrow-vector") { | ||
| exclude group: 'io.netty', module: 'netty-buffer' | ||
| exclude group: 'io.netty', module: 'netty-common' | ||
| exclude group: 'com.google.code.findbugs', module: 'jsr305' | ||
| } | ||
|
|
||
| testImplementation("org.apache.hadoop:hadoop-minicluster") { | ||
| exclude group: 'org.apache.avro', module: 'avro' | ||
| // to make sure io.netty.buffer only comes from project(':iceberg-arrow') | ||
| exclude group: 'io.netty', module: 'netty-buffer' | ||
| } | ||
| testImplementation project(path: ':iceberg-hive-metastore') | ||
| testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts') | ||
| testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts') | ||
| testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts') | ||
| testImplementation project(path: ':iceberg-data', configuration: 'testArtifacts') | ||
| testImplementation "org.xerial:sqlite-jdbc" | ||
| } | ||
|
|
||
| tasks.withType(Test) { | ||
| // For vectorized reads | ||
| // Allow unsafe memory access to avoid the costly check arrow does to check if index is within bounds | ||
| systemProperty("arrow.enable_unsafe_memory_access", "true") | ||
| // Disable expensive null check for every get(index) call. | ||
| // Iceberg manages nullability checks itself instead of relying on arrow. | ||
| systemProperty("arrow.enable_null_check_for_get", "false") | ||
|
|
||
| // Vectorized reads need more memory | ||
| maxHeapSize '2560m' | ||
| } | ||
| } | ||
|
|
||
| project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}") { | ||
| apply plugin: 'java-library' | ||
| apply plugin: 'scala' | ||
| apply plugin: 'com.github.alisiikh.scalastyle' | ||
| apply plugin: 'antlr' | ||
|
|
||
| configurations { | ||
| /* | ||
| The Gradle Antlr plugin erroneously adds both antlr-build and runtime dependencies to the runtime path. This | ||
| bug https://github.com/gradle/gradle/issues/820 exists because older versions of Antlr do not have separate | ||
| runtime and implementation dependencies and they do not want to break backwards compatibility. So to only end up with | ||
| the runtime dependency on the runtime classpath we remove the dependencies added by the plugin here. Then add | ||
| the runtime dependency back to only the runtime configuration manually. | ||
| */ | ||
| implementation { | ||
| extendsFrom = extendsFrom.findAll { it != configurations.antlr } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation("org.scala-lang.modules:scala-collection-compat_${scalaVersion}") | ||
|
|
||
| compileOnly "org.scala-lang:scala-library:${scalaVersion}" | ||
| compileOnly project(path: ':iceberg-bundled-guava', configuration: 'shadow') | ||
| compileOnly project(':iceberg-api') | ||
| compileOnly project(':iceberg-core') | ||
| compileOnly project(':iceberg-common') | ||
| compileOnly project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") | ||
| compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${sparkVersion}") { | ||
| exclude group: 'org.apache.avro', module: 'avro' | ||
| exclude group: 'org.apache.arrow' | ||
| exclude group: 'org.apache.parquet' | ||
| // to make sure io.netty.buffer only comes from project(':iceberg-arrow') | ||
| exclude group: 'io.netty', module: 'netty-buffer' | ||
| exclude group: 'org.roaringbitmap' | ||
| } | ||
|
|
||
| testImplementation project(path: ':iceberg-hive-metastore') | ||
| testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts') | ||
|
|
||
| testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts') | ||
| testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts') | ||
| testImplementation project(path: ":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts') | ||
|
|
||
| testImplementation "org.apache.avro:avro" | ||
|
|
||
| // Required because we remove antlr plugin dependencies from the compile configuration, see note above | ||
| runtimeOnly "org.antlr:antlr4-runtime:4.8" | ||
| antlr "org.antlr:antlr4:4.8" | ||
| } | ||
|
|
||
| generateGrammarSource { | ||
| maxHeapSize = "64m" | ||
| arguments += ['-visitor', '-package', 'org.apache.spark.sql.catalyst.parser.extensions'] | ||
| } | ||
| } | ||
|
|
||
| project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}") { | ||
| apply plugin: 'com.github.johnrengelman.shadow' | ||
|
|
||
| tasks.jar.dependsOn tasks.shadowJar | ||
|
|
||
| sourceSets { | ||
| integration { | ||
| java.srcDir "$projectDir/src/integration/java" | ||
| resources.srcDir "$projectDir/src/integration/resources" | ||
| } | ||
| } | ||
|
|
||
| configurations { | ||
| implementation { | ||
| exclude group: 'org.apache.spark' | ||
| // included in Spark | ||
| exclude group: 'org.slf4j' | ||
| exclude group: 'org.apache.commons' | ||
| exclude group: 'commons-pool' | ||
| exclude group: 'commons-codec' | ||
| exclude group: 'org.xerial.snappy' | ||
| exclude group: 'javax.xml.bind' | ||
| exclude group: 'javax.annotation' | ||
| exclude group: 'com.github.luben' | ||
| exclude group: 'com.ibm.icu' | ||
| exclude group: 'org.glassfish' | ||
| exclude group: 'org.abego.treelayout' | ||
| exclude group: 'org.antlr' | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| api project(':iceberg-api') | ||
| implementation project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") | ||
| implementation project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}") | ||
| implementation project(':iceberg-aws') | ||
| implementation(project(':iceberg-aliyun')) { | ||
| exclude group: 'edu.umd.cs.findbugs', module: 'findbugs' | ||
| exclude group: 'org.apache.httpcomponents', module: 'httpclient' | ||
| exclude group: 'commons-logging', module: 'commons-logging' | ||
| } | ||
| implementation project(':iceberg-hive-metastore') | ||
| implementation(project(':iceberg-nessie')) { | ||
| exclude group: 'com.google.code.findbugs', module: 'jsr305' | ||
| } | ||
|
|
||
| integrationImplementation "org.apache.spark:spark-hive_${scalaVersion}:${sparkVersion}" | ||
| integrationImplementation 'org.junit.vintage:junit-vintage-engine' | ||
| integrationImplementation 'org.slf4j:slf4j-simple' | ||
| integrationImplementation project(path: ':iceberg-api', configuration: 'testArtifacts') | ||
| integrationImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts') | ||
| integrationImplementation project(path: ":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts') | ||
| integrationImplementation project(path: ":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts') | ||
| // Not allowed on our classpath, only the runtime jar is allowed | ||
| integrationCompileOnly project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}") | ||
| integrationCompileOnly project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") | ||
| integrationCompileOnly project(':iceberg-api') | ||
| } | ||
|
|
||
| shadowJar { | ||
| configurations = [project.configurations.runtimeClasspath] | ||
|
|
||
| zip64 true | ||
|
|
||
| // include the LICENSE and NOTICE files for the shaded Jar | ||
| from(projectDir) { | ||
| include 'LICENSE' | ||
| include 'NOTICE' | ||
| } | ||
|
|
||
| // Relocate dependencies to avoid conflicts | ||
| relocate 'com.google', 'org.apache.iceberg.shaded.com.google' | ||
| relocate 'com.fasterxml', 'org.apache.iceberg.shaded.com.fasterxml' | ||
| relocate 'com.github.benmanes', 'org.apache.iceberg.shaded.com.github.benmanes' | ||
| relocate 'org.checkerframework', 'org.apache.iceberg.shaded.org.checkerframework' | ||
| relocate 'org.apache.avro', 'org.apache.iceberg.shaded.org.apache.avro' | ||
| relocate 'avro.shaded', 'org.apache.iceberg.shaded.org.apache.avro.shaded' | ||
| relocate 'com.thoughtworks.paranamer', 'org.apache.iceberg.shaded.com.thoughtworks.paranamer' | ||
| relocate 'org.apache.parquet', 'org.apache.iceberg.shaded.org.apache.parquet' | ||
| relocate 'shaded.parquet', 'org.apache.iceberg.shaded.org.apache.parquet.shaded' | ||
| relocate 'org.apache.orc', 'org.apache.iceberg.shaded.org.apache.orc' | ||
| relocate 'io.airlift', 'org.apache.iceberg.shaded.io.airlift' | ||
| // relocate Arrow and related deps to shade Iceberg specific version | ||
| relocate 'io.netty.buffer', 'org.apache.iceberg.shaded.io.netty.buffer' | ||
| relocate 'org.apache.arrow', 'org.apache.iceberg.shaded.org.apache.arrow' | ||
| relocate 'com.carrotsearch', 'org.apache.iceberg.shaded.com.carrotsearch' | ||
| relocate 'org.threeten.extra', 'org.apache.iceberg.shaded.org.threeten.extra' | ||
| relocate 'org.roaringbitmap', 'org.apache.iceberg.shaded.org.roaringbitmap' | ||
|
|
||
| classifier null | ||
| } | ||
|
|
||
| task integrationTest(type: Test) { | ||
| description = "Test Spark3 Runtime Jar against Spark ${sparkMajorVersion}" | ||
| group = "verification" | ||
| testClassesDirs = sourceSets.integration.output.classesDirs | ||
| classpath = sourceSets.integration.runtimeClasspath + files(shadowJar.archiveFile.get().asFile.path) | ||
| inputs.file(shadowJar.archiveFile.get().asFile.path) | ||
| } | ||
| integrationTest.dependsOn shadowJar | ||
|
|
||
| jar { | ||
| enabled = false | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.