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): support eq delete merge on read for iceberg #18448

Merged
merged 27 commits into from
Sep 13, 2024

Conversation

xxhZs
Copy link
Contributor

@xxhZs xxhZs commented Sep 6, 2024

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

What's changed and what's your intention?

support merge on read for iceberg source.
Only support eq delete

The delete file's pk must be consistent

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.

@xxhZs xxhZs requested a review from a team as a code owner September 6, 2024 11:06
@xxhZs xxhZs requested a review from hzxa21 September 6, 2024 11:06
@graphite-app graphite-app bot requested a review from a team September 6, 2024 11:30
@xxhZs xxhZs requested a review from chenzl25 September 10, 2024 06:16
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
risedev.yml Outdated Show resolved Hide resolved
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
src/common/src/array/mod.rs Outdated Show resolved Hide resolved
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
src/batch/src/executor/iceberg_scan.rs Outdated Show resolved Hide resolved
Cargo.toml Outdated
Comment on lines 145 to 147
iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "682b38037dafa78ebbc6e0479844e980c5ed68a4" }
iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "682b38037dafa78ebbc6e0479844e980c5ed68a4" }
iceberg-catalog-glue = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "682b38037dafa78ebbc6e0479844e980c5ed68a4" }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Just curious, do we have a plan to contribute back to upstream to expose delete files?

@@ -51,7 +51,7 @@ itertools = { workspace = true }
jsonbb = { workspace = true }
linkme = { version = "0.3", features = ["used_linker"] }
md5 = "0.7"
moka = { version = "0.12", features = ["sync"] }
moka = { version = "0.12.8", features = ["sync"] }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Any specific reason that we want to pin to a specific version here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since we update the version of iceberg_rust in this pr, and it depends on moka ^0.12.8

@xxhZs xxhZs requested a review from chenzl25 September 11, 2024 06:28
Cargo.toml Outdated Show resolved Hide resolved
src/connector/src/source/iceberg/mod.rs Outdated Show resolved Hide resolved
@xxhZs xxhZs force-pushed the xxh/iceberg_merge_on_read branch from 0fc921e to 2004482 Compare September 12, 2024 08:07
fix

fmt
@xxhZs xxhZs force-pushed the xxh/iceberg_merge_on_read branch from 2004482 to e39af11 Compare September 12, 2024 08:15
@xxhZs xxhZs force-pushed the xxh/iceberg_merge_on_read branch from b516b85 to e0df8cc Compare September 12, 2024 09:57
Copy link
Contributor

@chenzl25 chenzl25 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for your effort!

fix cargo lock

fix
@xxhZs xxhZs force-pushed the xxh/iceberg_merge_on_read branch from 741b069 to 83c30a6 Compare September 12, 2024 15:02
@graphite-app graphite-app bot requested a review from a team September 13, 2024 03:40
@xxhZs xxhZs requested a review from hzxa21 September 13, 2024 05:23
Copy link
Collaborator

@hzxa21 hzxa21 left a comment

Choose a reason for hiding this comment

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

LGTM for Cargo.lock

@xxhZs xxhZs added this pull request to the merge queue Sep 13, 2024
Merged via the queue into main with commit 870bcde Sep 13, 2024
32 of 33 checks passed
@xxhZs xxhZs deleted the xxh/iceberg_merge_on_read branch September 13, 2024 07:00
Copy link
Contributor

@Li0k Li0k left a comment

Choose a reason for hiding this comment

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

Rest LGTM, thanks for the efforts

let visibilitys: Vec<_> = chunk
.columns()
.iter()
.zip_eq(column_names.clone())
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

}
Ok(splits
.into_iter()
.filter(|split| !split.files.is_empty())
.collect_vec())
}

async fn get_require_field_names(
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add some doc / example for this case

@chenzl25
Copy link
Contributor

#15784

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.

4 participants