Skip to content

Commit 4ceef51

Browse files
author
Devdutt Shenoi
committed
refactor: ObjectStorage: Send by default
1 parent 1f084d7 commit 4ceef51

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

server/src/catalog/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fn get_file_bounds(
101101
}
102102

103103
pub async fn update_snapshot(
104-
storage: Arc<dyn ObjectStorage + Send>,
104+
storage: Arc<dyn ObjectStorage>,
105105
stream_name: &str,
106106
change: manifest::File,
107107
) -> Result<(), ObjectStorageError> {
@@ -239,7 +239,7 @@ pub async fn update_snapshot(
239239
async fn create_manifest(
240240
lower_bound: DateTime<Utc>,
241241
change: manifest::File,
242-
storage: Arc<dyn ObjectStorage + Send>,
242+
storage: Arc<dyn ObjectStorage>,
243243
stream_name: &str,
244244
update_snapshot: bool,
245245
mut meta: ObjectStoreFormat,

server/src/handlers/http/ingest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ pub async fn create_stream_if_not_exists(
224224
}
225225
metadata::STREAM_INFO
226226
.upsert_stream_info(
227-
&*store,
227+
store.as_ref(),
228228
LogStream {
229229
name: stream_name.to_owned(),
230230
},

server/src/handlers/http/modal/ingest/ingester_logstream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub async fn put_enable_cache(
8585
}
8686
metadata::STREAM_INFO
8787
.upsert_stream_info(
88-
&*storage,
88+
storage.as_ref(),
8989
LogStream {
9090
name: stream_name.clone().to_owned(),
9191
},

server/src/query/listing_table_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl ListingTableBuilder {
5656

5757
pub async fn populate_via_listing(
5858
self,
59-
storage: Arc<dyn ObjectStorage + Send>,
59+
storage: Arc<dyn ObjectStorage>,
6060
client: Arc<dyn ObjectStore>,
6161
time_filters: &[PartialTimeFilter],
6262
) -> Result<Self, DataFusionError> {

server/src/query/stream_schema_provider.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ use crate::catalog::Snapshot as CatalogSnapshot;
7575

7676
// schema provider for stream based on global data
7777
pub struct GlobalSchemaProvider {
78-
pub storage: Arc<dyn ObjectStorage + Send>,
78+
pub storage: Arc<dyn ObjectStorage>,
7979
}
8080

8181
#[async_trait::async_trait]
@@ -614,7 +614,7 @@ async fn get_hottier_exectuion_plan(
614614
#[allow(clippy::too_many_arguments)]
615615
async fn legacy_listing_table(
616616
stream: String,
617-
glob_storage: Arc<dyn ObjectStorage + Send>,
617+
glob_storage: Arc<dyn ObjectStorage>,
618618
object_store: Arc<dyn ObjectStore>,
619619
time_filters: &[PartialTimeFilter],
620620
schema: Arc<Schema>,

server/src/stats.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ pub fn get_current_stats(stream_name: &str, format: &'static str) -> Option<Full
100100
}
101101

102102
pub async fn update_deleted_stats(
103-
storage: Arc<dyn ObjectStorage + Send>,
103+
storage: Arc<dyn ObjectStorage>,
104104
stream_name: &str,
105105
meta: ObjectStoreFormat,
106106
dates: Vec<String>,

0 commit comments

Comments
 (0)