mirrors/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2026-09-25 04:09:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix caching issue in ROS3 VFD (#5507)

Browse Source 
Fix an incorrect range check that would prevent reads
from being served from the ROS3 VFD's internal cache
when the offset + length of the read extends exactly
to the end of the cached range of bytes.
This commit is contained in:
jhendersonHDF
2025-05-05 07:53:01 -05:00
committed by GitHub
parent 2a7fc63be7
commit f38cea902a
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
release_docs/RELEASE.txt
+10
View File
@@ -549,6 +549,16 @@ Bug Fixes since HDF5-2.0.0 release
===================================
Library
-------
- Fixed an issue with caching in the ROS3 VFD
The ROS3 VFD uses a very simple caching mechanism that caches the
first 16MiB of a file during file open and serves later reads from
that cache if the offset + length falls within the cached range of
bytes. Combinations of offset + length that extended exactly to the
end of the cached range of bytes (for example, offset=0 and
len=16777216) would end up not being served from the cache due to
an incorrect range check. This has now been fixed.
- Fixed an error with H5Fget_file_image() with the latest file format
When using H5Fget_file_image() on a file created with the latest file
src/H5FDros3.c
+3 -3
View File
@@ -789,7 +789,7 @@ done:
if (H5FD__s3comms_s3r_close(handle) < 0)
HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL, "unable to close s3 file handle");
if (file != NULL) {
H5MM_xfree(file->cache);
file->cache = H5MM_xfree(file->cache);
file = H5FL_FREE(H5FD_ros3_t, file);
}
curl_global_cleanup();
@@ -827,7 +827,7 @@ H5FD__ros3_close(H5FD_t H5_ATTR_UNUSED *_file)
HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to close S3 request handle");
/* Release the file info */
H5MM_xfree(file->cache);
file->cache = H5MM_xfree(file->cache);
file = H5FL_FREE(H5FD_ros3_t, file);
done:
@@ -1097,7 +1097,7 @@ H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
/* Copy from the cache when accessing the first N bytes of the file.
* Saves network I/O operations when opening files.
*/
if (addr + size < file->cache_size) {
if (addr + size <= file->cache_size) {
memcpy(buf, file->cache + addr, size);
}
else {