Skip to content

refactor: move take() impl to SeriesBufferGuard #145

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

Open
KevinWMatthews wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: move take() impl to SeriesBufferGuard #145

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
48 changes: 26 additions & 22 deletions nominal-streaming/src/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,31 @@ impl SeriesBufferGuard<'_> {

self.count.fetch_add(new_point_count, Ordering::Release);
}

fn take(&mut self) -> (usize, Vec<Series>) {
let result = self
.sb
.drain()
.map(|(ChannelDescriptor { name, tags }, points)| {
let channel = Channel { name };
let points_obj = Points {
points_type: Some(points),
};
Series {
channel: Some(channel),
tags: tags
.map(|tags| tags.into_iter().collect())
.unwrap_or_default(),
points: Some(points_obj),
}
})
.collect();
let result_count = self
.count
.fetch_update(Ordering::Release, Ordering::Acquire, |_| Some(0))
Comment on lines +642 to +644
Copy link
Copy Markdown
Contributor Author

@KevinWMatthews KevinWMatthews Dec 15, 2025

Choose a reason for hiding this comment

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

Write access to the count now must occur through SeriesBufferGuard, as SeriesBuffer is not in scope.

.unwrap();
(result_count, result)
}
}

impl PartialEq for SeriesBuffer {
Expand Down Expand Up @@ -669,28 +694,7 @@ impl SeriesBuffer {
UNIX_EPOCH.elapsed().unwrap().as_nanos() as u64,
Ordering::Release,
);
Comment on lines 694 to 696
Copy link
Copy Markdown
Contributor Author

@KevinWMatthews KevinWMatthews Dec 15, 2025

Choose a reason for hiding this comment

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

Unlike count, flush_time is not considered in this PR.

The mechanics of how these two values are accessed are a little bit different, and I haven't considered flush_time deeply.

let result = points
.sb
.drain()
.map(|(ChannelDescriptor { name, tags }, points)| {
let channel = Channel { name };
let points_obj = Points {
points_type: Some(points),
};
Series {
channel: Some(channel),
tags: tags
.map(|tags| tags.into_iter().collect())
.unwrap_or_default(),
points: Some(points_obj),
}
})
.collect();
let result_count = self
.count
.fetch_update(Ordering::Release, Ordering::Acquire, |_| Some(0))
.unwrap();
(result_count, result)
points.take()
}

fn is_empty(&self) -> bool {
Expand Down