Skip to content

Commit fb0a26c

Browse files
calccryptocalccrypto
committed
more gufi_du updates
more tests doc updates
1 parent 2397654 commit fb0a26c

File tree

4 files changed

+147
-3
lines changed

4 files changed

+147
-3
lines changed

‎docs/latex/sections/gufi_du.tex

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ \subsection{Flags}
9898
\hline
9999
-c, -{}-total & produce a grand total \\
100100
\hline
101+
-{}-inodes & list inode usage information instead of block usage \\
102+
\hline
103+
-S, -{}-separate-dirs & for directories do not include size of subdirectories \\
104+
\hline
101105
-s, -{}-summarize & display only a total for each argument \\
102106
\hline
103107
\end{tabularx}

‎scripts/gufi_du

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,8 @@ def run(argv, config_path):
312312
if not line:
313313
break
314314

315+
# if line exists, there are contents
315316
line = line.strip().decode()
316-
if line == '':
317-
continue
318-
319317
level, isroot, raw, name = line.split(DELIM, 3)
320318

321319
rows += 1

‎test/regression/gufi_du.expected

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ $ gufi_du --apparent-size --block-size 1 prefix | sort -k 2
3535
Warning: Did not get any results from gufi_query.
3636
Does "prefix" have treesummary data?
3737

38+
$ gufi_du --apparent-size --block-size 2KB prefix | sort -k 2
39+
Warning: Did not get any results from gufi_query.
40+
Does "prefix" have treesummary data?
41+
42+
$ gufi_du --apparent-size --block-size 4KiB prefix | sort -k 2
43+
Warning: Did not get any results from gufi_query.
44+
Does "prefix" have treesummary data?
45+
3846
$ gufi_du --apparent-size --block-size 1 --total prefix | sort -k 2
3947
Warning: Did not get any results from gufi_query.
4048
Does "prefix" have treesummary data?
@@ -52,6 +60,14 @@ Does "prefix" have treesummary data?
5260
0 total
5361

5462
# separate dirs
63+
$ gufi_du --separate-dirs prefix | sort -k 2
64+
0 prefix
65+
0 prefix/directory
66+
0 prefix/directory/subdirectory
67+
0 prefix/empty_directory
68+
8 prefix/leaf_directory
69+
0 prefix/unusual#? directory ,
70+
5571
$ gufi_du --separate-dirs --apparent-size --block-size 1 prefix | sort -k 2
5672
1049624 prefix
5773
6 prefix/directory
@@ -76,6 +92,14 @@ $ gufi_du --separate-dirs --apparent-size --block-size 1 --total --summarize pre
7692
1049624 prefix
7793
1049624 total
7894

95+
$ gufi_du --separate-dirs --inodes prefix | sort -k 2
96+
6 prefix
97+
3 prefix/directory
98+
2 prefix/directory/subdirectory
99+
0 prefix/empty_directory
100+
2 prefix/leaf_directory
101+
1 prefix/unusual#? directory ,
102+
79103
# inodes
80104
$ gufi_du --inodes prefix | sort -k 2
81105
Warning: Did not get any results from gufi_query.
@@ -191,6 +215,22 @@ $ gufi_du --apparent-size --block-size 1 prefix | sort -k 2
191215
23 prefix/leaf_directory
192216
15 prefix/unusual#? directory ,
193217

218+
$ gufi_du --apparent-size --block-size 2KB prefix | sort -k 2
219+
525 prefix
220+
1 prefix/directory
221+
1 prefix/directory/subdirectory
222+
0 prefix/empty_directory
223+
1 prefix/leaf_directory
224+
1 prefix/unusual#? directory ,
225+
226+
$ gufi_du --apparent-size --block-size 4KiB prefix | sort -k 2
227+
257 prefix
228+
1 prefix/directory
229+
1 prefix/directory/subdirectory
230+
0 prefix/empty_directory
231+
1 prefix/leaf_directory
232+
1 prefix/unusual#? directory ,
233+
194234
$ gufi_du --apparent-size --block-size 1 --total prefix | sort -k 2
195235
1049673 prefix
196236
11 prefix/directory
@@ -208,6 +248,14 @@ $ gufi_du --apparent-size --block-size 1 --total --summarize prefix
208248
1049673 total
209249

210250
# separate dirs
251+
$ gufi_du --separate-dirs prefix | sort -k 2
252+
0 prefix
253+
0 prefix/directory
254+
0 prefix/directory/subdirectory
255+
0 prefix/empty_directory
256+
8 prefix/leaf_directory
257+
0 prefix/unusual#? directory ,
258+
211259
$ gufi_du --separate-dirs --apparent-size --block-size 1 prefix | sort -k 2
212260
1049624 prefix
213261
6 prefix/directory
@@ -232,6 +280,14 @@ $ gufi_du --separate-dirs --apparent-size --block-size 1 --total --summarize pre
232280
1049624 prefix
233281
1049624 total
234282

283+
$ gufi_du --separate-dirs --inodes prefix | sort -k 2
284+
6 prefix
285+
3 prefix/directory
286+
2 prefix/directory/subdirectory
287+
0 prefix/empty_directory
288+
2 prefix/leaf_directory
289+
1 prefix/unusual#? directory ,
290+
235291
# inodes
236292
$ gufi_du --inodes prefix | sort -k 2
237293
14 prefix
@@ -313,6 +369,22 @@ $ gufi_du --apparent-size --block-size 1 prefix | sort -k 2
313369
23 prefix/leaf_directory
314370
15 prefix/unusual#? directory ,
315371

372+
$ gufi_du --apparent-size --block-size 2KB prefix | sort -k 2
373+
525 prefix
374+
1 prefix/directory
375+
1 prefix/directory/subdirectory
376+
0 prefix/empty_directory
377+
1 prefix/leaf_directory
378+
1 prefix/unusual#? directory ,
379+
380+
$ gufi_du --apparent-size --block-size 4KiB prefix | sort -k 2
381+
257 prefix
382+
1 prefix/directory
383+
1 prefix/directory/subdirectory
384+
0 prefix/empty_directory
385+
1 prefix/leaf_directory
386+
1 prefix/unusual#? directory ,
387+
316388
$ gufi_du --apparent-size --block-size 1 --total prefix | sort -k 2
317389
1049673 prefix
318390
11 prefix/directory
@@ -330,6 +402,14 @@ $ gufi_du --apparent-size --block-size 1 --total --summarize prefix
330402
1049673 total
331403

332404
# separate dirs
405+
$ gufi_du --separate-dirs prefix | sort -k 2
406+
0 prefix
407+
0 prefix/directory
408+
0 prefix/directory/subdirectory
409+
0 prefix/empty_directory
410+
8 prefix/leaf_directory
411+
0 prefix/unusual#? directory ,
412+
333413
$ gufi_du --separate-dirs --apparent-size --block-size 1 prefix | sort -k 2
334414
1049624 prefix
335415
6 prefix/directory
@@ -354,6 +434,14 @@ $ gufi_du --separate-dirs --apparent-size --block-size 1 --total --summarize pre
354434
1049624 prefix
355435
1049624 total
356436

437+
$ gufi_du --separate-dirs --inodes prefix | sort -k 2
438+
6 prefix
439+
3 prefix/directory
440+
2 prefix/directory/subdirectory
441+
0 prefix/empty_directory
442+
2 prefix/leaf_directory
443+
1 prefix/unusual#? directory ,
444+
357445
# inodes
358446
$ gufi_du --inodes prefix | sort -k 2
359447
14 prefix
@@ -385,6 +473,19 @@ $ gufi_du --inodes --total --summarize prefix
385473

386474
#####################################
387475

476+
#####################################
477+
# Run gufi_du without arguments (index parent search/ shows up without a name)
478+
$ gufi_du | sort -k 2
479+
8
480+
8 prefix
481+
0 prefix/directory
482+
0 prefix/directory/subdirectory
483+
0 prefix/empty_directory
484+
8 prefix/leaf_directory
485+
0 prefix/unusual#? directory ,
486+
487+
#####################################
488+
388489
#####################################
389490
# Run gufi_du on a file path
390491
# blocks (sparse files)
@@ -419,6 +520,14 @@ $ gufi_du --apparent-size --block-size 1 prefix/1MB prefix/1KB | sort -k 2
419520
1024 prefix/1KB
420521
1048576 prefix/1MB
421522

523+
$ gufi_du --apparent-size --block-size 2KB prefix/1MB prefix/1KB | sort -k 2
524+
1 prefix/1KB
525+
525 prefix/1MB
526+
527+
$ gufi_du --apparent-size --block-size 4KiB prefix/1MB prefix/1KB | sort -k 2
528+
1 prefix/1KB
529+
256 prefix/1MB
530+
422531
$ gufi_du --apparent-size --block-size 1 --total prefix/1MB prefix/1KB | sort -k 2
423532
1024 prefix/1KB
424533
1048576 prefix/1MB
@@ -434,6 +543,10 @@ $ gufi_du --apparent-size --block-size 1 --total --summarize prefix/1MB prefix/1
434543
1049600 total
435544

436545
# separate dirs
546+
$ gufi_du --separate-dirs prefix/1MB prefix/1KB | sort -k 2
547+
0 prefix/1KB
548+
0 prefix/1MB
549+
437550
$ gufi_du --separate-dirs --apparent-size --block-size 1 prefix/1MB prefix/1KB | sort -k 2
438551
1024 prefix/1KB
439552
1048576 prefix/1MB
@@ -452,6 +565,10 @@ $ gufi_du --separate-dirs --apparent-size --block-size 1 --total --summarize pre
452565
1024 prefix/1KB
453566
1049600 total
454567

568+
$ gufi_du --separate-dirs --inodes prefix/1MB prefix/1KB | sort -k 2
569+
1 prefix/1KB
570+
1 prefix/1MB
571+
455572
# inodes
456573
$ gufi_du --inodes prefix/1MB prefix/1KB | sort -k 2
457574
1 prefix/1KB
@@ -475,10 +592,20 @@ $ gufi_du --inodes --total --summarize prefix/1MB prefix/1KB
475592

476593
#####################################
477594
# Warnings/Errors
595+
596+
# Non-existent path is treated as possible file name
478597
$ gufi_du "search"
479598
Warning: Did not get any results from gufi_query.
480599
Does "search" have treesummary data?
481600

601+
# Non-existent path is discovered
602+
$ gufi_du "non/existent/path"
603+
"non/existent/path" is not a path
604+
605+
# Outside of index
606+
$ gufi_du ".."
607+
Warning: Ignoring path "..", which is not under index root "search"
608+
482609
$ gufi_du --inodes --apparent-size "prefix" | sort -k 2
483610
warning: options --apparent-size and -b are ineffective with --inodes
484611
14 prefix

‎test/regression/gufi_du.sh.in

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,19 @@ do_tests() {
8080
echo "# apparent sizes"
8181
run_no_sort "${GUFI_DU} --apparent-size ${paths[@]} | sort -k 2"
8282
run_no_sort "${GUFI_DU} --apparent-size --block-size 1 ${paths[@]} | sort -k 2"
83+
run_no_sort "${GUFI_DU} --apparent-size --block-size 2KB ${paths[@]} | sort -k 2"
84+
run_no_sort "${GUFI_DU} --apparent-size --block-size 4KiB ${paths[@]} | sort -k 2"
8385
run_no_sort "${GUFI_DU} --apparent-size --block-size 1 --total ${paths[@]} | sort -k 2"
8486
run_no_sort "${GUFI_DU} --apparent-size --block-size 1 --summarize ${paths[@]}"
8587
run_no_sort "${GUFI_DU} --apparent-size --block-size 1 --total --summarize ${paths[@]}"
8688

8789
echo "# separate dirs"
90+
run_no_sort "${GUFI_DU} --separate-dirs ${paths[@]} | sort -k 2"
8891
run_no_sort "${GUFI_DU} --separate-dirs --apparent-size --block-size 1 ${paths[@]} | sort -k 2"
8992
run_no_sort "${GUFI_DU} --separate-dirs --apparent-size --block-size 1 --total ${paths[@]} | sort -k 2"
9093
run_no_sort "${GUFI_DU} --separate-dirs --apparent-size --block-size 1 --summarize ${paths[@]}"
9194
run_no_sort "${GUFI_DU} --separate-dirs --apparent-size --block-size 1 --total --summarize ${paths[@]}"
95+
run_no_sort "${GUFI_DU} --separate-dirs --inodes ${paths[@]} | sort -k 2"
9296

9397
echo "# inodes"
9498
run_no_sort "${GUFI_DU} --inodes ${paths[@]} | sort -k 2"
@@ -143,13 +147,24 @@ echo
143147
echo "#####################################"
144148
echo
145149
echo "#####################################"
150+
echo "# Run gufi_du without arguments (index parent ${SEARCH}/ shows up without a name)"
151+
run_no_sort "${GUFI_DU} | sort -k 2"
152+
echo "#####################################"
153+
echo
154+
echo "#####################################"
146155
echo "# Run gufi_du on a file path"
147156
do_tests "${SRCDIR}/1MB" "${SRCDIR}/1KB"
148157
echo "#####################################"
149158
echo
150159
echo "#####################################"
151160
echo "# Warnings/Errors"
161+
echo
162+
echo "# Non-existent path is treated as possible file name"
152163
run_no_sort "${GUFI_DU} \"${SEARCH}\""
164+
echo "# Non-existent path is discovered"
165+
run_no_sort "${GUFI_DU} \"non/existent/path\""
166+
echo "# Outside of index"
167+
run_no_sort "${GUFI_DU} \"..\""
153168
run_no_sort "${GUFI_DU} --inodes --apparent-size \"${SRCDIR}\" | sort -k 2"
154169
run_no_sort "${GUFI_DU} --inodes --block-size 1 \"${SRCDIR}\" | sort -k 2"
155170
echo "# Verbose Output"

0 commit comments

Comments
 (0)