Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: clippy warnings #2548

Merged
merged 1 commit into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/core/src/kernel/snapshot/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ impl EagerSnapshot {
) -> DeltaResult<Self> {
let mut visitors = tracked_actions
.iter()
.flat_map(|a| get_visitor(a))
.flat_map(get_visitor)
.collect::<Vec<_>>();
let snapshot = Snapshot::try_new(table_root, store.clone(), config, version).await?;
let files = snapshot.files(store, &mut visitors)?.try_collect().await?;
Expand Down Expand Up @@ -469,7 +469,7 @@ impl EagerSnapshot {
let mut visitors = self
.tracked_actions
.iter()
.flat_map(|a| get_visitor(a))
.flat_map(get_visitor)
.collect::<Vec<_>>();

let mut schema_actions: HashSet<_> =
Expand Down Expand Up @@ -629,7 +629,7 @@ impl EagerSnapshot {
let mut visitors = self
.tracked_actions
.iter()
.flat_map(|a| get_visitor(a))
.flat_map(get_visitor)
.collect::<Vec<_>>();
let mut schema_actions: HashSet<_> =
visitors.iter().flat_map(|v| v.required_actions()).collect();
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/kernel/snapshot/visitors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ impl AppTransactionVisitor {
for (key, value) in &self.app_transaction_version {
clone.insert(key.clone(), value.clone());
}
return clone;
clone
}
}

Expand Down
4 changes: 2 additions & 2 deletions crates/core/src/operations/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ mod tests {
assert_eq!(result.fields().len(), 1);
let delta_type: DeltaDataType = result.fields()[0].data_type().try_into().unwrap();
assert_eq!(delta_type, DeltaDataType::STRING);
assert_eq!(result.fields()[0].is_nullable(), true);
assert!(result.fields()[0].is_nullable());
}

#[test]
Expand Down Expand Up @@ -282,7 +282,7 @@ mod tests {
delta_type,
DeltaDataType::Array(Box::new(DeltaArrayType::new(DeltaDataType::STRING, false)))
);
assert_eq!(result.fields()[0].is_nullable(), true);
assert!(result.fields()[0].is_nullable());
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/operations/optimize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ pub(super) mod zorder {
"+-----+-----+-----------+",
];

let expected = vec![expected_1, expected_2, expected_3];
let expected = [expected_1, expected_2, expected_3];

let indices = Int32Array::from(shuffled_indices().to_vec());
let shuffled_columns = batch
Expand Down
6 changes: 3 additions & 3 deletions crates/core/src/operations/transaction/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ mod tests {
.with_partition_columns(["modified"])
.with_commit_properties(
CommitProperties::default()
.with_application_transaction(Transaction::new(&"my-app", 1)),
.with_application_transaction(Transaction::new("my-app", 1)),
)
.await
.unwrap();
Expand All @@ -113,7 +113,7 @@ mod tests {
.write(vec![get_record_batch(None, false)])
.with_commit_properties(
CommitProperties::default()
.with_application_transaction(Transaction::new(&"my-app", 2)),
.with_application_transaction(Transaction::new("my-app", 2)),
)
.await
.unwrap();
Expand All @@ -123,7 +123,7 @@ mod tests {
.write(vec![get_record_batch(None, false)])
.with_commit_properties(
CommitProperties::default()
.with_application_transaction(Transaction::new(&"my-app", 3)),
.with_application_transaction(Transaction::new("my-app", 3)),
)
.await;

Expand Down
4 changes: 2 additions & 2 deletions crates/core/src/operations/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -613,15 +613,15 @@ mod tests {

match result {
Ok(_) => {
assert!(false, "Should not have successfully written");
panic!("Should not have successfully written");
}
Err(e) => {
match e {
DeltaTableError::SchemaMismatch { .. } => {
// this is expected
}
others => {
assert!(false, "Got the wrong error: {others:?}");
panic!("Got the wrong error: {others:?}");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/protocol/checkpoints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ fn parquet_bytes_from_state(
state
.app_transaction_version()
.map_err(|_| CheckpointError::MissingActionType("txn".to_string()))?
.map(|txn| Action::Txn(txn)),
.map(Action::Txn),
)
// removes
.chain(tombstones.iter().map(|r| {
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/table/state_arrow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ impl DeltaTableState {
// into StructArrays, until it is consolidated into a single array.
columnar_stats = columnar_stats
.into_iter()
.group_by(|col_stat| {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

group_by is deprecated. The library suggests to use chunk_by instead.

.chunk_by(|col_stat| {
if col_stat.path.len() < level {
col_stat.path.clone()
} else {
Expand Down
7 changes: 2 additions & 5 deletions crates/core/src/writer/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -600,11 +600,8 @@ mod tests {
}
);

match writer.write(vec![second_data]).await {
Ok(_) => {
assert!(false, "Should not have successfully written");
}
_ => {}
if writer.write(vec![second_data]).await.is_ok() {
panic!("Should not have successfully written");
}
}

Expand Down
6 changes: 3 additions & 3 deletions crates/core/src/writer/record_batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ mod tests {
let mut writer = RecordBatchWriter::for_table(&table).unwrap();
let partitions = writer.divide_by_partition_values(&batch).unwrap();

let expected_keys = vec![
let expected_keys = [
String::from("modified=2021-02-01"),
String::from("modified=2021-02-02"),
];
Expand Down Expand Up @@ -710,15 +710,15 @@ mod tests {

match result {
Ok(_) => {
assert!(false, "Should not have successfully written");
panic!("Should not have successfully written");
}
Err(e) => {
match e {
DeltaTableError::SchemaMismatch { .. } => {
// this is expected
}
others => {
assert!(false, "Got the wrong error: {others:?}");
panic!("Got the wrong error: {others:?}");
}
}
}
Expand Down
24 changes: 12 additions & 12 deletions crates/core/tests/command_merge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ use deltalake_core::protocol::SaveMode;
use deltalake_core::{open_table, DeltaOps, DeltaResult, DeltaTable, DeltaTableError};
use std::sync::Arc;

async fn create_table(table_uri: &String, partition: Option<Vec<&str>>) -> DeltaTable {
async fn create_table(table_uri: &str, partition: Option<Vec<&str>>) -> DeltaTable {
let table_schema = get_delta_schema();
let ops = DeltaOps::try_from_uri(table_uri.clone()).await.unwrap();
let ops = DeltaOps::try_from_uri(table_uri).await.unwrap();
let table = ops
.create()
.with_columns(table_schema.fields().clone())
Expand All @@ -25,7 +25,7 @@ async fn create_table(table_uri: &String, partition: Option<Vec<&str>>) -> Delta
.expect("Failed to create table");

let schema = get_arrow_schema();
return write_data(table, &schema).await;
write_data(table, &schema).await
}

fn get_delta_schema() -> StructType {
Expand All @@ -49,11 +49,11 @@ fn get_delta_schema() -> StructType {
}

fn get_arrow_schema() -> Arc<ArrowSchema> {
return Arc::new(ArrowSchema::new(vec![
Arc::new(ArrowSchema::new(vec![
Field::new("id", DataType::Utf8, true),
Field::new("value", DataType::Int32, true),
Field::new("event_date", DataType::Utf8, true),
]));
]))
}

async fn write_data(table: DeltaTable, schema: &Arc<ArrowSchema>) -> DeltaTable {
Expand Down Expand Up @@ -108,15 +108,15 @@ fn create_test_data() -> (DataFrame, DataFrame) {
)
.unwrap();
let df2 = ctx.read_batch(batch).unwrap();
return (df1, df2);
(df1, df2)
}

async fn merge(
table: DeltaTable,
df: DataFrame,
predicate: Expr,
) -> DeltaResult<(DeltaTable, MergeMetrics)> {
return DeltaOps(table)
DeltaOps(table)
.merge(df, predicate)
.with_source_alias("source")
.with_target_alias("target")
Expand All @@ -133,7 +133,7 @@ async fn merge(
.set("event_date", col("source.event_date"))
})
.unwrap()
.await;
.await
}

#[tokio::test]
Expand All @@ -142,7 +142,7 @@ async fn test_merge_concurrent_conflict() {
let tmp_dir = tempfile::tempdir().unwrap();
let table_uri = tmp_dir.path().to_str().to_owned().unwrap();

let table_ref1 = create_table(&table_uri.to_string(), Some(vec!["event_date"])).await;
let table_ref1 = create_table(table_uri, Some(vec!["event_date"])).await;
let table_ref2 = open_table(table_uri).await.unwrap();
let (df1, df2) = create_test_data();

Expand All @@ -165,7 +165,7 @@ async fn test_merge_concurrent_different_partition() {
let tmp_dir = tempfile::tempdir().unwrap();
let table_uri = tmp_dir.path().to_str().to_owned().unwrap();

let table_ref1 = create_table(&table_uri.to_string(), Some(vec!["event_date"])).await;
let table_ref1 = create_table(table_uri, Some(vec!["event_date"])).await;
let table_ref2 = open_table(table_uri).await.unwrap();
let (df1, df2) = create_test_data();

Expand All @@ -177,7 +177,7 @@ async fn test_merge_concurrent_different_partition() {

// TODO: Currently it throws a Version mismatch error, but the merge commit was successfully
// This bug needs to be fixed, see pull request #2280
assert!(matches!(result.as_ref().is_ok(), true));
assert!(result.as_ref().is_ok());
}

#[tokio::test]
Expand All @@ -186,7 +186,7 @@ async fn test_merge_concurrent_with_overlapping_files() {
let tmp_dir = tempfile::tempdir().unwrap();
let table_uri = tmp_dir.path().to_str().to_owned().unwrap();

let table_ref1 = create_table(&table_uri.to_string(), None).await;
let table_ref1 = create_table(table_uri, None).await;
let table_ref2 = open_table(table_uri).await.unwrap();
let (df1, _df2) = create_test_data();

Expand Down
2 changes: 1 addition & 1 deletion crates/core/tests/integration_datafusion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ mod local {
for batch in batches {
table = DeltaOps(table)
.write(vec![batch])
.with_save_mode(save_mode.clone())
.with_save_mode(save_mode)
.await
.unwrap();
}
Expand Down
Loading