Skip to content

Commit

Permalink
chore: upgrade dependencies (#2632)
Browse files Browse the repository at this point in the history
  • Loading branch information
tychoish authored Feb 10, 2024
1 parent d6e7009 commit c9cc53c
Show file tree
Hide file tree
Showing 14 changed files with 193 additions and 158 deletions.
291 changes: 163 additions & 128 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ strip = true
wildcard_imports = "deny"

[workspace.dependencies]
clap = { version = "4.4.18", features = ["derive"] }
clap = { version = "4.5.0", features = ["derive"] }
datafusion = { version = "35.0.0", features = ["avro"] }
arrow-flight = { version = "50.0.0", features = ["flight-sql-experimental"] }
datafusion-proto = { version = "35.0.0" }
Expand All @@ -37,7 +37,7 @@ prost = "0.12"
prost-build = "0.12"
prost-types = "0.12"
serde_json = "1.0.113"
tempfile = "3.9.0"
tempfile = "3.10.0"
thiserror = "1.0"
tracing = "0.1"
url = "2.5.0"
Expand Down
2 changes: 1 addition & 1 deletion bindings/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
ioutil = { path = "../../crates/ioutil" }
napi = { version = "2.15.1", default-features = false, features = ["full"] }
napi-derive = "2.15.0"
napi-derive = "2.15.1"
sqlexec = { path = "../../crates/sqlexec" }
metastore = { path = "../../crates/metastore" }
telemetry = { path = "../../crates/telemetry" }
Expand Down
10 changes: 5 additions & 5 deletions crates/datasources/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ workspace = true
ioutil = { path = "../ioutil" }
logutil = { path = "../logutil" }
apache-avro = "0.16"
async-channel = "2.1.1"
async-channel = "2.2.0"
async-stream = "0.3.5"
async-trait = { workspace = true }
bigquery-storage = { git = "https://github.com/glaredb/bigquery-storage", branch = "deps/2023-10-27-update" }
Expand Down Expand Up @@ -44,7 +44,7 @@ rustls = "0.21.10"
reqwest = { workspace = true }
rust_decimal = { version = "1.34.2", features = ["db-tokio-postgres"] }
serde = { workspace = true }
serde_with = "3.6.0"
serde_with = "3.6.1"
serde_json = {workspace = true}
snowflake_connector = { path = "../snowflake_connector" }
tempfile = { workspace = true }
Expand All @@ -62,16 +62,16 @@ tokio-rustls = "0.24.1"
tracing = { workspace = true }
uuid = "1.7.0"
url.workspace = true
webpki-roots = "0.26.0"
calamine = { version = "0.23.1", features = ["dates"] }
webpki-roots = "0.26.1"
calamine = { version = "0.24.0", features = ["dates"] }
tiberius = { version = "0.12.2", default-features = false, features = [
"tds73",
"rustls",
"chrono",
] }
lance = { git = "https://github.com/lancedb/lance", rev = "310d79eccf93f3c6a48c162c575918cdba13faec" }
bson = "2.9.0"
scylla = { version = "0.11.1" }
scylla = { version = "0.12.0" }
glob = "0.3.1"
indexmap = "2.2.2"

Expand Down
22 changes: 11 additions & 11 deletions crates/datasources/src/excel/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
use std::path::PathBuf;
use std::sync::Arc;

use calamine::{open_workbook, Range, Reader, Xlsx};
use calamine::{open_workbook, DataType as CalamineDataType, Range, Reader, Xlsx};
use datafusion::arrow::array::{ArrayRef, BooleanArray, Date64Array, PrimitiveArray, StringArray};
use datafusion::arrow::datatypes::{DataType, Field, Float64Type, Int64Type, Schema};
use datafusion::arrow::record_batch::RecordBatch;
Expand All @@ -18,23 +18,23 @@ pub enum Error {
OpenWorkbook(#[from] calamine::XlsxError),
}

fn infer_value_type(v: &calamine::DataType) -> Result<DataType, Error> {
fn infer_value_type(v: &calamine::Data) -> Result<DataType, Error> {
match v {
calamine::DataType::Int(_) if v.get_int().is_some() => Ok(DataType::Int64),
calamine::DataType::Float(_) if v.get_float().is_some() => Ok(DataType::Float64),
calamine::DataType::Bool(_) if v.get_bool().is_some() => Ok(DataType::Boolean),
calamine::DataType::String(_) if v.get_string().is_some() => Ok(DataType::Utf8),
calamine::DataType::Error(e) => Err(Error::Load { msg: e.to_string() }),
calamine::DataType::DateTime(_) => Ok(DataType::Date64),
calamine::DataType::Empty => Ok(DataType::Null),
calamine::Data::Int(_) => Ok(DataType::Int64),
calamine::Data::Float(_) => Ok(DataType::Float64),
calamine::Data::Bool(_) => Ok(DataType::Boolean),
calamine::Data::String(_) => Ok(DataType::Utf8),
calamine::Data::Error(e) => Err(Error::Load { msg: e.to_string() }),
calamine::Data::DateTime(_) => Ok(DataType::Date64),
calamine::Data::Empty => Ok(DataType::Null),
_ => Err(Error::Load {
msg: "Failed to parse the cell value".to_owned(),
}),
}
}

fn infer_schema(
r: &Range<calamine::DataType>,
r: &Range<calamine::Data>,
has_header: Option<bool>,
infer_schema_length: usize,
) -> Result<(Schema, bool), Error> {
Expand Down Expand Up @@ -93,7 +93,7 @@ fn infer_schema(
// TODO: vectorize this to improve performance
// Ideally we can iterate over the columns instead of iterating over the rows
fn xlsx_sheet_value_to_record_batch(
r: Range<calamine::DataType>,
r: Range<calamine::Data>,
has_header: Option<bool>,
infer_schema_length: usize,
) -> Result<RecordBatch, Error> {
Expand Down
2 changes: 1 addition & 1 deletion crates/decimal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ workspace = true

[dependencies]
thiserror.workspace = true
num-traits = "0.2.17"
num-traits = "0.2.18"
regex = "1.10.3"
2 changes: 1 addition & 1 deletion crates/distexec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ tokio.workspace = true
futures.workspace = true
tracing.workspace = true
parking_lot = "0.12.1"
async-channel = "2.1.1"
async-channel = "2.2.0"
4 changes: 2 additions & 2 deletions crates/glaredb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ terminal_util = { path = "../terminal_util" }

num_cpus = "1.16.0"
colored = "2.1.0"
reedline = "0.28.0"
nu-ansi-term = "0.49.0"
reedline = "0.29.0"
nu-ansi-term = "0.50.0"
atty = "0.2.14"
console-subscriber = "0.2.0"
tokio-postgres = "0.7.8"
Expand Down
2 changes: 1 addition & 1 deletion crates/pgrepr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ chrono = { workspace = true }
tracing = { workspace = true }
repr = { path = "../repr" }
decimal = { path = "../decimal" }
num-traits = "0.2.17"
num-traits = "0.2.18"
dtoa = "1.0.9"
chrono-tz = "0.8.5"
bytes = "1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/pgsrv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pgrepr = {path = "../pgrepr"}
datafusion_ext = {path = "../datafusion_ext"}
bytes = "1.4.0"
rustls = "0.21.10"
webpki-roots = "0.26.0"
webpki-roots = "0.26.1"
tokio-rustls = "0.24.1"
rustls-pemfile = "2.0.0"
tokio-util = { version = "0.7.10", features = ["codec"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/protogen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ uuid = { version = "1.7.0", features = ["v4", "fast-rng", "macro-diagnostics"] }
tracing = { workspace = true }

[build-dependencies]
tonic-build = "0.10"
tonic-build = "0.11"
# Only needed to handle custom btree mapping; can be removed when we bump the tonic version which will have this too
prost-build = { workspace = true }
2 changes: 1 addition & 1 deletion crates/repr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ workspace = true

[dependencies]
thiserror.workspace = true
num-traits = "0.2.17"
num-traits = "0.2.18"
dtoa = "1.0.9"
chrono = { workspace = true }
decimal = { path = "../decimal" }
4 changes: 2 additions & 2 deletions crates/sqlbuiltins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ thiserror.workspace = true
tracing = { workspace = true }
uuid = { version = "1.7.0", features = ["v4", "fast-rng", "macro-diagnostics"] }
once_cell = "1.19.0"
num-traits = "0.2.17"
num-traits = "0.2.18"
strum = "0.25.0"
kdl = "5.0.0-alpha.1"
siphasher = "1.0.0"
fnv = "1.0.7"
memoize = { version = "0.4.2", features = ["full"] }
async-openai = "0.18.2"
async-openai = "0.18.3"
tokio.workspace = true
reqwest.workspace = true
2 changes: 1 addition & 1 deletion crates/sqlexec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ url.workspace = true
parking_lot = "0.12.1"
serde = { workspace = true }
reqwest = { workspace = true }
prql-compiler = "0.11.1"
prql-compiler = "0.11.2"
num_cpus = "1.16.0"

[dev-dependencies]
Expand Down

0 comments on commit c9cc53c

Please sign in to comment.