Skip to content

Commit eaae4e0

Browse files
authored
refactor(deps): Bump OpenDAL and other crates (#16251)
* deps: Bump OpenDAL and other crates Signed-off-by: Xuanwo <github@xuanwo.io> * fix test for ahash upgrade Signed-off-by: Xuanwo <github@xuanwo.io> * Fix test Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io>
1 parent 43de923 commit eaae4e0

File tree

44 files changed

+1724
-2159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1724
-2159
lines changed

Cargo.lock

Lines changed: 1710 additions & 2095 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ arrow-udf-js = "0.3.1"
221221
arrow-udf-python = "0.2.1"
222222
arrow-udf-wasm = "0.2.2"
223223
async-backtrace = "0.2"
224-
async-trait = { version = "0.1.77", package = "async-trait-fn" }
224+
async-trait = { version = "0.1.77" }
225225
backtrace = "0.3.73"
226226
base64 = "0.22"
227227
bincode = { version = "2.0.0-rc.3", features = ["serde", "std", "alloc"] }
@@ -256,10 +256,10 @@ jsonb = "0.4.1"
256256
jwt-simple = "0.11.0"
257257
match-template = "0.0.1"
258258
mysql_async = { version = "0.34", default-features = false, features = ["native-tls-tls"] }
259-
object_store_opendal = "0.45"
259+
object_store_opendal = "0.46"
260260
once_cell = "1.15.0"
261261
openai_api_rust = "0.1"
262-
opendal = { version = "0.48.0", features = [
262+
opendal = { version = "0.49.0", features = [
263263
"layers-fastrace",
264264
"layers-prometheus-client",
265265
"layers-async-backtrace",

src/common/storage/src/operator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pub fn build_operator<B: Builder>(builder: B) -> Result<Operator> {
135135
// Add async backtrace
136136
.layer(AsyncBacktraceLayer)
137137
// Add logging
138-
.layer(LoggingLayer::default().with_backtrace_output(true))
138+
.layer(LoggingLayer::default())
139139
// Add tracing
140140
.layer(FastraceLayer)
141141
// Add PrometheusClientLayer

src/query/pipeline/sinks/src/async_mpsc_sink.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use std::any::Any;
1616
use std::sync::Arc;
1717

1818
use async_trait::async_trait;
19-
use async_trait::unboxed_simple;
2019
use databend_common_exception::Result;
2120
use databend_common_expression::DataBlock;
2221
use databend_common_pipeline_core::processors::Event;
@@ -38,7 +37,6 @@ pub trait AsyncMpscSink: Send {
3837
Ok(())
3938
}
4039

41-
#[unboxed_simple]
4240
async fn consume(&mut self, data_block: DataBlock) -> Result<bool>;
4341
}
4442

src/query/pipeline/sinks/src/async_sink.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use std::any::Any;
1616
use std::sync::Arc;
1717

1818
use async_trait::async_trait;
19-
use async_trait::unboxed_simple;
2019
use databend_common_base::runtime::drop_guard;
2120
use databend_common_base::runtime::GlobalIORuntime;
2221
use databend_common_base::runtime::TrySpawn;
@@ -40,7 +39,6 @@ pub trait AsyncSink: Send {
4039
Ok(())
4140
}
4241

43-
#[unboxed_simple]
4442
async fn consume(&mut self, data_block: DataBlock) -> Result<bool>;
4543

4644
fn details_status(&self) -> Option<String> {

src/query/pipeline/sinks/src/union_receive_sink.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use std::sync::Arc;
1616

1717
use async_channel::Sender;
1818
use async_trait::async_trait;
19-
use async_trait::unboxed_simple;
2019
use databend_common_exception::ErrorCode;
2120
use databend_common_exception::Result;
2221
use databend_common_expression::DataBlock;
@@ -46,7 +45,6 @@ impl AsyncSink for UnionReceiveSink {
4645
Ok(())
4746
}
4847

49-
#[unboxed_simple]
5048
#[async_backtrace::framed]
5149
async fn consume(&mut self, data_block: DataBlock) -> Result<bool> {
5250
if let Some(sender) = self.sender.as_ref() {

src/query/pipeline/sinks/tests/it/async_mpsc_sink.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use std::sync::atomic::Ordering;
1717
use std::sync::Arc;
1818

1919
use async_trait::async_trait;
20-
use async_trait::unboxed_simple;
2120
use databend_common_exception::Result;
2221
use databend_common_expression::DataBlock;
2322
use databend_common_pipeline_core::processors::connect;
@@ -51,7 +50,6 @@ impl AsyncMpscSink for TestSink {
5150
Ok(())
5251
}
5352

54-
#[unboxed_simple]
5553
async fn consume(&mut self, data_block: DataBlock) -> Result<bool> {
5654
self.count
5755
.fetch_add(data_block.num_rows(), Ordering::SeqCst);

src/query/pipeline/sources/src/async_source.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ pub trait AsyncSource: Send {
3333
const NAME: &'static str;
3434
const SKIP_EMPTY_DATA_BLOCK: bool = true;
3535

36-
#[async_trait::unboxed_simple]
3736
async fn generate(&mut self) -> Result<Option<DataBlock>>;
3837

3938
fn un_reacted(&self) -> Result<()> {

src/query/pipeline/sources/src/prefetch_async_source.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ pub trait PrefetchAsyncSource: Send {
3333
const NAME: &'static str;
3434
const SKIP_EMPTY_DATA_BLOCK: bool = true;
3535

36-
#[async_trait::unboxed_simple]
3736
async fn generate(&mut self) -> Result<Option<DataBlock>>;
3837
fn is_full(&self, prefetched: &[DataBlock]) -> bool;
3938

src/query/pipeline/sources/src/stream_source.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ impl<const T: bool> AsyncSource for AsyncStreamSource<T> {
5757
const NAME: &'static str = "stream source";
5858
const SKIP_EMPTY_DATA_BLOCK: bool = T;
5959

60-
#[async_trait::unboxed_simple]
6160
#[async_backtrace::framed]
6261
async fn generate(&mut self) -> Result<Option<DataBlock>> {
6362
match self

0 commit comments

Comments
 (0)