mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-15 08:30:11 +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.
326 lines
8.5 KiB
C
326 lines
8.5 KiB
C
/*********************************************************************
|
|
* COPYRIGHT 2018, UCAR/UNIDATA
|
|
* SEE NETCDF/COPYRIGHT FILE FOR COPYING AND REDISTRIBUTION CONDITIONS.
|
|
* ********************************************************************/
|
|
|
|
#if HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#undef DEBUG
|
|
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
#ifdef DEBUG
|
|
#include <stdio.h>
|
|
#endif
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
#ifdef _MSC_VER /* MICROSOFT COMPILERS */
|
|
#include <io.h>
|
|
#endif
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "netcdf.h"
|
|
#include "nc3internal.h"
|
|
#include "nclist.h"
|
|
#include "ncbytes.h"
|
|
#include "ncrc.h"
|
|
#include "nclog.h"
|
|
#include "ncio.h"
|
|
#include "fbits.h"
|
|
#include "rnd.h"
|
|
#include "ncs3sdk.h"
|
|
#include "ncuri.h"
|
|
|
|
#define DEFAULTPAGESIZE 16384
|
|
|
|
/* PRIVATE DATA */
|
|
|
|
enum IO {NOIO=0, CURLIO=1, S3IO=2};
|
|
|
|
typedef struct NCS3IO {
|
|
long long size; /* of the object */
|
|
NCS3INFO s3;
|
|
void* s3client;
|
|
char* errmsg;
|
|
void* buffer;
|
|
} NCS3IO;
|
|
|
|
/* Forward */
|
|
static int s3io_rel(ncio *const nciop, off_t offset, int rflags);
|
|
static int s3io_get(ncio *const nciop, off_t offset, size_t extent, int rflags, void **const vpp);
|
|
static int s3io_move(ncio *const nciop, off_t to, off_t from, size_t nbytes, int rflags);
|
|
static int s3io_sync(ncio *const nciop);
|
|
static int s3io_filesize(ncio* nciop, off_t* filesizep);
|
|
static int s3io_pad_length(ncio* nciop, off_t length);
|
|
static int s3io_close(ncio* nciop, int);
|
|
|
|
#define reporterr(s3io) {if((s3io) && (s3io)->errmsg) {nclog(NCLOGERR,(s3io)->errmsg);} nullfree((s3io)->errmsg); (s3io)->errmsg = NULL;}
|
|
|
|
static long pagesize = 0;
|
|
|
|
/* Create a new ncio struct to hold info about the file. */
|
|
static int
|
|
s3io_new(const char* path, int ioflags, ncio** nciopp, NCS3IO** hpp)
|
|
{
|
|
int status = NC_NOERR;
|
|
ncio* nciop = NULL;
|
|
NCS3IO* s3io = NULL;
|
|
|
|
if(pagesize == 0)
|
|
pagesize = DEFAULTPAGESIZE;
|
|
errno = 0;
|
|
|
|
nciop = (ncio* )calloc(1,sizeof(ncio));
|
|
if(nciop == NULL) {status = NC_ENOMEM; goto fail;}
|
|
|
|
nciop->ioflags = ioflags;
|
|
|
|
*((char**)&nciop->path) = strdup(path);
|
|
if(nciop->path == NULL) {status = NC_ENOMEM; goto fail;}
|
|
|
|
*((ncio_relfunc**)&nciop->rel) = s3io_rel;
|
|
*((ncio_getfunc**)&nciop->get) = s3io_get;
|
|
*((ncio_movefunc**)&nciop->move) = s3io_move;
|
|
*((ncio_syncfunc**)&nciop->sync) = s3io_sync;
|
|
*((ncio_filesizefunc**)&nciop->filesize) = s3io_filesize;
|
|
*((ncio_pad_lengthfunc**)&nciop->pad_length) = s3io_pad_length;
|
|
*((ncio_closefunc**)&nciop->close) = s3io_close;
|
|
|
|
s3io = (NCS3IO*)calloc(1,sizeof(NCS3IO));
|
|
if(s3io == NULL) {status = NC_ENOMEM; goto fail;}
|
|
*((void* *)&nciop->pvt) = s3io;
|
|
|
|
if(nciopp) *nciopp = nciop;
|
|
if(hpp) *hpp = s3io;
|
|
|
|
done:
|
|
return status;
|
|
|
|
fail:
|
|
nullfree(s3io);
|
|
if(nciop != NULL) {
|
|
if(nciop->path != NULL) free((char*)nciop->path);
|
|
}
|
|
goto done;
|
|
}
|
|
|
|
/* Create a file, and the ncio struct to go with it. This function is
|
|
only called from nc__create_mp.
|
|
|
|
path - path of file to create.
|
|
ioflags - flags from nc_create
|
|
initialsz - From the netcdf man page: "The argument
|
|
Iinitialsize sets the initial size of the file at creation time."
|
|
igeto -
|
|
igetsz -
|
|
sizehintp - the size of a page of data for buffered reads and writes.
|
|
nciopp - pointer to a pointer that will get location of newly
|
|
created and inited ncio struct.
|
|
mempp - pointer to pointer to the initial memory read.
|
|
*/
|
|
int
|
|
s3io_create(const char* path, int ioflags,
|
|
size_t initialsz,
|
|
off_t igeto, size_t igetsz, size_t* sizehintp,
|
|
void* parameters,
|
|
ncio* *nciopp, void** const mempp)
|
|
{
|
|
return NC_EPERM;
|
|
}
|
|
|
|
/* This function opens the data file. It is only called from nc.c,
|
|
from nc__open_mp and nc_delete_mp.
|
|
|
|
path - path of data file.
|
|
ioflags - flags passed into nc_open.
|
|
igeto - looks like this function can do an initial page get, and
|
|
igeto is going to be the offset for that. But it appears to be
|
|
unused
|
|
igetsz - the size in bytes of initial page get (a.k.a. extent). Not
|
|
ever used in the library.
|
|
sizehintp - the size of a page of data for buffered reads and writes.
|
|
nciopp - pointer to pointer that will get address of newly created
|
|
and inited ncio struct.
|
|
mempp - pointer to pointer to the initial memory read.
|
|
*/
|
|
int
|
|
s3io_open(const char* path,
|
|
int ioflags,
|
|
/* ignored */ off_t igeto, size_t igetsz, size_t* sizehintp,
|
|
/* ignored */ void* parameters,
|
|
ncio* *nciopp,
|
|
/* ignored */ void** const mempp)
|
|
{
|
|
ncio* nciop;
|
|
int status;
|
|
NCS3IO* s3io = NULL;
|
|
size_t sizehint;
|
|
NCURI* url = NULL;
|
|
|
|
if(path == NULL ||* path == 0)
|
|
return EINVAL;
|
|
|
|
/* Create private data */
|
|
if((status = s3io_new(path, ioflags, &nciop, &s3io))) goto done;
|
|
|
|
/* parse path */
|
|
ncuriparse(path,&url);
|
|
if(url == NULL)
|
|
{status = NC_EURL; goto done;}
|
|
|
|
/* Convert to canonical path-style */
|
|
if((status = NC_s3urlprocess(url,&s3io->s3,NULL))) goto done;
|
|
/* Verify root path */
|
|
if(s3io->s3.rootkey == NULL)
|
|
{status = NC_EURL; goto done;}
|
|
s3io->s3client = NC_s3sdkcreateclient(&s3io->s3);
|
|
/* Get the size */
|
|
switch (status = NC_s3sdkinfo(s3io->s3client,s3io->s3.bucket,s3io->s3.rootkey,(long long unsigned*)&s3io->size,&s3io->errmsg)) {
|
|
case NC_NOERR: break;
|
|
case NC_EEMPTY:
|
|
s3io->size = 0;
|
|
goto done;
|
|
default:
|
|
goto done;
|
|
}
|
|
|
|
sizehint = pagesize;
|
|
|
|
/* sizehint must be multiple of 8 */
|
|
sizehint = (sizehint / 8) * 8;
|
|
if(sizehint < 8) sizehint = 8;
|
|
|
|
*sizehintp = sizehint;
|
|
*nciopp = nciop;
|
|
done:
|
|
ncurifree(url);
|
|
if(status) {
|
|
reporterr(s3io);
|
|
s3io_close(nciop,0);
|
|
}
|
|
return status;
|
|
}
|
|
|
|
/*
|
|
* Get file size in bytes.
|
|
*/
|
|
static int
|
|
s3io_filesize(ncio* nciop, off_t* filesizep)
|
|
{
|
|
NCS3IO* s3io;
|
|
if(nciop == NULL || nciop->pvt == NULL) return NC_EINVAL;
|
|
s3io = (NCS3IO*)nciop->pvt;
|
|
if(filesizep != NULL) *filesizep = s3io->size;
|
|
return NC_NOERR;
|
|
}
|
|
|
|
/*
|
|
* Sync any changes to disk, then truncate or extend file so its size
|
|
* is length. This is only intended to be called before close, if the
|
|
* file is open for writing and the actual size does not match the
|
|
* calculated size, perhaps as the result of having been previously
|
|
* written in NOFILL mode.
|
|
*/
|
|
static int
|
|
s3io_pad_length(ncio* nciop, off_t length)
|
|
{
|
|
return NC_NOERR; /* do nothing */
|
|
}
|
|
|
|
/* Write out any dirty buffers to disk and
|
|
ensure that next read will get data from disk.
|
|
Sync any changes, then close the open file associated with the ncio
|
|
struct, and free its memory.
|
|
nciop - pointer to ncio to close.
|
|
doUnlink - if true, unlink file
|
|
*/
|
|
|
|
static int
|
|
s3io_close(ncio* nciop, int deleteit)
|
|
{
|
|
int status = NC_NOERR;
|
|
NCS3IO* s3io;
|
|
if(nciop == NULL || nciop->pvt == NULL) return NC_NOERR;
|
|
|
|
s3io = (NCS3IO*)nciop->pvt;
|
|
assert(s3io != NULL);
|
|
|
|
if(s3io->s3client && s3io->s3.bucket && s3io->s3.rootkey) {
|
|
NC_s3sdkclose(s3io->s3client, &s3io->s3, deleteit, &s3io->errmsg);
|
|
}
|
|
s3io->s3client = NULL;
|
|
NC_s3clear(&s3io->s3);
|
|
nullfree(s3io->errmsg);
|
|
nullfree(s3io->buffer);
|
|
nullfree(s3io);
|
|
|
|
if(nciop->path != NULL) free((char*)nciop->path);
|
|
free(nciop);
|
|
return status;
|
|
}
|
|
|
|
/*
|
|
* Request that the region (offset, extent)
|
|
* be made available through *vpp.
|
|
*/
|
|
static int
|
|
s3io_get(ncio* const nciop, off_t offset, size_t extent, int rflags, void** const vpp)
|
|
{
|
|
int status = NC_NOERR;
|
|
NCS3IO* s3io;
|
|
|
|
if(nciop == NULL || nciop->pvt == NULL) {status = NC_EINVAL; goto done;}
|
|
s3io = (NCS3IO*)nciop->pvt;
|
|
|
|
assert(s3io->buffer == NULL);
|
|
if((s3io->buffer = (unsigned char*)malloc(extent))==NULL)
|
|
{status = NC_ENOMEM; goto done;}
|
|
status = NC_s3sdkread(s3io->s3client, s3io->s3.bucket, s3io->s3.rootkey, offset, extent, s3io->buffer, &s3io->errmsg);
|
|
if(status) {reporterr(s3io); goto done;}
|
|
|
|
if(vpp) *vpp = s3io->buffer;
|
|
done:
|
|
return status;
|
|
}
|
|
|
|
/*
|
|
* Like memmove(), safely move possibly overlapping data.
|
|
*/
|
|
static int
|
|
s3io_move(ncio* const nciop, off_t to, off_t from, size_t nbytes, int ignored)
|
|
{
|
|
return NC_EPERM;
|
|
}
|
|
|
|
static int
|
|
s3io_rel(ncio* const nciop, off_t offset, int rflags)
|
|
{
|
|
int status = NC_NOERR;
|
|
NCS3IO* s3io;
|
|
|
|
if(nciop == NULL || nciop->pvt == NULL) {status = NC_EINVAL; goto done;}
|
|
s3io = (NCS3IO*)nciop->pvt;
|
|
nullfree(s3io->buffer);
|
|
s3io->buffer = NULL;
|
|
done:
|
|
return status;
|
|
}
|
|
|
|
/*
|
|
* Write out any dirty buffers to disk and
|
|
* ensure that next read will get data from disk.
|
|
*/
|
|
static int
|
|
s3io_sync(ncio* const nciop)
|
|
{
|
|
return NC_NOERR; /* do nothing */
|
|
}
|
|
|