philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r16515] To improve the performance of querrying the info of a link(bug #1404). When the index was set to

Browse Source 
creation order in querry function but there's no creation order indexed in the file, the library tried 
to build and sort a table of all links.  To optimize it, let the library use the B-tree for names of 
links.

Tested with h5committest.
This commit is contained in:
Raymond Lu
2009-02-24 13:53:59 -05:00
parent fe217cfd57
commit 39c794d2c4
1 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/H5Gdense.c
View File

@@ -656,29 +656,34 @@ H5G_dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
/* Determine the address of the index to use */ /* Determine the address of the index to use */
if(idx_type == H5_INDEX_NAME) { if(idx_type == H5_INDEX_NAME) {
/* Check if "native" order is OK - since names are hashed, getting them /* Since names are hashed, getting them in strictly increasing or
* in strictly increasing or decreasing order requires building a * decreasing order requires building a table and sorting it.
* table and sorting it. * If the order is native, use the B-tree for names.
*/ */
if(order == H5_ITER_NATIVE) { bt2_addr = HADDR_UNDEF;
bt2_addr = linfo->name_bt2_addr;
bt2_class = H5G_BT2_NAME;
HDassert(H5F_addr_defined(bt2_addr));
} /* end if */
else
bt2_addr = HADDR_UNDEF;
} /* end if */ } /* end if */
else { else {
HDassert(idx_type == H5_INDEX_CRT_ORDER); HDassert(idx_type == H5_INDEX_CRT_ORDER);
/* This address may not be defined if creation order is tracked, but /* This address may not be defined if creation order is tracked, but
* there's no index on it. If there's no v2 B-tree that indexes * there's no index on it. If there's no v2 B-tree that indexes
* the links, a table will be built. * the links and the order is native, use the B-tree for names.
* Otherwise, build a table.
*/ */
bt2_addr = linfo->corder_bt2_addr; bt2_addr = linfo->corder_bt2_addr;
bt2_class = H5G_BT2_CORDER; bt2_class = H5G_BT2_CORDER;
} /* end else */ } /* end else */
/* If the order is native and there's no B-tree for indexing the links,
* use the B-tree for names instead of building a table to speed up the
* process.
*/
if(order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
bt2_addr = linfo->name_bt2_addr;
bt2_class = H5G_BT2_NAME;
HDassert(H5F_addr_defined(bt2_addr));
} /* end if */
/* If there is an index defined for the field, use it */ /* If there is an index defined for the field, use it */
if(H5F_addr_defined(bt2_addr)) { if(H5F_addr_defined(bt2_addr)) {
H5G_bt2_ud_lbi_t udata; /* User data for v2 B-tree link lookup */ H5G_bt2_ud_lbi_t udata; /* User data for v2 B-tree link lookup */
@@ -953,31 +958,37 @@ H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
/* Determine the address of the index to use */ /* Determine the address of the index to use */
if(idx_type == H5_INDEX_NAME) { if(idx_type == H5_INDEX_NAME) {
/* Check if "native" order is OK - since names are hashed, getting them /* Since names are hashed, getting them in strictly increasing or
* in strictly increasing or decreasing order requires building a * decreasing order requires building a table and sorting it. If
* table and sorting it. * the order is native, use the B-tree for names.
*/ */
if(order == H5_ITER_NATIVE) { bt2_addr = HADDR_UNDEF;
HDassert(H5F_addr_defined(linfo->name_bt2_addr));
bt2_addr = linfo->name_bt2_addr;
bt2_class = H5G_BT2_NAME;
} /* end if */
else
bt2_addr = HADDR_UNDEF;
} /* end if */ } /* end if */
else { else {
HDassert(idx_type == H5_INDEX_CRT_ORDER); HDassert(idx_type == H5_INDEX_CRT_ORDER);
/* This address may not be defined if creation order is tracked, but /* This address may not be defined if creation order is tracked, but
* there's no index on it. If there's no v2 B-tree that indexes * there's no index on it. If there's no v2 B-tree that indexes
* the links, a table will be built. * the links and the order is native, use the B-tree for names.
* Otherwise, build a table.
*/ */
bt2_addr = linfo->corder_bt2_addr; bt2_addr = linfo->corder_bt2_addr;
bt2_class = H5G_BT2_CORDER; bt2_class = H5G_BT2_CORDER;
} /* end else */ } /* end else */
/* If the order is native and there's no B-tree for indexing the links,
* use the B-tree for names instead of building a table to speed up the
* process.
*/
if(order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
HDassert(H5F_addr_defined(linfo->name_bt2_addr));
bt2_addr = linfo->name_bt2_addr;
bt2_class = H5G_BT2_NAME;
} /* end if */
/* Check on iteration order */ /* Check on iteration order */
if(order == H5_ITER_NATIVE && H5F_addr_defined(bt2_addr)) { if(order == H5_ITER_NATIVE) {
HDassert(H5F_addr_defined(bt2_addr));
H5G_bt2_ud_it_t udata; /* User data for iterator callback */ H5G_bt2_ud_it_t udata; /* User data for iterator callback */
/* Open the fractal heap */ /* Open the fractal heap */
@@ -1146,29 +1157,34 @@ H5G_dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
/* Determine the address of the index to use */ /* Determine the address of the index to use */
if(idx_type == H5_INDEX_NAME) { if(idx_type == H5_INDEX_NAME) {
/* Check if "native" order is OK - since names are hashed, getting them /* Since names are hashed, getting them in strictly increasing or
* in strictly increasing or decreasing order requires building a * decreasing order requires building a table and sorting it. If
* table and sorting it. * the order is native, use the B-tree for names.
*/ */
if(order == H5_ITER_NATIVE) { bt2_addr = HADDR_UNDEF;
bt2_addr = linfo->name_bt2_addr;
bt2_class = H5G_BT2_NAME;
HDassert(H5F_addr_defined(bt2_addr));
} /* end if */
else
bt2_addr = HADDR_UNDEF;
} /* end if */ } /* end if */
else { else {
HDassert(idx_type == H5_INDEX_CRT_ORDER); HDassert(idx_type == H5_INDEX_CRT_ORDER);
/* This address may not be defined if creation order is tracked, but /* This address may not be defined if creation order is tracked, but
* there's no index on it. If there's no v2 B-tree that indexes * there's no index on it. If there's no v2 B-tree that indexes
* the links, a table will be built. * the links and the order is native, use the B-tree for names.
* Otherwise, build a table.
*/ */
bt2_addr = linfo->corder_bt2_addr; bt2_addr = linfo->corder_bt2_addr;
bt2_class = H5G_BT2_CORDER; bt2_class = H5G_BT2_CORDER;
} /* end else */ } /* end else */
/* If the order is native and there's no B-tree for indexing the links,
* use the B-tree for names instead of building a table to speed up the
* process.
*/
if(order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
bt2_addr = linfo->name_bt2_addr;
bt2_class = H5G_BT2_NAME;
HDassert(H5F_addr_defined(bt2_addr));
} /* end if */
/* If there is an index defined for the field, use it */ /* If there is an index defined for the field, use it */
if(H5F_addr_defined(bt2_addr)) { if(H5F_addr_defined(bt2_addr)) {
H5G_bt2_ud_gnbi_t udata; /* User data for v2 B-tree callback */ H5G_bt2_ud_gnbi_t udata; /* User data for v2 B-tree callback */
@@ -1561,29 +1577,34 @@ H5G_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
/* Determine the address of the index to use */ /* Determine the address of the index to use */
if(idx_type == H5_INDEX_NAME) { if(idx_type == H5_INDEX_NAME) {
/* Check if "native" order is OK - since names are hashed, getting them /* Since names are hashed, getting them in strictly increasing or
* in strictly increasing or decreasing order requires building a * decreasing order requires building a table and sorting it. If
* table and sorting it. * the order is native, use the B-tree for names.
*/ */
if(order == H5_ITER_NATIVE) { bt2_addr = HADDR_UNDEF;
bt2_addr = linfo->name_bt2_addr;
bt2_class = H5G_BT2_NAME;
HDassert(H5F_addr_defined(bt2_addr));
} /* end if */
else
bt2_addr = HADDR_UNDEF;
} /* end if */ } /* end if */
else { else {
HDassert(idx_type == H5_INDEX_CRT_ORDER); HDassert(idx_type == H5_INDEX_CRT_ORDER);
/* This address may not be defined if creation order is tracked, but /* This address may not be defined if creation order is tracked, but
* there's no index on it. If there's no v2 B-tree that indexes * there's no index on it. If there's no v2 B-tree that indexes
* the links, a table will be built. * the links and the order is native, use the B-tree for names.
* Otherwise, build a table.
*/ */
bt2_addr = linfo->corder_bt2_addr; bt2_addr = linfo->corder_bt2_addr;
bt2_class = H5G_BT2_CORDER; bt2_class = H5G_BT2_CORDER;
} /* end else */ } /* end else */
/* If the order is native and there's no B-tree for indexing the links,
* use the B-tree for names instead of building a table to speed up the
* process.
*/
if(order == H5_ITER_NATIVE && !H5F_addr_defined(bt2_addr)) {
bt2_addr = linfo->name_bt2_addr;
bt2_class = H5G_BT2_NAME;
HDassert(H5F_addr_defined(bt2_addr));
} /* end if */
/* If there is an index defined for the field, use it */ /* If there is an index defined for the field, use it */
if(H5F_addr_defined(bt2_addr)) { if(H5F_addr_defined(bt2_addr)) {
H5G_bt2_ud_rmbi_t udata; /* User data for v2 B-tree record removal */ H5G_bt2_ud_rmbi_t udata; /* User data for v2 B-tree record removal */