Skip to content

Commit f3a89c0

Browse files
ustc-wxyustc-wxy
committed
code clean up.
Signed-off-by: root <[email protected]>
1 parent 1a41d8c commit f3a89c0

File tree

6 files changed

+15
-108
lines changed

6 files changed

+15
-108
lines changed

‎src/engine.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// Copyright (c) 2017-present, PingCAP, Inc. Licensed under Apache-2.0.
22

3-
use libc::{aio_return, aiocb};
43
use std::cell::{Cell, RefCell};
54
use std::marker::PhantomData;
6-
use std::mem;
75
use std::path::Path;
86
use std::sync::{mpsc, Arc, Mutex};
97
use std::thread::{Builder as ThreadBuilder, JoinHandle};
@@ -14,7 +12,7 @@ use protobuf::{parse_from_bytes, Message};
1412

1513
use crate::config::{Config, RecoveryMode};
1614
use crate::consistency::ConsistencyChecker;
17-
use crate::env::{AioContext, AsyncContext, DefaultFileSystem, FileSystem};
15+
use crate::env::{DefaultFileSystem, FileSystem};
1816
use crate::event_listener::EventListener;
1917
use crate::file_pipe_log::debug::LogItemReader;
2018
use crate::file_pipe_log::{DefaultMachineFactory, FilePipeLog, FilePipeLogBuilder};
@@ -653,14 +651,13 @@ where
653651
#[cfg(test)]
654652
mod tests {
655653
use super::*;
656-
use crate::env::{AioContext, ObfuscatedFileSystem};
654+
use crate::env::ObfuscatedFileSystem;
657655
use crate::file_pipe_log::{parse_recycled_file_name, FileNameExt};
658656
use crate::log_batch::AtomicGroupBuilder;
659657
use crate::pipe_log::Version;
660658
use crate::test_util::{generate_entries, PanicGuard};
661659
use crate::util::ReadableSize;
662660
use kvproto::raft_serverpb::RaftLocalState;
663-
use libc::aiocb;
664661
use raft::eraftpb::Entry;
665662
use std::collections::{BTreeSet, HashSet};
666663
use std::fs::OpenOptions;
@@ -2106,11 +2103,11 @@ mod tests {
21062103
buf: Vec<u8>,
21072104
block: &mut FileBlockHandle,
21082105
) -> std::io::Result<()> {
2109-
todo!()
2106+
self.inner.async_read(ctx, handle, buf, block)
21102107
}
21112108

21122109
fn async_finish(&self, ctx: &mut Self::AsyncIoContext) -> std::io::Result<Vec<Vec<u8>>> {
2113-
todo!()
2110+
self.inner.async_finish(ctx)
21142111
}
21152112

21162113
fn create<P: AsRef<Path>>(&self, path: P) -> std::io::Result<Self::Handle> {

‎src/env/default.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::ffi::c_void;
44
use std::io::{Error, ErrorKind, Read, Result as IoResult, Seek, SeekFrom, Write};
55
use std::os::unix::io::RawFd;
66
use std::path::Path;
7-
use std::sync::{Arc, Mutex};
7+
use std::sync::Arc;
88
use std::{mem, ptr};
99

1010
use fail::fail_point;
@@ -286,9 +286,9 @@ pub struct AioContext {
286286
impl AioContext {
287287
pub fn new(block_sum: usize) -> Self {
288288
let mut aio_vec = vec![];
289-
let mut buf_vec = vec![];
289+
let buf_vec = vec![];
290290
unsafe {
291-
for i in 0..block_sum {
291+
for _ in 0..block_sum {
292292
aio_vec.push(mem::zeroed::<libc::aiocb>());
293293
}
294294
}
@@ -310,7 +310,7 @@ impl AsyncContext for AioContext {
310310
let mut total = 0;
311311
for seq in 0..self.aio_vec.len() {
312312
match self.single_wait(seq) {
313-
Ok(len) => total += 1,
313+
Ok(_) => total += 1,
314314
Err(e) => return Err(e),
315315
}
316316
}

‎src/env/mod.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// Copyright (c) 2017-present, PingCAP, Inc. Licensed under Apache-2.0.
22

3-
use libc::aiocb;
43
use std::io::{Read, Result, Seek, Write};
54
use std::path::Path;
6-
use std::sync::{Arc, Mutex};
5+
use std::sync::Arc;
76

87
mod default;
98
mod obfuscated;

‎src/env/obfuscated.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
// Copyright (c) 2017-present, PingCAP, Inc. Licensed under Apache-2.0.
22

3-
use libc::aiocb;
43
use std::io::{Read, Result as IoResult, Seek, SeekFrom, Write};
54
use std::path::Path;
65
use std::sync::atomic::{AtomicUsize, Ordering};
7-
use std::sync::{Arc, Mutex};
6+
use std::sync::Arc;
87

9-
use crate::env::default::AioContext;
108
use crate::env::{DefaultFileSystem, FileSystem, WriteExt};
119

1210
use super::AsyncContext;

‎src/file_pipe_log/pipe.rs‎

Lines changed: 4 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,21 @@ use std::collections::VecDeque;
44
use std::fs::File as StdFile;
55
use std::path::{Path, PathBuf};
66
use std::sync::Arc;
7-
use std::sync::Mutex as SyncMutex;
87

98
use crossbeam::utils::CachePadded;
109
use fail::fail_point;
11-
use libc::aiocb;
1210
use log::error;
1311
use parking_lot::{Mutex, MutexGuard, RwLock};
14-
use protobuf::{parse_from_bytes, Message};
1512

1613
use crate::config::Config;
17-
use crate::env::{AioContext, AsyncContext, DefaultFileSystem, FileSystem};
14+
use crate::env::FileSystem;
1815
use crate::event_listener::EventListener;
1916
use crate::memtable::EntryIndex;
2017
use crate::metrics::*;
2118
use crate::pipe_log::{
2219
FileBlockHandle, FileId, FileSeq, LogFileContext, LogQueue, PipeLog, ReactiveBytes,
2320
};
24-
use crate::{perf_context, Error, LogBatch, MessageExt, Result};
21+
use crate::{perf_context, Error, Result};
2522

2623
use super::format::{build_recycled_file_name, FileNameExt, LogFileFormat};
2724
use super::log_file::build_file_reader;
@@ -453,87 +450,7 @@ impl<F: FileSystem> PipeLog for DualPipes<F> {
453450
fn read_bytes(&self, handle: FileBlockHandle) -> Result<Vec<u8>> {
454451
self.pipes[handle.id.queue as usize].read_bytes(handle)
455452
}
456-
// #[inline]
457-
// fn async_entry_read<M: Message + MessageExt<Entry = M>>(
458-
// &self,
459-
// ents_idx: &mut Vec<EntryIndex>,
460-
// vec: &mut Vec<M::Entry>,
461-
// ) -> Result<()> {
462-
// let mut handles: Vec<FileBlockHandle> = vec![];
463-
// for (t, i) in ents_idx.iter().enumerate() {
464-
// if t == 0 || (i.entries.unwrap() != ents_idx[t - 1].entries.unwrap())
465-
// { handles.push(i.entries.unwrap());
466-
// }
467-
// }
468-
469-
// let mut ctx_append = self.pipes[LogQueue::Append as usize]
470-
// .file_system
471-
// .new_async_io_context(handles.len() as usize)
472-
// .unwrap();
473-
// let mut ctx_rewrite = self.pipes[LogQueue::Rewrite as usize]
474-
// .file_system
475-
// .new_async_io_context(handles.len() as usize)
476-
// .unwrap();
477-
478-
// for handle in handles.iter_mut() {
479-
// match handle.id.queue {
480-
// LogQueue::Append => {
481-
// self.pipes[LogQueue::Append as usize].submit_read_req(
482-
// handle,
483-
// &mut ctx_append,
484-
// );
485-
// }
486-
// LogQueue::Rewrite => {
487-
// self.pipes[LogQueue::Rewrite as usize].submit_read_req(
488-
// handle,
489-
// &mut ctx_rewrite,
490-
// );
491-
// }
492-
// }
493-
// }
494-
495-
// let mut decode_buf = vec![];
496-
// let mut seq_append: i32 = -1;
497-
// let mut seq_rewrite: i32 = -1;
498-
499-
// for (t, i) in ents_idx.iter().enumerate() {
500-
// decode_buf =
501-
// match t == 0 || ents_idx[t - 1].entries.unwrap() !=
502-
// ents_idx[t].entries.unwrap() { true => match
503-
// ents_idx[t].entries.unwrap().id.queue {
504-
// LogQueue::Append => { seq_append += 1;
505-
// ctx_append.single_wait(seq_append as usize).unwrap();
506-
// LogBatch::decode_entries_block(
507-
// &ctx_append.data(seq_append as usize),
508-
// i.entries.unwrap(),
509-
// i.compression_type,
510-
// )
511-
// .unwrap()
512-
// }
513-
// LogQueue::Rewrite => {
514-
// seq_rewrite += 1;
515-
// ctx_rewrite.single_wait(seq_rewrite as
516-
// usize).unwrap(); LogBatch::decode_entries_block(
517-
// &ctx_rewrite.data(seq_rewrite as usize),
518-
// i.entries.unwrap(),
519-
// i.compression_type,
520-
// )
521-
// .unwrap()
522-
// }
523-
// },
524-
// false => decode_buf,
525-
// };
526-
527-
// vec.push(
528-
// parse_from_bytes::<M>(
529-
// &mut decode_buf
530-
// [(i.entry_offset) as usize..(i.entry_offset +
531-
// i.entry_len) as usize], )
532-
// .unwrap(),
533-
// );
534-
// }
535-
// Ok(())
536-
// }
453+
537454
#[inline]
538455
fn async_read_bytes(&self, ents_idx: &mut Vec<EntryIndex>) -> Result<Vec<Vec<u8>>> {
539456
let mut blocks: Vec<FileBlockHandle> = vec![];
@@ -542,12 +459,11 @@ impl<F: FileSystem> PipeLog for DualPipes<F> {
542459
blocks.push(i.entries.unwrap());
543460
}
544461
}
545-
let mut res: Vec<Vec<u8>> = vec![];
546462

547463
let fs = &self.pipes[LogQueue::Append as usize].file_system;
548464
let mut ctx = fs.new_async_io_context(blocks.len()).unwrap();
549465

550-
for (seq, block) in blocks.iter_mut().enumerate() {
466+
for block in blocks.iter_mut() {
551467
match block.id.queue {
552468
LogQueue::Append => {
553469
self.pipes[LogQueue::Append as usize].async_read(block, &mut ctx);

‎src/pipe_log.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55
use std::cmp::Ordering;
66
use std::fmt::{self, Display};
77

8-
use crate::env::AioContext;
98
use crate::memtable::EntryIndex;
109
use fail::fail_point;
11-
use libc::aiocb;
1210
use num_derive::{FromPrimitive, ToPrimitive};
1311
use num_traits::ToPrimitive;
14-
use protobuf::Message;
1512
use serde_repr::{Deserialize_repr, Serialize_repr};
1613
use strum::EnumIter;
1714

18-
use crate::{MessageExt, Result};
15+
use crate::Result;
1916

2017
/// The type of log queue.
2118
#[repr(u8)]

0 commit comments

Comments
 (0)