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
57 changes: 54 additions & 3 deletions datafusion/proto-common/src/generated/pbjson.rs

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions datafusion/proto-common/src/generated/prost.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ pub struct ParquetFormat {
pub options: ::core::option::Option<TableParquetOptions>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct AvroFormat {}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct NdJsonFormat {
#[prost(message, optional, tag = "1")]
pub options: ::core::option::Option<JsonOptions>,
Expand Down Expand Up @@ -89,10 +89,10 @@ pub struct Constraints {
pub constraints: ::prost::alloc::vec::Vec<Constraint>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct AvroOptions {}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct ArrowOptions {}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand Down Expand Up @@ -137,15 +137,15 @@ pub struct Timestamp {
pub timezone: ::prost::alloc::string::String,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct Decimal {
#[prost(uint32, tag = "3")]
pub precision: u32,
#[prost(int32, tag = "4")]
pub scale: i32,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct Decimal256Type {
#[prost(uint32, tag = "3")]
pub precision: u32,
Expand Down Expand Up @@ -223,15 +223,15 @@ pub mod scalar_nested_value {
}
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct ScalarTime32Value {
#[prost(oneof = "scalar_time32_value::Value", tags = "1, 2")]
pub value: ::core::option::Option<scalar_time32_value::Value>,
}
/// Nested message and enum types in `ScalarTime32Value`.
pub mod scalar_time32_value {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum Value {
#[prost(int32, tag = "1")]
Time32SecondValue(i32),
Expand All @@ -240,15 +240,15 @@ pub mod scalar_time32_value {
}
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct ScalarTime64Value {
#[prost(oneof = "scalar_time64_value::Value", tags = "1, 2")]
pub value: ::core::option::Option<scalar_time64_value::Value>,
}
/// Nested message and enum types in `ScalarTime64Value`.
pub mod scalar_time64_value {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum Value {
#[prost(int64, tag = "1")]
Time64MicrosecondValue(i64),
Expand All @@ -267,7 +267,7 @@ pub struct ScalarTimestampValue {
/// Nested message and enum types in `ScalarTimestampValue`.
pub mod scalar_timestamp_value {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum Value {
#[prost(int64, tag = "1")]
TimeMicrosecondValue(i64),
Expand All @@ -288,15 +288,15 @@ pub struct ScalarDictionaryValue {
pub value: ::core::option::Option<::prost::alloc::boxed::Box<ScalarValue>>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct IntervalDayTimeValue {
#[prost(int32, tag = "1")]
pub days: i32,
#[prost(int32, tag = "2")]
pub milliseconds: i32,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct IntervalMonthDayNanoValue {
#[prost(int32, tag = "1")]
pub months: i32,
Expand Down Expand Up @@ -558,10 +558,10 @@ pub mod arrow_type {
/// }
/// }
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct EmptyMessage {}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct JsonWriterOptions {
#[prost(enumeration = "CompressionTypeVariant", tag = "1")]
pub compression: i32,
Expand Down Expand Up @@ -658,7 +658,7 @@ pub struct CsvOptions {
}
/// Options controlling CSV format
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct JsonOptions {
/// Compression type
#[prost(enumeration = "CompressionTypeVariant", tag = "1")]
Expand Down Expand Up @@ -723,7 +723,7 @@ pub struct ParquetColumnOptions {
/// Nested message and enum types in `ParquetColumnOptions`.
pub mod parquet_column_options {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum BloomFilterEnabledOpt {
#[prost(bool, tag = "1")]
BloomFilterEnabled(bool),
Expand All @@ -735,7 +735,7 @@ pub mod parquet_column_options {
Encoding(::prost::alloc::string::String),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum DictionaryEnabledOpt {
#[prost(bool, tag = "3")]
DictionaryEnabled(bool),
Expand All @@ -753,19 +753,19 @@ pub mod parquet_column_options {
StatisticsEnabled(::prost::alloc::string::String),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum BloomFilterFppOpt {
#[prost(double, tag = "6")]
BloomFilterFpp(f64),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum BloomFilterNdvOpt {
#[prost(uint64, tag = "7")]
BloomFilterNdv(u64),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum MaxStatisticsSizeOpt {
#[prost(uint32, tag = "8")]
MaxStatisticsSize(u32),
Expand Down Expand Up @@ -860,7 +860,7 @@ pub struct ParquetOptions {
/// Nested message and enum types in `ParquetOptions`.
pub mod parquet_options {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum MetadataSizeHintOpt {
#[prost(uint64, tag = "4")]
MetadataSizeHint(u64),
Expand All @@ -872,7 +872,7 @@ pub mod parquet_options {
Compression(::prost::alloc::string::String),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum DictionaryEnabledOpt {
#[prost(bool, tag = "11")]
DictionaryEnabled(bool),
Expand All @@ -884,13 +884,13 @@ pub mod parquet_options {
StatisticsEnabled(::prost::alloc::string::String),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum MaxStatisticsSizeOpt {
#[prost(uint64, tag = "14")]
MaxStatisticsSize(u64),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum ColumnIndexTruncateLengthOpt {
#[prost(uint64, tag = "17")]
ColumnIndexTruncateLength(u64),
Expand All @@ -902,13 +902,13 @@ pub mod parquet_options {
Encoding(::prost::alloc::string::String),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum BloomFilterFppOpt {
#[prost(double, tag = "21")]
BloomFilterFpp(f64),
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Oneof)]
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
pub enum BloomFilterNdvOpt {
#[prost(uint64, tag = "22")]
BloomFilterNdv(u64),
Expand Down
21 changes: 21 additions & 0 deletions datafusion/proto/proto/datafusion.proto
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ message LogicalPlanNode {
DistinctOnNode distinct_on = 28;
CopyToNode copy_to = 29;
UnnestNode unnest = 30;
// Gap in numeration here to accommodate changes in upstream
// and make it easier to pull changes in the future
// RecursiveQueryNode recursive_query = 31;
// CteWorkTableScanNode cte_work_table_scan = 32;
DmlNode dml = 33;
}
}

Expand Down Expand Up @@ -260,6 +265,22 @@ message CopyToNode {
repeated string partition_by = 7;
}

message DmlNode{
enum Type {
UPDATE = 0;
DELETE = 1;
CTAS = 2;
INSERT_APPEND = 3;
INSERT_OVERWRITE = 4;
INSERT_REPLACE = 5;

}
Type dml_type = 1;
LogicalPlanNode input = 2;
TableReference table_name = 3;
LogicalPlanNode target = 5;
}

message UnnestNode {
LogicalPlanNode input = 1;
repeated datafusion_common.Column exec_columns = 2;
Expand Down
Loading
Loading