refactor: Avoid accessor in object entry (#992)

* Save work Signed-off-by: Xuanwo <[email protected]> * Save work Signed-off-by: Xuanwo <[email protected]> * Save work Signed-off-by: Xuanwo <[email protected]> * Save work Signed-off-by: Xuanwo <[email protected]> * Fix Signed-off-by: Xuanwo <[email protected]> * Save work Signed-off-by: Xuanwo <[email protected]> * Format code Signed-off-by: Xuanwo <[email protected]> * Fix build Signed-off-by: Xuanwo <[email protected]> * polish API Signed-off-by: Xuanwo <[email protected]> * Polish stat Signed-off-by: Xuanwo <[email protected]> * Make sure cache updated Signed-off-by: Xuanwo <[email protected]> * Update comments for object Signed-off-by: Xuanwo <[email protected]> * Fix test Signed-off-by: Xuanwo <[email protected]> * Fix link Signed-off-by: Xuanwo <[email protected]> * Fix ftp Signed-off-by: Xuanwo <[email protected]> Signed-off-by: Xuanwo <[email protected]>
apache · Nov 24, 2022 · 0b9eb7d · 0b9eb7d · github-actions · Nov 24, 2022
1 parent 296e4e5
commit 0b9eb7d
Show file tree

Hide file tree

Showing 52 changed files with 1,401 additions and 1,575 deletions.
diff --git a/examples/ftp.rs b/examples/ftp.rs
@@ -33,7 +33,7 @@ async fn main() -> Result<()> {
         r#"OpenDAL ftp Example.
 
 Available Environment Values:
-    - OPENDAL_FTP_ENDPOINT=endpoint     # required  
+    - OPENDAL_FTP_ENDPOINT=endpoint     # required
     - OPENDAL_FTP_ROOT=/path/to/dir/   # if not set, will be seen as "/"
     - OPENDAL_FTP_USER=user    # default with empty string ""
     - OPENDAL_FTP_PASSWORD=password    # default with empty string ""

diff --git a/src/accessor.rs b/src/accessor.rs
@@ -19,6 +19,8 @@ use async_trait::async_trait;
 use flagset::flags;
 use flagset::FlagSet;
 
+use crate::object::BlockingObjectPager;
+use crate::object::ObjectPager;
 use crate::ops::*;
 use crate::*;
 
@@ -173,7 +175,7 @@ pub trait Accessor: Send + Sync + Debug + 'static {
     ///
     /// - Input path MUST be dir path, DON'T NEED to check object mode.
     /// - List non-exist dir should return Empty.
-    async fn list(&self, path: &str, args: OpList) -> Result<ObjectStreamer> {
+    async fn list(&self, path: &str, args: OpList) -> Result<(RpList, ObjectPager)> {
         match self.inner() {
             Some(inner) => inner.list(path, args).await,
             None => Err(Error::new(
@@ -370,7 +372,7 @@ pub trait Accessor: Send + Sync + Debug + 'static {
     ///
     /// - Require capability: `Blocking`
     /// - List non-exist dir should return Empty.
-    fn blocking_list(&self, path: &str, args: OpList) -> Result<ObjectIterator> {
+    fn blocking_list(&self, path: &str, args: OpList) -> Result<(RpList, BlockingObjectPager)> {
         match self.inner() {
             Some(inner) => inner.blocking_list(path, args),
             None => Err(Error::new(
@@ -404,7 +406,7 @@ impl<T: Accessor> Accessor for Arc<T> {
     async fn delete(&self, path: &str, args: OpDelete) -> Result<RpDelete> {
         self.as_ref().delete(path, args).await
     }
-    async fn list(&self, path: &str, args: OpList) -> Result<ObjectStreamer> {
+    async fn list(&self, path: &str, args: OpList) -> Result<(RpList, ObjectPager)> {
         self.as_ref().list(path, args).await
     }
 
@@ -457,7 +459,7 @@ impl<T: Accessor> Accessor for Arc<T> {
     fn blocking_delete(&self, path: &str, args: OpDelete) -> Result<RpDelete> {
         self.as_ref().blocking_delete(path, args)
     }
-    fn blocking_list(&self, path: &str, args: OpList) -> Result<ObjectIterator> {
+    fn blocking_list(&self, path: &str, args: OpList) -> Result<(RpList, BlockingObjectPager)> {
         self.as_ref().blocking_list(path, args)
     }
 }