Skip to content
Open
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions datafusion/datasource/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ all-features = true
backtrace = ["datafusion-common/backtrace"]
compression = ["async-compression", "liblzma", "bzip2", "flate2", "zstd", "tokio-util"]
default = ["compression"]
# Enables `DataSink::try_to_proto` serialization hooks. Off by default so
# consumers that never serialize plans pay nothing.
proto = [
"dep:datafusion-proto-models",
"datafusion-physical-plan/proto",
]

[dependencies]
arrow = { workspace = true }
Expand All @@ -56,6 +62,7 @@ datafusion-physical-expr = { workspace = true }
datafusion-physical-expr-adapter = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
datafusion-physical-plan = { workspace = true }
datafusion-proto-models = { workspace = true, optional = true }
datafusion-session = { workspace = true }
flate2 = { workspace = true, optional = true }
futures = { workspace = true }
Expand Down
6 changes: 6 additions & 0 deletions datafusion/datasource/src/file_sink_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ use datafusion_expr::dml::InsertOp;
use async_trait::async_trait;
use object_store::ObjectStore;

#[cfg(feature = "proto")]
mod proto;

#[cfg(feature = "proto")]
pub use proto::parse_sink_sort_order;

/// Determines how `FileSink` output paths are interpreted.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub enum FileOutputMode {
Expand Down
327 changes: 327 additions & 0 deletions datafusion/datasource/src/file_sink_config/proto.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,327 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

//! Protobuf conversion for the format-independent [`FileSinkConfig`].

use std::sync::Arc;

use arrow::compute::SortOptions;
use arrow::datatypes::Schema;
use chrono::{TimeZone, Utc};
use datafusion_common::{DataFusionError, Result, internal_datafusion_err};
use datafusion_execution::object_store::ObjectStoreUrl;
use datafusion_expr::dml::InsertOp;
use datafusion_physical_expr::PhysicalSortExpr;
use datafusion_physical_expr_common::sort_expr::LexRequirement;
use datafusion_physical_plan::proto::ExecutionPlanDecodeCtx;
use datafusion_proto_models::protobuf;
use object_store::ObjectMeta;
use object_store::path::Path;

use crate::file_groups::FileGroup;
use crate::file_sink_config::{FileOutputMode, FileSinkConfig};
use crate::{ListingTableUrl, PartitionedFile};

impl FileSinkConfig {
/// Serialize this shared file-sink configuration without format-specific
/// writer options.
pub fn to_proto(&self) -> Result<protobuf::FileSinkConfig> {
let file_groups = self
.file_group
.iter()
.map(partitioned_file_to_proto)
.collect::<Result<Vec<_>>>()?;
let table_paths = self
.table_paths
.iter()
.map(ToString::to_string)
.collect::<Vec<_>>();
let table_partition_cols = self
.table_partition_cols
.iter()
.map(|(name, data_type)| {
Ok(protobuf::PartitionColumn {
name: name.to_owned(),
arrow_type: Some(data_type.try_into()?),
})
})
.collect::<Result<Vec<_>>>()?;
let file_output_mode = match self.file_output_mode {
FileOutputMode::Automatic => protobuf::FileOutputMode::Automatic,
FileOutputMode::SingleFile => protobuf::FileOutputMode::SingleFile,
FileOutputMode::Directory => protobuf::FileOutputMode::Directory,
};

Ok(protobuf::FileSinkConfig {
object_store_url: self.object_store_url.to_string(),
file_groups,
table_paths,
output_schema: Some(self.output_schema.as_ref().try_into()?),
table_partition_cols,
keep_partition_by_columns: self.keep_partition_by_columns,
insert_op: self.insert_op as i32,
file_extension: self.file_extension.clone(),
file_output_mode: file_output_mode.into(),
})
}

/// Reconstruct a shared file-sink configuration from protobuf.
pub fn from_proto(conf: &protobuf::FileSinkConfig) -> Result<Self> {
let file_group = FileGroup::new(
conf.file_groups
.iter()
.map(partitioned_file_from_proto)
.collect::<Result<Vec<_>>>()?,
);
let table_paths = conf
.table_paths
.iter()
.map(ListingTableUrl::parse)
.collect::<Result<Vec<_>>>()?;
let table_partition_cols = conf
.table_partition_cols
.iter()
.map(|protobuf::PartitionColumn { name, arrow_type }| {
let data_type = arrow_type
.as_ref()
.ok_or_else(|| {
internal_datafusion_err!(
"PartitionColumn is missing required field 'arrow_type'"
)
})?
.try_into()?;
Ok((name.clone(), data_type))
})
.collect::<Result<Vec<_>>>()?;
let insert_op = protobuf::InsertOp::try_from(conf.insert_op).map_err(|_| {
internal_datafusion_err!(
"Received a FileSinkConfig message with unknown InsertOp {}",
conf.insert_op
)
})?;
let insert_op = match insert_op {
protobuf::InsertOp::Append => InsertOp::Append,
protobuf::InsertOp::Overwrite => InsertOp::Overwrite,
protobuf::InsertOp::Replace => InsertOp::Replace,
};
let file_output_mode = protobuf::FileOutputMode::try_from(conf.file_output_mode)
.map_err(|_| {
internal_datafusion_err!(
"Received a FileSinkConfig message with unknown FileOutputMode {}",
conf.file_output_mode
)
})?;
let file_output_mode = match file_output_mode {
protobuf::FileOutputMode::Automatic => FileOutputMode::Automatic,
protobuf::FileOutputMode::SingleFile => FileOutputMode::SingleFile,
protobuf::FileOutputMode::Directory => FileOutputMode::Directory,
};
let output_schema = conf.output_schema.as_ref().ok_or_else(|| {
internal_datafusion_err!(
"FileSinkConfig is missing required field 'output_schema'"
)
})?;

Ok(Self {
original_url: String::default(),
object_store_url: ObjectStoreUrl::parse(&conf.object_store_url)?,
file_group,
table_paths,
output_schema: Arc::new(output_schema.try_into()?),
table_partition_cols,
insert_op,
keep_partition_by_columns: conf.keep_partition_by_columns,
file_extension: conf.file_extension.clone(),
file_output_mode,
})
}
}

/// Decode a sink's optional required output ordering against its input schema.
pub fn parse_sink_sort_order(
collection: Option<&protobuf::PhysicalSortExprNodeCollection>,
ctx: &ExecutionPlanDecodeCtx<'_>,
schema: &Schema,
) -> Result<Option<LexRequirement>> {
let Some(collection) = collection else {
return Ok(None);
};
let sort_exprs = collection
.physical_sort_expr_nodes
.iter()
.map(|node| {
let expr = node.expr.as_ref().ok_or_else(|| {
internal_datafusion_err!("Unexpected empty physical expression")
})?;
Ok(PhysicalSortExpr {
expr: ctx.decode_expr(expr, schema)?,
options: SortOptions {
descending: !node.asc,
nulls_first: node.nulls_first,
},
})
})
.collect::<Result<Vec<_>>>()?;
Ok(LexRequirement::new(sort_exprs.into_iter().map(Into::into)))
}

fn partitioned_file_to_proto(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

#23683 now provides these shared PartitionedFile helpers. Once that gets merged in the main we can merge main to this pr so we can remove this duplicate code, and reuse those helpers.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

OK, I'll rebase this PR when #23683 is merged.

file: &PartitionedFile,
) -> Result<protobuf::PartitionedFile> {
let last_modified = file.object_meta.last_modified;
let last_modified_ns = last_modified.timestamp_nanos_opt().ok_or_else(|| {
DataFusionError::Plan(format!(
"Invalid timestamp on PartitionedFile::ObjectMeta: {last_modified}"
))
})? as u64;

Ok(protobuf::PartitionedFile {
arrow_schema: file
.arrow_schema
.as_ref()
.map(|schema| schema.as_ref().try_into())
.transpose()?,
path: file.object_meta.location.as_ref().to_owned(),
size: file.object_meta.size,
last_modified_ns,
partition_values: file
.partition_values
.iter()
.map(TryInto::try_into)
.collect::<Result<Vec<_>, _>>()?,
range: file.range.as_ref().map(|range| protobuf::FileRange {
start: range.start,
end: range.end,
}),
statistics: file.statistics.as_ref().map(|stats| stats.as_ref().into()),
})
}

fn partitioned_file_from_proto(
file: &protobuf::PartitionedFile,
) -> Result<PartitionedFile> {
let mut partitioned_file = PartitionedFile::new_from_meta(ObjectMeta {
location: Path::parse(file.path.as_str()).map_err(|error| {
internal_datafusion_err!("Invalid object_store path: {error}")
})?,
last_modified: Utc.timestamp_nanos(file.last_modified_ns as i64),
size: file.size,
e_tag: None,
version: None,
})
.with_partition_values(
file.partition_values
.iter()
.map(TryInto::try_into)
.collect::<Result<Vec<_>, _>>()?,
);
if let Some(schema) = file.arrow_schema.as_ref() {
partitioned_file = partitioned_file.with_arrow_schema(Arc::new(
schema.try_into().map_err(DataFusionError::from)?,
));
}
if let Some(range) = file.range.as_ref() {
partitioned_file = partitioned_file.with_range(range.start, range.end);
}
if let Some(statistics) = file.statistics.as_ref() {
partitioned_file =
partitioned_file.with_statistics(Arc::new(statistics.try_into()?));
}
Ok(partitioned_file)
}

#[cfg(test)]
mod tests {
use super::*;

fn valid_file_sink_config() -> protobuf::FileSinkConfig {
protobuf::FileSinkConfig {
object_store_url: ObjectStoreUrl::local_filesystem().to_string(),
output_schema: Some(
(&Schema::empty())
.try_into()
.expect("empty schema should serialize"),
),
insert_op: protobuf::InsertOp::Append.into(),
file_output_mode: protobuf::FileOutputMode::Automatic.into(),
..Default::default()
}
}

fn assert_decode_error(
mutate: impl FnOnce(&mut protobuf::FileSinkConfig),
expected: impl AsRef<str>,
) {
let mut conf = valid_file_sink_config();
mutate(&mut conf);

let error =
FileSinkConfig::from_proto(&conf).expect_err("invalid config should fail");
match error {
DataFusionError::Internal(message) => {
let message = message
.split_once(DataFusionError::BACK_TRACE_SEP)
.map_or(message.as_str(), |(message, _)| message);
assert_eq!(message, expected.as_ref());
}
error => panic!("expected internal error, got {error}"),
}
}

#[test]
fn rejects_unknown_insert_op() {
assert_decode_error(
|conf| conf.insert_op = i32::MAX,
format!(
"Received a FileSinkConfig message with unknown InsertOp {}",
i32::MAX
),
);
}

#[test]
fn rejects_unknown_file_output_mode() {
assert_decode_error(
|conf| conf.file_output_mode = i32::MAX,
format!(
"Received a FileSinkConfig message with unknown FileOutputMode {}",
i32::MAX
),
);
}

#[test]
fn rejects_missing_output_schema() {
assert_decode_error(
|conf| conf.output_schema = None,
"FileSinkConfig is missing required field 'output_schema'",
);
}

#[test]
fn rejects_partition_column_without_arrow_type() {
assert_decode_error(
|conf| {
conf.table_partition_cols.push(protobuf::PartitionColumn {
name: "partition".to_string(),
arrow_type: None,
});
},
"PartitionColumn is missing required field 'arrow_type'",
);
}
}
Loading
Loading