mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-06 17:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1959 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/iteration_error_in_test_versionbounds to develop

Browse Source 
* commit '9ea386b6a660bd29225e96a246439db0c7f73da2':
  Fixed the iteration error in test_versionbounds() in test/dtypes.c.
This commit is contained in:
Vailin Choi 2019-10-01 10:33:35 -05:00
commit 5c9c07b149
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release_docs/RELEASE.txt
View File

@ -362,6 +362,16 @@ Bug Fixes since HDF5-1.10.3 release
Library
-------
- Fixed the iteration error in test_versionbounds() in test/dtypes.c
The test was supposed to loop through all valid combinations of
low and high bounds in the array versions[], but they were set to
H5F_LIBVER_EARLIEST always without changing.
The problem was fixed by indexing low and high into the array versions[].
(VC - 2019/09/30)
- Fixed the slowness of regular hyperslab selection in a chunked dataset
It was reported that the selection of every 10th element from a 20G

11
test/dtypes.c
View File

@ -7648,8 +7648,7 @@ test_versionbounds(void)
H5F_t *filep = NULL; /* Pointer to internal structure of a file */
H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */
hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */
int i, j; /* Indices for iterating over versions */
H5F_libver_t low, high; /* File format bounds */
int low, high; /* Indices for iterating over versions */
H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, H5F_LIBVER_V114};
int versions_count = 5; /* Number of version bounds in the array */
unsigned highest_version; /* Highest version in nested datatypes */
@ -7751,13 +7750,13 @@ test_versionbounds(void)
skipping invalid combinations */
/* Create the file, create and write to a dataset with compound datatype */
/* Verify the dataset's datatype and its members */
for(i = 0, low = versions[i]; i < versions_count; i++) {
for(low = 0; low < versions_count; low++) {
for(j = 0, high = versions[j]; j < versions_count; j++) {
for(high = 0; high < versions_count; high++) {
/* Set version bounds */
H5E_BEGIN_TRY {
ret = H5Pset_libver_bounds(fapl, low, high);
ret = H5Pset_libver_bounds(fapl, versions[low], versions[high]);
} H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
@ -7783,7 +7782,7 @@ test_versionbounds(void)
highest_version = dtypep->shared->version;
/* Verify version of the datatype recursevily */
ret = verify_version(dset_dtype, low, &highest_version);
ret = verify_version(dset_dtype, versions[low], &highest_version);
/* Close the dataset's datatype */
if (H5Tclose(dset_dtype) < 0) TEST_ERROR