diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-19 04:21:12 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-19 04:21:12 (GMT) |
| commit | f7aff7d5cf0f1c9cd056ebc0274ad8d0683890a2 (patch) | |
| tree | 88247f058e18aebfcb06f802ea9d21967a37ab6b /src/H5Dchunk.c | |
| parent | 6ce67650fbaa78b37ccb0734fb97bf34d3770af6 (diff) | |
| download | hdf5-f7aff7d5cf0f1c9cd056ebc0274ad8d0683890a2.zip hdf5-f7aff7d5cf0f1c9cd056ebc0274ad8d0683890a2.tar.gz hdf5-f7aff7d5cf0f1c9cd056ebc0274ad8d0683890a2.tar.bz2 | |
[svn-r29738] Description:
Bring "single" chunk index from revise_chunks branch to trunk.
Tested on:
MacOSX/64 10.11.4 (amazon) w/serial, parallel & production (w/check-vfd)
(h5committest forthcoming)
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 0acb385..08c671b 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -78,7 +78,8 @@ HDassert((H5D_CHUNK_IDX_EARRAY == storage->idx_type && H5D_COPS_EARRAY == storage->ops) || \ (H5D_CHUNK_IDX_FARRAY == storage->idx_type && H5D_COPS_FARRAY == storage->ops) || \ (H5D_CHUNK_IDX_BT2 == storage->idx_type && H5D_COPS_BT2 == storage->ops) || \ - (H5D_CHUNK_IDX_BTREE == storage->idx_type && H5D_COPS_BTREE == storage->ops)); + (H5D_CHUNK_IDX_BTREE == storage->idx_type && H5D_COPS_BTREE == storage->ops) || \ + (H5D_CHUNK_IDX_SINGLE == storage->idx_type && H5D_COPS_SINGLE == storage->ops)); /* * Feature: If this constant is defined then every cache preemption and load @@ -6232,7 +6233,6 @@ H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, const H5F_block_t *old HDassert(idx_info->pline); HDassert(idx_info->layout); HDassert(idx_info->storage); - HDassert(H5F_addr_defined(idx_info->storage->idx_addr)); HDassert(new_chunk); HDassert(need_insert); @@ -6297,6 +6297,7 @@ H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, const H5F_block_t *old case H5D_CHUNK_IDX_FARRAY: case H5D_CHUNK_IDX_BT2: case H5D_CHUNK_IDX_BTREE: + case H5D_CHUNK_IDX_SINGLE: HDassert(new_chunk->length > 0); H5_CHECK_OVERFLOW(new_chunk->length, /*From: */uint32_t, /*To: */hsize_t); new_chunk->offset = H5MF_alloc(idx_info->f, H5FD_MEM_DRAW, idx_info->dxpl_id, (hsize_t)new_chunk->length); |