diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-05 07:12:56 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-05 07:12:56 (GMT) |
| commit | 5d46ad9b3984dcddffaf369a92a8ef95339f8547 (patch) | |
| tree | c2d31d43ca3a4030d6809b65d719e064ca27fa17 /src/H5Dchunk.c | |
| parent | a816d031089f0afd2f2a2261a4e0d6277491e8b5 (diff) | |
| download | hdf5-5d46ad9b3984dcddffaf369a92a8ef95339f8547.zip hdf5-5d46ad9b3984dcddffaf369a92a8ef95339f8547.tar.gz hdf5-5d46ad9b3984dcddffaf369a92a8ef95339f8547.tar.bz2 | |
[svn-r29635] Description:
Bring support for earray and v2 B-trees from revise_chunks branch to
trunk.
Tested on:
MacOSX/64 10.11.4 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 4d0e2c3..4df493d 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -75,7 +75,9 @@ /* Sanity check on chunk index types: commonly used by a lot of routines in this file */ #define H5D_CHUNK_STORAGE_INDEX_CHK(storage) \ - HDassert((H5D_CHUNK_IDX_BTREE == storage->idx_type && H5D_COPS_BTREE == storage->ops)); + HDassert((H5D_CHUNK_IDX_EARRAY == storage->idx_type && H5D_COPS_EARRAY == 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)); /* * Feature: If this constant is defined then every cache preemption and load @@ -6285,6 +6287,8 @@ H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, const H5F_block_t *old /* Actually allocate space for the chunk in the file */ if(alloc_chunk) { switch(idx_info->storage->idx_type) { + case H5D_CHUNK_IDX_EARRAY: + case H5D_CHUNK_IDX_BT2: case H5D_CHUNK_IDX_BTREE: HDassert(new_chunk->length > 0); H5_CHECK_OVERFLOW(new_chunk->length, /*From: */uint32_t, /*To: */hsize_t); |