Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(services/gcs): support sink #2576

Merged
merged 1 commit into from
Jun 30, 2023
Merged

feat(services/gcs): support sink #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/services/gcs/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ impl Accessor for GcsBackend {
read_with_if_none_match: true,

write: true,
write_can_sink: true,
write_with_content_type: true,
write_without_content_length: true,
delete: true,
Expand Down
2 changes: 1 addition & 1 deletion core/src/services/gcs/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ impl GcsCore {
pub fn gcs_insert_object_request(
&self,
path: &str,
size: Option<usize>,
size: Option<u64>,
content_type: Option<&str>,
body: AsyncBody,
) -> Result<Request<AsyncBody>> {
Expand Down
17 changes: 8 additions & 9 deletions core/src/services/gcs/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ impl GcsWriter {
}
}

async fn write_oneshot(&self, bs: Bytes) -> Result<()> {
async fn write_oneshot(&self, size: u64, body: AsyncBody) -> Result<()> {
let mut req = self.core.gcs_insert_object_request(
&percent_encode_path(&self.path),
Some(bs.len()),
Some(size),
self.op.content_type(),
AsyncBody::Bytes(bs),
body,
)?;

self.core.sign(&mut req).await?;
Expand Down Expand Up @@ -125,7 +125,9 @@ impl oio::Write for GcsWriter {
if self.op.content_length().unwrap_or_default() == bs.len() as u64
&& self.written == 0
{
return self.write_oneshot(bs).await;
return self
.write_oneshot(bs.len() as u64, AsyncBody::Bytes(bs))
.await;
} else {
let location = self.initiate_upload().await?;
self.location = Some(location);
Expand Down Expand Up @@ -162,11 +164,8 @@ impl oio::Write for GcsWriter {
}
}

async fn sink(&mut self, _size: u64, _s: oio::Streamer) -> Result<()> {
Err(Error::new(
ErrorKind::Unsupported,
"Write::sink is not supported",
))
async fn sink(&mut self, size: u64, s: oio::Streamer) -> Result<()> {
self.write_oneshot(size, AsyncBody::Stream(s)).await
}

async fn abort(&mut self) -> Result<()> {
Expand Down