tustvold commented on code in PR #4930:
URL: https://github.com/apache/arrow-rs/pull/4930#discussion_r1358288349
##########
object_store/src/limit.rs:
##########
@@ -147,23 +147,24 @@ impl<T: ObjectStore> ObjectStore for LimitStore<T> {
self.inner.delete_stream(locations)
}
- async fn list(
- &self,
- prefix: Option<&Path>,
- ) -> Result<BoxStream<'_, Result<ObjectMeta>>> {
- let permit =
Arc::clone(&self.semaphore).acquire_owned().await.unwrap();
- let s = self.inner.list(prefix).await?;
- Ok(PermitWrapper::new(s, permit).boxed())
+ fn list(&self, prefix: Option<&Path>) -> BoxStream<'_, Result<ObjectMeta>>
{
+ let s = self.inner.list(prefix);
+ let fut = Arc::clone(&self.semaphore)
+ .acquire_owned()
+ .map(|permit| PermitWrapper::new(s, permit.unwrap()));
+ fut.into_stream().flatten().boxed()
}
- async fn list_with_offset(
+ fn list_with_offset(
&self,
prefix: Option<&Path>,
offset: &Path,
- ) -> Result<BoxStream<'_, Result<ObjectMeta>>> {
- let permit =
Arc::clone(&self.semaphore).acquire_owned().await.unwrap();
- let s = self.inner.list_with_offset(prefix, offset).await?;
- Ok(PermitWrapper::new(s, permit).boxed())
+ ) -> BoxStream<'_, Result<ObjectMeta>> {
+ let s = self.inner.list_with_offset(prefix, offset);
+ let fut = Arc::clone(&self.semaphore)
Review Comment:
This somewhat peculiar ordering is required because the returned stream
cannot borrow prefix
##########
object_store/src/limit.rs:
##########
@@ -147,23 +147,24 @@ impl<T: ObjectStore> ObjectStore for LimitStore<T> {
self.inner.delete_stream(locations)
}
- async fn list(
- &self,
- prefix: Option<&Path>,
- ) -> Result<BoxStream<'_, Result<ObjectMeta>>> {
- let permit =
Arc::clone(&self.semaphore).acquire_owned().await.unwrap();
- let s = self.inner.list(prefix).await?;
- Ok(PermitWrapper::new(s, permit).boxed())
+ fn list(&self, prefix: Option<&Path>) -> BoxStream<'_, Result<ObjectMeta>>
{
+ let s = self.inner.list(prefix);
+ let fut = Arc::clone(&self.semaphore)
+ .acquire_owned()
+ .map(|permit| PermitWrapper::new(s, permit.unwrap()));
+ fut.into_stream().flatten().boxed()
}
- async fn list_with_offset(
+ fn list_with_offset(
&self,
prefix: Option<&Path>,
offset: &Path,
- ) -> Result<BoxStream<'_, Result<ObjectMeta>>> {
- let permit =
Arc::clone(&self.semaphore).acquire_owned().await.unwrap();
- let s = self.inner.list_with_offset(prefix, offset).await?;
- Ok(PermitWrapper::new(s, permit).boxed())
+ ) -> BoxStream<'_, Result<ObjectMeta>> {
+ let s = self.inner.list_with_offset(prefix, offset);
+ let fut = Arc::clone(&self.semaphore)
Review Comment:
This somewhat peculiar ordering is required because the returned stream
cannot borrow prefix, only self
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
