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

Fix handling of NULL start/count/stride, remove unneeded file lookups, moved get/put code from nc4hdf5.c to hdf5var.c #1112

Merged
merged 34 commits into from
Aug 28, 2018
Merged

Fix handling of NULL start/count/stride, remove unneeded file lookups, moved get/put code from nc4hdf5.c to hdf5var.c #1112

merged 34 commits into from
Aug 28, 2018

Conversation

edhartnett
Copy link
Contributor

@edhartnett edhartnett commented Aug 16, 2018 •
edited
Loading

Fixes #231.
Fixes #999.
Part of #856.
Part of #857.
Part of #965.
Fixes #1009.
Fixes #1029.

In this PR there are some fixes on the way to the lazy var reads:

  • Fixed handling of NULLs as start/count/stride in get/put calls.
  • Removed dead code protected by VARS_USES_VARM macro - this code would no longer work with these changes, and is no longer needed.
  • Removed unneeded extra file lookup in var1, vara, and vars functions.
  • Moved some type checking for user-defined types from dvarget/dvarput into the netCDF-4 code.
  • Moved the get/put functions from nc4hdf5.c to hdf5var.c.
  • Extra testing for these changes.
  • Some documentation improvements along the way.

@edhartnett
renamed get_fill_value
5e9ffca
@edhartnett
moved put and get vars functions from nc4hdf5.c to hdf5var.c
2e7a7ea
@edhartnett
added nc4_find_grp_h5_var
b599927
@edhartnett
further development
252f1c3
@edhartnett
checking for user-defined type in put_vars
80d4b9f
@edhartnett
reject NULL start for put_vars
df371b2
@edhartnett
return error for put_vars calls with NULL start
1922263
@edhartnett
return error for put_vara calls with NULL start
a63f344
@edhartnett
return error for put_vara calls with NULL start
ec3d3a3
@edhartnett
removed unneeded netcdf-4 checks in dvarget.c
b29cc1b
@edhartnett
undid unneeded nc_test changes
8b26c83
@edhartnett
put_vars checking for NULL start for non-scalar vars and test
97c2541
@edhartnett
testing NULL starts
a271ebb
@edhartnett
return error for NULL start for varm functions
5c39fa1
@edhartnett
documentation
0b13f52
@edhartnett
fixed problem of not calling NC_ versions of vars and varm functions …
a0bea92 
…for extra error checking
@edhartnett
checking NULLs in function
acc22e0
@edhartnett
fixed HDF4 test
69b37d9
@edhartnett
more NULL parameter changes
baa7621
@edhartnett
more NULL parameter changes
3046dab
@edhartnett
removing unneeded file lookups
d1ed803
@edhartnett
removing unneeded file lookups
1e3fe2b
@edhartnett
removing unneeded file lookups
bc3c63b
@edhartnett
removing unneeded file lookups
24f0c9d
@edhartnett
removing unneeded file lookups
5800fdd
@edhartnett
removing unneeded file lookups
d6c0cbe
@edhartnett
converting NULL checking of put functions
5f9b7af
@edhartnett
converting NULL checking of put functions
829d9d2
@edhartnett
converting NULL checking of put functions
9953e53
@edhartnett
fix memory issue
ab1216d
@edhartnett edhartnett changed the title Ejh vars null count issue 2 Fix handling of NULL start/count/stride, remove unneeded file lookups, moved get/put code from nc4hdf5.c to hdf5var.c Aug 16, 2018
@edhartnett edhartnett closed this Aug 16, 2018
@edhartnett edhartnett mentioned this pull request Aug 18, 2018
Closed
@edhartnett edhartnett reopened this Aug 20, 2018
@edhartnett edhartnett mentioned this pull request Aug 21, 2018
Merged
@edhartnett
Copy link
Contributor Author

@WardF can we get this one merged soon please? Plenty more to come...

@WardF WardF self-assigned this Aug 27, 2018
@WardF WardF added this to the 4.7.0 milestone Aug 27, 2018
@WardF
Copy link
Member

WardF commented Aug 27, 2018

Merging after the update w/ master!

@WardF WardF merged commit 416413b into Unidata:master Aug 28, 2018
@edhartnett
Copy link
Contributor Author

Thanks!

@edhartnett edhartnett deleted the ejh_vars_null_count_issue_2 branch August 28, 2018 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DennisHeimbigner DennisHeimbigner Awaiting requested review from DennisHeimbigner

@WardF WardF Awaiting requested review from WardF

Assignees

@WardF WardF

Labels
None yet
Projects
None yet
Milestone
4.6.2
2 participants
@edhartnett @WardF