Skip to content

Commit 7d29885

Browse files
committed
fix: pin pyarrow and run clippy
Signed-off-by: Robert Pack <[email protected]>
1 parent 0850bef commit 7d29885

File tree

10 files changed

+21
-23
lines changed

10 files changed

+21
-23
lines changed

crates/azure/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ impl ObjectStoreFactory for AzureFactory {
4747
let config = config::AzureConfigHelper::try_new(options.as_azure_options())?.build()?;
4848

4949
let (_, path) =
50-
ObjectStoreScheme::parse(&url).map_err(|e| DeltaTableError::GenericError {
50+
ObjectStoreScheme::parse(url).map_err(|e| DeltaTableError::GenericError {
5151
source: Box::new(e),
5252
})?;
5353
let prefix = Path::parse(path)?;
5454

5555
let mut builder = MicrosoftAzureBuilder::new().with_url(url.to_string());
5656

5757
for (key, value) in config.iter() {
58-
builder = builder.with_config(key.clone(), value.clone());
58+
builder = builder.with_config(*key, value.clone());
5959
}
6060

6161
let inner = builder
62-
.with_retry(self.parse_retry_config(&options)?)
62+
.with_retry(self.parse_retry_config(options)?)
6363
.build()?;
6464

6565
let store = limit_store_handler(url_prefix_handler(inner, prefix.clone()), options);

crates/catalog-unity/src/lib.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ pub enum UnityCatalogError {
7575

7676
impl From<UnityCatalogError> for DataCatalogError {
7777
fn from(value: UnityCatalogError) -> Self {
78-
match value {
79-
_ => DataCatalogError::Generic {
80-
catalog: "Unity",
81-
source: Box::new(value),
82-
},
78+
DataCatalogError::Generic {
79+
catalog: "Unity",
80+
source: Box::new(value),
8381
}
8482
}
8583
}

crates/core/src/operations/add_column.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use delta_kernel::schema::StructType;
66
use futures::future::BoxFuture;
77
use itertools::Itertools;
88

9-
use super::transaction::{CommitBuilder, CommitProperties, PROTOCOL};
9+
use super::transaction::{CommitBuilder, CommitProperties};
1010
use super::{CustomExecuteHandler, Operation};
1111
use crate::kernel::{StructField, StructTypeExt};
1212
use crate::logstore::LogStoreRef;

crates/core/src/operations/merge/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ async fn execute(
764764
if df
765765
.clone()
766766
.schema()
767-
.field_with_unqualified_name(&col_name.to_string())
767+
.field_with_unqualified_name(col_name)
768768
.is_err()
769769
// implies it doesn't exist
770770
{

crates/core/src/storage/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -356,21 +356,21 @@ pub trait RetryConfigParse {
356356
}
357357

358358
if let Some(retry_timeout) = options.0.get("retry_timeout") {
359-
retry_config.retry_timeout = parse_duration(&retry_timeout).map_err(|_| {
359+
retry_config.retry_timeout = parse_duration(retry_timeout).map_err(|_| {
360360
DeltaTableError::generic(format!("failed to parse \"{retry_timeout}\" as Duration"))
361361
})?;
362362
}
363363

364364
if let Some(bc_init_backoff) = options.0.get("backoff_config.init_backoff") {
365-
retry_config.backoff.init_backoff = parse_duration(&bc_init_backoff).map_err(|_| {
365+
retry_config.backoff.init_backoff = parse_duration(bc_init_backoff).map_err(|_| {
366366
DeltaTableError::generic(format!(
367367
"failed to parse \"{bc_init_backoff}\" as Duration"
368368
))
369369
})?;
370370
}
371371

372372
if let Some(bc_max_backoff) = options.0.get("backoff_config.max_backoff") {
373-
retry_config.backoff.max_backoff = parse_duration(&bc_max_backoff).map_err(|_| {
373+
retry_config.backoff.max_backoff = parse_duration(bc_max_backoff).map_err(|_| {
374374
DeltaTableError::generic(format!(
375375
"failed to parse \"{bc_max_backoff}\" as Duration"
376376
))
@@ -668,6 +668,6 @@ mod tests {
668668
assert_eq!(retry_config.retry_timeout, Duration::from_secs(300));
669669
assert_eq!(retry_config.backoff.init_backoff, Duration::from_secs(20));
670670
assert_eq!(retry_config.backoff.max_backoff, Duration::from_secs(3600));
671-
assert_eq!(retry_config.backoff.base, 50 as f64);
671+
assert_eq!(retry_config.backoff.base, 50_f64);
672672
}
673673
}

crates/gcp/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@ impl ObjectStoreFactory for GcpFactory {
4848
let config = config::GcpConfigHelper::try_new(options.as_gcp_options())?.build()?;
4949

5050
let (_, path) =
51-
ObjectStoreScheme::parse(&url).map_err(|e| DeltaTableError::GenericError {
51+
ObjectStoreScheme::parse(url).map_err(|e| DeltaTableError::GenericError {
5252
source: Box::new(e),
5353
})?;
5454
let prefix = Path::parse(path)?;
5555

5656
let mut builder = GoogleCloudStorageBuilder::new().with_url(url.to_string());
5757

5858
for (key, value) in config.iter() {
59-
builder = builder.with_config(key.clone(), value.clone());
59+
builder = builder.with_config(*key, value.clone());
6060
}
6161

6262
let inner = builder
63-
.with_retry(self.parse_retry_config(&options)?)
63+
.with_retry(self.parse_retry_config(options)?)
6464
.build()?;
6565

6666
let gcs_backend = crate::storage::GcsStorageBackend::try_new(Arc::new(inner))?;

crates/lakefs/src/storage.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl ObjectStoreFactory for LakeFSObjectStoreFactory {
101101
let mut builder = AmazonS3Builder::new().with_url(s3_url.to_string());
102102

103103
for (key, value) in config.iter() {
104-
builder = builder.with_config(key.clone(), value.clone());
104+
builder = builder.with_config(*key, value.clone());
105105
}
106106

107107
let inner = builder

python/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ classifiers = [
1616
"Programming Language :: Python :: 3.11",
1717
"Programming Language :: Python :: 3.12",
1818
]
19-
dependencies = ["pyarrow>=16"]
19+
dependencies = ["pyarrow>=16,<19"]
2020
dynamic = ["version"]
2121

2222
[project.optional-dependencies]

python/src/error.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ pub enum PythonError {
101101
ThreadingError(String),
102102
}
103103

104-
impl<T> Into<PythonError> for std::sync::PoisonError<T> {
105-
fn into(self) -> PythonError {
106-
PythonError::ThreadingError(self.to_string())
104+
impl<T> From<std::sync::PoisonError<T>> for PythonError {
105+
fn from(val: std::sync::PoisonError<T>) -> Self {
106+
PythonError::ThreadingError(val.to_string())
107107
}
108108
}
109109

python/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ impl RawDeltaTable {
153153
._table
154154
.lock()
155155
.map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
156-
(*original).state = state;
156+
original.state = state;
157157
Ok(())
158158
}
159159
}

0 commit comments

Comments
 (0)