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 Hadoop Downloader Range not correct #21778

Merged
merged 2 commits into from
Jun 14, 2022
Merged

Fix Hadoop Downloader Range not correct #21778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1626c
Fix Hadoop Downloader Range not correct
Abacn Jun 9, 2022
912e5bc
fix typo in comment
Abacn Jun 9, 2022
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: 2 additions & 3 deletions sdks/python/apache_beam/io/hadoopfilesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ def size(self):
return self._size

def get_range(self, start, end):
with self._hdfs_client.read(self._path,
offset=start,
length=end - start + 1) as reader:
with self._hdfs_client.read(self._path, offset=start,
length=end - start) as reader:
return reader.read()


Expand Down
25 changes: 23 additions & 2 deletions sdks/python/apache_beam/io/hadoopfilesystem_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,11 @@ def read(self, path, offset=0, length=None):
# old_file is closed and can't be operated upon. Return a copy instead.
new_file = FakeFile(path, 'rb')
if old_file.saved_data:
new_file.write(old_file.saved_data)
new_file.seek(0)
if length is None:
new_file.write(old_file.saved_data)
else:
new_file.write(old_file.saved_data[:offset + length])
new_file.seek(offset)
return new_file

def list(self, path, status=False):
Expand Down Expand Up @@ -386,6 +389,24 @@ def test_create_write_read_compressed(self):
self.assertEqual(data, read_data)
handle.close()

def test_random_read_large_file(self):
# this tests HdfsDownloader.get_range() works properly with
# filesystemio.readinto when reading a file of size larger than the buffer.
url = self.fs.join(self.tmpdir, 'read_length')
handle = self.fs.create(url)
data = b'test' * 10_000_000
handle.write(data)
handle.close()

handle = self.fs.open(url)
handle.seek(100)
# read 3 bytes
read_data = handle.read(3)
self.assertEqual(data[100:103], read_data)
# read 4 bytes
read_data = handle.read(4)
self.assertEqual(data[103:107], read_data)

def test_open(self):
url = self.fs.join(self.tmpdir, 'old_file1')
handle = self.fs.open(url)
Expand Down