diff --git a/components/br-stream/src/codec.rs b/components/br-stream/src/codec.rs index 1ed9c4ca577..59f07b47263 100644 --- a/components/br-stream/src/codec.rs +++ b/components/br-stream/src/codec.rs @@ -2,6 +2,7 @@ use bytes::{Buf, Bytes}; use std::io::prelude::*; use std::io::Cursor; +use tikv_util::Either; pub struct Encoder; @@ -26,7 +27,7 @@ impl Encoder { buf.read_exact(key.as_mut_slice()).unwrap(); let len = buf.get_u32_le() as usize; let mut val = vec![0; len]; - buf.read_exact(buffer.as_mut_slice()).unwrap(); + buf.read_exact(val.as_mut_slice()).unwrap(); (key, val) } } @@ -45,7 +46,7 @@ mod tests { let e = Encoder::encode_event(&key, &val); let mut event = vec![]; for s in e { - event.push(s.into()); + event.extend_from_slice(s.as_ref()); } let (decoded_key, decoded_val) = Encoder::decode_event(&event); assert_eq!(key, decoded_key); diff --git a/components/br-stream/src/endpoint.rs b/components/br-stream/src/endpoint.rs index 969e356c962..7be13216489 100644 --- a/components/br-stream/src/endpoint.rs +++ b/components/br-stream/src/endpoint.rs @@ -19,7 +19,7 @@ use raftstore::coprocessor::CmdBatch; use tikv::config::BackupStreamConfig; use tikv_util::worker::{Runnable, Scheduler}; -use tikv_util::{debug, error, info, Either}; +use tikv_util::{debug, error, info}; use super::metrics::{HANDLE_EVENT_DURATION_HISTOGRAM, HANDLE_KV_HISTOGRAM}; diff --git a/components/br-stream/src/router.rs b/components/br-stream/src/router.rs index c80145f1e3d..9ec155bc0b2 100644 --- a/components/br-stream/src/router.rs +++ b/components/br-stream/src/router.rs @@ -9,7 +9,7 @@ use std::{ time::Duration, }; -use crate::{codec::Encoder, endpoint::Task, errors::Error}; +use crate::{codec::Encoder, endpoint::Task, errors::Error, utils::SlotMap}; use super::errors::Result; use engine_traits::{CF_DEFAULT, CF_WRITE};