summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-08-29 22:10:41 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-08-29 22:10:41 (GMT)
commited506058832725fe3bf3acbbe7c1e2891499995b (patch)
treec7d77a544b1bd3699f21cf5cbbd3484840baeb98
parent097d2de6f8d8790596bbd189a8e01929e353bdd8 (diff)
downloadhdf5-ed506058832725fe3bf3acbbe7c1e2891499995b.zip
hdf5-ed506058832725fe3bf3acbbe7c1e2891499995b.tar.gz
hdf5-ed506058832725fe3bf3acbbe7c1e2891499995b.tar.bz2
[svn-r27618] Description:
Align w/vds branch: Remove extraneous sieve buffer flush in chunk flush callback, and move error check out of the middle of retrieving properties for dataset. Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest forthcoming)
-rw-r--r--src/H5Dchunk.c4
-rw-r--r--src/H5Dint.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index f54fa8e..8584d0a 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -2120,10 +2120,6 @@ H5D__chunk_flush(H5D_t *dset, hid_t dxpl_id)
/* Sanity check */
HDassert(dset);
- /* Flush any data caught in sieve buffer */
- if(H5D__flush_sieve_buf(dset, dxpl_id) < 0)
- HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to flush sieve buffer")
-
/* Fill the DXPL cache values for later use */
if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 20817c3..28bfa59 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -1048,12 +1048,14 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
layout = &new_dset->shared->layout;
if(H5P_get(dc_plist, H5D_CRT_LAYOUT_NAME, layout) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't retrieve layout")
- if(pline->nused > 0 && H5D_CHUNKED != layout->type)
- HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, NULL, "filters can only be used with chunked layout")
fill = &new_dset->shared->dcpl_cache.fill;
if(H5P_get(dc_plist, H5D_CRT_FILL_VALUE_NAME, fill) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't retrieve fill value info")
+ /* Check that chunked layout is used if filters are enabled */
+ if(pline->nused > 0 && H5D_CHUNKED != layout->type)
+ HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, NULL, "filters can only be used with chunked layout")
+
/* Check if the alloc_time is the default and error out */
if(fill->alloc_time == H5D_ALLOC_TIME_DEFAULT)
HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, NULL, "invalid space allocation state")