summaryrefslogtreecommitdiffstats
path: root/src/H5Dchunk.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5Dchunk.c')
-rw-r--r--src/H5Dchunk.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index cf61bab..edefd6e 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -461,6 +461,8 @@ H5D_chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id)
HDassert(dset);
HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == dset->shared->layout.u.chunk.idx_type &&
+ H5D_COPS_FARRAY == dset->shared->layout.u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
@@ -537,6 +539,8 @@ H5D_chunk_is_space_alloc(const H5O_layout_t *layout)
HDassert(layout);
HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type &&
H5D_COPS_EARRAY == layout->u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == layout->u.chunk.idx_type &&
+ H5D_COPS_FARRAY == layout->u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type &&
H5D_COPS_BTREE == layout->u.chunk.ops));
@@ -2007,6 +2011,8 @@ H5D_chunk_idx_reset(H5O_layout_t *layout, hbool_t reset_addr)
HDassert(layout->u.chunk.ops);
HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type &&
H5D_COPS_EARRAY == layout->u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == layout->u.chunk.idx_type &&
+ H5D_COPS_FARRAY == layout->u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type &&
H5D_COPS_BTREE == layout->u.chunk.ops));
@@ -2162,6 +2168,8 @@ H5D_chunk_create(H5D_t *dset /*in,out*/, hid_t dxpl_id)
HDassert(dset->shared->layout.u.chunk.ndims > 0 && dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == dset->shared->layout.u.chunk.idx_type &&
+ H5D_COPS_FARRAY == dset->shared->layout.u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
#ifndef NDEBUG
@@ -2214,6 +2222,8 @@ H5D_chunk_get_info(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset
HDassert(dset->shared->layout.u.chunk.ndims > 0);
HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == dset->shared->layout.u.chunk.idx_type &&
+ H5D_COPS_FARRAY == dset->shared->layout.u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
HDassert(chunk_offset);
@@ -2280,6 +2290,8 @@ H5D_chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *
HDassert(dset->shared);
HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == dset->shared->layout.u.chunk.idx_type &&
+ H5D_COPS_FARRAY == dset->shared->layout.u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
HDassert(dxpl_cache);
@@ -3079,6 +3091,8 @@ H5D_chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes)
HDassert(dset->shared);
HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == dset->shared->layout.u.chunk.idx_type &&
+ H5D_COPS_FARRAY == dset->shared->layout.u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
@@ -3162,6 +3176,8 @@ H5D_chunk_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite)
HDassert(layout->u.chunk.ndims > 0 && layout->u.chunk.ndims <= H5O_LAYOUT_NDIMS);
HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type &&
H5D_COPS_EARRAY == layout->u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == layout->u.chunk.idx_type &&
+ H5D_COPS_FARRAY == layout->u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type &&
H5D_COPS_BTREE == layout->u.chunk.ops));
HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
@@ -3735,6 +3751,8 @@ H5D_chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dims)
HDassert(layout->u.chunk.ndims > 0 && layout->u.chunk.ndims <= H5O_LAYOUT_NDIMS);
HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type &&
H5D_COPS_EARRAY == layout->u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == layout->u.chunk.idx_type &&
+ H5D_COPS_FARRAY == layout->u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type &&
H5D_COPS_BTREE == layout->u.chunk.ops));
HDassert(dxpl_cache);
@@ -3970,6 +3988,8 @@ H5D_chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[])
HDassert(dset->shared);
HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == dset->shared->layout.u.chunk.idx_type &&
+ H5D_COPS_FARRAY == dset->shared->layout.u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
HDassert(chunk_addr);
@@ -4023,6 +4043,8 @@ H5D_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_layout_t *layout)
HDassert(layout);
HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type &&
H5D_COPS_EARRAY == layout->u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == layout->u.chunk.idx_type &&
+ H5D_COPS_FARRAY == layout->u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type &&
H5D_COPS_BTREE == layout->u.chunk.ops));
@@ -4357,11 +4379,15 @@ H5D_chunk_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst,
HDassert(layout_src && H5D_CHUNKED == layout_src->type);
HDassert((H5D_CHUNK_IDX_EARRAY == layout_src->u.chunk.idx_type &&
H5D_COPS_EARRAY == layout_src->u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == layout_src->u.chunk.idx_type &&
+ H5D_COPS_FARRAY == layout_src->u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == layout_src->u.chunk.idx_type &&
H5D_COPS_BTREE == layout_src->u.chunk.ops));
HDassert(layout_dst && H5D_CHUNKED == layout_dst->type);
HDassert((H5D_CHUNK_IDX_EARRAY == layout_dst->u.chunk.idx_type &&
H5D_COPS_EARRAY == layout_dst->u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == layout_dst->u.chunk.idx_type &&
+ H5D_COPS_FARRAY == layout_dst->u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == layout_dst->u.chunk.idx_type &&
H5D_COPS_BTREE == layout_dst->u.chunk.ops));
HDassert(dt_src);
@@ -4573,6 +4599,8 @@ H5D_chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
HDassert(layout);
HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type &&
H5D_COPS_EARRAY == layout->u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == layout->u.chunk.idx_type &&
+ H5D_COPS_FARRAY == layout->u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type &&
H5D_COPS_BTREE == layout->u.chunk.ops));
HDassert(pline);
@@ -4664,6 +4692,8 @@ H5D_chunk_dump_index(H5D_t *dset, hid_t dxpl_id, FILE *stream)
HDassert(dset);
HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == dset->shared->layout.u.chunk.idx_type &&
+ H5D_COPS_FARRAY == dset->shared->layout.u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
@@ -4727,6 +4757,8 @@ H5D_chunk_dest(H5F_t *f, hid_t dxpl_id, H5D_t *dset)
HDassert(dset);
HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
+ (H5D_CHUNK_IDX_FARRAY == dset->shared->layout.u.chunk.idx_type &&
+ H5D_COPS_FARRAY == dset->shared->layout.u.chunk.ops) ||
(H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type &&
H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));