Skip to content

Commit

Permalink
[WIP minimize me, bump to modern compiler, fix related to that issues…
Browse files Browse the repository at this point in the history
…] ci: Fix issues, lock Rust toolchain
  • Loading branch information
MazterQyou authored and mcheshkov committed Aug 21, 2024
1 parent aec2597 commit 7480fe7
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 107 deletions.
26 changes: 0 additions & 26 deletions .github/workflows/miri.sh

This file was deleted.

47 changes: 0 additions & 47 deletions .github/workflows/miri.yaml

This file was deleted.

32 changes: 16 additions & 16 deletions arrow-flight/src/arrow.flight.protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

///
/// The request that a client provides to a server on handshake.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct HandshakeRequest {
///
/// A defined protocol version
Expand All @@ -13,7 +13,7 @@ pub struct HandshakeRequest {
#[prost(bytes="vec", tag="2")]
pub payload: ::prost::alloc::vec::Vec<u8>,
}
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct HandshakeResponse {
///
/// A defined protocol version
Expand All @@ -26,20 +26,20 @@ pub struct HandshakeResponse {
}
///
/// A message for doing simple auth.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct BasicAuth {
#[prost(string, tag="2")]
pub username: ::prost::alloc::string::String,
#[prost(string, tag="3")]
pub password: ::prost::alloc::string::String,
}
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::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.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ActionType {
#[prost(string, tag="1")]
pub r#type: ::prost::alloc::string::String,
Expand All @@ -49,14 +49,14 @@ pub struct ActionType {
///
/// A service specific expression that can be used to return a limited set
/// of available Arrow Flight streams.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Criteria {
#[prost(bytes="vec", tag="1")]
pub expression: ::prost::alloc::vec::Vec<u8>,
}
///
/// An opaque action specific for the service.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Action {
#[prost(string, tag="1")]
pub r#type: ::prost::alloc::string::String,
Expand All @@ -65,14 +65,14 @@ pub struct Action {
}
///
/// An opaque result returned after executing an action.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Result {
#[prost(bytes="vec", tag="1")]
pub body: ::prost::alloc::vec::Vec<u8>,
}
///
/// Wrap the result of a getSchema call
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct SchemaResult {
/// schema of the dataset as described in Schema.fbs::Schema.
#[prost(bytes="vec", tag="1")]
Expand All @@ -81,7 +81,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.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct FlightDescriptor {
#[prost(enumeration="flight_descriptor::DescriptorType", tag="1")]
pub r#type: i32,
Expand Down Expand Up @@ -118,7 +118,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.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct FlightInfo {
/// schema of the dataset as described in Schema.fbs::Schema.
#[prost(bytes="vec", tag="1")]
Expand All @@ -140,7 +140,7 @@ pub struct FlightInfo {
}
///
/// A particular stream or split associated with a flight.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct FlightEndpoint {
///
/// Token used to retrieve this stream.
Expand All @@ -156,22 +156,22 @@ pub struct FlightEndpoint {
///
/// A location where a Flight service will accept retrieval of a particular
/// stream given a ticket.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Location {
#[prost(string, tag="1")]
pub uri: ::prost::alloc::string::String,
}
///
/// An opaque identifier that the service can use to retrieve a particular
/// portion of a stream.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Ticket {
#[prost(bytes="vec", tag="1")]
pub ticket: ::prost::alloc::vec::Vec<u8>,
}
///
/// A batch of Arrow data as part of a stream of batches.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct FlightData {
///
/// The descriptor of the data. This is only relevant when a client is
Expand All @@ -196,7 +196,7 @@ pub struct FlightData {
}
///*
/// The response message associated with the submission of a DoPut.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct PutResult {
#[prost(bytes="vec", tag="1")]
pub app_metadata: ::prost::alloc::vec::Vec<u8>,
Expand Down
36 changes: 18 additions & 18 deletions arrow-flight/src/sql/arrow.flight.protocol.sql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/// int32_to_int32_list_map: map<key: int32, value: list<$data$: int32>>
/// >
/// where there is one row per requested piece of metadata information.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetSqlInfo {
///
/// Values are modelled after ODBC's SQLGetInfo() function. This information is intended to provide
Expand Down Expand Up @@ -53,7 +53,7 @@ pub struct CommandGetSqlInfo {
/// catalog_name: utf8 not null
/// >
/// The returned data should be ordered by catalog_name.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetCatalogs {
}
///
Expand All @@ -69,7 +69,7 @@ pub struct CommandGetCatalogs {
/// db_schema_name: utf8 not null
/// >
/// The returned data should be ordered by catalog_name, then db_schema_name.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetDbSchemas {
///
/// Specifies the Catalog to search for the tables.
Expand Down Expand Up @@ -102,7 +102,7 @@ pub struct CommandGetDbSchemas {
/// it is serialized as an IPC message.)
/// >
/// The returned data should be ordered by catalog_name, db_schema_name, table_name, then table_type, followed by table_schema if requested.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetTables {
///
/// Specifies the Catalog to search for the tables.
Expand Down Expand Up @@ -149,7 +149,7 @@ pub struct CommandGetTables {
/// table_type: utf8 not null
/// >
/// The returned data should be ordered by table_type.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetTableTypes {
}
///
Expand All @@ -168,7 +168,7 @@ pub struct CommandGetTableTypes {
/// key_sequence: int not null
/// >
/// The returned data should be ordered by catalog_name, db_schema_name, table_name, key_name, then key_sequence.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetPrimaryKeys {
///
/// Specifies the catalog to search for the table.
Expand Down Expand Up @@ -211,7 +211,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.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetExportedKeys {
///
/// Specifies the catalog to search for the foreign key table.
Expand Down Expand Up @@ -258,7 +258,7 @@ pub struct CommandGetExportedKeys {
/// - 2 = SET NULL
/// - 3 = NO ACTION
/// - 4 = SET DEFAULT
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetImportedKeys {
///
/// Specifies the catalog to search for the primary key table.
Expand Down Expand Up @@ -307,7 +307,7 @@ pub struct CommandGetImportedKeys {
/// - 2 = SET NULL
/// - 3 = NO ACTION
/// - 4 = SET DEFAULT
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandGetCrossReference {
///*
/// The catalog name where the parent table is.
Expand Down Expand Up @@ -346,7 +346,7 @@ pub struct CommandGetCrossReference {

///
/// Request message for the "CreatePreparedStatement" action on a Flight SQL enabled backend.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ActionCreatePreparedStatementRequest {
/// The valid SQL string to create a prepared statement for.
#[prost(string, tag="1")]
Expand All @@ -358,7 +358,7 @@ pub struct ActionCreatePreparedStatementRequest {
/// The resultant PreparedStatement can be closed either:
/// - Manually, through the "ClosePreparedStatement" action;
/// - Automatically, by a server timeout.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ActionCreatePreparedStatementResult {
/// Opaque handle for the prepared statement on the server.
#[prost(bytes="vec", tag="1")]
Expand All @@ -375,7 +375,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.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ActionClosePreparedStatementRequest {
/// Opaque handle for the prepared statement on the server.
#[prost(bytes="vec", tag="1")]
Expand All @@ -388,7 +388,7 @@ pub struct ActionClosePreparedStatementRequest {
/// for the following RPC calls:
/// - GetSchema: return the Arrow schema of the query.
/// - GetFlightInfo: execute the query.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandStatementQuery {
/// The SQL syntax.
#[prost(string, tag="1")]
Expand All @@ -397,7 +397,7 @@ pub struct CommandStatementQuery {
///*
/// 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.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct TicketStatementQuery {
/// Unique identifier for the instance of the statement to execute.
#[prost(bytes="vec", tag="1")]
Expand All @@ -408,7 +408,7 @@ pub struct TicketStatementQuery {
/// the following RPC calls:
/// - DoPut: bind parameter values. All of the bound parameter sets will be executed as a single atomic execution.
/// - GetFlightInfo: execute the prepared statement instance.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandPreparedStatementQuery {
/// Opaque handle for the prepared statement on the server.
#[prost(bytes="vec", tag="1")]
Expand All @@ -417,7 +417,7 @@ pub struct CommandPreparedStatementQuery {
///
/// Represents a SQL update query. Used in the command member of FlightDescriptor
/// for the the RPC call DoPut to cause the server to execute the included SQL update.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandStatementUpdate {
/// The SQL syntax.
#[prost(string, tag="1")]
Expand All @@ -427,7 +427,7 @@ pub struct CommandStatementUpdate {
/// Represents a SQL update query. Used in the command member of FlightDescriptor
/// for the the RPC call DoPut to cause the server to execute the included
/// prepared statement handle as an update.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CommandPreparedStatementUpdate {
/// Opaque handle for the prepared statement on the server.
#[prost(bytes="vec", tag="1")]
Expand All @@ -437,7 +437,7 @@ pub struct CommandPreparedStatementUpdate {
/// Returned from the RPC call DoPut when a CommandStatementUpdate
/// CommandPreparedStatementUpdate was in the request, containing
/// results from the update.
#[derive(Clone, PartialEq, Eq, ::prost::Message)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct DoPutUpdateResult {
/// The number of records updated. A return value of -1 represents
/// an unknown updated record count.
Expand Down
1 change: 1 addition & 0 deletions dev/release/rat_exclude_files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ conbench/requirements.txt
conbench/requirements-test.txt
conbench/.flake8
conbench/.isort.cfg
rust-toolchain
# auto-generated
arrow-flight/src/arrow.flight.protocol.rs
arrow-flight/src/sql/arrow.flight.protocol.sql.rs
Expand Down
1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nightly-2022-03-08

0 comments on commit 7480fe7

Please sign in to comment.