chore: Fix clippy

This commit is contained in:
evenyag
2022-06-10 16:11:07 +08:00
parent 9697fbc5e4
commit 46c5681cb0
2 changed files with 21 additions and 8 deletions

View File

@@ -8,6 +8,7 @@ use std::mem;
use std::sync::Arc;
use datatypes::vectors::{UInt64Vector, UInt8Vector, VectorRef};
use snafu::Snafu;
use store_api::storage::{SequenceNumber, ValueType};
use crate::error::Result;
@@ -125,6 +126,10 @@ impl MemtableBuilder for DefaultMemtableBuilder {
}
}
#[derive(Debug, Snafu)]
#[snafu(display("Fail to switch memtable"))]
pub struct SwitchError;
pub struct MemtableSet {
mem: MemtableRef,
// TODO(yingwen): Support multiple immutable memtables.
@@ -141,9 +146,12 @@ impl MemtableSet {
}
/// Switch mutable memtable to immutable memtable, returns the old mutable memtable if success.
pub fn _switch_memtable(&mut self, mem: &MemtableRef) -> std::result::Result<MemtableRef, ()> {
pub fn _switch_memtable(
&mut self,
mem: &MemtableRef,
) -> std::result::Result<MemtableRef, SwitchError> {
match &self._immem {
Some(_) => Err(()),
Some(_) => SwitchSnafu {}.fail(),
None => {
let old_mem = mem::replace(&mut self.mem, mem.clone());
self._immem = Some(old_mem.clone());

View File

@@ -36,7 +36,7 @@ fn kvs_for_test_with_index(
key_builders.0.push(Some(key.0));
key_builders.1.push(Some(key.1));
}
let keys = vec![
let row_keys = vec![
Arc::new(key_builders.0.finish()) as _,
Arc::new(key_builders.1.finish()) as _,
];
@@ -45,15 +45,20 @@ fn kvs_for_test_with_index(
for value in values {
value_builder.push(*value);
}
let values = vec![Arc::new(value_builder.finish()) as _];
let row_values = vec![Arc::new(value_builder.finish()) as _];
KeyValues {
let kvs = KeyValues {
sequence,
value_type,
start_index_in_batch,
keys,
values,
}
keys: row_keys,
values: row_values,
};
assert_eq!(keys.len(), kvs.len());
assert_eq!(keys.is_empty(), kvs.is_empty());
kvs
}
fn kvs_for_test(