gufi_rollup --dry-run fix

added dry_run test

Author: calccrypto

src/gufi_rollup.c

@@ -875,7 +875,7 @@ static int do_rollup(struct RollUp *rollup,
      * were integrated into above loop, but that would add a lot
      * of complexity
      */
-    if (!rc) {
+    if (!rc && !pa->in.dry_run) {
         bottomup_collect_treesummary(dst, rollup->data.name, &rollup->data.subdirs, ROLLUPSCORE_KNOWN_YES);
     }
 
@@ -979,7 +979,9 @@ static int rollup_ascend(void *args) {
                 }
             }
 
-            bottomup_collect_treesummary(dst, dir->data.name, &dir->data.subdirs, ROLLUPSCORE_KNOWN_NO);
+            if (!pa->in.dry_run) {
+                bottomup_collect_treesummary(dst, dir->data.name, &dir->data.subdirs, ROLLUPSCORE_KNOWN_NO);
+            }
         }
     }
 

test/regression/gufi_rollup.expected

@@ -19,6 +19,7 @@ GUFI_tree         GUFI tree to roll up
 Creating GUFI tree search with 1 threads
 Total Dirs:          69
 Total Non-Dirs:      96
+$ gufi_rollup --dry-run "search"
 Roots:
     search
 
@@ -72,6 +73,62 @@ Files/Links:    96
 Directories:    70 (22 empty)
 Total:          166
 Remaining Dirs: 18 (25.71%)
+
+$ gufi_rollup "search"
+Roots:
+    search
+
+Thread Pool Size:            1
+Files/Links Limit:           0
+
+Not Processed:               0
+Cannot Roll Up:              5
+    Subdirectories:
+        min:                 1
+        max:                 4
+        median:           4.00
+        sum:                17
+        average:          3.40
+    Files/Links:
+        min:                 0
+        max:                 0
+        median:           0.00
+        sum:                 0
+        average:          0.00
+    Level:
+        min:                 0
+        max:                 2
+        median:           2.00
+        sum:                 7
+        average:          1.40
+    Too Many Before:         0
+    Too Many After:          0
+Can Roll Up:                65
+    Subdirectories:
+        min:                 0
+        max:                 4
+        median:           0.00
+        sum:                52
+        average:          0.80
+    Files/Links:
+        min:                 0
+        max:                 3
+        median:           1.00
+        sum:                96
+        average:          1.48
+    Level:
+        min:                 2
+        max:                 4
+        median:           4.00
+        sum:               242
+        average:          3.72
+    Successful:             65
+    Failed:                  0
+Files/Links:    96
+Directories:    70 (22 empty)
+Total:          166
+Remaining Dirs: 18 (25.71%)
+
 $ gufi_query -d " " -S "SELECT rpath(sname, sroll) FROM vrsummary;" "search" | wc -l
 69
 
@@ -723,6 +780,7 @@ $ gufi_stats -c total-dircount prefix
 Creating GUFI tree search with 1 threads
 Total Dirs:          69
 Total Non-Dirs:      96
+$ gufi_rollup --limit 3 "search"
 Roots:
     search
 
@@ -781,6 +839,7 @@ Files/Links:    96
 Directories:    70 (22 empty)
 Total:          166
 Remaining Dirs: 70 (100.00%)
+
 $ gufi_query -d " " -S "SELECT rpath(sname, sroll) FROM vrsummary;" "search" | wc -l
 69
 
@@ -1687,6 +1746,7 @@ Files/Links:    14
 Directories:    7 (2 empty)
 Total:          21
 Remaining Dirs: 2 (28.57%)
+
 # test-xattr.db is only left at prefix and prefix/directory/subdirectory
 $ find "prefix" -name "*.db"
 prefix/db.db

test/regression/gufi_rollup.sh.in

@@ -136,14 +136,22 @@ do_tests() {
     run_sort "${GUFI_STATS} -c total-dircount ${BASENAME}"
 }
 
+# there is a weird bug with printing out stats when
+# running gufi_query on alpine linux in run_no_sort
+
 "${GUFI_DIR2INDEX}" "${SRCDIR}" "${SEARCH}" 2>&1
 "${GUFI_QUERY}" \
     -a 1 \
     -w \
     -S "UPDATE summary SET uid = 0, gid = 0, minuid = 0, maxuid = 0, mingid = 0, maxgid = 0;" \
     -E "UPDATE entries SET uid = 0, gid = 0;" \
     "${SEARCH}"
+echo "$ ${GUFI_ROLLUP} --dry-run \"${SEARCH}\""
+"${GUFI_ROLLUP}" --dry-run "${SEARCH}"
+echo
+echo "$ ${GUFI_ROLLUP} \"${SEARCH}\""
 "${GUFI_ROLLUP}" "${SEARCH}"
+echo
 do_tests
 
 rm -r "${SEARCH}"
@@ -155,7 +163,9 @@ rm -r "${SEARCH}"
     -S "UPDATE summary SET uid = 0, gid = 0, minuid = 0, maxuid = 0, mingid = 0, maxgid = 0;" \
     -E "UPDATE entries SET uid = 0, gid = 0;" \
     "${SEARCH}"
+echo "$ ${GUFI_ROLLUP} --limit 3 \"${SEARCH}\""
 "${GUFI_ROLLUP}" --limit 3 "${SEARCH}"
+echo
 do_tests
 
 rm -rf "${SEARCH}"
@@ -216,7 +226,8 @@ rm -rf "${SEARCH}"
 
     echo "# delete rollups under ${INDEXROOT}"
     echo "$ ${GUFI_ROLLUP} --delete-below 1 \"${SEARCH}\""
-    "${GUFI_ROLLUP}" --delete-below 1 "${SEARCH}" # alpine linux is weird about running this in run_no_sort
+    "${GUFI_ROLLUP}" --delete-below 1 "${SEARCH}"
+    echo
 
     echo "# ${EXT_DBNAME} is only left at ${INDEXROOT} and ${INSERT_DIR}"
     run_sort "find \"${INDEXROOT}\" -name \"*.db\""