mirrors/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2026-09-25 04:09:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Retarget blob storage to the 2.3.0 release

Browse Source 
Rename H5F_LIBVER_V220 to H5F_LIBVER_V230 throughout (enum, ver_bounds
comments, trace, h5test, Fortran/Java constants, chunk_info filenames)
and move the blob API's version tags from 2.2.0 to 2.3.0.
This commit is contained in:
Scot Breitenfeld
2026-07-10 16:18:53 -05:00
parent e6fee52855
commit a236bb2309
25 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fortran/src/H5_f.c
+1 -1
View File
@@ -560,7 +560,7 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid
h5f_flags[30] = (int_f)H5F_LIBVER_V200;
h5f_flags[31] = (int_f)H5F_ACC_SWMR_READ;
h5f_flags[32] = (int_f)H5F_ACC_SWMR_WRITE;
h5f_flags[33] = (int_f)H5F_LIBVER_V220;
h5f_flags[33] = (int_f)H5F_LIBVER_V230;
/*
* H5FD flags
fortran/src/H5_ff.F90
+1 -1
View File
@@ -391,7 +391,7 @@ CONTAINS
H5F_LIBVER_V200_F = H5F_flags(31)
H5F_ACC_SWMR_READ_F = H5F_flags(32)
H5F_ACC_SWMR_WRITE_F = H5F_flags(33)
H5F_LIBVER_V220_F = H5F_flags(34)
H5F_LIBVER_V230_F = H5F_flags(34)
!
! H5generic flags
!
fortran/src/H5f90global.F90
+2 -2
View File
@@ -255,7 +255,7 @@ MODULE H5GLOBAL
!DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V112_F
!DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V114_F
!DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V200_F
!DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V220_F
!DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V230_F
!DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_FSM_AGGR_F
!DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_PAGE_F
!DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_AGGR_F
@@ -292,7 +292,7 @@ MODULE H5GLOBAL
INTEGER :: H5F_LIBVER_V112_F !< H5F_LIBVER_V112
INTEGER :: H5F_LIBVER_V114_F !< H5F_LIBVER_V114
INTEGER :: H5F_LIBVER_V200_F !< H5F_LIBVER_V200
INTEGER :: H5F_LIBVER_V220_F !< H5F_LIBVER_V220
INTEGER :: H5F_LIBVER_V230_F !< H5F_LIBVER_V230
INTEGER :: H5F_FSPACE_STRATEGY_FSM_AGGR_F !< H5F_FSPACE_STRATEGY_FSM_AGGR
INTEGER :: H5F_FSPACE_STRATEGY_PAGE_F !< H5F_FSPACE_STRATEGY_PAGE
INTEGER :: H5F_FSPACE_STRATEGY_AGGR_F !< H5F_FSPACE_STRATEGY_AGGR
java/hdf/hdf5lib/HDF5Constants.java
+1 -1
View File
@@ -582,7 +582,7 @@ public class HDF5Constants {
/** */
public static final int H5F_LIBVER_V200 = H5F_LIBVER_V200();
/** */
public static final int H5F_LIBVER_V220 = H5F_LIBVER_V220();
public static final int H5F_LIBVER_V230 = H5F_LIBVER_V230();
/** */
public static final int H5F_LIBVER_LATEST = H5F_LIBVER_LATEST();
/** */
java/src-jni/hdf/hdf5lib/HDF5Constants.java
+2 -2
View File
@@ -575,7 +575,7 @@ public class HDF5Constants {
/** */
public static final int H5F_LIBVER_V200 = H5F_LIBVER_V200();
/** */
public static final int H5F_LIBVER_V220 = H5F_LIBVER_V220();
public static final int H5F_LIBVER_V230 = H5F_LIBVER_V230();
/** */
public static final int H5F_LIBVER_LATEST = H5F_LIBVER_LATEST();
/** */
@@ -2096,7 +2096,7 @@ public class HDF5Constants {
private static native final int H5F_LIBVER_V200();
private static native final int H5F_LIBVER_V220();
private static native final int H5F_LIBVER_V230();
private static native final int H5F_LIBVER_LATEST();
java/src-jni/jni/h5Constants.c
+2 -2
View File
@@ -1309,9 +1309,9 @@ Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V200(JNIEnv *env, jclass cls)
return H5F_LIBVER_V200;
}
JNIEXPORT jint JNICALL
Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V220(JNIEnv *env, jclass cls)
Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V230(JNIEnv *env, jclass cls)
{
return H5F_LIBVER_V220;
return H5F_LIBVER_V230;
}
JNIEXPORT jint JNICALL
Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1LATEST(JNIEnv *env, jclass cls)
release_docs/CHANGELOG.md
+5 -5
View File
@@ -124,7 +124,7 @@ We would like to thank the many HDF5 community members who contributed to this r
byte per filter and, when set, the blob's locator. Blob bytes live in the
global heap, not inline in the object header; deleting the dataset
reclaims the heap object. Writing a blob-bearing dataset requires a
library-version high bound of `H5F_LIBVER_V220` (see below) or later;
library-version high bound of `H5F_LIBVER_V230` (see below) or later;
files without blobs are unaffected.
`H5Pencode`/`H5Pdecode` serialize the blob bytes inline so an encoded DCPL
@@ -133,14 +133,14 @@ We would like to thank the many HDF5 community members who contributed to this r
HDF5, rank 0 writes the blob and broadcasts the locator so all ranks
encode an identical pipeline message.
### Added the H5F_LIBVER_V220 library version bound
### Added the H5F_LIBVER_V230 library version bound
The `H5F_libver_t` enumeration gains `H5F_LIBVER_V220`, and
The `H5F_libver_t` enumeration gains `H5F_LIBVER_V230`, and
`H5F_LIBVER_LATEST` now maps to it. A file access property list's high
bound must be at least `H5F_LIBVER_V220` to write the version-3 filter
bound must be at least `H5F_LIBVER_V230` to write the version-3 filter
pipeline message introduced for blob storage; all other format versions
are unchanged from `H5F_LIBVER_V200`. The constant is mirrored in the
Fortran (`H5F_LIBVER_V220_F`) and Java (`HDF5Constants.H5F_LIBVER_V220`)
Fortran (`H5F_LIBVER_V230_F`) and Java (`HDF5Constants.H5F_LIBVER_V230`)
bindings.
### Added string-based filter configuration API (RFC-HDFG-2026-001)
src/H5Aint.c
+1 -1
View File
@@ -99,7 +99,7 @@ const unsigned H5O_attr_ver_bounds[] = {
H5O_ATTR_VERSION_3, /* H5F_LIBVER_V112 */
H5O_ATTR_VERSION_3, /* H5F_LIBVER_V114 */
H5O_ATTR_VERSION_3, /* H5F_LIBVER_V200 */
H5O_ATTR_VERSION_3, /* H5F_LIBVER_V220 */
H5O_ATTR_VERSION_3, /* H5F_LIBVER_V230 */
H5O_ATTR_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
src/H5Dlayout.c
+1 -1
View File
@@ -49,7 +49,7 @@ const unsigned H5O_layout_ver_bounds[] = {
H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V112 */
H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V114 */
H5O_LAYOUT_VERSION_5, /* H5F_LIBVER_V200 */
H5O_LAYOUT_VERSION_5, /* H5F_LIBVER_V220 */
H5O_LAYOUT_VERSION_5, /* H5F_LIBVER_V230 */
H5O_LAYOUT_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
src/H5Fpublic.h
+1 -1
View File
@@ -184,7 +184,7 @@ typedef enum H5F_libver_t {
H5F_LIBVER_V112 = 3, /**< Use the 1.12 file format for storing objects */
H5F_LIBVER_V114 = 4, /**< Use the 1.14 file format for storing objects */
H5F_LIBVER_V200 = 5, /**< Use the 2.0 file format for storing objects */
H5F_LIBVER_V220 = 6, /**< Use the 2.2 file format for storing objects */
H5F_LIBVER_V230 = 6, /**< Use the 2.3 file format for storing objects */
H5F_LIBVER_LATEST = 6, /**< Use the latest file format for storing objects */
H5F_LIBVER_NBOUNDS /**< Sentinel */
} H5F_libver_t;
src/H5Fsuper.c
+1 -1
View File
@@ -72,7 +72,7 @@ static const unsigned HDF5_superblock_ver_bounds[] = {
HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V112 */
HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V114 */
HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V200 */
HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V220 */
HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V230 */
HDF5_SUPERBLOCK_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
src/H5Ofill.c
+1 -1
View File
@@ -154,7 +154,7 @@ const unsigned H5O_fill_ver_bounds[] = {
H5O_FILL_VERSION_3, /* H5F_LIBVER_V112 */
H5O_FILL_VERSION_3, /* H5F_LIBVER_V114 */
H5O_FILL_VERSION_3, /* H5F_LIBVER_V200 */
H5O_FILL_VERSION_3, /* H5F_LIBVER_V220 */
H5O_FILL_VERSION_3, /* H5F_LIBVER_V230 */
H5O_FILL_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
src/H5Ofsinfo.c
+1 -1
View File
@@ -70,7 +70,7 @@ static const unsigned H5O_fsinfo_ver_bounds[] = {
H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V112 */
H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V114 */
H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V200 */
H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V220 */
H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V230 */
H5O_FSINFO_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
#define N_FSINFO_VERSION_BOUNDS H5F_LIBVER_NBOUNDS
src/H5Oint.c
+1 -1
View File
@@ -129,7 +129,7 @@ const unsigned H5O_obj_ver_bounds[] = {
H5O_VERSION_2, /* H5F_LIBVER_V112 */
H5O_VERSION_2, /* H5F_LIBVER_V114 */
H5O_VERSION_2, /* H5F_LIBVER_V200 */
H5O_VERSION_2, /* H5F_LIBVER_V220 */
H5O_VERSION_2, /* H5F_LIBVER_V230 */
H5O_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
src/H5Opline.c
+1 -1
View File
@@ -91,7 +91,7 @@ const unsigned H5O_pline_ver_bounds[] = {
H5O_PLINE_VERSION_2, /* H5F_LIBVER_V112 */
H5O_PLINE_VERSION_2, /* H5F_LIBVER_V114 */
H5O_PLINE_VERSION_2, /* H5F_LIBVER_V200 */
H5O_PLINE_VERSION_3, /* H5F_LIBVER_V220 */
H5O_PLINE_VERSION_3, /* H5F_LIBVER_V230 */
H5O_PLINE_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
src/H5Pocpl.c
+1 -1
View File
@@ -2031,7 +2031,7 @@ done:
*
* Return: Non-negative on success / Negative on failure
*
* Since: 2.2.0
* Since: 2.3.0
*-------------------------------------------------------------------------
*/
herr_t
src/H5Ppublic.h
+1 -1
View File
@@ -2886,7 +2886,7 @@ H5_DLL herr_t H5Pappend_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int
* to another dataset). The filter's \c set_config callback is not
* invoked for this entry point.
*
* \since 2.2.0
* \since 2.3.0
*/
H5_DLL herr_t H5Pappend_filter_blob(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, const void *buf,
size_t size);
src/H5S.c
+1 -1
View File
@@ -65,7 +65,7 @@ const unsigned H5O_sdspace_ver_bounds[] = {
H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V112 */
H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V114 */
H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V200 */
H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V220 */
H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V230 */
H5O_SDSPACE_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
src/H5Shyper.c
+1 -1
View File
@@ -242,7 +242,7 @@ static const unsigned H5O_sds_hyper_ver_bounds[] = {
H5S_HYPER_VERSION_3, /* H5F_LIBVER_V112 */
H5S_HYPER_VERSION_3, /* H5F_LIBVER_V114 */
H5S_HYPER_VERSION_3, /* H5F_LIBVER_V200 */
H5S_HYPER_VERSION_3, /* H5F_LIBVER_V220 */
H5S_HYPER_VERSION_3, /* H5F_LIBVER_V230 */
H5S_HYPER_VERSION_3 /* H5F_LIBVER_LATEST */
};
src/H5Spoint.c
+1 -1
View File
@@ -127,7 +127,7 @@ static const unsigned H5O_sds_point_ver_bounds[] = {
H5S_POINT_VERSION_2, /* H5F_LIBVER_V112 */
H5S_POINT_VERSION_2, /* H5F_LIBVER_V114 */
H5S_POINT_VERSION_2, /* H5F_LIBVER_V200 */
H5S_POINT_VERSION_2, /* H5F_LIBVER_V220 */
H5S_POINT_VERSION_2, /* H5F_LIBVER_V230 */
H5S_POINT_VERSION_2 /* H5F_LIBVER_LATEST */
};
src/H5T.c
+1 -1
View File
@@ -742,7 +742,7 @@ const unsigned H5O_dtype_ver_bounds[] = {
H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V112 */
H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V114 */
H5O_DTYPE_VERSION_5, /* H5F_LIBVER_V200 */
H5O_DTYPE_VERSION_5, /* H5F_LIBVER_V220 */
H5O_DTYPE_VERSION_5, /* H5F_LIBVER_V230 */
H5O_DTYPE_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
src/H5Zdevelop.h
+4 -4
View File
@@ -270,7 +270,7 @@ typedef size_t (*H5Z_func2_t)(unsigned int flags, size_t cd_nelmts, const unsign
* whatever they need in the two fields, as long as \c read_blob can recover
* the blob from them.
*
* \since 2.2.0
* \since 2.3.0
*/
typedef struct H5Z_blob_loc_t {
haddr_t addr; /**< Global heap collection address */
@@ -292,7 +292,7 @@ typedef struct H5Z_blob_loc_t {
* \c set_local callback runs. If the filter class leaves this field
* NULL, the library uses its default global-heap (H5HG) writer.
*
* \since 2.2.0
* \since 2.3.0
*/
typedef herr_t (*H5Z_write_blob_func_t)(hid_t file_id, const void *buf, size_t size, H5Z_blob_loc_t *loc_out);
@@ -313,7 +313,7 @@ typedef herr_t (*H5Z_write_blob_func_t)(hid_t file_id, const void *buf, size_t s
* it here using \p file_id and cache the result for later
* \c H5Z_func2_t invocations.
*
* \since 2.2.0
* \since 2.3.0
*/
typedef herr_t (*H5Z_read_blob_func_t)(hid_t file_id, H5Z_blob_loc_t loc, void **buf_out, size_t *size_out);
@@ -328,7 +328,7 @@ typedef herr_t (*H5Z_read_blob_func_t)(hid_t file_id, H5Z_blob_loc_t loc, void *
* \details Called at dataset close. If the filter class leaves this field
* NULL, the library releases the buffer itself.
*
* \since 2.2.0
* \since 2.3.0
*/
typedef herr_t (*H5Z_close_blob_func_t)(void *buf, size_t size);
src/H5trace.c
+2 -2
View File
@@ -1456,8 +1456,8 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap)
H5RS_acat(rs, "H5F_LIBVER_V200");
break;
case H5F_LIBVER_V220:
HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V220);
case H5F_LIBVER_V230:
HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V230);
H5RS_acat(rs, "H5F_LIBVER_LATEST");
break;
test/chunk_info.c
+1 -1
View File
@@ -53,7 +53,7 @@
* a new library version bound is added to H5F_libver_t in H5Fpublic.h. */
static const char *FILENAME[] = {"tchunk_info_earliest", "tchunk_info_v18", "tchunk_info_v110",
"tchunk_info_v112", "tchunk_info_v114", "tchunk_info_v200",
"tchunk_info_v220", "tchunk_info_v300", NULL};
"tchunk_info_v230", "tchunk_info_v300", NULL};
/* File to be used in test_failed_attempts */
#define FILTERMASK_FILE "tflt_msk"
test/h5test.c
+1 -1
View File
@@ -111,7 +111,7 @@ const char *LIBVER_NAMES[] = {"earliest", /* H5F_LIBVER_EARLIEST = 0 */
"v112", /* H5F_LIBVER_V112 = 3 */
"v114", /* H5F_LIBVER_V114 = 4 */
"v200", /* H5F_LIBVER_V200 = 5 */
"v220", /* H5F_LIBVER_V220 = 6 */
"v230", /* H5F_LIBVER_V230 = 6 */
NULL};
/* Previous error reporting function */