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

Improve the fix for #350 included in #1119 #1521

Merged
merged 4 commits into from
Nov 15, 2019
Merged

Improve the fix for #350 included in #1119 #1521

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd181de
Improve the fix for #350 included in #1119
ckhroulev Nov 12, 2019
098f2c1
Modify the condition used to check if an attribute can be re-used
ckhroulev Nov 13, 2019
6abbf8d
Whitespace changes
ckhroulev Nov 13, 2019
bb45db4
Add regression tests modifying attributes 2^16 times
ckhroulev Nov 13, 2019
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
51 changes: 39 additions & 12 deletions libhdf5/nc4hdf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,6 @@ put_att_grpa(NC_GRP_INFO_T *grp, int varid, NC_ATT_INFO_T *att)
hid_t existing_att_typeid = 0, existing_attid = 0, existing_spaceid = 0;
hsize_t dims[1]; /* netcdf attributes always 1-D. */
htri_t attr_exists;
int reuse_att = 0; /* Will be true if we can re-use an existing att. */
void *data;
int phoney_data = 99;
int retval = NC_NOERR;
Expand Down Expand Up @@ -612,31 +611,59 @@ put_att_grpa(NC_GRP_INFO_T *grp, int varid, NC_ATT_INFO_T *att)
BAIL(NC_EATTMETA);

/* How big is the attribute? */
if ((existing_spaceid = H5Aget_space(existing_attid)) < 0)
if (att->nc_typeid == NC_CHAR) {
/* For text attributes the size is specified in the datatype
and it is enough to compare types using H5Tequal(). Here
we set npoints to disable the second part of the
comparison below. */
npoints = att->len;
}
else
{
if ((existing_spaceid = H5Aget_space(existing_attid)) < 0)
BAIL(NC_EATTMETA);
if ((npoints = H5Sget_simple_extent_npoints(existing_spaceid)) < 0)
if ((npoints = H5Sget_simple_extent_npoints(existing_spaceid)) < 0)
BAIL(NC_EATTMETA);
}

/* Delete the attribute. */
if (file_typeid != existing_att_typeid || npoints != att->len)
if (!H5Tequal(file_typeid, existing_att_typeid) || npoints != att->len)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should modify this condition instead of setting npoints to att->len above. This has been a long day...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, it's a new day! ;-) Make the modification if you think it should be made.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. I think this version makes it easier to see what's going on.

{
/* The attribute exists but we cannot re-use it. */

/* Delete the attribute. */
if (H5Adelete(locid, att->hdr.name) < 0)
BAIL(NC_EHDFERR);

/* Re-create the attribute with the type and length
reflecting the new value (or values). */
if ((attid = H5Acreate(locid, att->hdr.name, file_typeid, spaceid,
H5P_DEFAULT)) < 0)
BAIL(NC_EATTMETA);

/* Write the values, (even if length is zero). */
if (H5Awrite(attid, file_typeid, data) < 0)
BAIL(NC_EATTMETA);
}
else
{
reuse_att++;
/* The attribute exists and we can re-use it. */

/* Write the values, re-using the existing attribute. */
if (H5Awrite(existing_attid, file_typeid, data) < 0)
BAIL(NC_EATTMETA);
}
}
} else {
/* The attribute does not exist yet. */

/* Create the attribute. */
if ((attid = H5Acreate(locid, att->hdr.name, file_typeid, spaceid,
H5P_DEFAULT)) < 0)
/* Create the attribute. */
if ((attid = H5Acreate(locid, att->hdr.name, file_typeid, spaceid,
H5P_DEFAULT)) < 0)
BAIL(NC_EATTMETA);

/* Write the values, (even if length is zero). */
if (H5Awrite(attid, file_typeid, data) < 0)
/* Write the values, (even if length is zero). */
if (H5Awrite(attid, file_typeid, data) < 0)
BAIL(NC_EATTMETA);
}

exit:
if (file_typeid && H5Tclose(file_typeid))
Expand Down