diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-23 05:03:00 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-23 05:03:00 (GMT) |
| commit | b2d6d68d5dfe5c68cbeb45f30da89d44eaa58719 (patch) | |
| tree | d6b6205b09360e90e76dffa73854bf288890280f /src/H5Olayout.c | |
| parent | 997392079b023bf366b62c17936d4ec305739be3 (diff) | |
| download | hdf5-b2d6d68d5dfe5c68cbeb45f30da89d44eaa58719.zip hdf5-b2d6d68d5dfe5c68cbeb45f30da89d44eaa58719.tar.gz hdf5-b2d6d68d5dfe5c68cbeb45f30da89d44eaa58719.tar.bz2 | |
[svn-r29770] Description:
Bring 'none' 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/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 299a43e..b7a2584 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -298,6 +298,10 @@ H5O__layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "v1 B-tree index type should never be in a v4 layout message") break; + case H5D_CHUNK_IDX_NONE: /* Implicit Index */ + mesg->storage.u.chunk.ops = H5D_COPS_NONE; + break; + case H5D_CHUNK_IDX_SINGLE: /* Single Chunk Index */ if(mesg->u.chunk.flags & H5O_LAYOUT_CHUNK_SINGLE_INDEX_WITH_FILTER) { H5F_DECODE_LENGTH(f, p, mesg->storage.u.chunk.u.single.nbytes); @@ -628,6 +632,9 @@ H5O__layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "v1 B-tree index type should never be in a v4 layout message") break; + case H5D_CHUNK_IDX_NONE: /* Implicit */ + break; + case H5D_CHUNK_IDX_SINGLE: /* Single Chunk */ /* Filter information */ if(mesg->u.chunk.flags & H5O_LAYOUT_CHUNK_SINGLE_INDEX_WITH_FILTER) { @@ -1192,6 +1199,11 @@ H5O__layout_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const v "Index Type:", "v1 B-tree"); break; + case H5D_CHUNK_IDX_NONE: + HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, + "Index Type:", "Implicit"); + break; + case H5D_CHUNK_IDX_SINGLE: HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Single Chunk"); |