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.

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

feat(iceberg): bump iceberg-rust #19206

Merged
merged 8 commits into from
Nov 1, 2024
Merged

Conversation

chenzl25
Copy link
Contributor

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@chenzl25 chenzl25 requested a review from a team as a code owner October 30, 2024 08:15
@chenzl25 chenzl25 requested review from stdrc and xxhZs October 30, 2024 08:15
@chenzl25 chenzl25 requested a review from xxchan October 30, 2024 08:15
Cargo.toml Outdated
parquet = { version = "53", features = ["async"] }
parquet = { version = "53.2", features = ["async"] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why to upgrade parquet? It's ok to me though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the upstream iceberg-rust upgrades it, so we do.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

@chenzl25 chenzl25 Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But the actual version needs to be 53.2. see Cargo.lock

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what you mean. If we change back to 53 in cargo.toml, it's possible to revert Cargo.lock.

Not suggest to revert the upgrade. Just FYI:

> cargo update -p [email protected] --precise 53.0.0
    Updating crates.io index
    Removing brotli v7.0.0
 Downgrading parquet v53.2.0 -> v53.0.0
diff --git a/Cargo.toml b/Cargo.toml
index fb1c838f44..7c77a043dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -161,7 +161,7 @@ deltalake = { version = "0.20.1", features = [
 itertools = "0.13.0"
 jsonbb = "0.1.4"
 lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "2682b85" }
-parquet = { version = "53.2", features = ["async"] }
+parquet = { version = "53", features = ["async"] }
 thiserror-ext = "0.1.2"
 tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }
 tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", features = [



diff --git a/Cargo.lock b/Cargo.lock
index 12fc55f45a..e23bffc0c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2240,17 +2240,6 @@ dependencies = [
  "brotli-decompressor",
 ]
 
-[[package]]
-name = "brotli"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
 [[package]]
 name = "brotli-decompressor"
 version = "4.0.1"
@@ -6320,7 +6309,7 @@ dependencies = [
  "once_cell",
  "opendal 0.50.1",
  "ordered-float 4.1.1",
- "parquet 53.2.0",
+ "parquet 53.0.0",
  "paste",
  "rand",
  "reqwest 0.12.4",
@@ -6405,7 +6394,7 @@ dependencies = [
  "once_cell",
  "opendal 0.49.2",
  "ordered-float 3.9.1",
- "parquet 53.2.0",
+ "parquet 53.0.0",
  "prometheus",
  "regex",
  "reqwest 0.11.20",
@@ -8792,7 +8781,7 @@ dependencies = [
  "arrow-schema 52.2.0",
  "arrow-select 52.2.0",
  "base64 0.22.0",
- "brotli 6.0.0",
+ "brotli",
  "bytes",
  "chrono",
  "flate2",
@@ -8815,9 +8804,9 @@ dependencies = [
 
 [[package]]
 name = "parquet"
-version = "53.2.0"
+version = "53.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea02606ba6f5e856561d8d507dba8bac060aefca2a6c0f1aa1d361fed91ff3e"
+checksum = "f0fbf928021131daaa57d334ca8e3904fe9ae22f73c56244fc7db9b04eedc3d8"
 dependencies = [
  "ahash 0.8.11",
  "arrow-array 53.2.0",
@@ -8828,7 +8817,7 @@ dependencies = [
  "arrow-schema 53.2.0",
  "arrow-select 53.2.0",
  "base64 0.22.0",
- "brotli 7.0.0",
+ "brotli",
  "bytes",
  "chrono",
  "flate2",
@@ -9851,7 +9840,7 @@ dependencies = [
  "indoc",
  "libc",
  "memoffset",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
@@ -10549,7 +10538,7 @@ dependencies = [
  "memcomparable",
  "opendal 0.49.2",
  "parking_lot 0.12.1",
- "parquet 53.2.0",
+ "parquet 53.0.0",
  "paste",
  "prometheus",
  "prost 0.13.1",
@@ -11084,7 +11073,7 @@ dependencies = [
  "opensearch",
  "openssl",
  "parking_lot 0.12.1",
- "parquet 53.2.0",
+ "parquet 53.0.0",
  "paste",
  "pg_bigdecimal",
  "postgres-openssl",

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean iceberg-rust uses some structs that are newly added in parquet 52.3, but these structs don't exist in 52.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we use 53.0.0, we will have a compile error.

error[E0432]: unresolved import parquet::file::metadata::ParquetMetaDataReader
--> /Users/dylan/.cargo/git/checkouts/iceberg-rust-0821e0c4f5c01b19-shallow/13a561f/crates/iceberg/src/arrow/reader.rs:38:48
|
38 | use parquet::file::metadata::{ParquetMetaData, ParquetMetaDataReader};
| ^^^^^^^^^^^^^^^^^^^^^
| |
| no ParquetMetaDataReader in file::metadata
| help: a similar name exists in the module: ParquetMetaDataWriter

Copy link
Member

@xxchan xxchan Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄 interesting. This sounds like a bug of iceberg-rust. They wrongly specify the minimal version

@chenzl25 chenzl25 added this pull request to the merge queue Oct 30, 2024
@chenzl25 chenzl25 removed this pull request from the merge queue due to a manual request Oct 30, 2024
@chenzl25
Copy link
Contributor Author

@xxhZs It seems iceberg-rust has some breaking change that will cause position delete can't work. Please take a look together.

@chenzl25 chenzl25 added this pull request to the merge queue Nov 1, 2024
Merged via the queue into main with commit 56ab1fa Nov 1, 2024
31 of 32 checks passed
@chenzl25 chenzl25 deleted the dylan/bump_iceberg_rust_20241030 branch November 1, 2024 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants