Skip to content

Commit 0c54654

Browse files
committed
return full response from s3_get
1 parent 785c1c3 commit 0c54654

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

  • libsql-wal/src/storage/backend

libsql-wal/src/storage/backend/s3.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use std::task::Poll;
1010

1111
use aws_config::SdkConfig;
1212
use aws_sdk_s3::operation::create_bucket::CreateBucketError;
13+
use aws_sdk_s3::operation::get_object::GetObjectOutput;
1314
use aws_sdk_s3::primitives::{ByteStream, SdkBody};
1415
use aws_sdk_s3::types::CreateBucketConfiguration;
1516
use aws_sdk_s3::Client;
@@ -128,7 +129,7 @@ impl<IO: Io> S3Backend<IO> {
128129
) -> Result<impl AsyncRead> {
129130
let key = s3_segment_data_key(folder_key, segment_key);
130131
let stream = self.s3_get(config, key).await?;
131-
Ok(stream.into_async_read())
132+
Ok(stream.body.into_async_read())
132133
}
133134

134135
async fn fetch_segment_data_inner(
@@ -158,8 +159,7 @@ impl<IO: Io> S3Backend<IO> {
158159
.key(key.to_string())
159160
.send()
160161
.await
161-
.map_err(|e| Error::unhandled(e, "error sending s3 GET request"))?
162-
.body)
162+
.map_err(|e| Error::unhandled(e, "error sending s3 GET request"))?)
163163
}
164164

165165
async fn s3_put(&self, config: &S3Config, key: impl ToString, body: ByteStream) -> Result<()> {
@@ -181,7 +181,7 @@ impl<IO: Io> S3Backend<IO> {
181181
segment_key: &SegmentKey,
182182
) -> Result<fst::Map<Arc<[u8]>>> {
183183
let s3_index_key = s3_segment_index_key(folder_key, segment_key);
184-
let mut stream = self.s3_get(config, s3_index_key).await?.into_async_read();
184+
let mut stream = self.s3_get(config, s3_index_key).await?.body.into_async_read();
185185
let mut header: SegmentIndexHeader = SegmentIndexHeader::new_zeroed();
186186
stream.read_exact(header.as_bytes_mut()).await?;
187187
if header.magic.get() != LIBSQL_MAGIC && header.version.get() != 1 {

0 commit comments

Comments
 (0)