Skip to content

Commit

Permalink
fix import
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Chien <[email protected]>
  • Loading branch information
stdrc committed Apr 2, 2024
1 parent 2bf54a5 commit 2d11b72
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ postgres-types = { version = "0.2.6", features = [
"with-chrono-0_4",
"with-serde_json-1",
] }
prehash = "1"
prometheus = { version = "0.13" }
prost = { workspace = true }
rand = "0.8"
Expand Down
1 change: 1 addition & 0 deletions src/stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ memcomparable = "0.2"
multimap = "0.10"
parking_lot = "0.12"
pin-project = "1"
prehash = "1"
prometheus = { version = "0.13", features = ["process"] }
prost = { workspace = true }
rand = "0.8"
Expand Down
20 changes: 10 additions & 10 deletions src/stream/src/common/compact_chunk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@ use std::mem;

use itertools::Itertools;
use prehash::{new_prehashed_map_with_capacity, Passthru, Prehashed};

use super::stream_chunk::{OpRowMutRef, StreamChunkMut};
use super::stream_chunk_builder::StreamChunkBuilder;
use super::stream_record::Record;
use super::DataType;
use crate::array::{Op, RowRef, StreamChunk};
use crate::row::{Project, RowExt};
use crate::util::hash_util::Crc32FastBuilder;
use risingwave_common::array::stream_chunk::{OpRowMutRef, StreamChunkMut};
use risingwave_common::array::stream_chunk_builder::StreamChunkBuilder;
use risingwave_common::array::stream_record::Record;
use risingwave_common::array::{Op, RowRef, StreamChunk};
use risingwave_common::row::{Project, RowExt};
use risingwave_common::types::DataType;
use risingwave_common::util::hash_util::Crc32FastBuilder;

/// A helper to compact the stream chunks by modifying the `Ops` and visibility of the chunk.
pub struct StreamChunkCompactor {
Expand Down Expand Up @@ -292,9 +291,10 @@ pub fn merge_chunk_row(stream_chunk: StreamChunk, pk_indices: &[usize]) -> Strea

#[cfg(test)]
mod tests {
use risingwave_common::array::StreamChunk;
use risingwave_common::test_prelude::StreamChunkTestExt;

use super::*;
use crate::array::StreamChunk;
use crate::test_prelude::StreamChunkTestExt;

#[test]
fn test_merge_chunk_row() {
Expand Down
3 changes: 2 additions & 1 deletion src/stream/src/executor/sink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use futures::{pin_mut, FutureExt, StreamExt, TryFutureExt, TryStreamExt};
use futures_async_stream::try_stream;
use itertools::Itertools;
use risingwave_common::array::stream_chunk::StreamChunkMut;
use risingwave_common::array::{merge_chunk_row, Op, StreamChunk, StreamChunkCompactor};
use risingwave_common::array::{Op, StreamChunk};
use risingwave_common::catalog::{ColumnCatalog, Field, Schema};
use risingwave_common::metrics::GLOBAL_ERROR_METRICS;
use risingwave_common::types::DataType;
Expand All @@ -36,6 +36,7 @@ use thiserror_ext::AsReport;

use super::error::{StreamExecutorError, StreamExecutorResult};
use super::{Execute, Executor, ExecutorInfo, Message, PkIndices};
use crate::common::compact_chunk::{merge_chunk_row, StreamChunkCompactor};
use crate::executor::{
expect_first_barrier, ActorContextRef, BoxedMessageStream, MessageStream, Mutation,
};
Expand Down

0 comments on commit 2d11b72

Please sign in to comment.