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

Jump to bottom

Update prost, prost-derive, pbjson, tonic ecosystem #11372

Closed
wants to merge 7 commits into from
Closed

Update prost, prost-derive, pbjson, tonic ecosystem #11372

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
f13c8f3
Update prost, prost-derive, pbjson
alamb Jul 9, 2024
c51fd50
udpate more
alamb Jul 9, 2024
839ba91
Merge remote-tracking branch 'apache/main' into alamb/update_prost
alamb Jul 10, 2024
a6cadde
Update datafusion/substrait/Cargo.toml
alamb Jul 10, 2024
e34019b
Merge branch 'alamb/update_prost' of github.com:alamb/datafusion into…
alamb Jul 10, 2024
7900a07
Update vendored code
alamb Jul 10, 2024
5ea5ced
revert upgrade in datafusion-examples until arrow-flight is updated
alamb Jul 10, 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
4 changes: 2 additions & 2 deletions datafusion/proto-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ arrow = { workspace = true }
chrono = { workspace = true }
datafusion-common = { workspace = true }
object_store = { workspace = true }
pbjson = { version = "0.6.0", optional = true }
prost = "0.12.0"
pbjson = { version = "0.7.0", optional = true }
prost = "0.13.0"
serde = { version = "1.0", optional = true }
serde_json = { workspace = true, optional = true }

Expand Down
4 changes: 2 additions & 2 deletions datafusion/proto-common/gen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ workspace = true

[dependencies]
# Pin these dependencies so that the generated output is deterministic
pbjson-build = "=0.6.2"
prost-build = "=0.12.6"
pbjson-build = "=0.7.0"
prost-build = "=0.13.1"
4 changes: 2 additions & 2 deletions datafusion/proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ datafusion-common = { workspace = true, default-features = true }
datafusion-expr = { workspace = true }
datafusion-proto-common = { workspace = true }
object_store = { workspace = true }
pbjson = { version = "0.6.0", optional = true }
prost = "0.12.0"
pbjson = { version = "0.7.0", optional = true }
prost = "0.13.0"
serde = { version = "1.0", optional = true }
serde_json = { workspace = true, optional = true }

Expand Down
4 changes: 2 additions & 2 deletions datafusion/proto/gen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ workspace = true

[dependencies]
# Pin these dependencies so that the generated output is deterministic
pbjson-build = "=0.6.2"
prost-build = "=0.12.6"
pbjson-build = "=0.7.0"
prost-build = "=0.13.1"
50 changes: 25 additions & 25 deletions datafusion/proto/src/generated/datafusion_proto_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ 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)]
Expand Down Expand Up @@ -83,10 +83,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 @@ -131,7 +131,7 @@ 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,
Expand Down Expand Up @@ -209,15 +209,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 @@ -226,15 +226,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 @@ -253,7 +253,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 @@ -274,15 +274,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 @@ -542,10 +542,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 @@ -636,7 +636,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 @@ -692,7 +692,7 @@ pub struct ColumnOptions {
/// Nested message and enum types in `ColumnOptions`.
pub mod 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 @@ -704,7 +704,7 @@ pub mod 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 @@ -722,19 +722,19 @@ pub mod 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)]
Copy link
Contributor

Choose a reason for hiding this comment

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

just wondering why the Copy was added?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is generated code. so I think it comes from the changes in prost. I think it comes from tokio-rs/prost#950 specifically

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 @@ -826,7 +826,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 @@ -838,7 +838,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 @@ -850,13 +850,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 @@ -868,13 +868,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
Loading