Skip to content

Commit 78ab9d7

Browse files
[arrow-flight] Update prost-* crates to 0.14 (#8026)
# Which issue does this PR close? We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. - Closes #7990 . - Closes #8138 - Closes #8139 - Closes #7657 - Closes #7656 Sorry for the late reply. # What changes are included in this PR? - Update prost from 0.13.1 to 0.14.1 - Update tonic from 0.13 to 0.14.1 - Remove 'prost' feature from tonic - Add tonic-prost and tonic-prost-build dependencies - Update build scripts to use new dependencies --------- Signed-off-by: codephage2020 <[email protected]>
1 parent cdbbbf7 commit 78ab9d7

File tree

9 files changed

+91
-94
lines changed

9 files changed

+91
-94
lines changed

.github/workflows/integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ jobs:
9898
uses: actions/checkout@v5
9999
with:
100100
path: rust
101+
submodules: true
101102
fetch-depth: 0
102103
- name: Checkout Arrow .NET
103104
uses: actions/checkout@v5

arrow-flight/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ bytes = { version = "1", default-features = false }
4444
futures = { version = "0.3", default-features = false, features = ["alloc"] }
4545
once_cell = { version = "1", optional = true }
4646
paste = { version = "1.0" , optional = true }
47-
prost = { version = "0.13.1", default-features = false, features = ["prost-derive"] }
47+
prost = { version = "0.14.1", default-features = false, features = ["derive"] }
4848
# For Timestamp type
49-
prost-types = { version = "0.13.1", default-features = false }
49+
prost-types = { version = "0.14.1", default-features = false }
5050
tokio = { version = "1.0", default-features = false, features = ["macros", "rt", "rt-multi-thread"], optional = true }
51-
tonic = { version = "0.13", default-features = false, features = ["transport", "codegen", "prost", "router"] }
51+
tonic = { version = "0.14.1", default-features = false, features = ["transport", "codegen", "router"] }
52+
tonic-prost = { version = "0.14.1", default-features = false }
5253

5354
# CLI-related dependencies
5455
anyhow = { version = "1.0", optional = true }

arrow-flight/gen/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ publish = false
3232
[dependencies]
3333
# Pin specific version of the tonic-build dependencies to avoid auto-generated
3434
# (and checked in) arrow.flight.protocol.rs from changing
35-
prost-build = { version = "=0.13.5", default-features = false }
36-
tonic-build = { version = "=0.13.1", default-features = false, features = ["transport", "prost"] }
35+
prost-build = { version = "0.14.1", default-features = false }
36+
tonic-prost-build = { version = "0.14.1", default-features = false }

arrow-flight/gen/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
2525
let proto_dir = Path::new("../format");
2626
let proto_path = Path::new("../format/Flight.proto");
2727

28-
tonic_build::configure()
28+
tonic_prost_build::configure()
2929
// protoc in Ubuntu builder needs this option
3030
.protoc_arg("--experimental_allow_proto3_optional")
3131
.out_dir("src")
32-
.compile_protos_with_config(prost_config(), &[proto_path], &[proto_dir])?;
32+
.compile_with_config(prost_config(), &[proto_path], &[proto_dir])?;
3333

3434
// read file contents to string
3535
let mut file = OpenOptions::new()
@@ -48,11 +48,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
4848
let proto_dir = Path::new("../format");
4949
let proto_path = Path::new("../format/FlightSql.proto");
5050

51-
tonic_build::configure()
51+
tonic_prost_build::configure()
5252
// protoc in Ubuntu builder needs this option
5353
.protoc_arg("--experimental_allow_proto3_optional")
5454
.out_dir("src/sql")
55-
.compile_protos_with_config(prost_config(), &[proto_path], &[proto_dir])?;
55+
.compile_with_config(prost_config(), &[proto_path], &[proto_dir])?;
5656

5757
// read file contents to string
5858
let mut file = OpenOptions::new()

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

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

0 commit comments

Comments
 (0)