From 8996d220f0c5207031744cd32112bcc287e42e29 Mon Sep 17 00:00:00 2001 From: Shanicky Chen Date: Wed, 15 Mar 2023 14:27:25 +0800 Subject: [PATCH] Code cleanup: Remove unused imports and functions, update paths, minor refactoring. --- src/common/src/array/data_chunk.rs | 3 +-- src/common/src/hash/consistent_hash/vnode.rs | 4 ++-- src/common/src/util/scan_range.rs | 3 +-- src/expr/src/expr/expr_vnode.rs | 2 +- src/storage/src/table/mod.rs | 5 +---- src/stream/src/executor/dispatch.rs | 6 ++---- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/common/src/array/data_chunk.rs b/src/common/src/array/data_chunk.rs index ddefbc5b2ff13..54ce16beeab91 100644 --- a/src/common/src/array/data_chunk.rs +++ b/src/common/src/array/data_chunk.rs @@ -23,7 +23,7 @@ use risingwave_pb::data::DataChunk as ProstDataChunk; use super::{ArrayResult, Vis}; use crate::array::column::Column; use crate::array::data_chunk_iter::RowRef; -use crate::array::{Array, ArrayBuilderImpl, ArrayImpl, StructValue}; +use crate::array::{ArrayBuilderImpl, StructValue}; use crate::buffer::{Bitmap, BitmapBuilder}; use crate::hash::HashCode; use crate::row::Row; @@ -32,7 +32,6 @@ use crate::types::to_text::ToText; use crate::types::{DataType, Datum, NaiveDateTimeWrapper, ToOwnedDatum}; use crate::util::hash_util::finalize_hashers; use crate::util::iter_util::{ZipEqDebug, ZipEqFast}; -use crate::util::row_id::extract_vnode_id_from_row_id; use crate::util::value_encoding::{serialize_datum_into, ValueRowSerializer}; /// `DataChunk` is a collection of arrays with visibility mask. diff --git a/src/common/src/hash/consistent_hash/vnode.rs b/src/common/src/hash/consistent_hash/vnode.rs index 198fcd87a1d49..a98685da803df 100644 --- a/src/common/src/hash/consistent_hash/vnode.rs +++ b/src/common/src/hash/consistent_hash/vnode.rs @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::hash::{BuildHasher, Hasher}; +use std::hash::BuildHasher; use itertools::Itertools; use parse_display::Display; use crate::array::{Array, ArrayImpl, DataChunk}; use crate::hash::HashCode; -use crate::row::{Row, RowExt}; +use crate::row::Row; use crate::types::ScalarRefImpl; use crate::util::hash_util::Crc32FastBuilder; use crate::util::row_id::extract_vnode_id_from_row_id; diff --git a/src/common/src/util/scan_range.rs b/src/common/src/util/scan_range.rs index 371a4124f7a47..6664250244cad 100644 --- a/src/common/src/util/scan_range.rs +++ b/src/common/src/util/scan_range.rs @@ -21,9 +21,8 @@ use risingwave_pb::batch_plan::ScanRange as ScanRangeProst; use super::value_encoding::serialize_datum; use crate::catalog::get_dist_key_in_pk_indices; use crate::hash::VirtualNode; -use crate::row::{Row, RowExt}; +use crate::row::RowExt; use crate::types::{Datum, ScalarImpl}; -use crate::util::hash_util::Crc32FastBuilder; use crate::util::value_encoding::serialize_datum_into; /// See also [`ScanRangeProst`] diff --git a/src/expr/src/expr/expr_vnode.rs b/src/expr/src/expr/expr_vnode.rs index 9c39d1fdbeab4..49a12cf98e5ff 100644 --- a/src/expr/src/expr/expr_vnode.rs +++ b/src/expr/src/expr/expr_vnode.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use risingwave_common::array::{ArrayBuilder, ArrayImpl, ArrayRef, DataChunk, I16ArrayBuilder}; use risingwave_common::hash::VirtualNode; -use risingwave_common::row::{OwnedRow, Row, RowExt}; +use risingwave_common::row::{OwnedRow, RowExt}; use risingwave_common::types::{DataType, Datum}; use risingwave_common::util::hash_util::Crc32FastBuilder; use risingwave_pb::expr::expr_node::{RexNode, Type}; diff --git a/src/storage/src/table/mod.rs b/src/storage/src/table/mod.rs index 142512e5e9232..a5af790fbc9ab 100644 --- a/src/storage/src/table/mod.rs +++ b/src/storage/src/table/mod.rs @@ -16,16 +16,13 @@ pub mod batch_table; use std::sync::{Arc, LazyLock}; -use itertools::Itertools; use risingwave_common::array::DataChunk; use risingwave_common::buffer::{Bitmap, BitmapBuilder}; use risingwave_common::catalog::Schema; -use risingwave_common::hash::{HashCode, VirtualNode}; +use risingwave_common::hash::VirtualNode; use risingwave_common::row::{OwnedRow, Row, RowExt}; -use risingwave_common::types::ScalarRefImpl; use risingwave_common::util::hash_util::Crc32FastBuilder; use risingwave_common::util::iter_util::ZipEqFast; -use risingwave_common::util::row_id::extract_vnode_id_from_row_id; use crate::error::StorageResult; diff --git a/src/stream/src/executor/dispatch.rs b/src/stream/src/executor/dispatch.rs index a9986e7051a66..5868ddff048ef 100644 --- a/src/stream/src/executor/dispatch.rs +++ b/src/stream/src/executor/dispatch.rs @@ -15,7 +15,6 @@ use std::collections::{HashMap, HashSet}; use std::fmt::Debug; use std::future::Future; -use std::hash::Hasher; use std::iter::repeat_with; use std::sync::Arc; @@ -23,12 +22,11 @@ use await_tree::InstrumentAwait; use futures::Stream; use futures_async_stream::try_stream; use itertools::Itertools; -use risingwave_common::array::{Array, ArrayImpl, DataChunk, Op, StreamChunk}; +use risingwave_common::array::{Op, StreamChunk}; use risingwave_common::buffer::BitmapBuilder; -use risingwave_common::hash::{ActorMapping, ExpandedActorMapping, HashCode, VirtualNode}; +use risingwave_common::hash::{ActorMapping, ExpandedActorMapping, VirtualNode}; use risingwave_common::util::hash_util::Crc32FastBuilder; use risingwave_common::util::iter_util::ZipEqFast; -use risingwave_common::util::row_id::extract_vnode_id_from_row_id; use risingwave_pb::stream_plan::update_mutation::DispatcherUpdate as ProstDispatcherUpdate; use risingwave_pb::stream_plan::Dispatcher as ProstDispatcher; use smallvec::{smallvec, SmallVec};