This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-11936-a45acd6dfc871ebb0b62965a5b016d984589a60d in repository https://gitbox.apache.org/repos/asf/arrow-rs.git
commit 5db01b1fa7ba6f70d5f63abf31c48fabed40929b Author: RIchard Baah <[email protected]> AuthorDate: Tue Oct 27 17:48:49 2026 +0000 chore: update tonic to 0.14.7 (#11936) Tonic 0.14.7 updates zstd to 0.14.3. Pin the tonic dependencies to that exact release, update the lockfile, and remove the temporary audit exceptions from #11922. --- .github/workflows/audit.yml | 9 +--- Cargo.lock | 45 ++++++----------- arrow-flight/Cargo.toml | 4 +- arrow-flight/gen/Cargo.toml | 2 +- arrow-flight/src/arrow.flight.protocol.rs | 22 +++++++++ arrow-flight/src/sql/arrow.flight.protocol.sql.rs | 60 +++++++++++++++++++++++ arrow-integration-testing/Cargo.toml | 2 +- 7 files changed, 101 insertions(+), 43 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index dfa15307f1..5792aef411 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -37,11 +37,4 @@ jobs: - name: Run audit check # ubuntu-slim has no Rust toolchain to dispatch `cargo audit`, so # call the binary directly. - # tonic 0.14 pins zstd 0.13, but its compression codec doesn't use the - # APIs affected by these advisories. Remove these once tonic updates. - # See https://github.com/grpc/grpc-rust/issues/2960 - run: | - cargo-audit audit \ - --ignore RUSTSEC-2026-0391 \ - --ignore RUSTSEC-2026-0398 \ - --ignore RUSTSEC-2026-0403 + run: cargo-audit audit diff --git a/Cargo.lock b/Cargo.lock index a09c875504..f5e53beba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -269,7 +269,7 @@ dependencies = [ "tempfile", "tokio", "uuid", - "zstd 0.14.3", + "zstd", ] [[package]] @@ -437,7 +437,7 @@ dependencies = [ "memmap2", "tempfile", "tokio", - "zstd 0.14.3", + "zstd", ] [[package]] @@ -2622,7 +2622,7 @@ dependencies = [ "tempfile", "tokio", "twox-hash", - "zstd 0.14.3", + "zstd", ] [[package]] @@ -3885,9 +3885,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" +checksum = "16ea7e687c08008d22518056608ad0c1cc721204d30ed48c8439a88ae5b9fc73" dependencies = [ "async-trait", "axum", @@ -3909,19 +3909,20 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", + "tokio-util", "tower", "tower-layer", "tower-service", "tracing", "webpki-roots", - "zstd 0.13.3", + "zstd", ] [[package]] name = "tonic-build" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c68f61875ac5293cf72e6c8cf0158086428c82c37229e98c840878f1706b0322" +checksum = "040c96f2ebcbe22118dfa258310dad07002ccf92139370cf69532e4047c7d400" dependencies = [ "prettyplease", "proc-macro2", @@ -3931,9 +3932,9 @@ dependencies = [ [[package]] name = "tonic-prost" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0" +checksum = "8fe9efdab8bb668f5ef526e21c247c8cb658853a754983cb70f1dac3fc4f462a" dependencies = [ "bytes", "prost", @@ -3942,9 +3943,9 @@ dependencies = [ [[package]] name = "tonic-prost-build" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "654e5643eff75d7f8c99197ce1440ed19a3474eada74c12bbac488b2cafdae27" +checksum = "8b0e0e10c4980146d75d5acfe4f7a9822278130ca2025c0dc25c82f7307d63ac" dependencies = [ "prettyplease", "proc-macro2", @@ -4699,31 +4700,13 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" -[[package]] -name = "zstd" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" -dependencies = [ - "zstd-safe 7.2.4", -] - [[package]] name = "zstd" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "db3ae9bf90af6e40197bef767eeefc46ad6397420fe873830bd85e5fbbfb3c70" dependencies = [ - "zstd-safe 8.2.0", -] - -[[package]] -name = "zstd-safe" -version = "7.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" -dependencies = [ - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/arrow-flight/Cargo.toml b/arrow-flight/Cargo.toml index dc5935d0cc..790633d39a 100644 --- a/arrow-flight/Cargo.toml +++ b/arrow-flight/Cargo.toml @@ -45,8 +45,8 @@ prost = { version = "0.14.1", default-features = false, features = ["derive"] } # For Timestamp type prost-types = { version = "0.14.1", default-features = false } tokio = { version = "1.0", default-features = false, features = ["macros", "rt", "rt-multi-thread"], optional = true } -tonic = { version = "0.14.1", default-features = false, features = ["transport", "codegen", "router"] } -tonic-prost = { version = "0.14.1", default-features = false } +tonic = { version = "=0.14.7", default-features = false, features = ["transport", "codegen", "router"] } +tonic-prost = { version = "=0.14.7", default-features = false } # CLI-related dependencies anyhow = { version = "1.0", optional = true } diff --git a/arrow-flight/gen/Cargo.toml b/arrow-flight/gen/Cargo.toml index ddd7259a27..73134cffc8 100644 --- a/arrow-flight/gen/Cargo.toml +++ b/arrow-flight/gen/Cargo.toml @@ -32,7 +32,7 @@ publish = false # Pin specific version of the tonic-build dependencies to avoid auto-generated # (and checked in) arrow.flight.protocol.rs from changing prost-build = { version = "0.14.1", default-features = false } -tonic-prost-build = { version = "0.14.1", default-features = false } +tonic-prost-build = { version = "=0.14.7", default-features = false } [lints] workspace = true diff --git a/arrow-flight/src/arrow.flight.protocol.rs b/arrow-flight/src/arrow.flight.protocol.rs index 4796cbb10d..719f967915 100644 --- a/arrow-flight/src/arrow.flight.protocol.rs +++ b/arrow-flight/src/arrow.flight.protocol.rs @@ -3,6 +3,7 @@ // This file is @generated by prost-build. /// /// The request that a client provides to a server on handshake. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct HandshakeRequest { /// @@ -14,6 +15,7 @@ pub struct HandshakeRequest { #[prost(bytes = "bytes", tag = "2")] pub payload: ::prost::bytes::Bytes, } +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct HandshakeResponse { /// @@ -27,6 +29,7 @@ pub struct HandshakeResponse { } /// /// A message for doing simple auth. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct BasicAuth { #[prost(string, tag = "2")] @@ -34,11 +37,13 @@ pub struct BasicAuth { #[prost(string, tag = "3")] pub password: ::prost::alloc::string::String, } +#[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct Empty {} /// /// Describes an available action, including both the name used for execution /// along with a short description of the purpose of the action. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionType { #[prost(string, tag = "1")] @@ -49,6 +54,7 @@ pub struct ActionType { /// /// A service specific expression that can be used to return a limited set /// of available Arrow Flight streams. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct Criteria { #[prost(bytes = "bytes", tag = "1")] @@ -56,6 +62,7 @@ pub struct Criteria { } /// /// An opaque action specific for the service. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct Action { #[prost(string, tag = "1")] @@ -65,6 +72,7 @@ pub struct Action { } /// /// An opaque result returned after executing an action. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct Result { #[prost(bytes = "bytes", tag = "1")] @@ -72,6 +80,7 @@ pub struct Result { } /// /// Wrap the result of a getSchema call +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct SchemaResult { /// The schema of the dataset in its IPC form: @@ -84,6 +93,7 @@ pub struct SchemaResult { /// /// The name or tag for a Flight. May be used as a way to retrieve or generate /// a flight or be used to expose a set of previously defined flights. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct FlightDescriptor { #[prost(enumeration = "flight_descriptor::DescriptorType", tag = "1")] @@ -103,6 +113,7 @@ pub struct FlightDescriptor { pub mod flight_descriptor { /// /// Describes what type of descriptor is defined. + #[allow(clippy::all)] #[derive( Clone, Copy, @@ -153,6 +164,7 @@ pub mod flight_descriptor { /// /// The access coordinates for retrieval of a dataset. With a FlightInfo, a /// consumer is able to determine how to retrieve a dataset. +#[allow(clippy::all)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct FlightInfo { /// The schema of the dataset in its IPC form: @@ -212,6 +224,7 @@ pub struct FlightInfo { } /// /// The information to process a long-running query. +#[allow(clippy::all)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct PollInfo { /// @@ -254,6 +267,7 @@ pub struct PollInfo { /// The request of the CancelFlightInfo action. /// /// The request should be stored in Action.body. +#[allow(clippy::all)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct CancelFlightInfoRequest { #[prost(message, optional, tag = "1")] @@ -263,6 +277,7 @@ pub struct CancelFlightInfoRequest { /// The result of the CancelFlightInfo action. /// /// The result should be stored in Result.body. +#[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct CancelFlightInfoResult { #[prost(enumeration = "CancelStatus", tag = "1")] @@ -274,6 +289,7 @@ pub struct CancelFlightInfoResult { /// /// Tickets are meant to be single use. It is an error/application-defined /// behavior to reuse a ticket. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct Ticket { #[prost(bytes = "bytes", tag = "1")] @@ -315,6 +331,7 @@ pub struct Ticket { /// /// Note: new schemes may be proposed in the future to allow for more flexibility based /// on community requests. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct Location { #[prost(string, tag = "1")] @@ -322,6 +339,7 @@ pub struct Location { } /// /// A particular stream or split associated with a flight. +#[allow(clippy::all)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct FlightEndpoint { /// @@ -370,6 +388,7 @@ pub struct FlightEndpoint { /// The request of the RenewFlightEndpoint action. /// /// The request should be stored in Action.body. +#[allow(clippy::all)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RenewFlightEndpointRequest { #[prost(message, optional, tag = "1")] @@ -377,6 +396,7 @@ pub struct RenewFlightEndpointRequest { } /// /// A batch of Arrow data as part of a stream of batches. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct FlightData { /// @@ -402,6 +422,7 @@ pub struct FlightData { } /// * /// The response message associated with the submission of a DoPut. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct PutResult { #[prost(bytes = "bytes", tag = "1")] @@ -411,6 +432,7 @@ pub struct PutResult { /// The result of a cancel operation. /// /// This is used by CancelFlightInfoResult.status. +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum CancelStatus { diff --git a/arrow-flight/src/sql/arrow.flight.protocol.sql.rs b/arrow-flight/src/sql/arrow.flight.protocol.sql.rs index 225d85198c..47a4cdaee5 100644 --- a/arrow-flight/src/sql/arrow.flight.protocol.sql.rs +++ b/arrow-flight/src/sql/arrow.flight.protocol.sql.rs @@ -19,6 +19,7 @@ /// int32_to_int32_list_map: map<key: int32, value: list<$data$: int32>> /// > /// where there is one row per requested piece of metadata information. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetSqlInfo { /// @@ -99,6 +100,7 @@ pub struct CommandGetSqlInfo { /// is only relevant to be used by ODBC). /// > /// The returned data should be ordered by data_type and then by type_name. +#[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetXdbcTypeInfo { /// @@ -118,6 +120,7 @@ pub struct CommandGetXdbcTypeInfo { /// catalog_name: utf8 not null /// > /// The returned data should be ordered by catalog_name. +#[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetCatalogs {} /// @@ -133,6 +136,7 @@ pub struct CommandGetCatalogs {} /// db_schema_name: utf8 not null /// > /// The returned data should be ordered by catalog_name, then db_schema_name. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetDbSchemas { /// @@ -178,6 +182,7 @@ pub struct CommandGetDbSchemas { /// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. /// - ARROW:FLIGHT:SQL:REMARKS - A comment describing the column. This field has been added after all others, clients should be prepared to find it missing. /// The returned data should be ordered by catalog_name, db_schema_name, table_name, then table_type, followed by table_schema if requested. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetTables { /// @@ -227,6 +232,7 @@ pub struct CommandGetTables { /// table_type: utf8 not null /// > /// The returned data should be ordered by table_type. +#[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetTableTypes {} /// @@ -245,6 +251,7 @@ pub struct CommandGetTableTypes {} /// key_sequence: int32 not null /// > /// The returned data should be ordered by catalog_name, db_schema_name, table_name, key_name, then key_sequence. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetPrimaryKeys { /// @@ -288,6 +295,7 @@ pub struct CommandGetPrimaryKeys { /// > /// The returned data should be ordered by fk_catalog_name, fk_db_schema_name, fk_table_name, fk_key_name, then key_sequence. /// update_rule and delete_rule returns a byte that is equivalent to actions declared on UpdateDeleteRules enum. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetExportedKeys { /// @@ -335,6 +343,7 @@ pub struct CommandGetExportedKeys { /// - 2 = SET NULL /// - 3 = NO ACTION /// - 4 = SET DEFAULT +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetImportedKeys { /// @@ -384,6 +393,7 @@ pub struct CommandGetImportedKeys { /// - 2 = SET NULL /// - 3 = NO ACTION /// - 4 = SET DEFAULT +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandGetCrossReference { /// * @@ -421,6 +431,7 @@ pub struct CommandGetCrossReference { } /// /// Request message for the "CreatePreparedStatement" action on a Flight SQL enabled backend. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionCreatePreparedStatementRequest { /// The valid SQL string to create a prepared statement for. @@ -433,6 +444,7 @@ pub struct ActionCreatePreparedStatementRequest { } /// /// An embedded message describing a Substrait plan to execute. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct SubstraitPlan { /// The serialized substrait.Plan to create a prepared statement for. @@ -449,6 +461,7 @@ pub struct SubstraitPlan { } /// /// Request message for the "CreatePreparedSubstraitPlan" action on a Flight SQL enabled backend. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionCreatePreparedSubstraitPlanRequest { /// The serialized substrait.Plan to create a prepared statement for. @@ -467,6 +480,7 @@ pub struct ActionCreatePreparedSubstraitPlanRequest { /// - Automatically, by a server timeout. /// /// The result should be wrapped in a google.protobuf.Any message. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionCreatePreparedStatementResult { /// Opaque handle for the prepared statement on the server. @@ -487,6 +501,7 @@ pub struct ActionCreatePreparedStatementResult { /// /// Request message for the "ClosePreparedStatement" action on a Flight SQL enabled backend. /// Closes server resources associated with the prepared statement handle. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionClosePreparedStatementRequest { /// Opaque handle for the prepared statement on the server. @@ -496,6 +511,7 @@ pub struct ActionClosePreparedStatementRequest { /// /// Request message for the "BeginTransaction" action. /// Begins a transaction. +#[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionBeginTransactionRequest {} /// @@ -504,6 +520,7 @@ pub struct ActionBeginTransactionRequest {} /// /// Only supported if FLIGHT_SQL_SERVER_TRANSACTION returns /// SQL_SUPPORTED_TRANSACTION_SAVEPOINT. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionBeginSavepointRequest { /// The transaction to which a savepoint belongs. @@ -521,6 +538,7 @@ pub struct ActionBeginSavepointRequest { /// automatically rolled back. /// /// The result should be wrapped in a google.protobuf.Any message. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionBeginTransactionResult { /// Opaque handle for the transaction on the server. @@ -535,6 +553,7 @@ pub struct ActionBeginTransactionResult { /// out, then the savepoint is also invalidated. /// /// The result should be wrapped in a google.protobuf.Any message. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionBeginSavepointResult { /// Opaque handle for the savepoint on the server. @@ -548,6 +567,7 @@ pub struct ActionBeginSavepointResult { /// /// If the action completes successfully, the transaction handle is /// invalidated, as are all associated savepoints. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionEndTransactionRequest { /// Opaque handle for the transaction on the server. @@ -559,6 +579,7 @@ pub struct ActionEndTransactionRequest { } /// Nested message and enum types in `ActionEndTransactionRequest`. pub mod action_end_transaction_request { + #[allow(clippy::all)] #[derive( Clone, Copy, @@ -610,6 +631,7 @@ pub mod action_end_transaction_request { /// Releasing a savepoint invalidates that savepoint. Rolling back to /// a savepoint does not invalidate the savepoint, but invalidates all /// savepoints created after the current savepoint. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionEndSavepointRequest { /// Opaque handle for the savepoint on the server. @@ -621,6 +643,7 @@ pub struct ActionEndSavepointRequest { } /// Nested message and enum types in `ActionEndSavepointRequest`. pub mod action_end_savepoint_request { + #[allow(clippy::all)] #[derive( Clone, Copy, @@ -680,6 +703,7 @@ pub mod action_end_savepoint_request { /// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise. /// - ARROW:FLIGHT:SQL:REMARKS - A comment describing the column. This field has been added after all others, clients should be prepared to find it missing. /// - GetFlightInfo: execute the query. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandStatementQuery { /// The SQL syntax. @@ -707,6 +731,7 @@ pub struct CommandStatementQuery { /// - ARROW:FLIGHT:SQL:REMARKS - A comment describing the column. This field has been added after all others, clients should be prepared to find it missing. /// - GetFlightInfo: execute the query. /// - DoPut: execute the query. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandStatementSubstraitPlan { /// A serialized substrait.Plan @@ -719,6 +744,7 @@ pub struct CommandStatementSubstraitPlan { /// * /// Represents a ticket resulting from GetFlightInfo with a CommandStatementQuery. /// This should be used only once and treated as an opaque value, that is, clients should not attempt to parse this. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct TicketStatementQuery { /// Unique identifier for the instance of the statement to execute. @@ -746,6 +772,7 @@ pub struct TicketStatementQuery { /// for the parameters when determining the schema. /// - DoPut: bind parameter values. All of the bound parameter sets will be executed as a single atomic execution. /// - GetFlightInfo: execute the prepared statement instance. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandPreparedStatementQuery { /// Opaque handle for the prepared statement on the server. @@ -755,6 +782,7 @@ pub struct CommandPreparedStatementQuery { /// /// Represents a SQL update query. Used in the command member of FlightDescriptor /// for the RPC call DoPut to cause the server to execute the included SQL update. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandStatementUpdate { /// The SQL syntax. @@ -768,6 +796,7 @@ pub struct CommandStatementUpdate { /// Represents a SQL update query. Used in the command member of FlightDescriptor /// for the RPC call DoPut to cause the server to execute the included /// prepared statement handle as an update. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct CommandPreparedStatementUpdate { /// Opaque handle for the prepared statement on the server. @@ -778,6 +807,7 @@ pub struct CommandPreparedStatementUpdate { /// Represents a bulk ingestion request. Used in the command member of FlightDescriptor /// for the RPC call DoPut to cause the server load the contents of the stream's /// FlightData into the target destination. +#[allow(clippy::all)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct CommandStatementIngest { /// The behavior for handling the table definition. @@ -814,6 +844,7 @@ pub struct CommandStatementIngest { /// Nested message and enum types in `CommandStatementIngest`. pub mod command_statement_ingest { /// Options for table definition behavior + #[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct TableDefinitionOptions { #[prost( @@ -827,6 +858,7 @@ pub mod command_statement_ingest { /// Nested message and enum types in `TableDefinitionOptions`. pub mod table_definition_options { /// The action to take if the target table does not exist + #[allow(clippy::all)] #[derive( Clone, Copy, @@ -870,6 +902,7 @@ pub mod command_statement_ingest { } } /// The action to take if the target table already exists + #[allow(clippy::all)] #[derive( Clone, Copy, @@ -922,6 +955,7 @@ pub mod command_statement_ingest { /// Returned from the RPC call DoPut when a CommandStatementUpdate, /// CommandPreparedStatementUpdate, or CommandStatementIngest was /// in the request, containing results from the update. +#[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct DoPutUpdateResult { /// The number of records updated. A return value of -1 represents @@ -934,6 +968,7 @@ pub struct DoPutUpdateResult { /// *Note on legacy behavior*: previous versions of the protocol did not return any result for /// this command, and that behavior should still be supported by clients. In that case, the client /// can continue as though the fields in this message were not provided or set to sensible default values. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct DoPutPreparedStatementResult { /// Represents a (potentially updated) opaque handle for the prepared statement on the server. @@ -963,6 +998,7 @@ pub struct DoPutPreparedStatementResult { /// /// This command is deprecated since 13.0.0. Use the "CancelFlightInfo" /// action with DoAction instead. +#[allow(clippy::all)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionCancelQueryRequest { /// The result of the GetFlightInfo RPC that initiated the query. @@ -979,6 +1015,7 @@ pub struct ActionCancelQueryRequest { /// /// This command is deprecated since 13.0.0. Use the "CancelFlightInfo" /// action with DoAction instead. +#[allow(clippy::all)] #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct ActionCancelQueryResult { #[prost(enumeration = "action_cancel_query_result::CancelResult", tag = "1")] @@ -986,6 +1023,7 @@ pub struct ActionCancelQueryResult { } /// Nested message and enum types in `ActionCancelQueryResult`. pub mod action_cancel_query_result { + #[allow(clippy::all)] #[derive( Clone, Copy, @@ -1039,6 +1077,7 @@ pub mod action_cancel_query_result { } } /// Options for CommandGetSqlInfo. +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlInfo { @@ -1930,6 +1969,7 @@ impl SqlInfo { } } /// The level of support for Flight SQL transaction RPCs. +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedTransaction { @@ -1964,6 +2004,7 @@ impl SqlSupportedTransaction { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedCaseSensitivity { @@ -2000,6 +2041,7 @@ impl SqlSupportedCaseSensitivity { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlNullOrdering { @@ -2032,6 +2074,7 @@ impl SqlNullOrdering { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SupportedSqlGrammar { @@ -2061,6 +2104,7 @@ impl SupportedSqlGrammar { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SupportedAnsi92SqlGrammarLevel { @@ -2090,6 +2134,7 @@ impl SupportedAnsi92SqlGrammarLevel { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlOuterJoinsSupportLevel { @@ -2119,6 +2164,7 @@ impl SqlOuterJoinsSupportLevel { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedGroupBy { @@ -2145,6 +2191,7 @@ impl SqlSupportedGroupBy { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedElementActions { @@ -2180,6 +2227,7 @@ impl SqlSupportedElementActions { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedPositionedCommands { @@ -2206,6 +2254,7 @@ impl SqlSupportedPositionedCommands { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedSubqueries { @@ -2238,6 +2287,7 @@ impl SqlSupportedSubqueries { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedUnions { @@ -2264,6 +2314,7 @@ impl SqlSupportedUnions { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlTransactionIsolationLevel { @@ -2301,6 +2352,7 @@ impl SqlTransactionIsolationLevel { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedTransactions { @@ -2334,6 +2386,7 @@ impl SqlSupportedTransactions { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedResultSetType { @@ -2374,6 +2427,7 @@ impl SqlSupportedResultSetType { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportedResultSetConcurrency { @@ -2415,6 +2469,7 @@ impl SqlSupportedResultSetConcurrency { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SqlSupportsConvert { @@ -2498,6 +2553,7 @@ impl SqlSupportsConvert { /// * /// The JDBC/ODBC-defined type of any object. /// All the values here are the same as in the JDBC and ODBC specs. +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum XdbcDataType { @@ -2592,6 +2648,7 @@ impl XdbcDataType { } /// * /// Detailed subtype information for XDBC_TYPE_DATETIME and XDBC_TYPE_INTERVAL. +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum XdbcDatetimeSubcode { @@ -2717,6 +2774,7 @@ impl XdbcDatetimeSubcode { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum Nullable { @@ -2752,6 +2810,7 @@ impl Nullable { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum Searchable { @@ -2797,6 +2856,7 @@ impl Searchable { } } } +#[allow(clippy::all)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum UpdateDeleteRules { diff --git a/arrow-integration-testing/Cargo.toml b/arrow-integration-testing/Cargo.toml index 5e7b30efb7..286166eeb3 100644 --- a/arrow-integration-testing/Cargo.toml +++ b/arrow-integration-testing/Cargo.toml @@ -41,7 +41,7 @@ futures = { version = "0.3", default-features = false } prost = { version = "0.14.1", default-features = false } serde_json = { version = "1.0", default-features = false, features = ["std"] } tokio = { version = "1.0", default-features = false, features = [ "rt-multi-thread"] } -tonic = { version = "0.14.1", default-features = false } +tonic = { version = "=0.14.7", default-features = false } tracing-subscriber = { version = "0.3.1", default-features = false, features = ["fmt"], optional = true } flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
