From d339191e29eaef1a19a2aea09c1eb60ad2aa32a6 Mon Sep 17 00:00:00 2001 From: Zhenchi Date: Mon, 18 Dec 2023 18:36:45 +0800 Subject: [PATCH] refactor: remove reduntant `.compat()` (#2949) * refactor: remove reduntant `.compat()` Signed-off-by: Zhenchi * remove dep Signed-off-by: Zhenchi --------- Signed-off-by: Zhenchi --- Cargo.lock | 2 -- src/mito2/Cargo.toml | 1 - src/mito2/src/sst/parquet/reader.rs | 6 ++---- src/operator/Cargo.toml | 1 - src/operator/src/statement/copy_table_from.rs | 4 +--- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a714e7389..5c4a03af73 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4888,7 +4888,6 @@ dependencies = [ "aquamarine", "arc-swap", "async-channel", - "async-compat", "async-stream", "async-trait", "bytes", @@ -5622,7 +5621,6 @@ name = "operator" version = "0.4.4" dependencies = [ "api", - "async-compat", "async-trait", "auth", "catalog", diff --git a/src/mito2/Cargo.toml b/src/mito2/Cargo.toml index 13d48636d6..10de52cd11 100644 --- a/src/mito2/Cargo.toml +++ b/src/mito2/Cargo.toml @@ -14,7 +14,6 @@ api.workspace = true aquamarine.workspace = true arc-swap = "1.6" async-channel = "1.9" -async-compat = "0.2" async-stream.workspace = true async-trait = "0.1" bytes.workspace = true diff --git a/src/mito2/src/sst/parquet/reader.rs b/src/mito2/src/sst/parquet/reader.rs index 49e38ddc4d..45e36786d4 100644 --- a/src/mito2/src/sst/parquet/reader.rs +++ b/src/mito2/src/sst/parquet/reader.rs @@ -18,7 +18,6 @@ use std::collections::{HashSet, VecDeque}; use std::sync::Arc; use std::time::{Duration, Instant}; -use async_compat::{Compat, CompatExt}; use async_trait::async_trait; use common_telemetry::debug; use common_time::range::TimestampRange; @@ -123,8 +122,7 @@ impl ParquetReaderBuilder { .object_store .reader(&file_path) .await - .context(OpenDalSnafu)? - .compat(); + .context(OpenDalSnafu)?; let mut reader = BufReader::new(reader); // Loads parquet metadata of the file. let parquet_meta = self.read_parquet_metadata(&mut reader, &file_path).await?; @@ -288,7 +286,7 @@ struct RowGroupReaderBuilder { /// Metadata of the parquet file. parquet_meta: Arc, /// Reader to get data. - file_reader: BufReader>, + file_reader: BufReader, /// Projection mask. projection: ProjectionMask, /// Field levels to read. diff --git a/src/operator/Cargo.toml b/src/operator/Cargo.toml index bd49fd9a3e..a0d627b872 100644 --- a/src/operator/Cargo.toml +++ b/src/operator/Cargo.toml @@ -9,7 +9,6 @@ testing = [] [dependencies] api.workspace = true -async-compat = "0.2" async-trait = "0.1" auth.workspace = true catalog.workspace = true diff --git a/src/operator/src/statement/copy_table_from.rs b/src/operator/src/statement/copy_table_from.rs index 2474ee3483..a6944e8938 100644 --- a/src/operator/src/statement/copy_table_from.rs +++ b/src/operator/src/statement/copy_table_from.rs @@ -16,7 +16,6 @@ use std::collections::HashMap; use std::future::Future; use std::sync::Arc; -use async_compat::CompatExt; use common_base::readable_size::ReadableSize; use common_datasource::file_format::csv::{CsvConfigBuilder, CsvOpener}; use common_datasource::file_format::json::JsonOpener; @@ -205,8 +204,7 @@ impl StatementExecutor { .reader(path) .await .context(error::ReadObjectSnafu { path })?; - - let buf_reader = BufReader::new(reader.compat()); + let buf_reader = BufReader::new(reader); let builder = ParquetRecordBatchStreamBuilder::new(buf_reader) .await