diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-10-26 04:33:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-26 04:33:30 (GMT) |
commit | 9c61f7b1e1cfb65cd562febfbb7ad49e8785825c (patch) | |
tree | 2bf6453021345ae6013d6181e6028f2ff41dd7cb /java/test/TestH5R.java | |
parent | ad2d77397ac564836f5fd89e66d5647250daf10e (diff) | |
download | hdf5-9c61f7b1e1cfb65cd562febfbb7ad49e8785825c.zip hdf5-9c61f7b1e1cfb65cd562febfbb7ad49e8785825c.tar.gz hdf5-9c61f7b1e1cfb65cd562febfbb7ad49e8785825c.tar.bz2 |
JNI: Improve varlen datatype handling in H5A/H5D read/write functions (#2156)
* Improve JNI VL datatype read/write to handle complex combinations
* Implement VL of VL JNI writes and reads
* Add Java VLofVL test for attributtes
* Changes to address review issues
* Fix H5Aread vl blocks
Diffstat (limited to 'java/test/TestH5R.java')
-rw-r--r-- | java/test/TestH5R.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/java/test/TestH5R.java b/java/test/TestH5R.java index 221a71e..1dcf992 100644 --- a/java/test/TestH5R.java +++ b/java/test/TestH5R.java @@ -600,7 +600,7 @@ public class TestH5R { HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT); assertTrue("testH5RVLattr_ref: ", attr_obj_id >= 0); - H5.H5AwriteVL(attr_obj_id, atype_obj_id, vl_obj_data); + H5.H5Awrite(attr_obj_id, atype_obj_id, vl_obj_data); } catch (Exception err) { if (attr_obj_id > 0) @@ -657,7 +657,7 @@ public class TestH5R { HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT); assertTrue("testH5RVLattr_ref: ", attr_reg_id >= 0); - H5.H5AwriteVL(attr_reg_id, atype_reg_id, vl_reg_data); + H5.H5Awrite(attr_reg_id, atype_reg_id, vl_reg_data); } catch (Exception err) { if (attr_reg_id > 0) @@ -696,7 +696,7 @@ public class TestH5R { vl_readbuf[j] = new ArrayList<byte[]>(); try { - H5.H5AreadVL(attr_obj_id, atype_obj_id, vl_readbuf); + H5.H5Aread(attr_obj_id, atype_obj_id, vl_readbuf); } catch (Exception ex) { ex.printStackTrace(); @@ -716,7 +716,7 @@ public class TestH5R { vl_readbuf[j] = new ArrayList<byte[]>(); try { - H5.H5AreadVL(attr_reg_id, atype_reg_id, vl_readbuf); + H5.H5Aread(attr_reg_id, atype_reg_id, vl_readbuf); } catch (Exception ex) { ex.printStackTrace(); @@ -831,8 +831,8 @@ public class TestH5R { HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT); assertTrue("testH5RVLdset_ref: ", dset_obj_id >= 0); - H5.H5DwriteVL(dset_obj_id, dtype_obj_id, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, - HDF5Constants.H5P_DEFAULT, vl_obj_data); + H5.H5Dwrite(dset_obj_id, dtype_obj_id, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, + HDF5Constants.H5P_DEFAULT, vl_obj_data); } catch (Exception err) { if (dset_obj_id > 0) @@ -890,8 +890,8 @@ public class TestH5R { HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT); assertTrue("testH5RVLdset_ref: ", dset_reg_id >= 0); - H5.H5DwriteVL(dset_reg_id, dtype_reg_id, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, - HDF5Constants.H5P_DEFAULT, vl_reg_data); + H5.H5Dwrite(dset_reg_id, dtype_reg_id, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, + HDF5Constants.H5P_DEFAULT, vl_reg_data); } catch (Exception err) { if (dset_reg_id > 0) @@ -930,8 +930,8 @@ public class TestH5R { vl_readbuf[j] = new ArrayList<byte[]>(); try { - H5.H5DreadVL(dset_obj_id, dtype_obj_id, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, - HDF5Constants.H5P_DEFAULT, vl_readbuf); + H5.H5Dread(dset_obj_id, dtype_obj_id, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, + HDF5Constants.H5P_DEFAULT, vl_readbuf); } catch (Exception ex) { ex.printStackTrace(); @@ -951,8 +951,8 @@ public class TestH5R { vl_readbuf[j] = new ArrayList<byte[]>(); try { - H5.H5DreadVL(dset_reg_id, dtype_reg_id, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, - HDF5Constants.H5P_DEFAULT, vl_readbuf); + H5.H5Dread(dset_reg_id, dtype_reg_id, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, + HDF5Constants.H5P_DEFAULT, vl_readbuf); } catch (Exception ex) { ex.printStackTrace(); |