Skip to content

Commit 1063e0a

Browse files
authored
Upgrade datafusion to 31.0.0 (#878)
1 parent 479208b commit 1063e0a

File tree

5 files changed

+20
-16
lines changed

5 files changed

+20
-16
lines changed

Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ members = [
2929
resolver = "2"
3030

3131
[workspace.dependencies]
32-
arrow = { version = "45.0.0" }
33-
arrow-flight = { version = "45.0.0", features = ["flight-sql-experimental"] }
34-
arrow-schema = { version = "45.0.0", default-features = false }
32+
arrow = { version = "46.0.0" }
33+
arrow-flight = { version = "46.0.0", features = ["flight-sql-experimental"] }
34+
arrow-schema = { version = "46.0.0", default-features = false }
3535
configure_me = { version = "0.4.0" }
3636
configure_me_codegen = { version = "0.4.4" }
37-
datafusion = "30.0.0"
38-
datafusion-cli = "30.0.0"
39-
datafusion-proto = "30.0.0"
40-
object_store = "0.6.1"
41-
sqlparser = "0.36.1"
37+
datafusion = "31.0.0"
38+
datafusion-cli = "31.0.0"
39+
datafusion-proto = "31.0.0"
40+
object_store = "0.7.0"
41+
sqlparser = "0.37.0"
4242
tonic = { version = "0.9" }
4343
tonic-build = { version = "0.9", default-features = false, features = [
4444
"transport",

ballista/client/src/context.rs

+2
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,8 @@ mod tests {
616616
infinite_source: false,
617617
insert_mode:
618618
datafusion::datasource::listing::ListingTableInsertMode::Error,
619+
file_type_write_options: None,
620+
single_file: false,
619621
};
620622

621623
let table_paths = listing_table

ballista/core/src/cache_layer/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ mod tests {
4141
use futures::TryStreamExt;
4242
use object_store::local::LocalFileSystem;
4343
use object_store::path::Path;
44-
use object_store::{GetResult, ObjectStore};
44+
use object_store::{GetResultPayload, ObjectStore};
4545
use std::io::Write;
4646
use std::sync::Arc;
4747
use tempfile::NamedTempFile;
@@ -71,8 +71,8 @@ mod tests {
7171
source_object_store.clone(),
7272
));
7373
let actual_source = source_object_store.get(&source_location).await.unwrap();
74-
match actual_source {
75-
GetResult::File(file, _) => {
74+
match actual_source.payload {
75+
GetResultPayload::File(file, _) => {
7676
assert_eq!(test_bytes.len(), file.metadata()?.len() as usize);
7777
}
7878
_ => {
@@ -99,13 +99,13 @@ mod tests {
9999
source_object_store_with_key.clone(),
100100
);
101101
let actual_cache = cache_object_store.get(&source_location).await.unwrap();
102-
match actual_cache {
103-
GetResult::File(_, _) => {
102+
match actual_cache.payload {
103+
GetResultPayload::File(_, _) => {
104104
return Err(BallistaError::General(
105105
"Data stream instead of file should be returned".to_string(),
106106
))
107107
}
108-
GetResult::Stream(s) => {
108+
GetResultPayload::Stream(s) => {
109109
let mut buf: Vec<u8> = vec![];
110110
s.try_fold(&mut buf, |acc, part| async move {
111111
let mut part: Vec<u8> = part.into();

ballista/scheduler/src/flight_sql.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ impl FlightSqlServiceImpl {
446446
> {
447447
type FlightResult = Result<FlightData, Status>;
448448
let (tx, rx): (Sender<FlightResult>, Receiver<FlightResult>) = channel(2);
449-
let schema = (*rb.schema()).clone();
450-
let flights = batches_to_flight_data(schema, vec![rb])
449+
let schema = rb.schema();
450+
let flights = batches_to_flight_data(&schema, vec![rb])
451451
.map_err(|_| Status::internal("Error encoding batches".to_string()))?;
452452
for flight in flights {
453453
tx.send(Ok(flight))

benchmarks/src/bin/tpch.rs

+2
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,8 @@ async fn get_table(
846846
file_sort_order: vec![],
847847
infinite_source: false,
848848
insert_mode: ListingTableInsertMode::Error,
849+
file_type_write_options: None,
850+
single_file: false,
849851
};
850852

851853
let url = ListingTableUrl::parse(path)?;

0 commit comments

Comments
 (0)