Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion obstore/src/buffered.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,10 @@ async fn read(reader: Arc<Mutex<BufReader>>, size: Option<usize>) -> PyResult<Py
let mut reader = reader.lock().await;
if let Some(size) = size {
let mut buf = vec![0; size as _];
reader.read_exact(&mut buf).await?;
let n = reader.read(&mut buf).await?;
if n < buf.len() {
buf.truncate(n);
}
Ok(Bytes::from(buf).into())
} else {
let mut buf = Vec::new();
Expand Down
35 changes: 35 additions & 0 deletions tests/test_buffered.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from io import BytesIO

import pytest

import obstore as obs
Expand Down Expand Up @@ -77,3 +79,36 @@ async def test_writable_file_async():
resp = await obs.get_async(store, path)
retour = await resp.bytes_async()
assert retour == line * 50


def test_read_past_eof_sync():
store = MemoryStore()

data = b"Hello, World!"
path = "greeting.txt"
obs.put(store, path, data)

file = obs.open_reader(store, path)
buffer = file.read(20)
assert memoryview(data) == memoryview(buffer)

buf = BytesIO(data)
expected = buf.read(20)
assert memoryview(expected) == memoryview(buffer)


@pytest.mark.asyncio
async def test_read_past_eof_async():
store = MemoryStore()

data = b"Hello, World!"
path = "greeting.txt"
await obs.put_async(store, path, data)

file = await obs.open_reader_async(store, path)
buffer = await file.read(20)
assert memoryview(data) == memoryview(buffer)

buf = BytesIO(data)
expected = buf.read(20)
assert memoryview(expected) == memoryview(buffer)
Loading