diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2010-02-17 20:50:50 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2010-02-17 20:50:50 (GMT) |
commit | 0fb3254237255e8d145be86931c38ef77de02f78 (patch) | |
tree | e2c57b5ace89855c1571e2fd4bf892c13116afec /tools/h5stat/testfiles | |
parent | ec709b76da66ff79c330a3a8d1d2164d4bfd354c (diff) | |
download | hdf5-0fb3254237255e8d145be86931c38ef77de02f78.zip hdf5-0fb3254237255e8d145be86931c38ef77de02f78.tar.gz hdf5-0fb3254237255e8d145be86931c38ef77de02f78.tar.bz2 |
[svn-r18270] Changes to h5stat in response to bug 1778:
1. Gather attribute info for named datatype,
2. Fixed -T, -G, -A, -D options
3. Brought over some changes from trunk h5stat
h5committested.
Diffstat (limited to 'tools/h5stat/testfiles')
-rw-r--r-- | tools/h5stat/testfiles/h5stat_filters-F.ddl | 17 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_filters-UD.ddl | 8 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_filters-UT.ddl | 13 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_filters-d.ddl | 3 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_filters-dT.ddl | 3 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_filters.ddl | 20 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_help1.ddl | 8 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_help2.ddl | 8 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_newgrat-UA.ddl | 10 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_newgrat-UG.ddl | 8 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_newgrat.ddl | 18 | ||||
-rw-r--r-- | tools/h5stat/testfiles/h5stat_tsohm.ddl | 18 |
12 files changed, 95 insertions, 39 deletions
diff --git a/tools/h5stat/testfiles/h5stat_filters-F.ddl b/tools/h5stat/testfiles/h5stat_filters-F.ddl index 6bc6cc2..e20ef87 100644 --- a/tools/h5stat/testfiles/h5stat_filters-F.ddl +++ b/tools/h5stat/testfiles/h5stat_filters-F.ddl @@ -2,11 +2,13 @@ Expected output for 'h5stat -F h5stat_filters.h5' ############################# Filename: h5stat_filters.h5 -Object header size: (total/unused) - Groups: 48/8 - Datasets: 4936/1344 - Datatypes: 80/0 -Storage information: +File space information for file metadata (in bytes): + Superblock extension: 0 + User block: 0 + Object headers: (total/unused) + Groups: 48/8 + Datasets(exclude compact data): 4136/1344 + Datatypes: 80/0 Groups: B-tree/List: 1200 Heap: 288 @@ -14,9 +16,10 @@ Storage information: B-tree/List: 0 Heap: 0 Chunked datasets: - B-tree: 31392 + Index: 31392 + Datasets: + Heap: 72 Shared Messages: Header: 0 B-tree/List: 0 Heap: 0 - Superblock extension: 0 diff --git a/tools/h5stat/testfiles/h5stat_filters-UD.ddl b/tools/h5stat/testfiles/h5stat_filters-UD.ddl new file mode 100644 index 0000000..decfb81 --- /dev/null +++ b/tools/h5stat/testfiles/h5stat_filters-UD.ddl @@ -0,0 +1,8 @@ +############################# +Expected output for 'h5stat -D h5stat_filters.h5' +############################# +Filename: h5stat_filters.h5 +File space information for datasets' metadata (in bytes): + Object headers (total/unused): 4136/1344 + Index for Chunked datasets: 31392 + Heap: 72 diff --git a/tools/h5stat/testfiles/h5stat_filters-UT.ddl b/tools/h5stat/testfiles/h5stat_filters-UT.ddl new file mode 100644 index 0000000..189eaa6 --- /dev/null +++ b/tools/h5stat/testfiles/h5stat_filters-UT.ddl @@ -0,0 +1,13 @@ +############################# +Expected output for 'h5stat -T h5stat_filters.h5' +############################# +Filename: h5stat_filters.h5 +Dataset datatype information: + # of unique datatypes used by datasets: 2 + Dataset datatype #0: + Count (total/named) = (14/0) + Size (desc./elmt) = (14/4) + Dataset datatype #1: + Count (total/named) = (1/0) + Size (desc./elmt) = (14/4) + Total dataset datatype count: 15 diff --git a/tools/h5stat/testfiles/h5stat_filters-d.ddl b/tools/h5stat/testfiles/h5stat_filters-d.ddl index 42d0de3..3cc9071 100644 --- a/tools/h5stat/testfiles/h5stat_filters-d.ddl +++ b/tools/h5stat/testfiles/h5stat_filters-d.ddl @@ -15,7 +15,8 @@ Dataset dimension information: # of datasets of size 100 - 999: 1 Total # of datasets: 1 Dataset storage information: - Total raw data size: 9059 + Total raw data size: 8659 + Total external raw data size: 400 Dataset layout information: Dataset layout counts[COMPACT]: 1 Dataset layout counts[CONTIG]: 2 diff --git a/tools/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/h5stat/testfiles/h5stat_filters-dT.ddl index 2edcf7e..ae9121d 100644 --- a/tools/h5stat/testfiles/h5stat_filters-dT.ddl +++ b/tools/h5stat/testfiles/h5stat_filters-dT.ddl @@ -15,7 +15,8 @@ Dataset dimension information: # of datasets of size 100 - 999: 1 Total # of datasets: 1 Dataset storage information: - Total raw data size: 9059 + Total raw data size: 8659 + Total external raw data size: 400 Dataset layout information: Dataset layout counts[COMPACT]: 1 Dataset layout counts[CONTIG]: 2 diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl index f9adebd..03ea440 100644 --- a/tools/h5stat/testfiles/h5stat_filters.ddl +++ b/tools/h5stat/testfiles/h5stat_filters.ddl @@ -10,11 +10,13 @@ File information # of unique other: 0 Max. # of links to object: 1 Max. # of objects in group: 16 -Object header size: (total/unused) - Groups: 48/8 - Datasets: 4936/1344 - Datatypes: 80/0 -Storage information: +File space information for file metadata (in bytes): + Superblock extension: 0 + User block: 0 + Object headers: (total/unused) + Groups: 48/8 + Datasets(exclude compact data): 4136/1344 + Datatypes: 80/0 Groups: B-tree/List: 1200 Heap: 288 @@ -22,12 +24,13 @@ Storage information: B-tree/List: 0 Heap: 0 Chunked datasets: - B-tree: 31392 + Index: 31392 + Datasets: + Heap: 72 Shared Messages: Header: 0 B-tree/List: 0 Heap: 0 - Superblock extension: 0 Small groups: Total # of small groups: 0 Group bins: @@ -46,7 +49,8 @@ Dataset dimension information: # of datasets of size 100 - 999: 1 Total # of datasets: 1 Dataset storage information: - Total raw data size: 9059 + Total raw data size: 8659 + Total external raw data size: 400 Dataset layout information: Dataset layout counts[COMPACT]: 1 Dataset layout counts[CONTIG]: 2 diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl index 0a86b4c..9e59044 100644 --- a/tools/h5stat/testfiles/h5stat_help1.ddl +++ b/tools/h5stat/testfiles/h5stat_help1.ddl @@ -7,11 +7,11 @@ Usage: h5stat [OPTIONS] file -h, --help Print a usage message and exit -V, --version Print version number and exit -f, --file Print file information - -F, --filemetadata Print file metadata + -F, --filemetadata Print file space information for file's metadata -g, --group Print group information - -G, --groupmetadata Print group metadata + -G, --groupmetadata Print file space information for groups' metadata -d, --dset Print dataset information - -D, --dsetmetadata Print dataset metadata - -T, --dtypemetadata Print datatype metadata + -D, --dsetmetadata Print file space information for datasets' metadata + -T, --dtypemetadata Print datasets' datatype metadata -A, --attribute Print attribute information diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl index e41eb9e..3276273 100644 --- a/tools/h5stat/testfiles/h5stat_help2.ddl +++ b/tools/h5stat/testfiles/h5stat_help2.ddl @@ -7,11 +7,11 @@ Usage: h5stat [OPTIONS] file -h, --help Print a usage message and exit -V, --version Print version number and exit -f, --file Print file information - -F, --filemetadata Print file metadata + -F, --filemetadata Print file space information for file's metadata -g, --group Print group information - -G, --groupmetadata Print group metadata + -G, --groupmetadata Print file space information for groups' metadata -d, --dset Print dataset information - -D, --dsetmetadata Print dataset metadata - -T, --dtypemetadata Print datatype metadata + -D, --dsetmetadata Print file space information for datasets' metadata + -T, --dtypemetadata Print datasets' datatype metadata -A, --attribute Print attribute information diff --git a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl new file mode 100644 index 0000000..70f9a82 --- /dev/null +++ b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl @@ -0,0 +1,10 @@ +############################# +Expected output for 'h5stat -A h5stat_newgrat.h5' +############################# +Filename: h5stat_newgrat.h5 +Small # of attributes: + Total # of objects with small # of attributes: 0 +Attribute bins: + # of objects with 100 - 999 attributes: 1 + Total # of objects with attributes: 1 + Max. # of attributes to objects: 100 diff --git a/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl b/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl new file mode 100644 index 0000000..b300a8f --- /dev/null +++ b/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl @@ -0,0 +1,8 @@ +############################# +Expected output for 'h5stat -G h5stat_newgrat.h5' +############################# +Filename: h5stat_newgrat.h5 +File space information for groups' metadata (in bytes): + Object headers (total/unused): 5145147/3220092 + B-tree/List: 470054 + Heap: 739102 diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl index 4f9bcac..9ee3b5f 100644 --- a/tools/h5stat/testfiles/h5stat_newgrat.ddl +++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl @@ -10,11 +10,13 @@ File information # of unique other: 0 Max. # of links to object: 1 Max. # of objects in group: 35001 -Object header size: (total/unused) - Groups: 5145147/3220092 - Datasets: 414/312 - Datatypes: 0/0 -Storage information: +File space information for file metadata (in bytes): + Superblock extension: 0 + User block: 0 + Object headers: (total/unused) + Groups: 5145147/3220092 + Datasets(exclude compact data): 414/312 + Datatypes: 0/0 Groups: B-tree/List: 470054 Heap: 739102 @@ -22,12 +24,13 @@ Storage information: B-tree/List: 2598 Heap: 4442 Chunked datasets: - B-tree: 0 + Index: 0 + Datasets: + Heap: 0 Shared Messages: Header: 0 B-tree/List: 0 Heap: 0 - Superblock extension: 0 Small groups: # of groups of size 0: 35000 Total # of small groups: 35000 @@ -45,6 +48,7 @@ Dataset dimension information: Total small datasets: 0 Dataset storage information: Total raw data size: 0 + Total external raw data size: 0 Dataset layout information: Dataset layout counts[COMPACT]: 0 Dataset layout counts[CONTIG]: 1 diff --git a/tools/h5stat/testfiles/h5stat_tsohm.ddl b/tools/h5stat/testfiles/h5stat_tsohm.ddl index e536c33..e3b58d5 100644 --- a/tools/h5stat/testfiles/h5stat_tsohm.ddl +++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl @@ -10,11 +10,13 @@ File information # of unique other: 0 Max. # of links to object: 1 Max. # of objects in group: 3 -Object header size: (total/unused) - Groups: 51/2 - Datasets: 852/447 - Datatypes: 0/0 -Storage information: +File space information for file metadata (in bytes): + Superblock extension: 40 + User block: 0 + Object headers: (total/unused) + Groups: 51/2 + Datasets(exclude compact data): 852/447 + Datatypes: 0/0 Groups: B-tree/List: 872 Heap: 120 @@ -22,12 +24,13 @@ Storage information: B-tree/List: 0 Heap: 0 Chunked datasets: - B-tree: 0 + Index: 0 + Datasets: + Heap: 0 Shared Messages: Header: 38 B-tree/List: 550 Heap: 1316 - Superblock extension: 40 Small groups: # of groups of size 3: 1 Total # of small groups: 1 @@ -44,6 +47,7 @@ Dataset dimension information: Total small datasets: 0 Dataset storage information: Total raw data size: 0 + Total external raw data size: 0 Dataset layout information: Dataset layout counts[COMPACT]: 0 Dataset layout counts[CONTIG]: 0 |