This is an automated email from the ASF dual-hosted git repository.
mneumann pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git
The following commit(s) were added to refs/heads/main by this push:
new 0a4ffa5f82 Fix: Converted feature flight-sql-experimental to
flight-sql (#7546)
0a4ffa5f82 is described below
commit 0a4ffa5f820c1a5a7bcb71e780b8fcfc94832d5a
Author: Hug_Bunter <[email protected]>
AuthorDate: Wed May 28 17:20:33 2025 +0530
Fix: Converted feature flight-sql-experimental to flight-sql (#7546)
* Fix: Converted feature flight-sql-experimental to flight-sql
* Fix: Converted all 'flight-sql-experimental' to 'flight-sql'
* fmt
---------
Co-authored-by: Andrew Lamb <[email protected]>
---
.github/workflows/arrow_flight.yml | 2 +-
arrow-flight/Cargo.toml | 12 +++++++-----
arrow-flight/README.md | 6 ++++--
arrow-flight/src/lib.rs | 8 +++++---
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/arrow_flight.yml
b/.github/workflows/arrow_flight.yml
index 79627448ca..2659a0d987 100644
--- a/.github/workflows/arrow_flight.yml
+++ b/.github/workflows/arrow_flight.yml
@@ -60,7 +60,7 @@ jobs:
cargo test -p arrow-flight --all-features
- name: Test --examples
run: |
- cargo test -p arrow-flight --features=flight-sql-experimental,tls
--examples
+ cargo test -p arrow-flight --features=flight-sql,tls --examples
vendor:
name: Verify Vendored Code
diff --git a/arrow-flight/Cargo.toml b/arrow-flight/Cargo.toml
index 30ee716970..041901e491 100644
--- a/arrow-flight/Cargo.toml
+++ b/arrow-flight/Cargo.toml
@@ -61,7 +61,9 @@ all-features = true
[features]
default = []
-flight-sql-experimental = ["dep:arrow-arith", "dep:arrow-data",
"dep:arrow-ord", "dep:arrow-row", "dep:arrow-select", "dep:arrow-string",
"dep:once_cell", "dep:paste"]
+flight-sql = ["dep:arrow-arith", "dep:arrow-data", "dep:arrow-ord",
"dep:arrow-row", "dep:arrow-select", "dep:arrow-string", "dep:once_cell",
"dep:paste"]
+# TODO: Remove in the next release
+flight-sql-experimental = ["flight-sql"]
tls = ["tonic/tls"]
# Enable CLI tools
cli = ["arrow-array/chrono-tz", "arrow-cast/prettyprint",
"tonic/tls-webpki-roots", "dep:anyhow", "dep:clap", "dep:tracing-log",
"dep:tracing-subscriber"]
@@ -83,18 +85,18 @@ uuid = { version = "1.10.0", features = ["v4"] }
[[example]]
name = "flight_sql_server"
-required-features = ["flight-sql-experimental", "tls"]
+required-features = ["flight-sql", "tls"]
[[bin]]
name = "flight_sql_client"
-required-features = ["cli", "flight-sql-experimental", "tls"]
+required-features = ["cli", "flight-sql", "tls"]
[[test]]
name = "flight_sql_client"
path = "tests/flight_sql_client.rs"
-required-features = ["flight-sql-experimental", "tls"]
+required-features = ["flight-sql", "tls"]
[[test]]
name = "flight_sql_client_cli"
path = "tests/flight_sql_client_cli.rs"
-required-features = ["cli", "flight-sql-experimental", "tls"]
+required-features = ["cli", "flight-sql", "tls"]
diff --git a/arrow-flight/README.md b/arrow-flight/README.md
index 3ffc8780c2..381a63048b 100644
--- a/arrow-flight/README.md
+++ b/arrow-flight/README.md
@@ -43,9 +43,11 @@ that demonstrate how to build a Flight server implemented
with [tonic](https://d
## Feature Flags
-- `flight-sql-experimental`: Enables experimental support for
+- `flight-sql`: Enables experimental support for
[Apache Arrow FlightSQL], a protocol for interacting with SQL databases.
+- `flight-sql-experimental` : Deprecated feature and will be removed in next
release
+
- `tls`: Enables `tls` on `tonic`
## CLI
@@ -55,7 +57,7 @@ This crates offers a basic [Apache Arrow FlightSQL] command
line interface.
The client can be installed from the repository:
```console
-$ cargo install --features=cli,flight-sql-experimental,tls
--bin=flight_sql_client --path=. --locked
+$ cargo install --features=cli,flight-sql,tls --bin=flight_sql_client --path=.
--locked
```
The client comes with extensive help text:
diff --git a/arrow-flight/src/lib.rs b/arrow-flight/src/lib.rs
index 74ee21a054..72dd070409 100644
--- a/arrow-flight/src/lib.rs
+++ b/arrow-flight/src/lib.rs
@@ -32,8 +32,10 @@
//! 2. Low level [tonic] generated [`flight_service_client`] and
//! [`flight_service_server`].
//!
-//! 3. Experimental support for [Flight SQL] in [`sql`]. Requires the
-//! `flight-sql-experimental` feature of this crate to be activated.
+//! 3. Support for [Flight SQL] in [`sql`]. Requires the
+//! `flight-sql` feature of this crate to be activated.
+//!
+//! 4. The feature [`flight-sql-experimental`] is deprecated and will be
removed in a future release.
//!
//! [Flight SQL]: https://arrow.apache.org/docs/format/FlightSql.html
@@ -128,7 +130,7 @@ mod trailers;
pub mod utils;
-#[cfg(feature = "flight-sql-experimental")]
+#[cfg(feature = "flight-sql")]
pub mod sql;
mod streams;