mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-27 08:49:16 +08:00
aeb3ac2809
re: https://github.com/Unidata/netcdf-c/issues/1836 Revert the internal filter code to simplify it. From the user's point of view, the only visible changes should be: 1. The functions that convert text to filter specs have had their signature reverted and have been moved to netcdf_aux.h 2. Some filter API functions now return NC_ENOFILTER when inquiry is made about some filter. Internally,the dispatch table has been modified to get rid of the filter_actions entry and associated complex structures. It has been replaced with inq_var_filter_ids and inq_var_filter_info entries and the dispatch table version has been bumped to 3. Corresponding NOOP and NOTNC4 functions were added to libdispatch/dnotnc4.c. Also, the filter_action entries in dispatch tables were replaced for all dispatch code bases (HDF5, DAP2, etc). This should only impact UDF users. In the process, it became clear that the form of the filters field in NC_VAR_INFO_T was format dependent, so I converted it to be of type void* and pushed its management into the various dispatch code bases. Specifically libhdf5 and libnczarr now manage the filters field in their own way. The auxilliary functions for parsing textual filter specifications were moved to netcdf_aux.h and were renamed to the following: * ncaux_h5filterspec_parse * ncaux_h5filterspec_parselist * ncaux_h5filterspec_free * ncaux_h5filter_fix8 Misc. Other Changes: 1. Document NUG/filters.md updated to reflect the changes above. 2. All the old data types (structs and enums) used by filter_actions actions were deleted. The exception is the NC_H5_Filterspec because it is needed by ncaux_h5filterspec_parselist. 3. Clientside filters were removed -- another enhancement for which no-one ever asked. 4. The ability to remove filters was itself removed. 5. Some functionality needed by nczarr was moved from libhdf5 to libsrc4 e.g. nc4_find_default_chunksizes 6. All the filterx code was removed 7. ncfilter.h and nc4filter.c no longer used Misc. Unrelated Changes: 1. The nczarr_test makefile clean was leaving some directories; so add clean-local to take care of them.
114 lines
3.2 KiB
Makefile
114 lines
3.2 KiB
Makefile
## This is a automake file, part of Unidata's netCDF package.
|
|
# Copyright 2018, see the COPYRIGHT file for more information.
|
|
|
|
# This file builds and runs DAP4 tests.
|
|
|
|
# Put together AM_CPPFLAGS and AM_LDFLAGS.
|
|
include $(top_srcdir)/lib_flags.am
|
|
|
|
TESTS_ENVIRONMENT =
|
|
|
|
#TEST_EXTENSIONS = .sh
|
|
|
|
#SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
|
|
#sh_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
|
|
#LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
|
|
#TESTS_ENVIRONMENT = export SETX=1;
|
|
|
|
AM_CFLAGS += -I${top_srcdir} -I${top_srcdir}/libnczarr
|
|
AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la
|
|
LDADD = ${top_builddir}/liblib/libnetcdf.la
|
|
|
|
# Set up the tests; do the .sh first, then .c
|
|
check_PROGRAMS =
|
|
TESTS =
|
|
|
|
# Unit Tests
|
|
check_PROGRAMS += ut_map ut_mapapi ut_json ut_projections ut_chunking
|
|
|
|
commonsrc = ut_util.c ut_test.c ut_includes.h ut_test.h ut_util.h test_nczarr_utils.h
|
|
|
|
ut_map_SOURCES = ut_map.c ${commonsrc}
|
|
ut_mapapi_SOURCES = ut_mapapi.c ${commonsrc}
|
|
ut_json_SOURCES = ut_json.c ${commonsrc}
|
|
ut_projections_SOURCES = ut_projections.c ${commonsrc}
|
|
ut_chunking_SOURCES = ut_chunking.c ${commonsrc}
|
|
|
|
check_PROGRAMS += tst_chunks tst_chunks2 tst_chunks3 tst_fillonlyz
|
|
|
|
TESTS += run_ut_map.sh
|
|
TESTS += run_ut_mapapi.sh
|
|
TESTS += run_ut_misc.sh
|
|
TESTS += run_ut_chunk.sh
|
|
|
|
if BUILD_UTILITIES
|
|
if USE_HDF5
|
|
TESTS += tst_nccopyz.sh
|
|
TESTS += run_it_test1.sh
|
|
TESTS += test_fillonlyz.sh
|
|
endif
|
|
TESTS += run_it_test2.sh
|
|
endif
|
|
|
|
ignorec = ut_allslices.c ut_transfer.c ut_vars.c ut_walk.c
|
|
ignoresh = run_meta_tests.sh run_unittests.sh
|
|
ignoreh = ut_varstest.h
|
|
|
|
# These programs are used by the test cases
|
|
noinst_PROGRAMS = zmapio
|
|
zmapio_SOURCES = zmapio.c
|
|
noinst_PROGRAMS += zhex
|
|
zhex_SOURCES = zhex.c
|
|
noinst_PROGRAMS += zisjson
|
|
zisjson_SOURCES = zisjson.c
|
|
noinst_PROGRAMS += zs3parse
|
|
zs3parse_SOURCES = zs3parse.c
|
|
|
|
|
|
EXTRA_DIST = \
|
|
run_ut_map.sh run_ut_mapapi.sh run_ut_misc.sh run_ut_chunk.sh run_it_test1.sh run_it_test2.sh \
|
|
test_nczarr.sh tst_nccopyz.sh \
|
|
ref_ut_map_readmeta_nzf.txt \
|
|
ref_ut_map_writedata_nzf.cdl \
|
|
ref_ut_map_writemeta_nzf.cdl \
|
|
ref_ut_map_writemeta_nz4.cdl \
|
|
ref_ut_map_writedata_nz4.cdl \
|
|
ref_ut_map_write2meta_nzf.cdl \
|
|
ref_ut_map_write2meta_nz4.cdl \
|
|
ref_ut_map_search_nzf.txt \
|
|
ref_ut_map_search_nz4.txt \
|
|
ref_ut_map_readmeta_nz4.txt \
|
|
ref_ut_map_readdata_nz4.txt \
|
|
ref_ut_map_create_nz4.cdl \
|
|
ref_ut_json_parse.txt \
|
|
ref_ut_json_build.txt \
|
|
ref_t_meta_var1.cdl \
|
|
ref_t_meta_dim1.cdl \
|
|
ref_ut_testmap_create_nz4.cdl \
|
|
ref_ut_proj.txt \
|
|
ref_ut_map_create_nzf.cdl \
|
|
ref_ut_mapapi_create_nz4.cdl \
|
|
ref_ut_mapapi_create_nzf.cdl \
|
|
ref_ut_mapapi_create_s3.cdl \
|
|
ref_ut_mapapi_data_nz4.cdl \
|
|
ref_ut_mapapi_data_nzf.cdl \
|
|
ref_ut_mapapi_data_s3.cdl \
|
|
ref_ut_mapapi_meta_nz4.cdl \
|
|
ref_ut_mapapi_meta_nzf.cdl \
|
|
ref_ut_mapapi_meta_s3.cdl \
|
|
ref_ut_mapapi_search_nz4.txt \
|
|
ref_ut_mapapi_search_nzf.txt \
|
|
ref_ut_mapapi_search_s3.txt \
|
|
ref_perdimspecs.cdl \
|
|
ref_fillonly.cdl test_fillonlyz.sh
|
|
|
|
CLEANFILES = test.nzf test.nz4 test.nz4 \
|
|
testmap.nzf testmap.nz4 testmapapi.nzf testmapapi.nz4 \
|
|
tst_chunks.nz4 tst_chunks2.nc.nz4 \
|
|
ut_*.txt ut*.cdl tmp*.nc tmp*.cdl *.dmp test.nzf \
|
|
tst_chunks3.nc
|
|
|
|
# Remove directories
|
|
clean-local:
|
|
rm -fr tst_chunks.nzf tst_chunks2.nzf tst_perdimspecs.nzf testmap.nzf testmapapi.nzf test.nzf
|