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.

Sign up for GitHub

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(sink): DRY SinkFormatterImpl::new #16575

Merged
merged 7 commits into from
May 6, 2024
Merged

refactor(sink): DRY SinkFormatterImpl::new #16575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e027460
FromBuilder for JsonEncoder & ProtoEncoder
xiangjinwu May 2, 2024
37330d7
AppendOnlyFormatter::from_builder
xiangjinwu May 2, 2024
1d3c736
schemas.enable and AvroEncoder::from_builder
xiangjinwu May 2, 2024
bf85847
FormatFromBuilder for Upsert and Debezium
xiangjinwu May 2, 2024
a0e71b7
infer from enum wrapper
xiangjinwu May 2, 2024
8cccf22
cleanup (more to come)
xiangjinwu May 3, 2024
da8df3d
minor refactors
xiangjinwu May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions src/connector/src/schema/avro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use std::collections::BTreeMap;
use std::sync::Arc;

use apache_avro::Schema as AvroSchema;

use super::loader::{LoadedSchema, SchemaLoader};
use super::loader::LoadedSchema;
use super::schema_registry::Subject;
use super::SchemaFetchError;

pub struct SchemaWithId {
pub schema: Arc<AvroSchema>,
pub id: i32,
}

/// Schema registry only
pub async fn fetch_schema(
format_options: &BTreeMap<String, String>,
topic: &str,
) -> Result<(SchemaWithId, SchemaWithId), SchemaFetchError> {
let loader = SchemaLoader::from_format_options(topic, format_options)?;

let (key_id, key_avro) = loader.load_key_schema().await?;
let (val_id, val_avro) = loader.load_val_schema().await?;

Ok((
SchemaWithId {
id: key_id,
schema: Arc::new(key_avro),
},
SchemaWithId {
id: val_id,
schema: Arc::new(val_avro),
},
))
}

impl LoadedSchema for AvroSchema {
fn compile(primary: Subject, _: Vec<Subject>) -> Result<Self, SchemaFetchError> {
AvroSchema::parse_str(&primary.schema.content)
Expand Down
Loading
Loading