From 430b4e692c61587f3af219d5803b9dafe81e27dd Mon Sep 17 00:00:00 2001 From: ZENOTME Date: Thu, 1 Feb 2024 15:34:41 +0800 Subject: [PATCH] update icelake --- Cargo.lock | 2 +- Cargo.toml | 2 +- .../src/source/filesystem/opendal_source/opendal_reader.rs | 3 +-- src/connector/src/source/filesystem/s3/source/reader.rs | 4 +--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca6e6644b505a..7e0115fd1d4f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5063,7 +5063,7 @@ dependencies = [ [[package]] name = "icelake" version = "0.0.10" -source = "git+https://github.com/icelake-io/icelake?rev=3f61f900d6914d4a28c00c2af6374a4dda6d95d4#3f61f900d6914d4a28c00c2af6374a4dda6d95d4" +source = "git+https://github.com/icelake-io/icelake?rev=56943d203464d32701c20d74b278b6b3ef2eefc7#56943d203464d32701c20d74b278b6b3ef2eefc7" dependencies = [ "anyhow", "apache-avro 0.17.0", diff --git a/Cargo.toml b/Cargo.toml index 452a0e39969e3..d2d5005e2c59d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,7 +121,7 @@ tonic = { package = "madsim-tonic", version = "0.4.1" } tonic-build = { package = "madsim-tonic-build", version = "0.4.2" } otlp-embedded = { git = "https://github.com/risingwavelabs/otlp-embedded", rev = "58c1f003484449d7c6dd693b348bf19dd44889cb" } prost = { version = "0.12" } -icelake = { git = "https://github.com/icelake-io/icelake", rev = "3f61f900d6914d4a28c00c2af6374a4dda6d95d4", features = [ +icelake = { git = "https://github.com/icelake-io/icelake", rev = "56943d203464d32701c20d74b278b6b3ef2eefc7", features = [ "prometheus", ] } arrow-array = "50" diff --git a/src/connector/src/source/filesystem/opendal_source/opendal_reader.rs b/src/connector/src/source/filesystem/opendal_source/opendal_reader.rs index d962f6e53e93a..49c6be470d573 100644 --- a/src/connector/src/source/filesystem/opendal_source/opendal_reader.rs +++ b/src/connector/src/source/filesystem/opendal_source/opendal_reader.rs @@ -19,7 +19,6 @@ use futures_async_stream::try_stream; use opendal::Operator; use risingwave_common::array::StreamChunk; use risingwave_common::error::RwError; -use risingwave_pb::meta::table_fragments::fragment; use tokio::io::BufReader; use tokio_util::io::{ReaderStream, StreamReader}; @@ -29,7 +28,7 @@ use crate::parser::{ByteStreamSourceParserImpl, ParserConfig}; use crate::source::filesystem::nd_streaming::need_nd_streaming; use crate::source::filesystem::{nd_streaming, OpendalFsSplit}; use crate::source::{ - self, BoxChunkSourceStream, Column, SourceContextRef, SourceMessage, SourceMeta, SplitMetaData, + BoxChunkSourceStream, Column, SourceContextRef, SourceMessage, SourceMeta, SplitMetaData, SplitReader, }; diff --git a/src/connector/src/source/filesystem/s3/source/reader.rs b/src/connector/src/source/filesystem/s3/source/reader.rs index f992b8381653d..d1e03b91fc6b9 100644 --- a/src/connector/src/source/filesystem/s3/source/reader.rs +++ b/src/connector/src/source/filesystem/s3/source/reader.rs @@ -39,9 +39,7 @@ use crate::source::filesystem::file_common::FsSplit; use crate::source::filesystem::nd_streaming; use crate::source::filesystem::nd_streaming::need_nd_streaming; use crate::source::filesystem::s3::S3Properties; -use crate::source::{ - self, BoxChunkSourceStream, Column, SourceContextRef, SourceMessage, SourceMeta, -}; +use crate::source::{BoxChunkSourceStream, Column, SourceContextRef, SourceMessage, SourceMeta}; const MAX_CHANNEL_BUFFER_SIZE: usize = 2048; const STREAM_READER_CAPACITY: usize = 4096;