Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compound subsetting through H5Tconvert and field selection #118

Merged
merged 6 commits into from
Apr 15, 2024
Merged

Compound subsetting through H5Tconvert and field selection #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc05d2e
Sync with curl refactor
mattjala Mar 21, 2024
a8e47f3
Merge branch 'master' into cmpd_subset_conversion_pipeline
jhendersonHDF Apr 9, 2024
712d2b2
Committing clang-format changes
github-actions[bot] Apr 9, 2024
2e83194
Update subset check; fix non-cmpd conversion
mattjala Apr 10, 2024
00cfda3
Check cmpd member types when subsetting
mattjala Apr 10, 2024
7701efa
Use encoded member name in request
mattjala Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/rest_vol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,17 @@ extern RV_type_info *RV_type_info_array_g[];
* *
**************************/

/* Values for the optimization of compound data reading and writing. They indicate
* whether the fields of the source and destination are subset of each other
*/
typedef enum {
H5T_SUBSET_BADVALUE = -1, /* Invalid value */
H5T_SUBSET_FALSE = 0, /* Source and destination aren't subset of each other */
H5T_SUBSET_SRC, /* Source is the subset of dest and no conversion is needed */
H5T_SUBSET_DST, /* Dest is the subset of source and no conversion is needed */
H5T_SUBSET_CAP /* Must be the last value */
} RV_subset_t;

/*
* A struct which is used to return a link's name or the size of
* a link's name when calling H5Lget_name_by_idx.
Expand Down Expand Up @@ -580,6 +591,10 @@ typedef struct dataset_write_info {
curl_off_t write_len;
upload_info uinfo;
const void *buf;

/* If writing using compound subsetting, this is a packed version of the
* compound type containing only the selected members */
hid_t dense_cmpd_subset_dtype_id;
} dataset_write_info;

typedef struct dataset_read_info {
Expand Down Expand Up @@ -796,6 +811,12 @@ herr_t RV_convert_datatype_to_JSON(hid_t type_id, char **type_body, size_t *type
/* Helper function to escape control characters for JSON strings */
herr_t RV_JSON_escape_string(const char *in, char *out, size_t *out_size);

/* Determine if a read from file to mem dtype is a compound subset read */
herr_t RV_get_cmpd_subset_type(hid_t src_type_id, hid_t dst_type_id, RV_subset_t *subset_info);

/* Helper to get information about members in dst that are included in src compound */
herr_t RV_get_cmpd_subset_nmembers(hid_t src_type_id, hid_t dst_type_id, size_t *num_cmpd_members);

#define SERVER_VERSION_MATCHES_OR_EXCEEDS(version, major_needed, minor_needed, patch_needed) \
(version.major > major_needed) || (version.major == major_needed && version.minor > minor_needed) || \
(version.major == major_needed && version.minor == minor_needed && version.patch >= patch_needed)
Expand All @@ -811,6 +832,9 @@ herr_t RV_JSON_escape_string(const char *in, char *out, size_t *out_size);

#define SERVER_VERSION_SUPPORTS_LONG_NAMES(version) (SERVER_VERSION_MATCHES_OR_EXCEEDS(version, 0, 8, 6))

#define SERVER_VERSION_SUPPORTS_MEMBER_SELECTION(version) \
(SERVER_VERSION_MATCHES_OR_EXCEEDS(version, 0, 8, 6))

#ifdef __cplusplus
}
#endif
Expand Down
Loading
Loading