Skip to content

Commit

Permalink
Add test for H5Fget_obj_count with datatypes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattjala
mattjala committed Aug 1, 2023
1 parent 966d7e1 commit 6d9525a
Showing 1 changed file with 144 additions and 0 deletions.
144 changes: 144 additions & 0 deletions test/tfile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,18 @@ const char *FILESPACE_NAME[] = {"tfilespace", NULL};
#define DST_FILE "fill18_copy.h5"
#define DSET_DS1 "DS1"

/* Declarations for test_get_datatype_count() */
#define DATATYPE_OBJ_COUNT_FILENAME_1 "datatype_obj_count_file1"
#define DATATYPE_OBJ_COUNT_FILENAME_2 "datatype_obj_count_file2"
#define DATATYPE_OBJ_COUNT_DATASET_NAME_1 "datatype_obj_count_dset1"
#define DATATYPE_OBJ_COUNT_DATASET_NAME_2 "datatype_obj_count_dset2"
#define DATATYPE_OBJ_COUNT_DATASET_NAME_3 "datatype_obj_count_dset3"
#define DATATYPE_OBJ_COUNT_DATASET_NAME_4 "datatype_obj_count_dset4"
#define DATATYPE_OBJ_COUNT_TRANSIENT_DATATYPE H5T_NATIVE_INT
#define DATATYPE_OBJ_COUNT_DATATYPE_NAME_1 "datatype_obj_count_type1"
#define DATATYPE_OBJ_COUNT_DATATYPE_NAME_2 "datatype_obj_count_type2"
#define DATATYPE_OBJ_COUNT_DSPACE_EXTENT 100

/* Local test function declarations for version bounds */
static void test_libver_bounds_low_high(const char *env_h5_drvr);
static void test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr);
Expand Down Expand Up @@ -1287,6 +1299,137 @@ test_get_obj_ids(void)
HDfree(oid_list);
}

/****************************************************************
**
** test_get_datatype_count(): Test that H5Fget_obj_ids doesn't
** count transient datatypes as open objects.
**
****************************************************************/
static void
test_get_datatype_count(void) {
hid_t file_id1 = H5I_INVALID_HID;
hid_t file_id2 = H5I_INVALID_HID;

hid_t dset_id1 = H5I_INVALID_HID;
hid_t dset_id2 = H5I_INVALID_HID;
hid_t dset_id3 = H5I_INVALID_HID;
hid_t dset_id4 = H5I_INVALID_HID;

hid_t type_id1 = H5I_INVALID_HID;
hid_t type_id2 = H5I_INVALID_HID;
hid_t type_id3 = H5I_INVALID_HID;

hid_t dspace_id = H5I_INVALID_HID;
hsize_t dims[1] = {DATATYPE_OBJ_COUNT_DSPACE_EXTENT};

ssize_t obj_count = 0;
herr_t ret = FAIL;

/* Check that no other files are open at the start of the test */
obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL);
VERIFY(obj_count, 0, "H5Fget_obj_count");

file_id1 = H5Fcreate(DATATYPE_OBJ_COUNT_FILENAME_1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(file_id1, H5I_INVALID_HID, "H5Fcreate");

/* Create dataset with transient datatype */
dspace_id = H5Screate_simple(1, dims, NULL);
CHECK(dspace_id, H5I_INVALID_HID, "H5Screate_simple");

dset_id1 = H5Dcreate2(file_id1, DATATYPE_OBJ_COUNT_DATASET_NAME_1, DATATYPE_OBJ_COUNT_TRANSIENT_DATATYPE, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
CHECK(dset_id1, H5I_INVALID_HID, "H5Dcreate2");

/* H5Fget_obj_count should not count transient datatype as open object */
obj_count = H5Fget_obj_count(file_id1, H5F_OBJ_DATATYPE);
VERIFY(obj_count, 0, "H5Fget_obj_count");

type_id1 = H5Tcopy(DATATYPE_OBJ_COUNT_TRANSIENT_DATATYPE);
CHECK(type_id1, H5I_INVALID_HID, "H5Tcopy");

ret = H5Tcommit2(file_id1, DATATYPE_OBJ_COUNT_DATATYPE_NAME_1, type_id1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
VERIFY((ret >= 0), true, "H5Tcommit2");

/* H5Fget_obj_count should count the committed datatype */
obj_count = H5Fget_obj_count(file_id1, H5F_OBJ_DATATYPE);
VERIFY(obj_count, 1, "H5Fget_obj_count");

/* Open file, committed datatype, and dataset */
obj_count = H5Fget_obj_count(file_id1, H5F_OBJ_ALL);
VERIFY(obj_count, 3, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(file_id1, H5F_OBJ_FILE | H5F_OBJ_DATATYPE);
VERIFY(obj_count, 2, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL);
VERIFY(obj_count, 3, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_FILE | H5F_OBJ_DATATYPE);
VERIFY(obj_count, 2, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_DATATYPE);
VERIFY(obj_count, 1, "H5Fget_obj_count");

/* Create second file to test file_id = H5F_OBJ_ALL with multiple files */
file_id2 = H5Fcreate(DATATYPE_OBJ_COUNT_FILENAME_2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(file_id2, H5I_INVALID_HID, "H5Fcreate");

dset_id2 = H5Dcreate2(file_id2, DATATYPE_OBJ_COUNT_DATASET_NAME_2, DATATYPE_OBJ_COUNT_TRANSIENT_DATATYPE, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
CHECK(dset_id2, H5I_INVALID_HID, "H5Dcreate2");

type_id2 = H5Tcopy(DATATYPE_OBJ_COUNT_TRANSIENT_DATATYPE);
CHECK(type_id2, H5I_INVALID_HID, "H5Tcopy");

ret = H5Tcommit2(file_id2, DATATYPE_OBJ_COUNT_DATATYPE_NAME_2, type_id2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
VERIFY((ret >= 0), true, "H5Tcommit2");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL);
VERIFY(obj_count, 6, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_FILE | H5F_OBJ_DATATYPE);
VERIFY(obj_count, 4, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_DATATYPE);
VERIFY(obj_count, 2, "H5Fget_obj_count");

/* Create a dataset which shares a pre-existing committed datatype */
dset_id3 = H5Dcreate2(file_id1, DATATYPE_OBJ_COUNT_DATASET_NAME_3, type_id1, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
CHECK(dset_id3, H5I_INVALID_HID, "H5Dcreate2");

obj_count = H5Fget_obj_count(file_id1, H5F_OBJ_DATATYPE);
VERIFY(obj_count, 1, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_DATATYPE);
VERIFY(obj_count, 2, "H5Fget_obj_count");

/* Create dataset with copy of transient datatype */
type_id3 = H5Tcopy(DATATYPE_OBJ_COUNT_TRANSIENT_DATATYPE);
CHECK(type_id3, H5I_INVALID_HID, "H5Tcopy");

dset_id4 = H5Dcreate2(file_id1, DATATYPE_OBJ_COUNT_DATASET_NAME_4, type_id3, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
CHECK(dset_id4, H5I_INVALID_HID, "H5Dcreate2");

obj_count = H5Fget_obj_count(file_id1, H5F_OBJ_DATATYPE);
VERIFY(obj_count, 1, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_DATATYPE);
VERIFY(obj_count, 2, "H5Fget_obj_count");

obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL);
VERIFY(obj_count, 8, "H5Fget_obj_count");

H5Tclose(type_id1);
H5Tclose(type_id2);
H5Tclose(type_id3);

H5Dclose(dset_id1);
H5Dclose(dset_id2);
H5Dclose(dset_id3);
H5Dclose(dset_id4);

H5Fclose(file_id1);
H5Fclose(file_id2);
}

/****************************************************************
**
** test_get_file_id(): Test H5Iget_file_id()
Expand Down Expand Up @@ -8153,6 +8296,7 @@ test_file(void)
test_file_close(); /* Test file close behavior */
test_get_file_id(); /* Test H5Iget_file_id */
test_get_obj_ids(); /* Test H5Fget_obj_ids for Jira Issue 8528 */
test_get_datatype_count(); /* Test for H5Fget_obj_count for committed vs. transient datatypes */
test_file_perm(); /* Test file access permissions */
test_file_perm2(); /* Test file access permission again */
test_file_is_accessible(env_h5_drvr); /* Test detecting HDF5 files correctly */
Expand Down

0 comments on commit 6d9525a

Please sign in to comment.