Skip to content

Commit 839d8cd

Browse files
connortsui20connortsui20
committed
fix clippy
1 parent 85b064f commit 839d8cd

File tree

3 files changed

+29
-31
lines changed

3 files changed

+29
-31
lines changed

‎optd/src/core/optimizer/merge.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,9 @@ impl<M: Memoize> Optimizer<M> {
379379
.await?;
380380
} else {
381381
let all_tasks_for_this_expr = exprs_to_trans_tasks.get(expr).unwrap().clone();
382-
for rule in self.rule_book.get_transformations().to_vec() {
382+
383+
let transformations = self.rule_book.get_transformations().to_vec();
384+
for rule in transformations {
383385
if !all_tasks_for_this_expr.contains_key(&rule) {
384386
self.create_transform_expression_task(rule, *expr, *repr_group_task_id)
385387
.await?;

‎optd/src/core/optimizer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ mod tests {
330330
annotations: HashMap::new(),
331331
};
332332

333-
let mut memo = MemoryMemo::default();
333+
let memo = MemoryMemo::default();
334334

335335
let mut client = Optimizer::launch(memo, mock_catalog(), hir);
336336

‎optd/src/memo/memory.rs

+25-29
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ impl Memoize for MemoryMemo {
347347
.transform_dependency
348348
.get(&logical_expr_id)
349349
.and_then(|status_map| status_map.get(rule))
350-
.map(|dep| dep.status.clone())
350+
.map(|dep| dep.status)
351351
.unwrap_or(Status::Dirty);
352352
Ok(status)
353353
}
@@ -386,7 +386,7 @@ impl Memoize for MemoryMemo {
386386
.implement_dependency
387387
.get(&logical_expr_id)
388388
.and_then(|status_map| status_map.get(&(goal_id, rule.clone())))
389-
.map(|dep| dep.status.clone())
389+
.map(|dep| dep.status)
390390
.unwrap_or(Status::Dirty);
391391
Ok(status)
392392
}
@@ -422,7 +422,7 @@ impl Memoize for MemoryMemo {
422422
let status = self
423423
.cost_dependency
424424
.get(&physical_expr_id)
425-
.map(|dep| dep.status.clone())
425+
.map(|dep| dep.status)
426426
.unwrap_or(Status::Dirty);
427427
Ok(status)
428428
}
@@ -573,14 +573,14 @@ impl Memoize for MemoryMemo {
573573
match child {
574574
Child::Singleton(group_id) => {
575575
self.group_dependent_logical_exprs
576-
.entry(group_id.clone())
576+
.entry(*group_id)
577577
.or_default()
578578
.insert(logical_expr_id);
579579
}
580580
Child::VarLength(group_ids) => {
581581
for group_id in group_ids.iter() {
582582
self.group_dependent_logical_exprs
583-
.entry(group_id.clone())
583+
.entry(*group_id)
584584
.or_default()
585585
.insert(logical_expr_id);
586586
}
@@ -624,7 +624,7 @@ impl Memoize for MemoryMemo {
624624
Child::Singleton(goal_member_id) => {
625625
if let GoalMemberId::GoalId(goal_id) = goal_member_id {
626626
self.goal_dependent_physical_exprs
627-
.entry(goal_id.clone())
627+
.entry(*goal_id)
628628
.or_default()
629629
.insert(physical_expr_id);
630630
}
@@ -634,13 +634,13 @@ impl Memoize for MemoryMemo {
634634
match goal_member_id {
635635
GoalMemberId::GoalId(goal_id) => {
636636
self.goal_dependent_physical_exprs
637-
.entry(goal_id.clone())
637+
.entry(*goal_id)
638638
.or_default()
639639
.insert(physical_expr_id);
640640
}
641641
GoalMemberId::PhysicalExpressionId(child_physical_expr_id) => {
642642
self.physical_expr_dependent_physical_exprs
643-
.entry(child_physical_expr_id.clone())
643+
.entry(*child_physical_expr_id)
644644
.or_default()
645645
.insert(physical_expr_id);
646646
}
@@ -703,17 +703,16 @@ impl MemoryMemo {
703703
for child in repr_logical_expr.children.iter() {
704704
match child {
705705
Child::Singleton(group_id) => {
706-
let repr_group_id = self.find_repr_group(group_id.clone()).await?;
706+
let repr_group_id = self.find_repr_group(*group_id).await?;
707707
new_children.push(Child::Singleton(repr_group_id));
708708
}
709709
Child::VarLength(group_ids) => {
710710
let new_group_ids = group_ids
711711
.iter()
712712
.map(|group_id| {
713-
let group_id = group_id.clone();
714713
let self_ref = &self;
715714
// TODO(Sarvesh): this is a hack to get the repr group id, i'm sure there's a better way to do this.
716-
async move { self_ref.find_repr_group(group_id).await }
715+
async move { self_ref.find_repr_group(*group_id).await }
717716
})
718717
.collect::<Vec<_>>();
719718

@@ -742,24 +741,23 @@ impl MemoryMemo {
742741
match child {
743742
Child::Singleton(goal_member_id) => {
744743
if let GoalMemberId::GoalId(goal_id) = goal_member_id {
745-
let repr_goal_id = self.find_repr_goal(goal_id.clone()).await?;
744+
let repr_goal_id = self.find_repr_goal(*goal_id).await?;
746745
new_children.push(Child::Singleton(GoalMemberId::GoalId(repr_goal_id)));
747746
} else {
748-
new_children.push(Child::Singleton(goal_member_id.clone()));
747+
new_children.push(Child::Singleton(*goal_member_id));
749748
}
750749
}
751750
Child::VarLength(goal_member_ids) => {
752751
let mut new_goal_member_ids = Vec::new();
753752
for goal_member_id in goal_member_ids.iter() {
754753
match goal_member_id {
755754
GoalMemberId::GoalId(goal_id) => {
756-
let repr_goal_id = self.find_repr_goal(goal_id.clone()).await?;
755+
let repr_goal_id = self.find_repr_goal(*goal_id).await?;
757756
new_goal_member_ids.push(GoalMemberId::GoalId(repr_goal_id));
758757
}
759758
GoalMemberId::PhysicalExpressionId(physical_expr_id) => {
760-
let repr_physical_expr_id = self
761-
.find_repr_physical_expr(physical_expr_id.clone())
762-
.await?;
759+
let repr_physical_expr_id =
760+
self.find_repr_physical_expr(*physical_expr_id).await?;
763761
new_goal_member_ids.push(GoalMemberId::PhysicalExpressionId(
764762
repr_physical_expr_id,
765763
));
@@ -780,7 +778,7 @@ impl MemoryMemo {
780778
&mut self,
781779
physical_expr_id: PhysicalExpressionId,
782780
) -> MemoizeResult<Vec<PhysicalMergeProduct>> {
783-
let (physical_expr, cost) = self.physical_exprs.get(&physical_expr_id).unwrap();
781+
let (physical_expr, _cost) = self.physical_exprs.get(&physical_expr_id).unwrap();
784782
let repr_physical_expr = self
785783
.create_repr_physical_expr(physical_expr.clone())
786784
.await?;
@@ -816,7 +814,7 @@ impl MemoryMemo {
816814
for dependent_physical_expr_id in dependent_physical_exprs {
817815
// TODO(Sarvesh): handle async recursion
818816
let merge_physical_expr_result = self
819-
.merge_physical_exprs(dependent_physical_expr_id.clone())
817+
.merge_physical_exprs(dependent_physical_expr_id)
820818
.await?;
821819
results.extend(merge_physical_expr_result);
822820
}
@@ -833,8 +831,7 @@ impl MemoryMemo {
833831
) -> MemoizeResult<(GoalMergeProduct, Vec<PhysicalMergeProduct>)> {
834832
let goal_2 = self.goals.remove(&goal_id2).unwrap();
835833
let goal_1 = self.goals.get(&goal_id1).unwrap();
836-
let goal_1_props = &goal_1.goal.1;
837-
let goal_2_props = &goal_2.goal.1;
834+
838835
self.repr_goal.merge(&goal_id2, &goal_id1);
839836

840837
let mut merged_goal_result = GoalMergeProduct {
@@ -995,14 +992,13 @@ impl MemoryMemo {
995992

996993
for goal_id1 in group_1_goals.iter() {
997994
for goal_id2 in group_2_goals.iter() {
998-
let goal_1 = self.goals.get(&goal_id1).unwrap();
999-
let goal_2 = self.goals.get(&goal_id2).unwrap();
995+
let goal_1 = self.goals.get(goal_id1).unwrap();
996+
let goal_2 = self.goals.get(goal_id2).unwrap();
1000997
let goal_1_props = &goal_1.goal.1;
1001998
let goal_2_props = &goal_2.goal.1;
1002999
if goal_1_props == goal_2_props {
1003-
let (merged_goal_result, merge_physical_expr_results) = self
1004-
.merge_goals_helper(goal_id1.clone(), goal_id2.clone())
1005-
.await?;
1000+
let (merged_goal_result, merge_physical_expr_results) =
1001+
self.merge_goals_helper(*goal_id1, *goal_id2).await?;
10061002
result.goal_merges.push(merged_goal_result);
10071003
result
10081004
.physical_expr_merges
@@ -1024,7 +1020,7 @@ impl MemoryMemo {
10241020
let repr_logical_expr_id = self.get_logical_expr_id(&repr_logical_expr).await?;
10251021
// merge the logical exprs
10261022
self.repr_logical_expr
1027-
.merge(&logical_expr_id, &repr_logical_expr_id);
1023+
.merge(logical_expr_id, &repr_logical_expr_id);
10281024

10291025
let parent_group_id = self.logical_expr_group_index.get(logical_expr_id).unwrap();
10301026
let parent_group_state = self.groups.get_mut(parent_group_id).unwrap();
@@ -1041,7 +1037,7 @@ impl MemoryMemo {
10411037
// we have another merge to do
10421038
// do a cascading merge between repr_parent_group_id and parent_group_id
10431039
let merge_result = self
1044-
.merge_groups_helper(repr_parent_group_id.clone(), parent_group_id.clone())
1040+
.merge_groups_helper(*repr_parent_group_id, *parent_group_id)
10451041
.await?;
10461042
// merge the cascading merge result with the current result.
10471043
if let Some(merge_result) = merge_result {
@@ -1060,7 +1056,7 @@ impl MemoryMemo {
10601056
.insert(repr_logical_expr_id);
10611057
// we update the index
10621058
self.logical_expr_group_index
1063-
.insert(repr_logical_expr_id, parent_group_id.clone());
1059+
.insert(repr_logical_expr_id, *parent_group_id);
10641060
}
10651061
}
10661062

0 commit comments

Comments
 (0)