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.

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

Jump to bottom

[Merged by Bors] - Update segment.rs #2950

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - Update segment.rs #2950

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d84deb8
Update segment.rs
morenol Jan 20, 2023
c6aba1c
WIP
morenol Jan 20, 2023
c7a2a69
Add unit test
morenol Jan 20, 2023
063ee1e
Use effective max offset
morenol Jan 20, 2023
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
27 changes: 20 additions & 7 deletions crates/fluvio-storage/src/segment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,22 @@ where
);
match max_offset_opt {
Some(max_offset) => {
// max_offset comes from HW, which could be greater than current segment end.
let effective_max_offset = std::cmp::min(max_offset, self.get_end_offset());
// check if max offset same as segment end
if max_offset == self.get_end_offset() {
debug!("max offset is same as end offset, reading to end");
if effective_max_offset == self.get_end_offset() {
debug!("effective max offset is same as end offset, reading to end");
Ok(Some(self.msg_log.as_file_slice(pos).map_err(|err| {
ErrorCode::Other(format!("msg as file slice: {:#?}", err))
})?))
} else {
debug!(max_offset);
match self.find_offset_position(max_offset).await.map_err(|err| {
ErrorCode::Other(format!("offset error: {:#?}", err))
})? {
debug!(effective_max_offset, max_offset);
match self
.find_offset_position(effective_max_offset)
.await
.map_err(|err| {
ErrorCode::Other(format!("offset error: {:#?}", err))
})? {
Some(end_pos) => Ok(Some(
self.msg_log
.as_file_slice_from_to(pos, end_pos.pos - pos)
Expand All @@ -153,7 +158,7 @@ where
)),
None => Err(ErrorCode::Other(format!(
"max offset position: {} not found",
max_offset
effective_max_offset
))),
}
}
Expand Down Expand Up @@ -667,5 +672,13 @@ mod tests {
next_batch.base_offset = 1000;
assert!(seg_sink.append_batch(&mut next_batch).await.is_ok());
assert_eq!(seg_sink.get_end_offset(), 50);

let _records = seg_sink
.records_slice(44, Some(52))
.await
.expect(
"failed to get records using max offset larger than current end offset in segment",
)
.expect("failed to get records");
}
}