mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-27 07:30:33 +08:00
74b40fd788
Re: https://github.com/zarr-developers/zarr-python/pull/716 The Zarr version 2 spec has been extended to include the ability to choose the dimension separator in chunk name keys. The legal separators has been extended from {'.'} to {'.' '/'}. So now it is possible to use a key like "0/1/2/0" for chunk names. This PR implements this for NCZarr. The V2 spec now says that this separator can be set on a per-variable basis. For now, I have chosen to allow this be set only globally by adding a key named "ZARR.DIMENSION_SEPARATOR=<char>" in the .daprc/.dodsrc/ncrc file. Currently, the only legal separator characters are '.' (the default) and '/'. On writing, this key will only be written if its value is different than the default. This change caused problems because supporting a separator of '/' is difficult to parse when keys/paths use '/' as the path separator. A test case was added for this. Additionally, make nczarr be enabled default by default. This required some additional changes so that if zip and/or AWS S3 sdk are unavailable, then they are disabled for NCZarr. In addition the following unrelated changes were made. 1. Tested that pure-zarr mode could read an nczarr formatted store. 1. The .rc file handling now merges all known .rc files (.ncrc,.daprc, and .dodsrc) in that order and using those in HOME first, then in current directory. For duplicate entries, the later ones override the earlier ones. This change is to remove some of the conflicts inherent in the current .rc file load process. A set of test cases was also added. 1. Re-order tests in configure.ac and CMakeLists.txt so that if libcurl is not found then the other options that depend upon it properly are disabled. 1. I decided that xarray support should be enabled by default for pure zarr. In order to allow disabling, I added a new mode flag "noxarray". 1. Certain test in nczarr_test depend on use of .dodsrc. In order for these to work when testing in parallel, some inter-test dependencies needed to be added. 1. Improved authorization testing to use changes in thredds.ucar.edu
133 lines
3.7 KiB
Bash
Executable File
133 lines
3.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# Note that this test builds a special results.<pid> directory in
|
|
# which to run the tests, where <pid> is the process id number of
|
|
# the bash shell instance. The reason for doing this is so that
|
|
# it works correctly under Github actions. By empirical
|
|
# observation, it appears that the various workflow matrix
|
|
# elements are not running in isolation when using cmake. Rather
|
|
# they appear to be running simultaneously while sharing the build
|
|
# directory for cmake. By running the tests in a separate
|
|
# results.<pid> I can guarantee that isolation is preserved.
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. ${srcdir}/test_nczarr.sh
|
|
|
|
set -e
|
|
|
|
TC="${execdir}/tst_chunkcases -4"
|
|
ZM="${execdir}/zmapio -t int"
|
|
|
|
remfile() {
|
|
case "$zext" in
|
|
nc4) rm -fr $1 ;;
|
|
file) rm -fr $1 ;;
|
|
zip) rm -fr $1 ;;
|
|
s3) ;;
|
|
*) echo "no such extension: $zext" ; exit 1;;
|
|
esac
|
|
}
|
|
|
|
remfile() {
|
|
case "$zext" in
|
|
nc4) rm -fr $1 ;;
|
|
file) rm -fr $1 ;;
|
|
zip) rm -fr $1 ;;
|
|
s3) ;;
|
|
*) echo "no such extension: $zext" ; exit 1;;
|
|
esac
|
|
}
|
|
|
|
makefile() {
|
|
fileargs $1
|
|
remfile $file
|
|
case "$zext" in
|
|
nc4) F=$file;;
|
|
file) F=$fileurl;;
|
|
zip) F=$fileurl;;
|
|
s3) F=$fileurl;;
|
|
*) echo "no such extension: $zext" ; exit 1;;
|
|
esac
|
|
}
|
|
|
|
testcases() {
|
|
|
|
zext=$1
|
|
echo ""; echo "*** Test format $1"
|
|
|
|
# Test whole chunk write and read
|
|
echo "Test whole chunk write then read"
|
|
makefile tmp_whole
|
|
rm -f tmp_whole_${zext}.txt tmp_whole_${zext}.cdl tmp_err_${zext}.txt
|
|
# This should fail
|
|
if ! $TC -d 8,8 -c 4,4 -f 4,3 -e 4,4 -X w -OWw $F >> tmp_err_${zext}.txt ; then
|
|
echo "XFAIL: wholechunk with bad -f"
|
|
fi
|
|
remfile $file
|
|
if ! $TC -d 8,8 -c 4,4 -f 4,4 -e 1,4 -X w -OWw $F >> tmp_err_${zext}.txt ; then
|
|
|
|
echo "XFAIL: wholechunk with bad -e"
|
|
fi
|
|
remfile $file
|
|
# This should succeed
|
|
$TC -d 8,8 -c 4,4 -f 4,4 -e 4,4 -X w -OWw $F
|
|
$TC -d 8,8 -c 4,4 -f 4,4 -e 4,4 -X w -OWr $F > tmp_whole_${zext}.txt
|
|
diff -b ${srcdir}/ref_whole.txt tmp_whole_${zext}.txt
|
|
${NCDUMP} $F > tmp_whole_${zext}.cdl
|
|
diff -b ${srcdir}/ref_whole.cdl tmp_whole_${zext}.cdl
|
|
|
|
# Test skipping whole chunks
|
|
echo "Test chunk skipping during read"
|
|
makefile tmp_skip
|
|
rm -f tmp_skip_${zext}.txt tmp_skip_${zext}.cdl
|
|
$TC -d 6,6 -c 2,2 -Ow $F
|
|
$TC -s 5,5 -p 6,6 -Or $F > tmp_skip_${zext}.txt
|
|
${NCDUMP} $F > tmp_skip_${zext}.cdl
|
|
diff -b ${srcdir}/ref_skip.txt tmp_skip_${zext}.txt
|
|
diff -b ${srcdir}/ref_skip.cdl tmp_skip_${zext}.cdl
|
|
|
|
echo "Test chunk skipping during write"
|
|
makefile tmp_skipw
|
|
rm -f tmp_skipw_${zext}.cdl
|
|
|
|
$TC -d 6,6 -s 5,5 -p 6,6 -Ow $F
|
|
${NCDUMP} $F > tmp_skipw_${zext}.cdl
|
|
diff -b ${srcdir}/ref_skipw.cdl tmp_skipw_${zext}.cdl
|
|
|
|
echo "Test dimlen % chunklen != 0"
|
|
makefile tmp_rem
|
|
|
|
rm -f tmp_rem_${zext}.txt tmp_rem_${zext}.cdl
|
|
$TC -d 8,8 -c 3,3 -Ow $F
|
|
${NCDUMP} $F > tmp_rem_${zext}.cdl
|
|
diff -b ${srcdir}/ref_rem.cdl tmp_rem_${zext}.cdl
|
|
${execdir}/ncdumpchunks -v v $F > tmp_rem_${zext}.txt
|
|
diff -b ${srcdir}/ref_rem.dmp tmp_rem_${zext}.txt
|
|
|
|
echo "Test rank > 2"
|
|
makefile tmp_ndims
|
|
rm -f tmp_ndims_${zext}.txt tmp_ndims_${zext}.cdl
|
|
$TC -d 8,8,8,8 -c 3,3,4,4 -Ow $F
|
|
${NCDUMP} $F > tmp_ndims_${zext}.cdl
|
|
diff -b ${srcdir}/ref_ndims.cdl tmp_ndims_${zext}.cdl
|
|
${execdir}/ncdumpchunks -v v $F > tmp_ndims_${zext}.dmp
|
|
diff -b ${srcdir}/ref_ndims.dmp tmp_ndims_${zext}.dmp
|
|
|
|
echo "Test miscellaneous 1"
|
|
makefile tmp_misc1
|
|
rm -f tmp_misc1_${zext}.txt tmp_misc1_${zext}.cdl
|
|
$TC -d 6,12,4 -c 2,3,1 -f 0,0,0 -e 6,1,4 -Ow $F
|
|
${NCDUMP} $F > tmp_misc1_${zext}.cdl
|
|
diff -b ${srcdir}/ref_misc1.cdl tmp_misc1_${zext}.cdl
|
|
${execdir}/ncdumpchunks -v v $F > tmp_misc1_${zext}.dmp
|
|
diff -b ${srcdir}/ref_misc1.dmp tmp_misc1_${zext}.dmp
|
|
|
|
} # testcases()
|
|
|
|
testcases file
|
|
if test "x$FEATURE_NCZARR_ZIP" = xyes ; then testcases zip; fi
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then testcases s3; fi
|
|
|