mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-23 16:59:54 +08:00
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
262 lines
6.4 KiB
C
Executable File
262 lines
6.4 KiB
C
Executable File
/*
|
|
x * Copyright 2018, University Corporation for Atmospheric Research
|
|
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
|
|
*/
|
|
|
|
#include "ut_includes.h"
|
|
#include "ncpathmgr.h"
|
|
#include "nclog.h"
|
|
|
|
#ifdef HAVE_GETOPT_H
|
|
#include <getopt.h>
|
|
#endif
|
|
|
|
#ifdef _MSC_VER
|
|
#include "XGetopt.h"
|
|
#endif
|
|
|
|
struct ZUTEST zutester;
|
|
|
|
struct UTOptions utoptions;
|
|
|
|
/*Forward*/
|
|
static void canonicalfile(char** fp);
|
|
|
|
void
|
|
usage(int err)
|
|
{
|
|
if(err) {
|
|
fprintf(stderr,"error: (%d) %s\n",err,nc_strerror(err));
|
|
}
|
|
fprintf(stderr,"usage:");
|
|
fprintf(stderr," -D/*debug*/");
|
|
fprintf(stderr," -x<cmd,cmd,...>");
|
|
fprintf(stderr," -f<inputfilename>");
|
|
fprintf(stderr," -o<outputfilename>");
|
|
fprintf(stderr," -k<kind>");
|
|
fprintf(stderr," -d<dim>=<len>");
|
|
fprintf(stderr," -v<type>var(<dim/chunksize,dim/chunksize...>)");
|
|
fprintf(stderr," -s<slices>");
|
|
fprintf(stderr," -W<int>,<int>...");
|
|
fprintf(stderr,"\n");
|
|
fflush(stderr);
|
|
exit(1);
|
|
}
|
|
|
|
int
|
|
ut_init(int argc, char** argv, struct UTOptions * options)
|
|
{
|
|
int stat = NC_NOERR;
|
|
int c;
|
|
Dimdef* dimdef = NULL;
|
|
Vardef* vardef = NULL;
|
|
|
|
nc_initialize();
|
|
|
|
if(options != NULL) {
|
|
options->dimdefs = nclistnew();
|
|
options->vardefs = nclistnew();
|
|
while ((c = getopt(argc, argv, "T:Dx:f:o:k:d:v:s:W:")) != EOF) {
|
|
switch(c) {
|
|
case 'T':
|
|
nctracelevel(atoi(optarg));
|
|
break;
|
|
case 'D':
|
|
options->debug = 1;
|
|
break;
|
|
case 'x': /*execute*/
|
|
if(parsestringvector(optarg,0,&options->cmds) <= 0) usage(THROW(0));
|
|
break;
|
|
case 'f':
|
|
options->file = strdup(optarg);
|
|
break;
|
|
case 'o':
|
|
options->output = strdup(optarg);
|
|
break;
|
|
case 'k': /*implementation*/
|
|
options->kind = strdup(optarg);
|
|
break;
|
|
case 'd': /*dimdef*/
|
|
if((stat=parsedimdef(optarg,&dimdef))) usage(THROW(stat));
|
|
nclistpush(options->dimdefs,dimdef);
|
|
dimdef = NULL;
|
|
break;
|
|
case 'v': /*vardef*/
|
|
if((stat=parsevardef(optarg,options->dimdefs,&vardef))) usage(THROW(stat));
|
|
nclistpush(options->vardefs,vardef);
|
|
vardef = NULL;
|
|
break;
|
|
case 's': /*slices*/
|
|
if((stat=parseslices(optarg,&options->nslices,options->slices))) usage(THROW(stat));
|
|
break;
|
|
case 'W': /*walk data*/
|
|
options->idatalen = parseintvector(optarg,4,(void**)&options->idata);
|
|
break;
|
|
case '?':
|
|
fprintf(stderr,"unknown option: '%c'\n",c);
|
|
stat = NC_EINVAL;
|
|
goto done;
|
|
}
|
|
}
|
|
}
|
|
|
|
canonicalfile(&options->file);
|
|
canonicalfile(&options->output);
|
|
|
|
done:
|
|
return THROW(stat);
|
|
}
|
|
|
|
#if 0
|
|
static void
|
|
getpathcwd(char** cwdp)
|
|
{
|
|
char buf[4096];
|
|
(void)NCgetcwd(buf,sizeof(buf));
|
|
if(cwdp) *cwdp = strdup(buf);
|
|
}
|
|
#endif
|
|
|
|
static void
|
|
canonicalfile(char** fp)
|
|
{
|
|
size_t len;
|
|
char* f = NULL;
|
|
char* abspath = NULL;
|
|
NCURI* uri = NULL;
|
|
#ifdef _WIN32
|
|
int fwin32=0, cwd32=0;
|
|
#endif
|
|
|
|
if(fp == NULL || *fp == NULL) return;
|
|
f = *fp;
|
|
len = strlen(f);
|
|
if(len <= 1) return;
|
|
ncuriparse(f,&uri);
|
|
if(uri != NULL) {ncurifree(uri); return;} /* its a url */
|
|
|
|
#if 1
|
|
abspath = NCpathabsolute(f);
|
|
#else
|
|
if(f[0] == '/' || f[0] == '\\' || hasdriveletter(f))
|
|
return; /* its already absolute */
|
|
#ifdef _WIN32
|
|
for(p=f;*p;p++) {if(*p == '\\') {*p = '/';}}
|
|
#endif
|
|
if(len >= 2 && memcmp(f,"./",2)==0) {
|
|
offset = 1; /* leave the '/' */
|
|
} else if(len >= 3 && memcmp(f,"../",3)==0) {
|
|
offset = 2;
|
|
} else
|
|
offset = 0;
|
|
getpathcwd(&cwd);
|
|
len2 = strlen(cwd);
|
|
#ifdef _WIN32
|
|
for(cwd32=0,p=cwd;*p;p++) {if(*p == '\\') {*p = '/'; cwd32 = 1;}}
|
|
#endif
|
|
if(offset == 2) {
|
|
p = strrchr(cwd,'/');
|
|
/* remove last segment including the preceding '/' */
|
|
if(p == NULL) {cwd[0] = '\0';} else {*p = '\0';}
|
|
}
|
|
len2 = (len-offset)+strlen(cwd);
|
|
if(offset == 0) len2++; /* need to add '/' */
|
|
abspath = (char*)malloc(len2+1);
|
|
abspath[0] = '\0';
|
|
strlcat(abspath,cwd,len2+1);
|
|
if(offset == 0) strlcat(abspath,"/",len2+1);
|
|
strlcat(abspath,f+offset,len2+1);
|
|
#ifdef _WIN32
|
|
if(fwin32)
|
|
for(p=abspath;*p;p++) {if(*p == '/') {*p = '\\';}}
|
|
#endif
|
|
nullfree(cwd);
|
|
#endif
|
|
nullfree(f);
|
|
fprintf(stderr,"canonicalfile: %s\n",abspath);
|
|
*fp = abspath;
|
|
}
|
|
|
|
void
|
|
nccheck(int stat, int line)
|
|
{
|
|
if(stat) {
|
|
fprintf(stderr,"%d: %s\n",line,nc_strerror(stat));
|
|
fflush(stderr);
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
char*
|
|
makeurl(const char* file, NCZM_IMPL impl)
|
|
{
|
|
char* url = NULL;
|
|
NCbytes* buf = ncbytesnew();
|
|
NCURI* uri = NULL;
|
|
const char* kind = impl2kind(impl);
|
|
char* urlpath = NULL;
|
|
char* p;
|
|
|
|
if(file && strlen(file) > 0) {
|
|
switch (impl) {
|
|
case NCZM_FILE:
|
|
case NCZM_ZIP:
|
|
/* Massage file to make it usable as URL path */
|
|
urlpath = strdup(file);
|
|
for(p=urlpath;*p;p++) {if(*p == '\\') *p = '/';}
|
|
ncbytescat(buf,"file://");
|
|
ncbytescat(buf,urlpath);
|
|
nullfree(urlpath); urlpath = NULL;
|
|
ncbytescat(buf,"#mode=nczarr"); /* => use default file: format */
|
|
ncbytescat(buf,",");
|
|
ncbytescat(buf,kind);
|
|
break;
|
|
case NCZM_S3:
|
|
/* Assume that we have a complete url */
|
|
if(ncuriparse(file,&uri)) return NULL;
|
|
if(strcasecmp(uri->protocol,"s3")==0)
|
|
ncurisetprotocol(uri,"https");
|
|
if(strcasecmp(uri->protocol,"http")!=0 && strcasecmp(uri->protocol,"https")!=0)
|
|
return NULL;
|
|
ncbytescat(buf,file);
|
|
break;
|
|
default: abort();
|
|
}
|
|
url = ncbytesextract(buf);
|
|
}
|
|
ncurifree(uri);
|
|
ncbytesfree(buf);
|
|
fprintf(stderr,"url=|%s|\n",url);
|
|
fflush(stderr);
|
|
return url;
|
|
}
|
|
|
|
struct Test*
|
|
findtest(const char* cmd, struct Test* tests)
|
|
{
|
|
struct Test* t = NULL;
|
|
for(t=tests;t->cmd;t++) {
|
|
if(strcasecmp(t->cmd,cmd)==0) return t;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
int
|
|
runtests(const char** cmds, struct Test* tests)
|
|
{
|
|
int stat = NC_NOERR;
|
|
struct Test* test = NULL;
|
|
const char** cmd = NULL;
|
|
if(cmds == NULL) return THROW(NC_EINVAL);
|
|
for(cmd=cmds;*cmd;cmd++) {
|
|
for(test=tests;test->cmd;test++) {
|
|
if(strcmp(test->cmd,*cmd)==0) {
|
|
if(test->cmd == NULL) return THROW(NC_EINVAL);
|
|
if((stat=test->test())) goto done; /* Execute */
|
|
}
|
|
}
|
|
}
|
|
done:
|
|
return THROW(stat);
|
|
}
|