refactor(source): minor refactors on source parser #17184
Merged
Conversation
This file contains 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
9 tasks
This stack of pull requests is managed by Graphite. Learn more about stacking. |
xxchan
force-pushed
the
refactor_move_json_schema_to_codec_crate
branch
from
3730c60 to
d2bb979
Compare
9 tasks
Base automatically changed from
06-05-feat_source_support_json_schema_addtionalproperties_map_
to
main
June 13, 2024 07:05
xxchan
force-pushed
the
refactor_move_json_schema_to_codec_crate
branch
from
d2bb979 to
47e928b
Compare
xxchan
changed the title
xxchan
force-pushed
the
refactor_move_json_schema_to_codec_crate
branch
2 times, most recently
from
e1e5cac to
cf04ecd
Compare
xxchan
changed the title
xxchan
commented
Jun 20, 2024
src/connector/codec/src/lib.rs
Outdated
Comment on lines
46
to
63
| pub use risingwave_pb::plan_common::ColumnDesc; | ||
| pub type RisingWaveSchema = Vec<ColumnDesc>; | ||
| pub use apache_avro::schema::Schema as AvroSchema; | ||
| pub struct JsonSchema(pub serde_json::Value); | ||
| impl JsonSchema { | ||
| pub fn parse_str(schema: &str) -> anyhow::Result<Self> { | ||
| use anyhow::Context; | ||
|
|
||
| let value = serde_json::from_str(schema).context("failed to parse json schema")?; | ||
| Ok(Self(value)) | ||
| } | ||
| } |
There was a problem hiding this comment.
exposed these while developing codec-console.
xxchan
commented
Jun 20, 2024
Comment on lines
-128
to
+130
| sea-schema = { version = "0.14", features = ["default", "sqlx-postgres", "sqlx-mysql"] } | ||
| sea-schema = { version = "0.14", default-features = false, features = [ | ||
| "discovery", | ||
| "sqlx-postgres", | ||
| "sqlx-mysql", | ||
| ] } |
There was a problem hiding this comment.
This is changed because I found cargo check -p risingwave_connector compile failed.
I would suggest keeping it. There's no problem at all for us to generate an |
BugenZhao
reviewed
Jun 21, 2024
Signed-off-by: xxchan <[email protected]>
Signed-off-by: xxchan <[email protected]>
Signed-off-by: xxchan <[email protected]>
Signed-off-by: xxchan <[email protected]>
xxchan
force-pushed
the
refactor_move_json_schema_to_codec_crate
branch
from
8baca40 to
c28b986
Compare
xiangjinwu
approved these changes
Jun 24, 2024
| let avro_schema = convert_avro(json_schema, Context::default()).to_string(); | ||
| let schema = Schema::parse_str(&avro_schema).context("failed to parse avro schema")?; | ||
| avro_schema_to_column_descs(&schema, Some(MapHandling::Jsonb)).map_err(Into::into) | ||
| json_schema.json_schema_to_columns().map_err(Into::into) |
There was a problem hiding this comment.
nit: json_schema_ in method name feels redundant.
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.
What's changed and what's your intention?
mostly cleanup
Checklist
./risedev check(or alias,./risedev c)Documentation
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.