mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-27 08:49:16 +08:00
df3636b959
This PR started as an attempt to add unlimited dimensions to NCZarr. It did that, but this exposed significant problems with test interference. So this PR is mostly about fixing -- well mitigating anyway -- test interference. The problem of test interference is now documented in the document docs/internal.md. The solutions implemented here are also describe in that document. The solution is somewhat fragile but multiple cleanup mechanisms are provided. Note that this feature requires that the AWS command line utility must be installed. ## Unlimited Dimensions. The existing NCZarr extensions to Zarr are modified to support unlimited dimensions. NCzarr extends the Zarr meta-data for the ".zgroup" object to include netcdf-4 model extensions. This information is stored in ".zgroup" as dictionary named "_nczarr_group". Inside "_nczarr_group", there is a key named "dims" that stores information about netcdf-4 named dimensions. The value of "dims" is a dictionary whose keys are the named dimensions. The value associated with each dimension name has one of two forms Form 1 is a special case of form 2, and is kept for backward compatibility. Whenever a new file is written, it uses format 1 if possible, otherwise format 2. * Form 1: An integer representing the size of the dimension, which is used for simple named dimensions. * Form 2: A dictionary with the following keys and values" - "size" with an integer value representing the (current) size of the dimension. - "unlimited" with a value of either "1" or "0" to indicate if this dimension is an unlimited dimension. For Unlimited dimensions, the size is initially zero, and as variables extend the length of that dimension, the size value for the dimension increases. That dimension size is shared by all arrays referencing that dimension, so if one array extends an unlimited dimension, it is implicitly extended for all other arrays that reference that dimension. This is the standard semantics for unlimited dimensions. Adding unlimited dimensions required a number of other changes to the NCZarr code-base. These included the following. * Did a partial refactor of the slice handling code in zwalk.c to clean it up. * Added a number of tests for unlimited dimensions derived from the same test in nc_test4. * Added several NCZarr specific unlimited tests; more are needed. * Add test of endianness. ## Misc. Other Changes * Modify libdispatch/ncs3sdk_aws.cpp to optionally support use of the AWS Transfer Utility mechanism. This is controlled by the ```#define TRANSFER```` command in that file. It defaults to being disabled. * Parameterize both the standard Unidata S3 bucket (S3TESTBUCKET) and the netcdf-c test data prefix (S3TESTSUBTREE). * Fixed an obscure memory leak in ncdump. * Removed some obsolete unit testing code and test cases. * Uncovered a bug in the netcdf-c handling of big-endian floats and doubles. Have not fixed yet. See tst_h5_endians.c. * Renamed some nczarr_tests testcases to avoid name conflicts with nc_test4. * Modify the semantics of zmap\#ncsmap_write to only allow total rewrite of objects. * Modify the semantics of zodom to properly handle stride > 1. * Add a truncate operation to the libnczarr zmap code.
137 lines
4.1 KiB
Bash
Executable File
137 lines
4.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
set -e
|
|
|
|
# Note: thredds-test is currently down and the URLs need to be replaced
|
|
|
|
# Test Urls
|
|
if test "x$FEATURE_THREDDSTEST" = x1 ; then
|
|
URL3="https://thredds-test.unidata.ucar.edu/thredds/fileServer/pointData/cf_dsg/example/point.nc#mode=bytes"
|
|
URL4b="https://thredds-test.unidata.ucar.edu/thredds/fileServer/irma/metar/files/METAR_20170910_0000.nc#bytes"
|
|
fi
|
|
if test "x$FEATURE_S3TESTS" != xno ; then
|
|
URL4a="https://s3.us-east-1.amazonaws.com/noaa-goes16/ABI-L1b-RadC/2017/059/03/OR_ABI-L1b-RadC-M3C13_G16_s20170590337505_e20170590340289_c20170590340316.nc#mode=bytes"
|
|
URL4c="s3://noaa-goes16/ABI-L1b-RadC/2017/059/03/OR_ABI-L1b-RadC-M3C13_G16_s20170590337505_e20170590340289_c20170590340316.nc#mode=bytes"
|
|
# Test alternate URL with no specified region
|
|
URL4e="http://noaa-goes16.s3.amazonaws.com/ABI-L1b-RadF/2022/001/18/OR_ABI-L1b-RadF-M6C01_G16_s20220011800205_e20220011809513_c20220011809562.nc#mode=bytes,s3"
|
|
fi
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then
|
|
# Requires auth
|
|
URL3b="s3://${S3TESTBUCKET}/byterangefiles/upload3.nc#bytes"
|
|
# Requires auth
|
|
URL4d="s3://${S3TESTBUCKET}/byterangefiles/upload4.nc#bytes&aws.profile=unidata"
|
|
fi
|
|
URL4f="https://crudata.uea.ac.uk/cru/data/temperature/HadCRUT.4.6.0.0.median.nc#mode=bytes"
|
|
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then
|
|
# Do not use unless we know it has some permanence (note the segment 'testing' in the URL);
|
|
URL4x="https://s3.us-west-2.amazonaws.com/coawst-public/testing/HadCRUT.4.6.0.0.median.nc#mode=bytes,&aws.profile=none"
|
|
fi
|
|
|
|
echo ""
|
|
|
|
testsetup() {
|
|
U=$1
|
|
# Create and upload test files
|
|
rm -f upload4.nc upload3.nc
|
|
${execdir}/../nczarr_test/s3util -u ${U} -k /byterangefiles clear
|
|
${NCGEN} -lb -3 ${srcdir}/nc_enddef.cdl
|
|
mv nc_enddef.nc upload3.nc
|
|
${execdir}/../nczarr_test/s3util -u ${U} -k /byterangefiles/upload3.nc -f upload3.nc upload
|
|
if test "x$FEATURE_HDF5" = xyes ; then
|
|
${NCGEN} -lb -4 ${srcdir}/nc_enddef.cdl
|
|
mv nc_enddef.nc upload4.nc
|
|
${execdir}/../nczarr_test/s3util -u ${U} -k /byterangefiles/upload4.nc -f upload4.nc upload
|
|
fi
|
|
rm -f tst_http_nc3.cdl tst_http_nc4?.cdl
|
|
}
|
|
|
|
testcleanup() {
|
|
U=$1
|
|
rm -f upload4.nc upload3.nc
|
|
${execdir}/../nczarr_test/s3util -u ${U} -k /byterangefiles clear
|
|
}
|
|
|
|
testbytes() {
|
|
TAG="$1"
|
|
EXPECTED="$2"
|
|
U="$3"
|
|
K=`${NCDUMP} -k "$U" | tr -d '\r\n'`
|
|
if test "x$K" != "x$EXPECTED" ; then
|
|
echo "test_http: -k flag mismatch: expected=$EXPECTED have=$K"
|
|
exit 1
|
|
fi
|
|
rm -f tst_http_$TAG.cdl
|
|
# Now test the reading of at least the metadata
|
|
${NCDUMP} -h "$U" >tst_http_$TAG.cdl
|
|
# compare
|
|
diff -wb tst_http_$TAG.cdl ${srcdir}/ref_tst_http_$TAG.cdl
|
|
}
|
|
|
|
tests3auth() {
|
|
TAG="$1"
|
|
EXPECTED="$2"
|
|
U="$3"
|
|
K=`${NCDUMP} -k "$U" | tr -d '\r\n'`
|
|
if test "x$K" != "x$EXPECTED" ; then
|
|
echo "test_http: -k flag mismatch: expected=$EXPECTED have=$K"
|
|
exit 1
|
|
fi
|
|
rm -f tmp_${TAG}.cdl
|
|
# Now test the reading of at least the metadata
|
|
${NCDUMP} -n nc_enddef "$U" >tmp_${TAG}.cdl
|
|
# compare
|
|
diff -wb tmp_$TAG.cdl ${srcdir}/nc_enddef.cdl
|
|
}
|
|
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then
|
|
testsetup https://s3.us-east-1.amazonaws.com/${S3TESTBUCKET}
|
|
fi
|
|
|
|
echo "*** Testing reading NetCDF-3 file with http"
|
|
|
|
if test "x$FEATURE_THREDDSTEST" = x1 ; then
|
|
echo "***Test remote classic file"
|
|
testbytes nc3 classic "$URL3"
|
|
fi
|
|
|
|
if test "x$FEATURE_HDF5" = xyes ; then
|
|
echo "***Test remote netcdf-4 files: non-s3"
|
|
if test "x$FEATURE_THREDDSTEST" = x1 ; then
|
|
testbytes nc4b netCDF-4 "$URL4b"
|
|
fi
|
|
testbytes nc4f netCDF-4 "$URL4f"
|
|
fi
|
|
|
|
if test "x$URL3B" != x ; then
|
|
echo "***Test remote netcdf-3 file: s3 auth"
|
|
tests3auth nc3b classic "$URL3b"
|
|
fi
|
|
|
|
if test "x$URL4a" != x ; then
|
|
echo "***Test remote netdf-4 file: s3"
|
|
testbytes nc4a netCDF-4 "$URL4a"
|
|
fi
|
|
if test "x$URL4c" != x ; then
|
|
echo "***Test remote netcdf-4 file: s3"
|
|
testbytes nc4c netCDF-4 "$URL4c"
|
|
fi
|
|
if test "x$URL4d" != x ; then
|
|
echo "***Test remote netcdf-4 file: s3 auth"
|
|
tests3auth nc4d netCDF-4 "$URL4d"
|
|
fi
|
|
if test "x$URL4e" != x ; then
|
|
echo "***Test remote netcdf-4 file: s3 noauth"
|
|
testbytes nc4e netCDF-4 "$URL4e"
|
|
fi
|
|
|
|
# Cleanup
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then
|
|
testcleanup https://s3.us-east-1.amazonaws.com/${S3TESTBUCKET}
|
|
fi
|
|
|
|
exit
|