Skip to content

Commit 878b017

Browse files
committed
Upgrade tonic dependencies to 0.13.0 version
1 parent a35bdf0 commit 878b017

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

.github/workflows/arrow_flight.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ jobs:
5454
uses: ./.github/actions/setup-builder
5555
- name: Test
5656
run: |
57-
cargo test -p arrow-flight
57+
cargo test -p arrow-flight --features=router
5858
- name: Test --all-features
5959
run: |
6060
cargo test -p arrow-flight --all-features
6161
- name: Test --examples
6262
run: |
63-
cargo test -p arrow-flight --features=flight-sql-experimental,tls --examples
63+
cargo test -p arrow-flight --features=flight-sql-experimental,tls,router --examples
6464
6565
vendor:
6666
name: Verify Vendored Code

arrow-flight/Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ prost = { version = "0.13.1", default-features = false, features = ["prost-deriv
4848
# For Timestamp type
4949
prost-types = { version = "0.13.1", default-features = false }
5050
tokio = { version = "1.0", default-features = false, features = ["macros", "rt", "rt-multi-thread"], optional = true }
51-
tonic = { version = "0.12.3", default-features = false, features = ["transport", "codegen", "prost"] }
51+
tonic = { version = "0.13.0", default-features = false, features = ["transport", "codegen", "prost"] }
5252

5353
# CLI-related dependencies
5454
anyhow = { version = "1.0", optional = true }
@@ -62,7 +62,8 @@ all-features = true
6262
[features]
6363
default = []
6464
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"]
65-
tls = ["tonic/tls"]
65+
tls = ["tonic/_tls-any"]
66+
router = ["tonic/router"]
6667
# Enable CLI tools
6768
cli = ["arrow-array/chrono-tz", "arrow-cast/prettyprint", "tonic/tls-webpki-roots", "dep:anyhow", "dep:clap", "dep:tracing-log", "dep:tracing-subscriber"]
6869

@@ -83,7 +84,7 @@ uuid = { version = "1.10.0", features = ["v4"] }
8384

8485
[[example]]
8586
name = "flight_sql_server"
86-
required-features = ["flight-sql-experimental", "tls"]
87+
required-features = ["flight-sql-experimental", "tls", "router"]
8788

8889
[[bin]]
8990
name = "flight_sql_client"
@@ -92,9 +93,9 @@ required-features = ["cli", "flight-sql-experimental", "tls"]
9293
[[test]]
9394
name = "flight_sql_client"
9495
path = "tests/flight_sql_client.rs"
95-
required-features = ["flight-sql-experimental", "tls"]
96+
required-features = ["flight-sql-experimental", "tls", "router"]
9697

9798
[[test]]
9899
name = "flight_sql_client_cli"
99100
path = "tests/flight_sql_client_cli.rs"
100-
required-features = ["cli", "flight-sql-experimental", "tls"]
101+
required-features = ["cli", "flight-sql-experimental", "tls", "router"]

arrow-flight/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ that demonstrate how to build a Flight server implemented with [tonic](https://d
4646
- `flight-sql-experimental`: Enables experimental support for
4747
[Apache Arrow FlightSQL], a protocol for interacting with SQL databases.
4848

49-
- `tls`: Enables `tls` on `tonic`
49+
- `tls`: Enables `_tls-any` on `tonic`
5050

5151
## CLI
5252

arrow-flight/src/arrow.flight.protocol.rs

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

arrow-integration-testing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ prost = { version = "0.13", default-features = false }
4343
serde = { version = "1.0", default-features = false, features = ["rc", "derive"] }
4444
serde_json = { version = "1.0", default-features = false, features = ["std"] }
4545
tokio = { version = "1.0", default-features = false, features = [ "rt-multi-thread"] }
46-
tonic = { version = "0.12", default-features = false }
46+
tonic = { version = "0.13", default-features = false, features = ["router"] }
4747
tracing-subscriber = { version = "0.3.1", default-features = false, features = ["fmt"], optional = true }
4848
flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
4949

0 commit comments

Comments
 (0)