mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-12 15:45:21 +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.
85 lines
2.7 KiB
Bash
Executable File
85 lines
2.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. "$srcdir/test_nczarr.sh"
|
|
|
|
set -e
|
|
|
|
s3isolate "testdir_nccopyz"
|
|
THISDIR=`pwd`
|
|
cd $ISOPATH
|
|
|
|
#chunkclean src dst
|
|
chunkclean() {
|
|
rm -f ./$2
|
|
cat ./$1 | sed -e "/:_Storage/d" | sed -e "/:_ChunkSizes/d" > ./$2
|
|
}
|
|
|
|
#verifychunking cdl-file <chunkspec>...
|
|
verifychunking() {
|
|
f=$1
|
|
shift
|
|
for t in "$@" ; do
|
|
x=`cat $f | tr -d "\t \r" | sed -e "/$t/p" -ed`
|
|
if test "x$x" = x ; then echo "$f: $t not found"; exit 1; fi
|
|
done
|
|
}
|
|
|
|
testcase() {
|
|
zext=$1
|
|
fileargs tmp
|
|
${execdir}/test_zchunks3 -e ${zext}
|
|
echo "*** Test that nccopy -c can chunk files"
|
|
${NCCOPY} -M0 tmp_chunks3.nc "$fileurl"
|
|
${NCDUMP} -n tmp -sh "$fileurl" > tmp_nccz.cdl
|
|
verifychunking tmp_nccz.cdl "ivar:_ChunkSizes=7,4,2,3,5,6,9;" "fvar:_ChunkSizes=9,6,5,3,2,4,7;"
|
|
|
|
fileargs tmp_chunked
|
|
${execdir}/test_zchunks3 -e ${zext}
|
|
${NCCOPY} -M0 -c dim0/,dim1/1,dim2/,dim3/1,dim4/,dim5/1,dim6/ tmp_chunks3.nc "$fileurl"
|
|
${NCDUMP} -sh -n tmp "$fileurl" > tmp_chunked.cdl
|
|
verifychunking tmp_chunked.cdl "ivar:_ChunkSizes=7,1,2,1,5,1,9;" "fvar:_ChunkSizes=9,1,5,1,2,1,7;"
|
|
chunkclean tmp_nccz.cdl tmpx.cdl
|
|
chunkclean tmp_chunked.cdl tmp_chunkedx.cdl
|
|
diff tmpx.cdl tmp_chunkedx.cdl
|
|
|
|
# Note that unchunked means that there is only one chunk
|
|
SRC="$fileurl"
|
|
fileargs tmp_unchunked
|
|
${NCCOPY} -M0 -c dim0/,dim1/,dim2/,dim3/,dim4/,dim5/,dim6/ "$SRC" "$fileurl"
|
|
${NCDUMP} -sh -n tmp "$fileurl" > tmp_unchunked.cdl
|
|
verifychunking tmp_unchunked.cdl "ivar:_ChunkSizes=7,4,2,3,5,6,9;" "fvar:_ChunkSizes=9,6,5,3,2,4,7;"
|
|
chunkclean tmp_unchunked.cdl tmp_unchunkedx.cdl
|
|
diff tmpx.cdl tmp_unchunkedx.cdl
|
|
|
|
# Test -c /
|
|
fileargs tmp_unchunked2
|
|
${NCCOPY} -M0 -c "//" "$SRC" "$fileurl"
|
|
${NCDUMP} -sh -n tmp "$fileurl" > tmp_unchunked2.cdl
|
|
verifychunking tmp_unchunked.cdl "ivar:_ChunkSizes=7,4,2,3,5,6,9;" "fvar:_ChunkSizes=9,6,5,3,2,4,7;"
|
|
chunkclean tmp_unchunked.cdl tmp_unchunkedx.cdl
|
|
diff tmpx.cdl tmp_unchunkedx.cdl
|
|
|
|
echo "*** Test that nccopy -c dim/n is used "
|
|
fileargs tmp_perdimspecs
|
|
${NCGEN} -4 -b -o "$fileurl" $srcdir/ref_perdimspecs.cdl
|
|
${NCDUMP} -n tmp_perdimspecs -hs "$fileurl" > tmp_perdimspecs.cdl
|
|
SRC=$fileurl
|
|
fileargs tmp_pds
|
|
|
|
${NCCOPY} -M0 -4 -c "time/10,lat/15,lon/20" "$SRC" "$fileurl"
|
|
${NCDUMP} -n tmp_pds -hs "$fileurl" > tmp_pds.cdl
|
|
STORAGE=`cat tmp_pds.cdl | sed -e "/tas:_Storage/p" -ed | tr '"' "'" | tr -d "\t \r"`
|
|
test "x$STORAGE" = "xtas:_Storage='chunked';"
|
|
CHUNKSIZES=`cat tmp_pds.cdl | sed -e "/tas:_ChunkSizes/p" -ed | tr -d "\t \r"`
|
|
test "x$CHUNKSIZES" = "xtas:_ChunkSizes=10,15,20;"
|
|
}
|
|
|
|
testcase file
|
|
if test "x$FEATURE_NCZARR_ZIP" = xyes ; then testcase zip; fi
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then testcase s3; fi
|
|
|
|
echo "*** All nccopy nczarr tests passed!"
|