mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-27 08:49:16 +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
79 lines
2.4 KiB
C
79 lines
2.4 KiB
C
/*
|
|
Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
|
|
See COPYRIGHT for license information.
|
|
*/
|
|
|
|
/*
|
|
Common functionality for reading
|
|
and accessing rc files (e.g. .daprc).
|
|
*/
|
|
|
|
#ifndef NCRC_H
|
|
#define NCRC_H
|
|
|
|
/* Need these support includes */
|
|
#include "ncuri.h"
|
|
#include "nclist.h"
|
|
#include "ncbytes.h"
|
|
|
|
/* getenv() keys */
|
|
#define NCRCENVIGNORE "NCRCENV_IGNORE"
|
|
#define NCRCENVRC "NCRCENV_RC"
|
|
|
|
|
|
typedef struct NCTriple {
|
|
char* host; /* combined host:port */
|
|
char* key;
|
|
char* value;
|
|
} NCTriple;
|
|
|
|
/* collect all the relevant info around the rc file */
|
|
typedef struct NCRCinfo {
|
|
int ignore; /* if 1, then do not use any rc file */
|
|
int loaded; /* 1 => already loaded */
|
|
NClist* triples; /* the rc file triple store fields*/
|
|
char* rcfile; /* specified rcfile; overrides anything else */
|
|
} NCRCinfo;
|
|
|
|
/* Collect global state info in one place */
|
|
typedef struct NCRCglobalstate {
|
|
int initialized;
|
|
char* tempdir; /* track a usable temp dir */
|
|
char* home; /* track $HOME */
|
|
char* cwd; /* track getcwd */
|
|
NCRCinfo rcinfo; /* Currently only one rc file per session */
|
|
struct GlobalZarr { /* Zarr specific parameters */
|
|
char dimension_separator;
|
|
} zarr;
|
|
} NCRCglobalstate;
|
|
|
|
/* From drc.c */
|
|
EXTERNL void ncrc_initialize(void);
|
|
EXTERNL void ncrc_freeglobalstate(void);
|
|
/* read and compile the rc file, if any */
|
|
EXTERNL int NC_rcload(void);
|
|
EXTERNL char* NC_rclookup(const char* key, const char* hostport);
|
|
EXTERNL int NC_rcfile_insert(const char* key, const char* value, const char* hostport);
|
|
|
|
/* Following are primarily for debugging */
|
|
/* Obtain the count of number of triples */
|
|
EXTERNL size_t NC_rcfile_length(NCRCinfo*);
|
|
/* Obtain the ith triple; return NULL if out of range */
|
|
EXTERNL NCTriple* NC_rcfile_ith(NCRCinfo*,size_t);
|
|
|
|
/* For internal use */
|
|
EXTERNL NCRCglobalstate* ncrc_getglobalstate(void);
|
|
EXTERNL void NC_rcclear(NCRCinfo* info);
|
|
EXTERNL void NC_rcclear(NCRCinfo* info);
|
|
|
|
/* From dutil.c (Might later move to e.g. nc.h */
|
|
EXTERNL int NC__testurl(const char* path, char** basenamep);
|
|
EXTERNL int NC_isLittleEndian(void);
|
|
EXTERNL char* NC_entityescape(const char* s);
|
|
EXTERNL int NC_readfile(const char* filename, NCbytes* content);
|
|
EXTERNL int NC_writefile(const char* filename, size_t size, void* content);
|
|
EXTERNL char* NC_mktmp(const char* base);
|
|
EXTERNL int NC_getmodelist(const char* url, NClist** modelistp);
|
|
EXTERNL int NC_testmode(const char* path, const char* tag);
|
|
#endif /*NCRC_H*/
|