mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-09 08:11:38 +08:00
49737888ca
## Improvements to S3 Documentation * Create a new document *quickstart_paths.md* that give a summary of the legal path formats used by netcdf-c. This includes both file paths and URL paths. * Modify *nczarr.md* to remove most of the S3 related text. * Move the S3 text from *nczarr.md* to a new document *cloud.md*. * Add some S3-related text to the *byterange.md* document. Hopefully, this will make it easier for users to find the information they want. ## Rebuild NCZarr Testing In order to avoid problems with running make check in parallel, two changes were made: 1. The *nczarr_test* test system was rebuilt. Now, for each test. any generated files are kept in a test-specific directory, isolated from all other test executions. 2. Similarly, since the S3 test bucket is shared, any generated S3 objects are isolated using a test-specific key path. ## Other S3 Related Changes * Add code to ensure that files created on S3 are reclaimed at end of testing. * Used the bash "trap" command to ensure S3 cleanup even if the test fails. * Cleanup the S3 related configure.ac flag set since S3 is used in several places. So now one should use the option *--enable-s3* instead of *--enable-nczarr-s3*, although the latter is still kept as a deprecated alias for the former. * Get some of the github actions yml to work with S3; required fixing various test scripts adding a secret to access the Unidata S3 bucket. * Cleanup S3 portion of libnetcdf.settings.in and netcdf_meta.h.in and test_common.in. * Merge partial S3 support into dhttp.c. * Create an experimental s3 access library especially for use with Windows. It is enabled by using the options *--enable-s3-internal* (automake) or *-DENABLE_S3_INTERNAL=ON* (CMake). Also add a unit-test for it. * Move some definitions from ncrc.h to ncs3sdk.h ## Other Changes * Provide a default implementation of strlcpy and move this and similar defaults into *dmissing.c*.
87 lines
2.7 KiB
Bash
Executable File
87 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
|
|
./tst_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
|
|
./tst_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!"
|
|
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then s3sdkdelete "/${S3ISOPATH}" ; fi # Cleanup
|