From 6ff2efb37bf53623b18b1107dde37a36fa2f1f52 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 4 Jan 2018 11:10:34 -0600 Subject: HDFFV-9724 Merge vds prefix from develop --- release_docs/RELEASE.txt | 37 ++++++++++++++++++------------------- src/H5Fquery.c | 12 ++++-------- test/vds.c | 2 +- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 46e0c59..952c01f 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -85,6 +85,20 @@ New Features Library: -------- + - Add prefix option to VDS files. + + Currently, VDS source files must be in the active directory to be + found by the virtual file. Adding the option of a prefix to be set + on the virtual file, using a data access property list (DAPL), + allows the source files to located at an absolute or relative path + to the virtual file. + + New public APIs: + herr_t H5Pset_virtual_prefix(hid_t dapl_id, const char* prefix); + ssize_t H5Pget_virtual_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size); + The prefix can also be set with an environment variable, HDF5_VDS_PREFIX. + + (ADB - 2017/12/12, HDFFV-9724) - H5FDdriver_query() API call added to the C library. @@ -120,21 +134,6 @@ New Features (HDFFV-10252, DER, 2017/04/05) - - Add prefix option to VDS files. - - Currently, VDS source files must be in the active directory to be - found by the virtual file. Adding the option of a prefix to be set - on the virtual file, using a data access property list (DAPL), - allows the source files to located at an absolute or relative path - to the virtual file. - - New public APIs: - herr_t H5Pset_virtual_prefix(hid_t dapl_id, const char* prefix); - ssize_t H5Pget_virtual_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size); - The prefix can also be set with an environment variable, HDF5_VDS_PREFIX. - - (ADB - 2017/12/12, HDFFV-9724) - Parallel Library: ----------------- @@ -267,13 +266,13 @@ Bug Fixes since HDF5-1.10.1 release - Fix H5Sencode() bug when the number of elements selected is > 2^32 - H5Sencode() incorrectly encodes dataspace selection with number of - elements exceeding 2^32. When decoding such selection via H5Sdecode(), + H5Sencode() incorrectly encodes dataspace selection with number of + elements exceeding 2^32. When decoding such selection via H5Sdecode(), the number of elements in the decoded dataspace is not the same as - what is encoded. This problem exists for H5S_SEL_HYPER and + what is encoded. This problem exists for H5S_SEL_HYPER and H5S_SEL_POINTS encoding. - The cause of the problem is because the library uses 32 bits to + The cause of the problem is because the library uses 32 bits to encode counts and block offsets for the selection. The solution is to use the original 32 bit encodings if possible, but use a different way to encode selection > 32 bits when needed. diff --git a/src/H5Fquery.c b/src/H5Fquery.c index b7fa4f0..235a26d 100644 --- a/src/H5Fquery.c +++ b/src/H5Fquery.c @@ -686,16 +686,12 @@ H5F_gc_ref(const H5F_t *f) /*------------------------------------------------------------------------- - * Function: H5F_use_latest_flags + * Function: H5F_use_latest_flags * - * Purpose: Retrieve the requested 'latest version support' for the file. + * Purpose: Retrieve the requested 'latest version support' for the file. * - * Return: Success: Non-negative, the requested 'version support' - * Failure: (can't happen) - * - * Programmer: Quincey Koziol - * koziol@hdfgroup.org - * Mar 5 2007 + * Return: Success: Non-negative, the requested 'version support' + * Failure: (can't happen) *------------------------------------------------------------------------- */ unsigned diff --git a/test/vds.c b/test/vds.c index 7d55c37..a882698 100644 --- a/test/vds.c +++ b/test/vds.c @@ -618,7 +618,7 @@ test_api(test_api_config_t config, hid_t fapl) TEST_ERROR /* Get examination DCPL */ - if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)174) < 0) + if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)213) < 0) TEST_ERROR /* Test H5Pget_virtual_count */ -- cgit v0.12 From 6fecfbb51a99160f71a5a4ee01ea537ae0883abd Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 4 Jan 2018 12:33:11 -0600 Subject: HDFFV-9724 1_10 branch has a different number --- test/vds.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/vds.c b/test/vds.c index a882698..a5d0251 100644 --- a/test/vds.c +++ b/test/vds.c @@ -57,7 +57,7 @@ const char *FILENAME[] = { #define TMPDIR "tmp/" - + /*------------------------------------------------------------------------- * Function: vds_select_equal * @@ -209,7 +209,7 @@ error: return -1; } /* end vds_select_equal() */ - + /*------------------------------------------------------------------------- * Function: vds_check_mapping * @@ -298,7 +298,7 @@ error: return -1; } /* end vds_check_mapping() */ - + /*------------------------------------------------------------------------- * Function: test_api_get_ex_dcpl * @@ -618,7 +618,7 @@ test_api(test_api_config_t config, hid_t fapl) TEST_ERROR /* Get examination DCPL */ - if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)213) < 0) + if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)174) < 0) TEST_ERROR /* Test H5Pget_virtual_count */ @@ -1561,7 +1561,7 @@ test_vds_prefix(unsigned config, hid_t fapl) return 1; } /* end vds_link_prefix() */ - + /*------------------------------------------------------------------------- * Function: test_basic_io * @@ -3721,7 +3721,7 @@ error: return 1; } /* end test_basic_io() */ - + /*------------------------------------------------------------------------- * Function: test_unlim * @@ -6743,7 +6743,7 @@ error: return 1; } /* end test_unlim() */ - + /*------------------------------------------------------------------------- * Function: test_printf * @@ -10434,7 +10434,7 @@ error: return 1; } /* end test_printf() */ - + /*------------------------------------------------------------------------- * Function: test_all * @@ -11459,7 +11459,7 @@ error: return 1; } /* end test_all() */ - + /*------------------------------------------------------------------------- * Function: test_dapl_values * @@ -11601,7 +11601,7 @@ test_dapl_values(hid_t fapl_id) return 1; } /* end test_dapl_values() */ - + /*------------------------------------------------------------------------- * Function: main * -- cgit v0.12 From 988c8d9bcc80f36a7cba37994e8899df1f19c433 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 5 Jan 2018 12:10:01 -0600 Subject: Merge fix --- test/vds.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/vds.c b/test/vds.c index a5d0251..7d55c37 100644 --- a/test/vds.c +++ b/test/vds.c @@ -57,7 +57,7 @@ const char *FILENAME[] = { #define TMPDIR "tmp/" - + /*------------------------------------------------------------------------- * Function: vds_select_equal * @@ -209,7 +209,7 @@ error: return -1; } /* end vds_select_equal() */ - + /*------------------------------------------------------------------------- * Function: vds_check_mapping * @@ -298,7 +298,7 @@ error: return -1; } /* end vds_check_mapping() */ - + /*------------------------------------------------------------------------- * Function: test_api_get_ex_dcpl * @@ -1561,7 +1561,7 @@ test_vds_prefix(unsigned config, hid_t fapl) return 1; } /* end vds_link_prefix() */ - + /*------------------------------------------------------------------------- * Function: test_basic_io * @@ -3721,7 +3721,7 @@ error: return 1; } /* end test_basic_io() */ - + /*------------------------------------------------------------------------- * Function: test_unlim * @@ -6743,7 +6743,7 @@ error: return 1; } /* end test_unlim() */ - + /*------------------------------------------------------------------------- * Function: test_printf * @@ -10434,7 +10434,7 @@ error: return 1; } /* end test_printf() */ - + /*------------------------------------------------------------------------- * Function: test_all * @@ -11459,7 +11459,7 @@ error: return 1; } /* end test_all() */ - + /*------------------------------------------------------------------------- * Function: test_dapl_values * @@ -11601,7 +11601,7 @@ test_dapl_values(hid_t fapl_id) return 1; } /* end test_dapl_values() */ - + /*------------------------------------------------------------------------- * Function: main * -- cgit v0.12