merge remote support

This commit is contained in:
weisd
2024-09-26 16:04:20 +08:00
parent 67c05c9c37
commit 98f48ba067
4 changed files with 8 additions and 12 deletions
+7 -9
View File
@@ -18,16 +18,14 @@ use crate::{
store_api::{FileInfo, RawFileInfo}, store_api::{FileInfo, RawFileInfo},
utils, utils,
}; };
use bytes::Bytes;
use path_absolutize::Absolutize; use path_absolutize::Absolutize;
use std::io::Read;
use std::{ use std::{
fs::Metadata, fs::Metadata,
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use time::{util, OffsetDateTime}; use time::OffsetDateTime;
use tokio::fs::{self, File}; use tokio::fs::{self, File};
use tokio::io::{self, AsyncReadExt, AsyncWriteExt, ErrorKind}; use tokio::io::{AsyncReadExt, AsyncWriteExt, ErrorKind};
use tokio::sync::Mutex; use tokio::sync::Mutex;
use tracing::{debug, warn}; use tracing::{debug, warn};
use uuid::Uuid; use uuid::Uuid;
@@ -1343,12 +1341,12 @@ impl DiskAPI for LocalDisk {
async fn delete_version( async fn delete_version(
&self, &self,
volume: &str, volume: &str,
path: &str, _path: &str,
fi: FileInfo, _fi: FileInfo,
force_del_marker: bool, _force_del_marker: bool,
opts: DeleteOptions, _opts: DeleteOptions,
) -> Result<RawFileInfo> { ) -> Result<RawFileInfo> {
let volume_dir = self.get_bucket_path(&volume)?; let _volume_dir = self.get_bucket_path(&volume)?;
// self.read_all_data(bucket, volume_dir, path); // self.read_all_data(bucket, volume_dir, path);
+1 -1
View File
@@ -19,7 +19,7 @@ use crate::{
file_meta::FileMeta, file_meta::FileMeta,
store_api::{FileInfo, RawFileInfo}, store_api::{FileInfo, RawFileInfo},
}; };
use bytes::Bytes;
use endpoint::Endpoint; use endpoint::Endpoint;
use protos::proto_gen::node_service::{node_service_client::NodeServiceClient, ReadAtRequest, WriteRequest}; use protos::proto_gen::node_service::{node_service_client::NodeServiceClient, ReadAtRequest, WriteRequest};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
-1
View File
@@ -3,7 +3,6 @@ use std::{
path::{Component, Path}, path::{Component, Path},
}; };
use futures::TryFutureExt;
use tokio::fs; use tokio::fs;
use crate::{ use crate::{
-1
View File
@@ -1,6 +1,5 @@
use std::{path::PathBuf, sync::Arc, time::Duration}; use std::{path::PathBuf, sync::Arc, time::Duration};
use bytes::Bytes;
use futures::lock::Mutex; use futures::lock::Mutex;
use protos::{ use protos::{
node_service_time_out_client, node_service_time_out_client,