Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions .github/workflows/clippy-fmt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
on: [push, pull_request]
name: Clippy & Fmt
jobs:
clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: clippy
- name: Cargo Clippy Check
uses: actions-rs/clippy@master
with:
args: --all-features --all-targets -- -D warnings
fmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Cargo Fmt Check
uses: icepuma/rust-action@master
with:
args: cargo fmt --all -- --check
10 changes: 5 additions & 5 deletions commit_log/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ impl CommitLog {
let segments = vec![Segment::new(path.clone(), 0, segment_size, index_size)?];

Ok(Self {
path: path,
segments: segments,
segment_size: segment_size,
index_size: index_size,
path,
segments,
segment_size,
index_size,
current_segment: 0,
})
}
Expand Down Expand Up @@ -146,7 +146,7 @@ impl CommitLog {
}

pub fn read(&mut self, position: &Position) -> Result<Record, Error> {
return self.read_after(position, 0);
self.read_after(position, 0)
}

fn rotate_segment(&mut self) -> Result<(), Error> {
Expand Down
2 changes: 1 addition & 1 deletion commit_log/src/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl<'a> Reader<'a> {
let segment_index = record.segment_index;
let total_segments = self.commit_log.segments.len();
if segment_index >= total_segments {
return Err(Error::InvalidPosition);
Err(Error::InvalidPosition)
} else {
let segment = &self.commit_log.segments[segment_index];
let buf = segment.read_at(record.current_offset)?;
Expand Down
8 changes: 5 additions & 3 deletions commit_log/src/segment/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use std::path::PathBuf;
use std::str::from_utf8_unchecked;

use derive_more::From;
use std::fmt;

#[derive(Debug, From)]
pub enum Error {
Expand Down Expand Up @@ -156,10 +157,11 @@ impl Entry {
pub fn new(offset: usize, size: usize) -> Self {
Self { offset, size }
}
}

/// Convert an entry to string
pub fn to_string(&self) -> String {
format!("{:010}{:010}", self.offset, self.size)
impl fmt::Display for Entry {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{:010}{:010}", self.offset, self.size)
}
}

Expand Down
2 changes: 1 addition & 1 deletion commit_log/src/segment/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ impl Log {
base_offset,
offset,
max_size,
mmap: mmap,
mmap,
})
}

Expand Down
4 changes: 2 additions & 2 deletions commit_log/src/segment/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ impl Segment {
) -> Result<Self, Error> {
Ok(Self {
log: Log::new(path.clone(), offset, max_log_size)?,
index: Index::new(path.clone(), offset, max_index_size)?,
offset: offset,
index: Index::new(path, offset, max_index_size)?,
offset,
})
}

Expand Down