mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
59e04ae071
cloud using a variant of the Zarr protocol and storage format. This enhancement is generically referred to as "NCZarr". The data model supported by NCZarr is netcdf-4 minus the user-defined types and the String type. In this sense it is similar to the CDF-5 data model. More detailed information about enabling and using NCZarr is described in the document NUG/nczarr.md and in a [Unidata Developer's blog entry](https://www.unidata.ucar.edu/blogs/developer/en/entry/overview-of-zarr-support-in). WARNING: this code has had limited testing, so do use this version for production work. Also, performance improvements are ongoing. Note especially the following platform matrix of successful tests: Platform | Build System | S3 support ------------------------------------ Linux+gcc | Automake | yes Linux+gcc | CMake | yes Visual Studio | CMake | no Additionally, and as a consequence of the addition of NCZarr, major changes have been made to the Filter API. NOTE: NCZarr does not yet support filters, but these changes are enablers for that support in the future. Note that it is possible (probable?) that there will be some accidental reversions if the changes here did not correctly mimic the existing filter testing. In any case, previously filter ids and parameters were of type unsigned int. In order to support the more general zarr filter model, this was all converted to char*. The old HDF5-specific, unsigned int operations are still supported but they are wrappers around the new, char* based nc_filterx_XXX functions. This entailed at least the following changes: 1. Added the files libdispatch/dfilterx.c and include/ncfilter.h 2. Some filterx utilities have been moved to libdispatch/daux.c 3. A new entry, "filter_actions" was added to the NCDispatch table and the version bumped. 4. An overly complex set of structs was created to support funnelling all of the filterx operations thru a single dispatch "filter_actions" entry. 5. Move common code to from libhdf5 to libsrc4 so that it is accessible to nczarr. Changes directly related to Zarr: 1. Modified CMakeList.txt and configure.ac to support both C and C++ -- this is in support of S3 support via the awd-sdk libraries. 2. Define a size64_t type to support nczarr. 3. More reworking of libdispatch/dinfermodel.c to support zarr and to regularize the structure of the fragments section of a URL. Changes not directly related to Zarr: 1. Make client-side filter registration be conditional, with default off. 2. Hack include/nc4internal.h to make some flags added by Ed be unique: e.g. NC_CREAT, NC_INDEF, etc. 3. cleanup include/nchttp.h and libdispatch/dhttp.c. 4. Misc. changes to support compiling under Visual Studio including: * Better testing under windows for dirent.h and opendir and closedir. 5. Misc. changes to the oc2 code to support various libcurl CURLOPT flags and to centralize error reporting. 6. By default, suppress the vlen tests that have unfixed memory leaks; add option to enable them. 7. Make part of the nc_test/test_byterange.sh test be contingent on remotetest.unidata.ucar.edu being accessible. Changes Left TO-DO: 1. fix provenance code, it is too HDF5 specific.
85 lines
2.9 KiB
Bash
Executable File
85 lines
2.9 KiB
Bash
Executable File
#!/bin/sh
|
|
# This shell script runs extra tests ncdump for netcdf-4
|
|
# Dennis Heimbigner, Ward Fisher
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
set -e
|
|
|
|
# Remove the version information from _NCProperties
|
|
cleanncprops() {
|
|
src="$1"
|
|
dst="$2"
|
|
rm -f $dst
|
|
cat $src \
|
|
| sed -e '/:_Endianness/d' \
|
|
| sed -e 's/_SuperblockVersion = 1/_SuperblockVersion = 0/' \
|
|
| sed -e 's/\(netcdflibversion\|netcdf\)=.*|/\1=NNNN|/' \
|
|
| sed -e 's/\(hdf5libversion\|hdf5\)=.*"/\1=HHHH"/' \
|
|
| grep -v '_NCProperties' \
|
|
| cat >$dst
|
|
}
|
|
|
|
echo ""
|
|
echo "*** Running extra netcdf-4 tests."
|
|
|
|
#
|
|
# In windows, these tests fail because srcdir is prepended.
|
|
# e.g., Instead of 'ncdump ref_tst_compounds2' the file would
|
|
# contain:
|
|
# 'ncdump ./ref_tst_compounds2'. This causes the test to fail.
|
|
# But, 'srcdir' is necessary for make distcheck.
|
|
#
|
|
# Short term solution, use sed when on windows/MSYS to
|
|
# remove the './','../../ncdump'.
|
|
#
|
|
# I am undoing this because libdispatch/dwinpath.c
|
|
# should be taking care of this. If not, then that is
|
|
# what we need to fix. Alternatively, we can use top_srcdir,
|
|
# which is an absolute path
|
|
|
|
echo "*** running tst_string_data to create test files..."
|
|
${execdir}/tst_string_data
|
|
|
|
echo "*** dumping tst_string_data.nc to tst_string_data.cdl..."
|
|
${NCDUMP} tst_string_data.nc > tst_string_data.cdl
|
|
cleanncprops tst_string_data.cdl tst_string_data.tmp
|
|
cleanncprops ${srcdir}/ref_tst_string_data.cdl ref_tst_string_data.tmp
|
|
echo "*** comparing tst_string_data.cdl with ref_tst_string_data.cdl..."
|
|
diff -b tst_string_data.tmp ref_tst_string_data.tmp
|
|
|
|
#echo '*** testing non-coordinate variable of same name as dimension...'
|
|
#${NCGEN} -v4 -b -o tst_noncoord.nc ${top_srcdir}/ncdump/ref_tst_noncoord.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds2.nc...'
|
|
${NCDUMP} ${top_srcdir}/ncdump/ref_tst_compounds2.nc > tst_compounds2.cdl
|
|
diff -b tst_compounds2.cdl ${top_srcdir}/ncdump/ref_tst_compounds2.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds3.nc...'
|
|
${NCDUMP} ${top_srcdir}/ncdump/ref_tst_compounds3.nc > tst_compounds3.cdl
|
|
diff -b tst_compounds3.cdl ${top_srcdir}/ncdump/ref_tst_compounds3.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds4.nc...'
|
|
${NCDUMP} ${top_srcdir}/ncdump/ref_tst_compounds4.nc > tst_compounds4.cdl
|
|
diff -b tst_compounds4.cdl ${top_srcdir}/ncdump/ref_tst_compounds4.cdl
|
|
|
|
# Exercise Jira NCF-213 bug fix
|
|
# rm -f tst_ncf213.cdl tst_ncf213.nc
|
|
# Remove specific _NCProperties values
|
|
${NCGEN} -b -o tst_ncf213.nc $srcdir/ref_tst_ncf213.cdl
|
|
${NCDUMP} -s -h tst_ncf213.nc > tst_ncf213.cdl
|
|
cleanncprops tst_ncf213.cdl tst_ncf213.tmp
|
|
cleanncprops ${srcdir}/ref_tst_ncf213.cdl ref_tst_ncf213.tmp
|
|
# Now compare
|
|
ok=1;
|
|
if diff -b tst_ncf213.tmp ref_tst_ncf213.tmp ; then ok=1; else ok=0; fi
|
|
|
|
if test $ok = 0 ; then
|
|
echo "*** FAIL: NCF-213 Bug Fix test"
|
|
exit 1
|
|
fi
|
|
|
|
echo "*** All ncgen and ncdump extra test output for netCDF-4 format passed!"
|
|
exit 0
|