Skip to content

fix: remove unnecessary borrow/clone #189

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.

Sign up for GitHub

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

Merged
JoeCap08055 merged 4 commits into from
Apr 2, 2024
Merged

fix: remove unnecessary borrow/clone #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e5ed22
fix: remove unnecessary borrow/clone
JoeCap08055 Apr 1, 2024
47b5e63
fix: lint
JoeCap08055 Apr 1, 2024
36c5d7b
fix: PR review comments
JoeCap08055 Apr 2, 2024
afec303
Merge branch 'main' into chore/remove-unnecessary-clone
JoeCap08055 Apr 2, 2024
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
4 changes: 2 additions & 2 deletions core/src/api/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ impl GraphState {
));
}
owner_graph.update_tracker_mut().register_update(
&UpdateEvent::create_add(*dsnp_user_id, *schema_id),
UpdateEvent::create_add(*dsnp_user_id, *schema_id),
ignore_existing_connections,
)?;
if let Some(inner_keys) = dsnp_keys {
Expand Down Expand Up @@ -563,7 +563,7 @@ impl GraphState {
));
}
owner_graph.update_tracker_mut().register_update(
&UpdateEvent::create_remove(*dsnp_user_id, *schema_id),
UpdateEvent::create_remove(*dsnp_user_id, *schema_id),
ignore_missing_connections,
)?;
},
Expand Down
32 changes: 16 additions & 16 deletions core/src/graph/updates.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ impl UpdateTracker {
#[log_result_err(Level::Info)]
pub fn register_update(
&mut self,
event: &UpdateEvent,
event: UpdateEvent,
ignore_existing: bool,
) -> DsnpGraphResult<()> {
if self.contains(event) {
if self.contains(&event) {
return match ignore_existing {
true => {
match event {
Expand All @@ -66,10 +66,10 @@ impl UpdateTracker {
Ok(())
},
false => Err(DsnpGraphError::EventExists),
}
};
}

match self.contains_complement(event) {
match self.contains_complement(&event) {
// removing the complement to cancel out a prior update
true => self.remove(&event.get_complement()),
// adding new update
Expand All @@ -83,14 +83,14 @@ impl UpdateTracker {
#[log_result_err(Level::Info)]
pub fn register_updates(
&mut self,
events: &[UpdateEvent],
events: Vec<UpdateEvent>,
ignore_existing: bool,
) -> DsnpGraphResult<()> {
if !ignore_existing && events.iter().any(|e| self.contains(e)) {
return Err(DsnpGraphError::DuplicateUpdateEvents)
return Err(DsnpGraphError::DuplicateUpdateEvents);
}

for e in events {
for e in events.into_iter() {
self.register_update(e, ignore_existing)?;
}

Expand Down Expand Up @@ -155,8 +155,8 @@ impl UpdateTracker {
}

/// adds the update event
fn add(&mut self, event: &UpdateEvent) {
self.updates.entry(*event.get_schema_id()).or_default().push(event.clone());
fn add(&mut self, event: UpdateEvent) {
self.updates.entry(*event.get_schema_id()).or_default().push(event);
}
}

Expand Down Expand Up @@ -211,13 +211,13 @@ mod test {
let schema_id = 4;
let event = UpdateEvent::create_add(1, schema_id);
tracker
.register_update(&event.clone(), false)
.register_update(event.clone(), false)
.expect("Should have registered successfully!");

// act
let exists = tracker.contains(&event);
let res1 = tracker.register_update(&event, false);
let res2 = tracker.register_update(&event, true);
let res1 = tracker.register_update(event.clone(), false);
let res2 = tracker.register_update(event, true);

// assert
assert!(exists);
Expand All @@ -238,13 +238,13 @@ mod test {
let events =
vec![UpdateEvent::create_add(1, schema_id), UpdateEvent::create_remove(2, schema_id)];
tracker
.register_updates(&events, false)
.register_updates(events.clone(), false)
.expect("Should have registered successfully!");
let complements: Vec<UpdateEvent> =
events.as_slice().iter().map(|e| e.get_complement()).collect();

// act
let res = tracker.register_updates(&complements, false);
let res = tracker.register_updates(complements, false);

// assert
assert!(res.is_ok());
Expand All @@ -267,7 +267,7 @@ mod test {
];

// act
let res = tracker.register_updates(&events, false);
let res = tracker.register_updates(events.clone(), false);

// assert
assert!(res.is_ok());
Expand Down Expand Up @@ -310,7 +310,7 @@ mod test {
UpdateEvent::create_remove(4, schema_1),
];
let existing_connections = HashSet::from([3, 2]);
tracker.register_updates(&events, false).expect("should register");
tracker.register_updates(events.clone(), false).expect("should register");

// act
tracker.sync_updates(schema_1, &existing_connections);
Expand Down
6 changes: 3 additions & 3 deletions core/src/graph/user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ impl UserGraph {
include_pending && self.update_tracker.contains_complement(add_event);

return (graph_connection_exists && !remove_update_exists) ||
(!graph_connection_exists && add_update_exists)
(!graph_connection_exists && add_update_exists);
}
false
}
Expand Down Expand Up @@ -239,7 +239,7 @@ impl UserGraph {
pub fn get_dsnp_config(&self, schema_id: SchemaId) -> Option<DsnpVersionConfig> {
let config = self.environment.get_config();
if let Some(dsnp_version) = config.get_dsnp_version_from_schema_id(schema_id) {
return Some(DsnpVersionConfig::new(dsnp_version))
return Some(DsnpVersionConfig::new(dsnp_version));
}
None
}
Expand Down Expand Up @@ -370,7 +370,7 @@ mod test {
let connection_dsnp = 1000000;
user_graph
.update_tracker
.register_update(&UpdateEvent::Add { dsnp_user_id: connection_dsnp, schema_id }, false)
.register_update(UpdateEvent::Add { dsnp_user_id: connection_dsnp, schema_id }, false)
.unwrap();
let key = StackKeyPair::gen();
user_graph
Expand Down