add external database list to dir2trace and trace2index tests

also reduced querying in inserttreesumdb

Author: calccrypto

src/dbutils.c

@@ -689,24 +689,20 @@ int insertsumdb(sqlite3 *sdb, const char *path, struct work *pwork, struct entry
     return 0;
 }
 
-static int get_str_callback(void *args, int count, char **data, char **columns) {
+static int get_2_strs(void *args, int count, char **data, char **columns) {
     (void) count;
     (void) columns;
 
-    char **str = (char **) args;
+    char **strs = (char **) args;
 
-    if (data[0]) {
-        const size_t len = strlen(data[0]) + 2; /* + 2 for quotation marks */
-        *str = malloc(len + 1);
-        SNFORMAT_S(*str, len + 1, 3,
+    for(int i = 0; i < 2; i++) {
+        const size_t len = strlen(data[i]) + 2; /* + 2 for quotation marks */
+        strs[i] = malloc(len + 1);
+        SNFORMAT_S(strs[i], len + 1, 3,
                    "'", (size_t) 1,
-                   data[0], len - 2,
+                   data[i], len - 2,
                    "'", (size_t) 1);
     }
-    else {
-        *str = malloc(5);
-        snprintf(*str, 5, "NULL");
-    }
 
     return 0;
 }
@@ -720,22 +716,16 @@ int inserttreesumdb(const char *name, sqlite3 *sdb, struct sum *su,int rectype,i
 
     char *err = NULL;
 
-    char *inode = NULL;
-    if (sqlite3_exec(sdb, "SELECT inode FROM " SUMMARY " WHERE isroot == 1;",
-                     get_str_callback, &inode, &err) != SQLITE_OK ) {
+    char *ip[2] = {NULL, NULL};
+    if (sqlite3_exec(sdb, "SELECT inode, pinode FROM " SUMMARY " WHERE isroot == 1;",
+                     get_2_strs, ip, &err) != SQLITE_OK) {
         fprintf(stderr, "Could not get inode from %s: %s\n", SUMMARY, err);
         sqlite3_free(err);
         return 1;
     }
 
-    char *pinode = NULL;
-    if (sqlite3_exec(sdb, "SELECT pinode FROM " SUMMARY " WHERE isroot == 1;",
-                     get_str_callback, &pinode, &err) != SQLITE_OK ) {
-        fprintf(stderr, "Could not get inode from %s: %s\n", SUMMARY, err);
-        free(inode);
-        sqlite3_free(err);
-        return 1;
-    }
+    char *inode  = ip[0];
+    char *pinode = ip[1];
 
     char sqlstmt[MAXSQL];
     SNPRINTF(sqlstmt, MAXSQL, "INSERT INTO " TREESUMMARY " VALUES (%s, %s, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %d, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %lld, %d, %d, %d);",

test/regression/gufi_dir2trace.expected

@@ -20,10 +20,10 @@ output_prefix        prefix of output files (<prefix>.<tid>)
 $ gufi_dir2trace -d "|" -n 2 -x "prefix" "trace"
 Creating GUFI Traces trace with 2 threads
 Total Dirs:          6
-Total Files:         14
+Total Files:         15
 
 Expecting 2 trace files. Found 2.
-Expecting 20 lines. Got 20.
+Expecting 21 lines. Got 21.
 Expecting 23 columns per row. Got 23.
 Source Directory:
     prefix
@@ -38,6 +38,7 @@ Source Directory:
     prefix/directory/subdirectory/repeat_name
     prefix/directory/writable
     prefix/empty_directory
+    prefix/external.gufi
     prefix/file_symlink
     prefix/leaf_directory
     prefix/leaf_directory/leaf_file1
@@ -59,6 +60,7 @@ Trace File:
     prefix/directory/subdirectory/repeat_name
     prefix/directory/writable
     prefix/empty_directory
+    prefix/external.gufi
     prefix/file_symlink
     prefix/leaf_directory
     prefix/leaf_directory/leaf_file1
@@ -103,14 +105,15 @@ $ gufi_dir2trace -d "|" -n 2 -k "skip" "prefix" "trace"
 "trace.1" Already exists!
 Creating GUFI Traces trace with 2 threads
 Total Dirs:          4
-Total Files:         9
+Total Files:         10
 
-$ cat trace.0 trace.1 | awk -F "|" '{print $1}'
+$ cat trace.0 trace.1 | awk -F "|" '{print $1}' | sed '/\/external\/db/d;'
 prefix
 prefix/.hidden
 prefix/1KB
 prefix/1MB
 prefix/empty_directory
+prefix/external.gufi
 prefix/file_symlink
 prefix/leaf_directory
 prefix/leaf_directory/leaf_file1

test/regression/gufi_dir2trace.sh.in

@@ -89,6 +89,9 @@ run_no_sort "${GUFI_DIR2TRACE}"
 # generate the tree
 @CMAKE_CURRENT_BINARY_DIR@/generatetree.sh "${SRCDIR}"
 
+# add an external db
+echo "/external/db" > "${SRCDIR}/external.gufi"
+
 # generate the trace
 run_no_sort "${GUFI_DIR2TRACE} -d \"${DELIM}\" -n ${THREADS} -x \"${SRCDIR}\" \"${TRACE}\""
 
@@ -98,20 +101,20 @@ echo "Expecting ${THREADS} trace files. Found ${found}."
 
 # count lines
 # shellcheck disable=SC2016
-trace_lines=$(cat "${TRACES[@]}" | wc -l | @AWK@ '{print $1}')
+trace_lines=$(cat "${TRACES[@]}" | wc -l | @AWK@ '{print $1 - 1}')
 contents=$(find "${SRCDIR}")
 # shellcheck disable=SC2016
 content_lines=$(echo "${contents}" | wc -l | @AWK@ '{print $1}')
 echo "Expecting ${content_lines} lines. Got ${trace_lines}."
 
 # count separators
-columns=$(sed "s/[^${DELIM}]//g" "${TRACES[@]}" | @AWK@ '{ print length }' | sort | uniq)
+columns=$(sed "/^.*${DELIM}e${DELIM}$/d; s/[^${DELIM}]//g;" "${TRACES[@]}" | @AWK@ '{ print length }' | sort | uniq)
 echo "Expecting 23 columns per row. Got ${columns}."
 
 # compare names
 src=$(find "${SRCDIR}" | sort)
 # shellcheck disable=SC2016
-lines=$(@AWK@ -F"${DELIM}" -v SRCDIR="${SRCDIR}" "{ print \$1 }" "${TRACES[@]}" | sed "s/\\/\\//\\//g" | sort)
+lines=$(@AWK@ -F"${DELIM}" -v SRCDIR="${SRCDIR}" "{ print \$1 }" "${TRACES[@]}" | sed "/\\/external\\/db/d; s/\\/\\//\\//g;" | sort)
 
 echo "Source Directory:"
 # shellcheck disable=SC2016
@@ -142,7 +145,7 @@ echo "# skip file"
 run_no_sort "${GUFI_DIR2TRACE} -d \"${DELIM}\" -n ${THREADS} -k \"${SKIP}\" \"${SRCDIR}\" \"${TRACE}\""
 
 # shellcheck disable=SC2145
-run_sort "cat ${TRACES[@]} | @AWK@ -F \"${DELIM}\" '{print \$1}'"
+run_sort "cat ${TRACES[@]} | @AWK@ -F \"${DELIM}\" '{print \$1}' | sed '/\\/external\\/db/d;'"
 
 echo "# bad skip file"
 run_no_sort "${GUFI_DIR2TRACE} -d \"${DELIM}\" -n ${THREADS} -k \"${SKIP}.bad\" \"${SRCDIR}\" \"${TRACE}\""

test/regression/gufi_trace2index.expected

@@ -22,11 +22,11 @@ Total Files:         14
 $ gufi_trace2index -d "|" trace.0 trace.1 "prefix"
 Creating GUFI Index prefix with 1 threads
 Dirs:                6 (1 empty)
-Files:               14
-Total:               20
+Files:               15
+Total:               21
 
 Total Dirs:          6
-Total Files:         14
+Total Files:         15
 
 Source Directory:
     prefix
@@ -76,11 +76,11 @@ GUFI Index:
 $ gufi_trace2index -d "|" -n "2" "empty_last_dir.trace" "prefix"
 Creating GUFI Index prefix with 2 threads
 Dirs:                7 (2 empty)
-Files:               14
-Total:               21
+Files:               15
+Total:               22
 
 Total Dirs:          7
-Total Files:         14
+Total Files:         15
 
 # bad trace path
 $ gufi_trace2index -d "|" -n "2" "" "prefix"

test/regression/gufi_trace2index.sh.in

@@ -90,6 +90,9 @@ run_no_sort "${GENERATETREE} ${SRCDIR}"
 # generate the trace
 run_no_sort "${GUFI_DIR2TRACE} -d \"${DELIM}\" -n ${THREADS} -x \"${SRCDIR}\" \"${TRACE}\""
 
+# add an external db
+echo "external_db${DELIM}e${DELIM}" >> "${TRACES[0]}"
+
 # generate the index
 run_no_sort "${GUFI_TRACE2INDEX} -d \"${DELIM}\"" "${TRACES[@]}" "\"${SEARCH}\""