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

Fix_s3_ignore_seeks_to_current_position #782

Merged
merged 13 commits into from
Sep 7, 2023
Merged

Fix_s3_ignore_seeks_to_current_position #782

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e3fea83
fix: ignore seek requests to the current position
rustyconover Dec 18, 2022
c5f6954
fix: adjust test to match new seek behavior
rustyconover Jan 27, 2023
0601688
run seek if it is the first time
beck3905 Sep 6, 2023
089340a
Add required import for example to work (#756)
Jan 19, 2023
815202c
run tests on py3.11 (#774)
tooptoop4 Jul 2, 2023
543ff2e
add type command to ftp (#781)
beck3905 Sep 2, 2023
99ee603
Add python 3.11 to setup.py (#775)
tooptoop4 Sep 6, 2023
b528239
Fixes KeyError when retrieving empty but existing object from S3 (#771)
Darkheir Sep 6, 2023
78d109d
bugfix: when read size > chunk size, return read size and not chunk s…
ronreiter Sep 6, 2023
5d39712
Merge branch 'develop' into fix_s3_ignore_seeks_to_current_position
beck3905 Sep 6, 2023
347f50c
undo formatting
beck3905 Sep 7, 2023
a80e031
fix whitespace
beck3905 Sep 7, 2023
02609be
undo formatting
beck3905 Sep 7, 2023
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
11 changes: 9 additions & 2 deletions smart_open/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ def __init__(
self._buffer = smart_open.bytebuffer.ByteBuffer(buffer_size)
self._eof = False
self._line_terminator = line_terminator
self._seek_initialized = False

#
# This member is part of the io.BufferedIOBase interface.
Expand Down Expand Up @@ -677,10 +678,16 @@ def seek(self, offset, whence=constants.WHENCE_START):
whence = constants.WHENCE_START
offset += self._current_pos

self._current_pos = self._raw_reader.seek(offset, whence)
if not self._seek_initialized or not (
whence == constants.WHENCE_START and offset == self._current_pos
):
self._current_pos = self._raw_reader.seek(offset, whence)

self._buffer.empty()

self._buffer.empty()
self._eof = self._current_pos == self._raw_reader._content_length

self._seek_initialized = True
return self._current_pos

def tell(self):
Expand Down
Loading