todo: get_object_reader

This commit is contained in:
weisd
2024-07-18 16:25:46 +08:00
parent fc04e08873
commit 1a6fa86fc2
7 changed files with 56 additions and 10 deletions
+15 -2
View File
@@ -1,4 +1,5 @@
use anyhow::Result;
use http::HeaderMap;
use uuid::Uuid;
use crate::{
@@ -7,8 +8,8 @@ use crate::{
format::{DistributionAlgoVersion, FormatV3},
set_disk::SetDisks,
store_api::{
BucketInfo, BucketOptions, CompletePart, FileInfo, MakeBucketOptions, MultipartUploadResult, ObjectInfo, ObjectOptions,
PartInfo, PutObjReader, StorageAPI,
BucketInfo, BucketOptions, CompletePart, FileInfo, GetObjectReader, HTTPRangeSpec, MakeBucketOptions,
MultipartUploadResult, ObjectInfo, ObjectOptions, PartInfo, PutObjReader, StorageAPI,
},
utils::hash,
};
@@ -132,6 +133,18 @@ impl StorageAPI for Sets {
async fn get_object_info(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<ObjectInfo> {
self.get_disks_by_key(object).get_object_info(bucket, object, opts).await
}
async fn get_Object_reader(
&self,
bucket: &str,
object: &str,
range: HTTPRangeSpec,
h: HeaderMap,
opts: &ObjectOptions,
) -> Result<GetObjectReader> {
self.get_disks_by_key(object)
.get_Object_reader(bucket, object, range, h, opts)
.await
}
async fn put_object(&self, bucket: &str, object: &str, data: PutObjReader, opts: &ObjectOptions) -> Result<()> {
self.get_disks_by_key(object).put_object(bucket, object, data, opts).await
}
+19 -2
View File
@@ -2,6 +2,7 @@ use std::collections::HashMap;
use anyhow::{Error, Result};
use http::HeaderMap;
use s3s::{dto::StreamingBlob, Body};
use uuid::Uuid;
@@ -14,8 +15,8 @@ use crate::{
peer::{PeerS3Client, S3PeerSys},
sets::Sets,
store_api::{
BucketInfo, BucketOptions, CompletePart, MakeBucketOptions, MultipartUploadResult, ObjectInfo, ObjectOptions, PartInfo,
PutObjReader, StorageAPI,
BucketInfo, BucketOptions, CompletePart, GetObjectReader, HTTPRangeSpec, MakeBucketOptions, MultipartUploadResult,
ObjectInfo, ObjectOptions, PartInfo, PutObjReader, StorageAPI,
},
store_init, utils,
};
@@ -160,6 +161,22 @@ impl StorageAPI for ECStore {
unimplemented!()
}
async fn get_Object_reader(
&self,
bucket: &str,
object: &str,
range: HTTPRangeSpec,
h: HeaderMap,
opts: &ObjectOptions,
) -> Result<GetObjectReader> {
let object = utils::path::encode_dir_object(object);
if self.single_pool() {
return self.pools[0].get_Object_reader(bucket, object.as_str(), range, h, opts).await;
}
unimplemented!()
}
async fn put_object(&self, bucket: &str, object: &str, data: PutObjReader, opts: &ObjectOptions) -> Result<()> {
// checkPutObjectArgs
+16
View File
@@ -1,4 +1,5 @@
use anyhow::Result;
use http::HeaderMap;
use rmp_serde::Serializer;
use s3s::dto::StreamingBlob;
use serde::{Deserialize, Serialize};
@@ -236,6 +237,13 @@ impl PutObjReader {
}
}
pub struct GetObjectReader {
pub stream: StreamingBlob,
pub object_info: ObjectInfo,
}
pub struct HTTPRangeSpec {}
#[derive(Debug)]
pub struct ObjectOptions {
// Use the maximum parity (N/2), used when saving server configuration files
@@ -302,6 +310,14 @@ pub trait StorageAPI {
async fn make_bucket(&self, bucket: &str, opts: &MakeBucketOptions) -> Result<()>;
async fn get_bucket_info(&self, bucket: &str, opts: &BucketOptions) -> Result<BucketInfo>;
async fn get_object_info(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<ObjectInfo>;
async fn get_Object_reader(
&self,
bucket: &str,
object: &str,
range: HTTPRangeSpec,
h: HeaderMap,
opts: &ObjectOptions,
) -> Result<GetObjectReader>;
async fn put_object(&self, bucket: &str, object: &str, data: PutObjReader, opts: &ObjectOptions) -> Result<()>;
async fn put_object_part(
&self,