-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Core: Move iceberg-parquet files to iceberg-core
#8500
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -111,7 +111,7 @@ if (file("${rootDir}/iceberg-build.properties").exists()) { | |
| } | ||
|
|
||
| def projectVersion = getProjectVersion() | ||
| final REVAPI_PROJECTS = ["iceberg-api", "iceberg-core", "iceberg-parquet", "iceberg-orc", "iceberg-common", "iceberg-data"] | ||
| final REVAPI_PROJECTS = ["iceberg-api", "iceberg-core", "iceberg-orc", "iceberg-common", "iceberg-data"] | ||
|
|
||
| allprojects { | ||
| group = "org.apache.iceberg" | ||
|
|
@@ -157,7 +157,7 @@ subprojects { | |
| rootTask.finalizedBy showDeprecationRulesOnRevApiFailure | ||
| } | ||
| } | ||
|
|
||
| tasks.named("revapiAnalyze").configure { | ||
| dependsOn(":iceberg-common:jar") | ||
| } | ||
|
|
@@ -353,6 +353,13 @@ project(':iceberg-core') { | |
| exclude group: 'org.slf4j', module: 'slf4j-log4j12' | ||
| } | ||
|
|
||
| implementation(libs.parquet.avro) { | ||
| exclude group: 'org.apache.avro', module: 'avro' | ||
| // already shaded by Parquet | ||
| exclude group: 'it.unimi.dsi' | ||
| exclude group: 'org.codehaus.jackson' | ||
| } | ||
|
|
||
| testImplementation libs.jetty.servlet | ||
| testImplementation libs.jakarta.servlet | ||
| testImplementation libs.jetty.server | ||
|
|
@@ -371,7 +378,6 @@ project(':iceberg-data') { | |
| implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow') | ||
| api project(':iceberg-api') | ||
| implementation project(':iceberg-core') | ||
| compileOnly project(':iceberg-parquet') | ||
| compileOnly project(':iceberg-orc') | ||
| compileOnly(libs.hadoop2.common) { | ||
| exclude group: 'commons-beanutils' | ||
|
|
@@ -564,7 +570,6 @@ project(':iceberg-delta-lake') { | |
| api project(':iceberg-api') | ||
| implementation project(':iceberg-common') | ||
| implementation project(':iceberg-core') | ||
| implementation project(':iceberg-parquet') | ||
| implementation platform(libs.jackson.bom) | ||
| implementation libs.jackson.databind | ||
| annotationProcessor libs.immutables.value | ||
|
|
@@ -770,33 +775,6 @@ project(':iceberg-orc') { | |
| } | ||
| } | ||
|
|
||
| project(':iceberg-parquet') { | ||
| test { | ||
| useJUnitPlatform() | ||
| } | ||
| dependencies { | ||
| implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow') | ||
| api project(':iceberg-api') | ||
| implementation project(':iceberg-core') | ||
| implementation project(':iceberg-common') | ||
|
|
||
| implementation(libs.parquet.avro) { | ||
| exclude group: 'org.apache.avro', module: 'avro' | ||
| // already shaded by Parquet | ||
| exclude group: 'it.unimi.dsi' | ||
| exclude group: 'org.codehaus.jackson' | ||
| } | ||
|
|
||
| compileOnly libs.avro.avro | ||
| compileOnly(libs.hadoop2.client) { | ||
| exclude group: 'org.apache.avro', module: 'avro' | ||
| } | ||
|
|
||
| testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts') | ||
| testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts') | ||
| } | ||
| } | ||
|
|
||
| project(':iceberg-arrow') { | ||
| test { | ||
| useJUnitPlatform() | ||
|
|
@@ -805,7 +783,6 @@ project(':iceberg-arrow') { | |
| implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow') | ||
| api project(':iceberg-api') | ||
| implementation project(':iceberg-core') | ||
| implementation project(':iceberg-parquet') | ||
|
|
||
| implementation(libs.arrow.vector) { | ||
| exclude group: 'io.netty', module: 'netty-buffer' | ||
|
|
@@ -897,7 +874,9 @@ project(':iceberg-snowflake') { | |
| } | ||
|
|
||
| dependencies { | ||
| implementation project(':iceberg-core') | ||
| implementation(project(':iceberg-core')) { | ||
| exclude group: 'com.github.luben', module: 'zstd-jni' | ||
| } | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a compile error about duplicate class. |
||
| implementation project(':iceberg-common') | ||
| implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow') | ||
| implementation platform(libs.jackson.bom) | ||
|
|
||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed the module as keeping empty jar to support compatibility was unnecessary. Users who depend on
iceberg-parquetwould obviously depend oniceberg-core. So, no impact for class imports.But the Users build files might have to update to remove
iceberg-parquetdependency. That had to be done anyways whether in this version or other when we delete it. We can update release notes about this.