Skip to content

Commit

Permalink
Code cleanup: Remove unused imports and functions, update paths, mino…
Browse files Browse the repository at this point in the history
…r refactoring.
  • Loading branch information
shanicky committed Mar 15, 2023
1 parent 039b893 commit 8996d22
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 15 deletions.
3 changes: 1 addition & 2 deletions src/common/src/array/data_chunk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/common/src/hash/consistent_hash/vnode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/common/src/util/scan_range.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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`]
Expand Down
2 changes: 1 addition & 1 deletion src/expr/src/expr/expr_vnode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
5 changes: 1 addition & 4 deletions src/storage/src/table/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 2 additions & 4 deletions src/stream/src/executor/dispatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,18 @@
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;

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};
Expand Down

0 comments on commit 8996d22

Please sign in to comment.