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(batch): support iceberg scan executor #14915

Merged
merged 6 commits into from
Feb 4, 2024

Conversation

chenzl25
Copy link
Contributor

@chenzl25 chenzl25 commented Feb 1, 2024

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

What's changed and what's your intention?

  • Related Feat: Batch ingest iceberg/file source #14742
  • Support IcebergScanExecutor which could be used to scan an iceberg table and return a DataChunk stream. The FileSelector is used to decide which files could be scanned by this executor.

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 February 1, 2024 06:52
Comment on lines 108 to 127
let catalog = self.iceberg_config.create_catalog().await?;

let table_ident = TableIdentifier::new(vec![self.database_name, self.table_name]).unwrap();
let table = catalog
.load_table(&table_ident)
.await
.map_err(BatchError::Iceberg)?;

let table_scan: TableScan = table
.new_scan_builder()
.with_snapshot_id(
self.snapshot_id
.unwrap_or_else(|| table.current_table_metadata().current_snapshot_id.unwrap()),
)
.with_batch_size(self.batch_size)
.with_column_names(self.schema.names())
.build()
.map_err(|e| BatchError::Internal(anyhow!(e)))?;
let file_scan_stream: icelake::io::FileScanStream =
table_scan.scan(&table).await.map_err(BatchError::Iceberg)?;
Copy link
Contributor

Choose a reason for hiding this comment

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

Usually we do this in planning phase, so that we only need to read metadata for only once, and the scan executor only needs to contains file names.

Copy link
Contributor

Choose a reason for hiding this comment

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

wondering if we can do the same as long as setting snapshot_id

Copy link
Contributor Author

Choose a reason for hiding this comment

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

However, icelake currently doesn't provide a way to read Files directly. If we have a better API later, we can avoid such planning in the future.

Copy link
Contributor

Choose a reason for hiding this comment

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

wondering if we can do the same as long as setting snapshot_id

Yes, in fact we should set snapshot_id, otherwise different tasks may see different snapshots.

Copy link
Contributor

Choose a reason for hiding this comment

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

cc @ZENOTME Could you help to add this api in icelake?

Copy link
Contributor

Choose a reason for hiding this comment

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

I would suggest to pending this to wait for icelake's api support, WDYT? cc @chenzl25

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 intend to move fast and present a demo version. Any optimization could be done in parallel as well. 😄

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool, let's move

Copy link
Contributor

Choose a reason for hiding this comment

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

cc @ZENOTME Could you help to add this api in icelake?

Sorry for replying late. Yes. And I agree to move it now. For the new API, let's track it in icelake as a new feature.

Copy link

gitguardian bot commented Feb 1, 2024

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secret in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
9425213 Triggered Generic Password 11fdfcd ci/scripts/regress-test.sh View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secret safely. Learn here the best practices.
  3. Revoke and rotate this secret.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@chenzl25 chenzl25 enabled auto-merge February 1, 2024 10:53
@chenzl25 chenzl25 disabled auto-merge February 2, 2024 04:21
@chenzl25 chenzl25 enabled auto-merge February 2, 2024 04:21
@ZENOTME
Copy link
Contributor

ZENOTME commented Feb 2, 2024

I intend to move fast and present a demo version. Any optimization could be done in parallel as well. 😄

Does this scan will move to the source executor in the future?

@chenzl25
Copy link
Contributor Author

chenzl25 commented Feb 2, 2024

I intend to move fast and present a demo version. Any optimization could be done in parallel as well. 😄

Does this scan will move to the source executor in the future?

I think we don't need to merge the iceberg scan executor into the batch source executor. The differences between them are greater than the similarities.

@chenzl25 chenzl25 added this pull request to the merge queue Feb 4, 2024
Merged via the queue into main with commit eeed1e9 Feb 4, 2024
27 of 28 checks passed
@chenzl25 chenzl25 deleted the dylan/support_iceberg_scan_executor branch February 4, 2024 05:17
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.

5 participants