summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2014-11-20 20:25:07 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2014-11-20 20:25:07 (GMT)
commit5d23fe9d97efcf3fb900f9c387c00265908f5fd4 (patch)
tree42c34e941013768612c1b879389111bedf854b4e /test
parenta0acf1329d983e47e29aa7b34c7c6bddc2b31a78 (diff)
downloadhdf5-5d23fe9d97efcf3fb900f9c387c00265908f5fd4.zip
hdf5-5d23fe9d97efcf3fb900f9c387c00265908f5fd4.tar.gz
hdf5-5d23fe9d97efcf3fb900f9c387c00265908f5fd4.tar.bz2
[svn-r25828] Description:
Check in Vailin's performance improvements: - Track min+max for v2 B-trees, so we can more quickly answer queries - Refactor chunk index/hash value computation so that it doesn't have to be updated on cached chunks every time the dataset's dimension sizes change. Tested on: Mac OSX/64 10.10.0 (amazon) w/gcc 4.9, FORTRAN, C++ & parallel (h5committest not required on this branch)
Diffstat (limited to 'test')
-rw-r--r--test/dsets.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/dsets.c b/test/dsets.c
index 809cf84..ffee6af 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -7205,7 +7205,10 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl)
if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR;
/* Create dataspace with unlimited maximum dimensions */
- if((s = H5Screate_simple(2, dsize, dmax)) < 0) TEST_ERROR;
+ if(early_alloc) {
+ if((s = H5Screate_simple(2, dsize, fixed_dmax)) < 0) TEST_ERROR;
+ } else
+ if((s = H5Screate_simple(2, dsize, dmax)) < 0) TEST_ERROR;
/* Create dataset creation property list */
if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR;
@@ -7225,7 +7228,10 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl)
/* Verify index type */
if(low == H5F_LIBVER_LATEST) {
- if(idx_type != H5D_CHUNK_IDX_BT2)
+ if(early_alloc) {
+ if(idx_type != H5D_CHUNK_IDX_NONE)
+ FAIL_PUTS_ERROR("should be using implicit indexing");
+ } else if(idx_type != H5D_CHUNK_IDX_BT2)
FAIL_PUTS_ERROR("should be using v2 B-tree as index");
} else if(idx_type != H5D_CHUNK_IDX_BTREE)
FAIL_PUTS_ERROR("should be using v1 B-tree as index");