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

refactor(iceberg): extract IcebergCommon config #18600

Merged
merged 4 commits into from
Sep 20, 2024

Conversation

xxchan
Copy link
Member

@xxchan xxchan commented Sep 19, 2024

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

What's changed and what's your intention?

Previously, we use sink/IcebergConfig for both source and sink, which is confusing. This PR

  • separates out common config and methods.
  • Don't convert source::IcerbergProperties to sink::IcebergConfig

Note: currently source and sink has some differences:

  • source doesn't support path_style_access
  • source supports less options in java_catalog_props

This PR tries to be an equivalent refactor and so doesn't change any of these.

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.

Copy link
Member Author

xxchan commented Sep 19, 2024

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @xxchan and the rest of your teammates on Graphite Graphite

@xxchan xxchan marked this pull request as ready for review September 19, 2024 04:56
@xxchan xxchan force-pushed the 09-18-refactor_connector_extract_icebergcommon_config branch from 4abecd7 to c6f0441 Compare September 19, 2024 04:58
@xxchan xxchan force-pushed the 09-18-refactor_connector_extract_icebergcommon_config branch from ff19cec to 71539bd Compare September 19, 2024 06:06
@xxchan xxchan changed the title refactor(connector): extract IcebergCommon config refactor(iceberg): extract IcebergCommon config Sep 19, 2024
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

.unwrap_or_else(|| "risingwave".to_string())
}

pub fn full_table_name(&self) -> ConnectorResult<TableIdentifier> {
Copy link
Contributor

@Li0k Li0k Sep 19, 2024

Choose a reason for hiding this comment

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

how about move full_table_name to v1 ? It use icelake::TableIdentifier

Signed-off-by: xxchan <xxchan22f@gmail.com>
Copy link
Contributor

@tabVersion tabVersion left a comment

Choose a reason for hiding this comment

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

Are both source and sink using IcebergProperties?

overall LGTM

Comment on lines +43 to +49
pub region: Option<String>,
#[serde(rename = "s3.endpoint")]
pub endpoint: Option<String>,
#[serde(rename = "s3.access.key")]
pub access_key: String,
#[serde(rename = "s3.secret.key")]
pub secret_key: String,
Copy link
Contributor

Choose a reason for hiding this comment

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

referencing this part to AwsAuthProps instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

They are incompatible and this PR doesn't want to change behavior

@xxchan xxchan added this pull request to the merge queue Sep 20, 2024
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!

Merged via the queue into main with commit 4bc3b28 Sep 20, 2024
33 of 34 checks passed
@xxchan xxchan deleted the 09-18-refactor_connector_extract_icebergcommon_config branch September 20, 2024 06:18
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