Skip to content

Commit

Permalink
Upgrade crates
Browse files Browse the repository at this point in the history
  • Loading branch information
Dandandan committed Nov 16, 2023
1 parent 8d0ddc2 commit c8a6427
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ballista/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ datafusion-proto = { workspace = true }
futures = "0.3"
hashbrown = "0.14"

itertools = "0.11"
itertools = "0.12"
libloading = "0.8.0"
log = "0.4"
md-5 = { version = "^0.10.0" }
Expand Down
6 changes: 3 additions & 3 deletions ballista/scheduler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ arrow-flight = { workspace = true }
async-recursion = "1.0.0"
async-trait = "0.1.41"
ballista-core = { path = "../core", version = "0.11.0", features = ["s3"] }
base64 = { version = "0.13" }
base64 = { version = "0.21" }
clap = { version = "3", features = ["derive", "cargo"] }
configure_me = { workspace = true }
dashmap = "5.4.0"
datafusion = { workspace = true }
datafusion-proto = { workspace = true }
etcd-client = { version = "0.11", optional = true }
etcd-client = { version = "0.12", optional = true }
flatbuffers = { version = "23.5.26" }
futures = "0.3"
graphviz-rust = "0.6.1"
http = "0.2"
http-body = "0.4"
hyper = "0.14.4"
itertools = "0.11.0"
itertools = "0.12.0"
log = "0.4"
object_store = { workspace = true }
once_cell = { version = "1.16.0", optional = true }
Expand Down
5 changes: 3 additions & 2 deletions ballista/scheduler/src/flight_sql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ use arrow_flight::{
Action, FlightData, FlightDescriptor, FlightEndpoint, FlightInfo, HandshakeRequest,
HandshakeResponse, Location, Ticket,
};
use base64::Engine;
use futures::Stream;
use log::{debug, error, warn};
use std::convert::TryFrom;
Expand Down Expand Up @@ -503,8 +504,8 @@ impl FlightSqlService for FlightSqlServiceImpl {
"Auth type not implemented: {authorization}"
)))?;
}
let base64 = &authorization[basic.len()..];
let bytes = base64::decode(base64)
let bytes = base64::engine::general_purpose::STANDARD
.decode(&authorization[basic.len()..])
.map_err(|_| Status::invalid_argument("authorization not parsable"))?;
let str = String::from_utf8(bytes)
.map_err(|_| Status::invalid_argument("authorization not parsable"))?;
Expand Down

0 comments on commit c8a6427

Please sign in to comment.