Skip to content

Commit d1d2808

Browse files
DennisHeimbignerDennisHeimbigner
committed
Additional DAP4 fixes
This change-set modifies PR #2555 to add the changes listed below. Most of these changes are required by changes to the Java remotetest.unidata.ucar.edu server. ## DAP4 Related Changes * Add tests *dap4_test/test_constraints.sh* and *dap4_test/test_hyrax.sh*. * Provide explicit list of remotetest files to test. * Cleanup local checksum computing and verification. * Define a temporary Hyrax hack flag to deal with the way Hyrax handles checksums and add "#hyrax" fragment flag for it. * Add a hack to get past an LGTM problem with using "http:". * Improve debug support. ## Other Changes * Cleanup the recipe in *docs/nczarr.md* for building *aws-sdk-cpp* library.
1 parent 9dfafe6 commit d1d2808

40 files changed

+5479
-127
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ ENDIF()
10621062
IF(ENABLE_DAP)
10631063
SET(USE_DAP ON CACHE BOOL "")
10641064
SET(ENABLE_DAP2 ON CACHE BOOL "")
1065-
1065+
10661066
IF(ENABLE_HDF5)
10671067
MESSAGE(STATUS "Enabling DAP4")
10681068
SET(ENABLE_DAP4 ON CACHE BOOL "")

‎dap4_test/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,17 @@ ENDIF()
5252

5353
IF(ENABLE_DAP_REMOTE_TESTS)
5454
add_sh_test(dap4_test test_remote)
55-
# add_sh_test(dap4_test test_hyrax)
55+
add_sh_test(dap4_test test_hyrax)
5656
# add_sh_test(dap4_test test_thredds)
5757
ENDIF(ENABLE_DAP_REMOTE_TESTS)
5858

5959
ENDIF(ENABLE_TESTS)
6060

61-
#FILE(COPY ./baselineraw DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
6261
#FILE(COPY ./baseline DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
62+
#FILE(COPY ./baselineraw DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
63+
#FILE(COPY ./baselineremote DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
64+
#FILE(COPY ./baselinethredds DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
65+
#FILE(COPY ./baselinehyrax DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
6366
#FILE(COPY ./cdltestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
6467
#FILE(COPY ./rawtestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
6568

@@ -69,6 +72,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/cdltestfiles
6972
${CMAKE_CURRENT_SOURCE_DIR}/rawtestfiles
7073
${CMAKE_CURRENT_SOURCE_DIR}/baseline
7174
${CMAKE_CURRENT_SOURCE_DIR}/baselineraw
75+
${CMAKE_CURRENT_SOURCE_DIR}/baselineremote
76+
#${CMAKE_CURRENT_SOURCE_DIR}/baselinerthredds
77+
${CMAKE_CURRENT_SOURCE_DIR}/baselinehyrax
7278
)
7379
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
7480
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")

‎dap4_test/Makefile.am

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,26 @@ TESTS += test_parse.sh test_meta.sh test_data.sh test_raw.sh
3636

3737
# Note: This program name was changed to findtestserver4
3838
# to avoid cmake complaint about duplicate targets.
39-
noinst_PROGRAMS += findtestserver4 pingurl4
39+
noinst_PROGRAMS += findtestserver4 pingurl4 dump
4040
findtestserver4_SOURCES = findtestserver4.c
4141
pingurl4_SOURCES = pingurl4.c
42+
dump_SOURCES = dump.c
4243

4344
# Disable Dap4 Remote Tests until the test server is working
4445
if BUILD_UTILITIES
4546
if ENABLE_DAP_REMOTE_TESTS
4647
TESTS += test_remote.sh
47-
# Test require help at the server end
48-
# TESTS += test_hyrax.sh test_thredds.sh
48+
TESTS += test_constraints.sh
49+
TESTS += test_hyrax.sh
50+
#TESTS += test_thredds.sh
4951
endif
5052
endif
5153

5254
EXTRA_DIST = CMakeLists.txt test_common.h build.sh \
53-
d4test_common.sh \
55+
d4manifest.sh d4test_common.sh \
5456
test_curlopt.sh test_data.sh test_hyrax.sh test_meta.sh \
55-
test_parse.sh test_raw.sh test_remote.sh test_thredds.sh \
57+
test_parse.sh test_raw.sh \
58+
test_remote.sh test_constraints.sh test_thredds.sh \
5659
cdltestfiles rawtestfiles \
5760
baseline baselineraw baselineremote baselinehyrax baselinethredds
5861

@@ -84,3 +87,4 @@ clean-local-check:
8487
# in the GenerateRaw.java program in the thredds tree.
8588
maketests::
8689
bash ./maketests.sh
90+

‎dap4_test/baselinehyrax/AIRS.2002.12.01.L3.RetStd_H031.v4.0.21.0.G06101132853.hdf.hyrax

Lines changed: 4604 additions & 0 deletions
Large diffs are not rendered by default.

‎dap4_test/baselinehyrax/amsre_20060131v5.dat.hyrax

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
netcdf amsre_20060131v5 {
2+
dimensions:
3+
_Anonymous3 = 3 ;
4+
_Anonymous6 = 6 ;
5+
variables:
6+
byte time_a(_Anonymous3, _Anonymous6) ;
7+
string time_a:Equator_Crossing_Time = "1:30 PM" ;
8+
data:
9+
10+
time_a =
11+
-1, -1, -1, -1, -1, -1,
12+
-1, -1, -1, -1, -1, -1,
13+
-1, -1, -1, -1, -1, -1 ;
14+
}

‎dap4_test/baselinehyrax/nc4_nc_classic_comp.nc.hyrax

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
netcdf nc4_nc_classic_comp {
2+
dimensions:
3+
lat = 6 ;
4+
lon = 5 ;
5+
time = 2 ;
6+
variables:
7+
int lat(lat) ;
8+
string lat:units = "degrees_north" ;
9+
int lon(lon) ;
10+
string lon:units = "degrees_east" ;
11+
int time(time) ;
12+
string time:units = "seconds" ;
13+
float z(time, lat, lon) ;
14+
string z:units = "meters" ;
15+
z:valid_range = 0., 5000. ;
16+
float z:_FillValue = 1.f ;
17+
string z:_edu.ucar.maps = "/time", "/lat", "/lon" ;
18+
float t(time, lat, lon) ;
19+
string t:_edu.ucar.maps = "/time", "/lat", "/lon" ;
20+
double p(time, lat, lon) ;
21+
double p:_FillValue = -9999. ;
22+
string p:_edu.ucar.maps = "/time", "/lat", "/lon" ;
23+
short rh(time, lat, lon) ;
24+
short rh:_FillValue = -1s ;
25+
string rh:_edu.ucar.maps = "/time", "/lat", "/lon" ;
26+
short pixel(lat, lon) ;
27+
string pixel:_edu.ucar.maps = "/lat", "/lon" ;
28+
string source(lat) ;
29+
source:string_length = 5 ;
30+
string source:_edu.ucar.maps = "/lat" ;
31+
data:
32+
33+
lat = 0, 10, 20, 30, 40, 50 ;
34+
35+
lon = -140, -118, -96, -84, -52 ;
36+
37+
time = 1, 2 ;
38+
39+
z =
40+
10, 10, 10, 10, 10,
41+
10, 10, 10, 10, 10,
42+
10, 10, 10, 10, 10,
43+
10, 10, 10, 10, 10,
44+
10, 10, 10, 10, 10,
45+
10, 10, 10, 10, 10,
46+
10, 10, 10, 10, 10,
47+
10, 10, 10, 10, 10,
48+
10, 10, 10, 10, 10,
49+
10, 10, 10, 10, 10,
50+
10, 10, 10, 10, 10,
51+
10, 10, 10, 10, 10 ;
52+
53+
t =
54+
1, 1, 1, 1, 1,
55+
1, 1, 1, 1, 1,
56+
1, 1, 1, 1, 1,
57+
1, 1, 1, 1, 1,
58+
1, 1, 1, 1, 1,
59+
1, 1, 1, 1, 1,
60+
1, 1, 1, 1, 1,
61+
1, 1, 1, 1, 1,
62+
1, 1, 1, 1, 1,
63+
1, 1, 1, 1, 1,
64+
1, 1, 1, 1, 1,
65+
1, 1, 1, 1, 1 ;
66+
67+
p =
68+
0.1, 0.1, 0.1, 0.1, 0.1,
69+
0.1, 0.1, 0.1, 0.1, 0.1,
70+
0.1, 0.1, 0.1, 0.1, 0.1,
71+
0.1, 0.1, 0.1, 0.1, 0.1,
72+
0.1, 0.1, 0.1, 0.1, 0.1,
73+
0.1, 0.1, 0.1, 0.1, 0.1,
74+
0.1, 0.1, 0.1, 0.1, 0.1,
75+
0.1, 0.1, 0.1, 0.1, 0.1,
76+
0.1, 0.1, 0.1, 0.1, 0.1,
77+
0.1, 0.1, 0.1, 0.1, 0.1,
78+
0.1, 0.1, 0.1, 0.1, 0.1,
79+
0.1, 0.1, 0.1, 0.1, 0.1 ;
80+
81+
rh =
82+
2, 2, 2, 2, 2,
83+
2, 2, 2, 2, 2,
84+
2, 2, 2, 2, 2,
85+
2, 2, 2, 2, 2,
86+
2, 2, 2, 2, 2,
87+
2, 2, 2, 2, 2,
88+
2, 2, 2, 2, 2,
89+
2, 2, 2, 2, 2,
90+
2, 2, 2, 2, 2,
91+
2, 2, 2, 2, 2,
92+
2, 2, 2, 2, 2,
93+
2, 2, 2, 2, 2 ;
94+
95+
pixel =
96+
7, 7, 7, 7, 7,
97+
7, 7, 7, 7, 7,
98+
7, 7, 7, 7, 7,
99+
7, 7, 7, 7, 7,
100+
7, 7, 7, 7, 7,
101+
7, 7, 7, 7, 7 ;
102+
103+
source = "aaaaa", "aaaaa", "aaaaa", "aaaaa", "aaaaa", "aaaaa" ;
104+
}

‎dap4_test/baselinehyrax/nc4_nc_classic_no_comp.nc.hyrax

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
netcdf nc4_nc_classic_no_comp {
2+
dimensions:
3+
lat = 6 ;
4+
lon = 5 ;
5+
time = 2 ;
6+
variables:
7+
int lat(lat) ;
8+
string lat:units = "degrees_north" ;
9+
int lon(lon) ;
10+
string lon:units = "degrees_east" ;
11+
int time(time) ;
12+
string time:units = "seconds" ;
13+
float z(time, lat, lon) ;
14+
string z:units = "meters" ;
15+
z:valid_range = 0., 5000. ;
16+
float z:_FillValue = 1.f ;
17+
string z:_edu.ucar.maps = "/time", "/lat", "/lon" ;
18+
float t(time, lat, lon) ;
19+
string t:_edu.ucar.maps = "/time", "/lat", "/lon" ;
20+
double p(time, lat, lon) ;
21+
double p:_FillValue = -9999. ;
22+
string p:_edu.ucar.maps = "/time", "/lat", "/lon" ;
23+
short rh(time, lat, lon) ;
24+
short rh:_FillValue = -1s ;
25+
string rh:_edu.ucar.maps = "/time", "/lat", "/lon" ;
26+
short pixel(lat, lon) ;
27+
string pixel:_edu.ucar.maps = "/lat", "/lon" ;
28+
string source(lat) ;
29+
source:string_length = 5 ;
30+
string source:_edu.ucar.maps = "/lat" ;
31+
data:
32+
33+
lat = 0, 10, 20, 30, 40, 50 ;
34+
35+
lon = -140, -118, -96, -84, -52 ;
36+
37+
time = 1, 2 ;
38+
39+
z =
40+
10, 10, 10, 10, 10,
41+
10, 10, 10, 10, 10,
42+
10, 10, 10, 10, 10,
43+
10, 10, 10, 10, 10,
44+
10, 10, 10, 10, 10,
45+
10, 10, 10, 10, 10,
46+
10, 10, 10, 10, 10,
47+
10, 10, 10, 10, 10,
48+
10, 10, 10, 10, 10,
49+
10, 10, 10, 10, 10,
50+
10, 10, 10, 10, 10,
51+
10, 10, 10, 10, 10 ;
52+
53+
t =
54+
1, 1, 1, 1, 1,
55+
1, 1, 1, 1, 1,
56+
1, 1, 1, 1, 1,
57+
1, 1, 1, 1, 1,
58+
1, 1, 1, 1, 1,
59+
1, 1, 1, 1, 1,
60+
1, 1, 1, 1, 1,
61+
1, 1, 1, 1, 1,
62+
1, 1, 1, 1, 1,
63+
1, 1, 1, 1, 1,
64+
1, 1, 1, 1, 1,
65+
1, 1, 1, 1, 1 ;
66+
67+
p =
68+
0.1, 0.1, 0.1, 0.1, 0.1,
69+
0.1, 0.1, 0.1, 0.1, 0.1,
70+
0.1, 0.1, 0.1, 0.1, 0.1,
71+
0.1, 0.1, 0.1, 0.1, 0.1,
72+
0.1, 0.1, 0.1, 0.1, 0.1,
73+
0.1, 0.1, 0.1, 0.1, 0.1,
74+
0.1, 0.1, 0.1, 0.1, 0.1,
75+
0.1, 0.1, 0.1, 0.1, 0.1,
76+
0.1, 0.1, 0.1, 0.1, 0.1,
77+
0.1, 0.1, 0.1, 0.1, 0.1,
78+
0.1, 0.1, 0.1, 0.1, 0.1,
79+
0.1, 0.1, 0.1, 0.1, 0.1 ;
80+
81+
rh =
82+
2, 2, 2, 2, 2,
83+
2, 2, 2, 2, 2,
84+
2, 2, 2, 2, 2,
85+
2, 2, 2, 2, 2,
86+
2, 2, 2, 2, 2,
87+
2, 2, 2, 2, 2,
88+
2, 2, 2, 2, 2,
89+
2, 2, 2, 2, 2,
90+
2, 2, 2, 2, 2,
91+
2, 2, 2, 2, 2,
92+
2, 2, 2, 2, 2,
93+
2, 2, 2, 2, 2 ;
94+
95+
pixel =
96+
7, 7, 7, 7, 7,
97+
7, 7, 7, 7, 7,
98+
7, 7, 7, 7, 7,
99+
7, 7, 7, 7, 7,
100+
7, 7, 7, 7, 7,
101+
7, 7, 7, 7, 7 ;
102+
103+
source = "aaaaa", "aaaaa", "aaaaa", "aaaaa", "aaaaa", "aaaaa" ;
104+
}

‎dap4_test/baselinehyrax/nc4_strings.nc.hyrax

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
netcdf nc4_strings {
2+
dimensions:
3+
lat = 6 ;
4+
lon = 5 ;
5+
variables:
6+
int lat(lat) ;
7+
int lon(lon) ;
8+
string station(lat, lon) ;
9+
string station:who = "james" ;
10+
string station:names = "site_1", "site_2", "site_3" ;
11+
string station:_edu.ucar.maps = "/lat", "/lon" ;
12+
string scan_line(lon) ;
13+
string scan_line:_edu.ucar.maps = "/lon" ;
14+
string codec_name ;
15+
data:
16+
17+
lat = 0, 10, 20, 30, 40, 50 ;
18+
19+
lon = -140, -118, -96, -84, -52 ;
20+
21+
station =
22+
"one", "two", "three", "four", "five",
23+
"one_b", "two_b", "three_b", "four_b", "five_b",
24+
"one_c", "two_c", "three_c", "four_c", "five_c",
25+
"one", "two", "three", "four", "five",
26+
"one", "two", "three", "four", "five",
27+
"one_f", "two_f", "three_f", "four_f", "five_f" ;
28+
29+
scan_line = "r", "r1", "r2", "r3", "r4" ;
30+
31+
codec_name = "mp3" ;
32+
}

‎dap4_test/baselinehyrax/nc4_strings_comp.nc.hyrax

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
netcdf nc4_strings_comp {
2+
dimensions:
3+
lat = 6 ;
4+
lon = 5 ;
5+
variables:
6+
int lat(lat) ;
7+
int lon(lon) ;
8+
string station(lat, lon) ;
9+
string station:who = "james" ;
10+
string station:names = "site_1", "site_2", "site_3" ;
11+
string station:_edu.ucar.maps = "/lat", "/lon" ;
12+
string scan_line(lon) ;
13+
string scan_line:_edu.ucar.maps = "/lon" ;
14+
string codec_name ;
15+
data:
16+
17+
lat = 0, 10, 20, 30, 40, 50 ;
18+
19+
lon = -140, -118, -96, -84, -52 ;
20+
21+
station =
22+
"one", "two", "three", "four", "five",
23+
"one_b", "two_b", "three_b", "four_b", "five_b",
24+
"one_c", "two_c", "three_c", "four_c", "five_c",
25+
"one", "two", "three", "four", "five",
26+
"one", "two", "three", "four", "five",
27+
"one_f", "two_f", "three_f", "four_f", "five_f" ;
28+
29+
scan_line = "r", "r1", "r2", "r3", "r4" ;
30+
31+
codec_name = "mp3" ;
32+
}

0 commit comments

Comments
 (0)