remove setstr

Author: calccrypto

docs/latex/sections/gufi_query.tex

@@ -212,68 +212,6 @@ \subsubsection{Short Circuiting with Compound Queries}
 To turn off short circuiting and always run all queries for each
 directory, pass the \texttt{-a} flag to \gufiquery.
 
-\subsubsection{User String Replacement}
-\label{sec:user_strings}
-Queries may have string replacements done to them before being run on
-a particular directory.
-
-After calling \texttt{setstr(`key', value)} in one SQL input argument,
-\texttt{\{key\}} can be used in a later SQL input argument to do
-string replacements. The key can be any string with at least 1
-character. Duplicate keys will replace previously defined values.
-
-Note that the key and value will only be available to the thread where
-it was processed. Each thread should set their own instances of the
-key.
-\\\\
-\noindent Example Usage:
-\begin{table}[H]
-  \centering
-  \begin{tabular}{ll}
-    \gufiquery & \texttt{-S "SELECT setstr(`key', (SELECT 123));"} \\
-               & \texttt{-E "SELECT \{key\};"} \\
-               & \indexroot \\
-  \end{tabular}
-\end{table}
-
-SQL statements combining setting and using values into one input
-argument will not work because the entire string will have been parsed
-by \sqlite before replacements can happen. \\
-
-\noindent Bad Usage:
-\begin{table}[H]
-  \centering
-  \begin{tabular}{ll}
-    \gufiquery & \texttt{-S "SELECT setstr(`key', (SELECT 123)); SELECT \{key\};"} \\
-               & \indexroot \\
-  \end{tabular}
-\end{table}
-
-Additionally, a few user strings are predefined for convenience. They
-were previously part of the deprecated \texttt{\% Formatting}, and
-have been moved here.
-
-\begin{table}[H]
-  \centering
-  \begin{tabular}{|l|l|}
-    \hline
-    User String & Explanation \\
-    \hline
-    \texttt{n} & Replace with the current index directory's name \\
-    \hline
-    \texttt{i} & Replace with the current index directory's path \\
-    \hline
-    \texttt{s} & Replace with the source path of this directory \\
-               & (Requires \texttt{-p}) \\
-    \hline
-  \end{tabular}
-  \caption{Predefined User Strings}
-\end{table}
-
-These strings may be redefined by the user. However, \texttt{n} and
-\texttt{i} will be reset at the beginning of the next directory's
-processing.
-
 \subsubsection{Extended Attributes}
 \label{sec:query_xattrs}
 When querying for xattrs, pass \texttt{-x} to \gufiquery to build the

include/gufi_query/process_queries.h

@@ -71,10 +71,9 @@ OF SUCH DAMAGE.
 #include "bf.h"
 #include "gufi_query/PoolArgs.h"
 #include "gufi_query/gqw.h"
-#include "trie.h"
 
 int process_queries(PoolArgs_t *pa, QPTPool_t *ctx, const int id,
-                    DIR *dir, gqw_t *gqw, sqlite3 *db, trie_t *user_strs,
+                    DIR *dir, gqw_t *gqw, sqlite3 *db,
                     const char *dbname, const size_t dbname_len,
                     const int descend, size_t *subdirs_walked_count);
 

include/gufi_query/query_replacement.h

@@ -189,8 +189,6 @@ add_library(gufi_query_lib OBJECT
   gufi_query/process_queries.c
   gufi_query/processdir.c
   gufi_query/query.c
-  gufi_query/query_replacement.c
-  gufi_query/query_user_strs.c
 )
 
 if (DEP_AI)

include/gufi_query/query_user_strs.h

@@ -74,39 +74,6 @@ OF SUCH DAMAGE.
 #include "gufi_query/external.h"
 #include "gufi_query/per_thread_kv.h"
 
-/* don't introduce undefined behavior by casting function when passing into trie_insert */
-static void str_free_wrapper(void *str) {
-    str_free((str_t *) str);
-}
-
-/*
- * udf that allows for user to name SQL values that can be used for string replacement
- *
- * -S "SELECT setstr('1', (SELECT col ...));"
- * -E "SELECT '{1}';"
- *
- * will print the value of col
- */
-static void setstr(sqlite3_context *context, int argc, sqlite3_value **argv) {
-    (void) argc;
-
-    trie_t *user_strs = (trie_t *) sqlite3_user_data(context);
-
-    /* args are cast to strings */
-
-    const size_t key_len = sqlite3_value_bytes(argv[0]);
-    const char *key = (const char *) sqlite3_value_text(argv[0]);
-
-    const size_t val_len = sqlite3_value_bytes(argv[1]);
-    const char *val = (const char *) sqlite3_value_text(argv[1]);
-
-    /* copy value since its lifetime is not guaranteed */
-    str_t *copy = str_alloc(val_len);
-    memcpy(copy->data, val, val_len);
-
-    trie_insert(user_strs, key, key_len, copy, str_free_wrapper);
-}
-
 void thread_id(sqlite3_context *context, int argc, sqlite3_value **argv) {
     (void) argc; (void) argv;
 
@@ -156,30 +123,15 @@ int PoolArgs_init(PoolArgs_t *pa, struct input *in, pthread_mutex_t *global_mute
             break;
         }
 
-        /* user string storage */
-        ta->user_strs = trie_alloc();
-
-        /*
-         * {s} defaults to the source tree path - can change, but generally will not
-         *
-         * maybe move this into processdir to reset the value every time?
-         */
-        if (in->sql_format.source_prefix.data && in->sql_format.source_prefix.len) {
-            trie_insert(ta->user_strs, "s", 1, &in->sql_format.source_prefix, NULL);
-        }
-
-        if (sqlite3_create_function(ta->outdb, "setstr", 2, SQLITE_UTF8,
-                                    ta->user_strs, &setstr, NULL, NULL) != SQLITE_OK) {
-            fprintf(stderr, "Error: Could not add setstr to sqlite\n");
-            break;
-        }
-
         /* create a simple kv table and functions to set and get */
         if (ptkv_init(ta->outdb) != SQLITE_OK) {
             break;
         }
 
-        /* set key s with the source tree path - can change, but generally will not */
+        /* set key s with the source tree path - can change, but generally will not
+         *
+         * maybe move this into processdir to reset the value every time?
+         */
         if (in->sql_format.source_prefix.data && in->sql_format.source_prefix.len) {
             if (ptkv_set_internal(i, ta->outdb, "s", 1, &in->sql_format.source_prefix) != SQLITE_OK) {
                 break;
@@ -294,8 +246,6 @@ void PoolArgs_fin(PoolArgs_t *pa, const size_t allocated) {
 
         closedb(ta->outdb);
 
-        trie_free(ta->user_strs);
-
         if (ta->outfile) {
             OutputBuffer_flush(&ta->output_buffer, ta->outfile);
         }

src/CMakeLists.txt

@@ -67,7 +67,6 @@ OF SUCH DAMAGE.
 
 #include "dbutils.h"
 #include "gufi_query/handle_sql.h"
-#include "gufi_query/query_replacement.h"
 #include "template_db.h"
 
 static int validate(struct input *in) {
@@ -220,13 +219,6 @@ static int gen_types(struct input *in) {
     return -1;
 }
 
-static int sql_formatting(struct input *in) {
-    save_replacements(&in->sql.tsum, &in->sql_format.tsum);
-    save_replacements(&in->sql.sum,  &in->sql_format.sum);
-    save_replacements(&in->sql.ent,  &in->sql_format.ent);
-    return 0;
-}
-
 int handle_sql(struct input *in) {
     if (validate(in) != 0) {
         return -1;
@@ -236,9 +228,5 @@ int handle_sql(struct input *in) {
         return -1;
     }
 
-    if (sql_formatting(in) != 0) {
-        return -1;
-    }
-
     return 0;
 }