Skip to content

reduce: remove superfluous cloning of keys #408

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
frankmcsherry merged 1 commit into from
Nov 1, 2023
Merged

reduce: remove superfluous cloning of keys #408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/operators/reduce.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@ where
while batch_cursor.key_valid(batch_storage) || exposed_position < exposed.len() {

// Determine the next key we will work on; could be synthetic, could be from a batch.
let key1 = exposed.get(exposed_position).map(|x| x.0.clone());
let key2 = batch_cursor.get_key(&batch_storage).map(|k| k.clone());
let key1 = exposed.get(exposed_position).map(|x| &x.0);
let key2 = batch_cursor.get_key(&batch_storage);
let key = match (key1, key2) {
(Some(key1), Some(key2)) => ::std::cmp::min(key1, key2),
(Some(key1), None) => key1,
Expand All @@ -514,7 +514,7 @@ where
interesting_times.clear();

// Populate `interesting_times` with synthetic interesting times (below `upper_limit`) for this key.
while exposed.get(exposed_position).map(|x| &x.0) == Some(&key) {
while exposed.get(exposed_position).map(|x| &x.0) == Some(key) {
interesting_times.push(exposed[exposed_position].1.clone());
exposed_position += 1;
}
Expand All @@ -524,7 +524,7 @@ where

// do the per-key computation.
let _counters = thinker.compute(
&key,
key,
(&mut source_cursor, source_storage),
(&mut output_cursor, output_storage),
(&mut batch_cursor, batch_storage),
Expand All @@ -535,7 +535,7 @@ where
&mut new_interesting_times,
);

if batch_cursor.get_key(batch_storage) == Some(&key) {
if batch_cursor.get_key(batch_storage) == Some(key) {
batch_cursor.step_key(batch_storage);
}

Expand Down