Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 17 additions & 8 deletions native-engine/datafusion-ext-plans/src/flink/kafka_scan_exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ use sonic_rs::{JsonContainerTrait, JsonValueTrait};

use crate::{
common::{column_pruning::ExecuteWithColumnPruning, execution_context::ExecutionContext},
flink::serde::{flink_deserializer::FlinkDeserializer, pb_deserializer::PbDeserializer},
flink::serde::{
flink_deserializer::FlinkDeserializer, json_deserializer::JsonDeserializer,
pb_deserializer::PbDeserializer,
},
rdkafka::Message,
};

Expand Down Expand Up @@ -132,6 +135,7 @@ impl KafkaScanExec {
exec_ctx.output_schema(),
exec_ctx.clone(),
serialized_pb_stream,
self.data_format,
self.format_config_json.clone(),
)?;
Ok(deserialized_pb_stream)
Expand Down Expand Up @@ -481,6 +485,7 @@ fn parse_records(
schema: SchemaRef,
exec_ctx: Arc<ExecutionContext>,
mut input_stream: SendableRecordBatchStream,
data_format: i32,
parser_config_json: String,
) -> Result<SendableRecordBatchStream> {
let parser_config = sonic_rs::from_str::<sonic_rs::Value>(&parser_config_json)
Expand Down Expand Up @@ -523,13 +528,17 @@ fn parse_records(
"KafkaScanExec.ParseRecords",
move |sender| async move {
// TODO: json parser
let mut parser: Box<dyn FlinkDeserializer> = Box::new(PbDeserializer::new(
&file_descriptor_bytes,
&root_message_name,
schema.clone(),
&nested_msg_mapping,
&skip_fields_vec,
)?);
let mut parser: Box<dyn FlinkDeserializer> = if data_format == 0 {
Box::new(JsonDeserializer::new(schema.clone(), &nested_msg_mapping)?)
} else {
Box::new(PbDeserializer::new(
&file_descriptor_bytes,
&root_message_name,
schema.clone(),
&nested_msg_mapping,
&skip_fields_vec,
)?)
};
while let Some(batch) = input_stream.next().await.transpose()? {
let kafka_partition = batch
.column(0)
Expand Down
Loading
Loading