diff options
author | Songyu Lu <songyulu@hdfgroup.org> | 2019-04-04 18:16:27 (GMT) |
---|---|---|
committer | Songyu Lu <songyulu@hdfgroup.org> | 2019-04-04 18:16:27 (GMT) |
commit | 5e7cccb5a2813c203fc9493a2c0d42c9f666d5af (patch) | |
tree | 257600fe3193e2f324d8dd8fe193a14e23a186e8 /src/H5Dio.c | |
parent | 50d9a397ab4bcbeaa6466eabe1c2ec6e2cf61f89 (diff) | |
parent | aa696a47715c3dd9c068f71915c6dcf23745441c (diff) | |
download | hdf5-5e7cccb5a2813c203fc9493a2c0d42c9f666d5af.zip hdf5-5e7cccb5a2813c203fc9493a2c0d42c9f666d5af.tar.gz hdf5-5e7cccb5a2813c203fc9493a2c0d42c9f666d5af.tar.bz2 |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~songyulu/hdf5_ray into HDFFV-10658-performance-drop-from-1-8
Diffstat (limited to 'src/H5Dio.c')
-rw-r--r-- | src/H5Dio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c index 2f87e38..9343b80 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -518,7 +518,8 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, * has been overwritten. So just proceed in reading. */ if(nelmts > 0 && dataset->shared->dcpl_cache.efl.nused == 0 && - !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage)) { + !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage) && + !(dataset->shared->layout.ops->is_data_cached && (*dataset->shared->layout.ops->is_data_cached)(dataset->shared))) { H5D_fill_value_t fill_status; /* Whether/How the fill value is defined */ /* Retrieve dataset's fill-value properties */ @@ -550,6 +551,7 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, /* Sanity check that space is allocated, if there are elements */ if(nelmts > 0) HDassert((*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage) + || (dataset->shared->layout.ops->is_data_cached && (*dataset->shared->layout.ops->is_data_cached)(dataset->shared)) || dataset->shared->dcpl_cache.efl.nused > 0 || dataset->shared->layout.type == H5D_COMPACT); |