tosnativeclient 1.0.5__tar.gz → 1.0.6__tar.gz

{tosnativeclient-1.0.5 → tosnativeclient-1.0.6}/Cargo.lock

@@ -1521,7 +1521,7 @@ dependencies = [
 
 [[package]]
 name = "tosnativeclient"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
  "arc-swap",
  "async-channel",

{tosnativeclient-1.0.5 → tosnativeclient-1.0.6}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tosnativeclient"
-version = "1.0.5"
+version = "1.0.6"
 edition = "2021"
 publish = false
 authors = ["xiangshijian"]

{tosnativeclient-1.0.5 → tosnativeclient-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tosnativeclient
-Version: 1.0.5
+Version: 1.0.6
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{tosnativeclient-1.0.5 → tosnativeclient-1.0.6}/src/read_stream.rs

@@ -11,6 +11,7 @@ use std::sync::atomic::{AtomicI8, AtomicIsize, Ordering};
 use std::sync::Arc;
 use tokio::runtime::{Handle, Runtime};
 use tokio::sync::{Mutex, MutexGuard};
+use tokio::task::JoinHandle;
 use tracing::log::{error, warn};
 use ve_tos_rust_sdk::asynchronous::object::ObjectAPI;
 use ve_tos_rust_sdk::error::TosError;
@@ -341,9 +342,9 @@ impl ObjectFetcher {
             return None;
         }
 
-        let task = self.new_fetch_task(fc);
+        let mut task = self.new_fetch_task(fc);
         self.revise_next_request_offset_and_size(fc, task.size);
-        task.async_fetch(self.client.clone(), runtime);
+        task.wait_async_fetch = Some(task.async_fetch(self.client.clone(), runtime));
         Some(task)
     }
 
@@ -512,6 +513,7 @@ impl ObjectFetcher {
             chunk_queue: Arc::new(ChunkQueue::new(self.calc_chunk_queue_size() as usize)),
             last_chunk: ChunkHolder::new(None),
             closed: self.closed.clone(),
+            wait_async_fetch: None,
         }
     }
 
@@ -537,6 +539,7 @@ impl ObjectFetcher {
             chunk_queue: Arc::new(ChunkQueue::new(chunks.len())),
             last_chunk: ChunkHolder { inner: None },
             closed: self.closed.clone(),
+            wait_async_fetch: None,
         };
 
         for chunk in chunks {
@@ -653,6 +656,7 @@ struct FetchTask {
     chunk_queue: Arc<ChunkQueue>,
     last_chunk: ChunkHolder,
     closed: Arc<AtomicI8>,
+    wait_async_fetch: Option<JoinHandle<()>>,
 }
 
 impl FetchTask {
@@ -666,12 +670,12 @@ impl FetchTask {
         self.start_offset + self.fetched_size.load(Ordering::Acquire)
     }
 
-    fn async_fetch(&self, client: Arc<InnerTosClient>, runtime: Arc<Runtime>) {
+    fn async_fetch(&self, client: Arc<InnerTosClient>, runtime: Arc<Runtime>) -> JoinHandle<()> {
         let fetch_task_context = FetchTaskContext::new(self, client);
         runtime.spawn(async move {
             fetch_task_context.fetch_from_server().await;
             fetch_task_context.chunk_queue.close();
-        });
+        })
     }
 
     async fn read(&mut self, length: isize) -> Option<Chunk> {
@@ -716,6 +720,9 @@ impl FetchTask {
             self.shared_prefetch_task.fetch_add(-1, Ordering::Release);
             self.pcontext.release_shared_prefetch_task();
         }
+        if let Some(wait_execute) = self.wait_async_fetch.take() {
+            let _ = wait_execute.await;
+        }
     }
 }