in_tail: Optional compile-time dependency on SQLlite

Author: Nigel Stewart

CMakeLists.txt

@@ -60,7 +60,7 @@ option(FLB_TESTS_INTERNAL     "Enable internal tests"         No)
 option(FLB_MTRACE             "Enable mtrace support"         No)
 option(FLB_POSIX_TLS          "Force POSIX thread storage"    No)
 option(FLB_INOTIFY            "Enable inotify support"       Yes)
-option(FLB_SQLDB              "Enable SQL embedded DB"        No)
+option(FLB_SQLDB              "Enable SQL embedded DB"       Yes)
 option(FLB_HTTP_SERVER        "Enable HTTP Server"            No)
 option(FLB_BACKTRACE          "Enable stacktrace support"    Yes)
 option(FLB_LUAJIT             "Enable Lua Scripting support" Yes)
@@ -314,10 +314,6 @@ if(FLB_METRICS)
   FLB_DEFINITION(FLB_HAVE_METRICS)
 endif()
 
-if(FLB_IN_TAIL)
-  set(FLB_SQLDB ON)
-endif()
-
 if(FLB_SQLDB)
   FLB_DEFINITION(FLB_HAVE_SQLDB)
   add_subdirectory(${FLB_PATH_LIB_SQLITE})

plugins/in_tail/tail_config.c

@@ -18,6 +18,8 @@
  *  limitations under the License.
  */
 
+#include <fluent-bit.h>
+
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_log.h>
 #include <fluent-bit/flb_input.h>
@@ -54,7 +56,9 @@ struct flb_tail_config *flb_tail_config_create(struct flb_input_instance *i_ins,
     ctx->i_ins = i_ins;
     ctx->ignore_older = 0;
     ctx->skip_long_lines = FLB_FALSE;
+#ifdef FLB_HAVE_SQLDB
     ctx->db_sync = -1;
+#endif
 
     /* Create the channel manager */
     ret = flb_pipe_create(ctx->ch_manager);
@@ -260,7 +264,9 @@ struct flb_tail_config *flb_tail_config_create(struct flb_input_instance *i_ins,
     mk_list_init(&ctx->files_static);
     mk_list_init(&ctx->files_event);
     mk_list_init(&ctx->files_rotated);
+#ifdef FLB_HAVE_SQLDB
     ctx->db = NULL;
+#endif
 
 #ifdef FLB_HAVE_REGEX
     tmp = flb_input_get_property("tag_regex", i_ins);
@@ -284,6 +290,7 @@ struct flb_tail_config *flb_tail_config_create(struct flb_input_instance *i_ins,
         ctx->dynamic_tag = FLB_TRUE;
     }
 
+#ifdef FLB_HAVE_SQLDB
     /* Database options (needs to be set before the context) */
     tmp = flb_input_get_property("db.sync", i_ins);
     if (tmp) {
@@ -312,6 +319,7 @@ struct flb_tail_config *flb_tail_config_create(struct flb_input_instance *i_ins,
             flb_error("[in_tail] could not open/create database");
         }
     }
+#endif
 
 #ifdef FLB_HAVE_METRICS
     flb_metrics_add(FLB_TAIL_METRIC_F_OPENED,
@@ -344,9 +352,11 @@ int flb_tail_config_destroy(struct flb_tail_config *config)
     }
 #endif
 
+#ifdef FLB_HAVE_SQLDB
     if (config->db != NULL) {
         flb_tail_db_close(config->db);
     }
+#endif
 
     if (config->key != NULL) {
         flb_free(config->key);

plugins/in_tail/tail_config.h

@@ -82,8 +82,10 @@ struct flb_tail_config {
     int   exit_on_eof;         /* exit fluent-bit on EOF, test */
 
     /* Database */
+#ifdef FLB_SQLDB
     struct flb_sqldb *db;
     int db_sync;
+#endif
 
     /* Parser / Format */
     struct flb_parser *parser;

plugins/in_tail/tail_db.c

@@ -18,6 +18,8 @@
  *  limitations under the License.
  */
 
+#ifdef FLB_HAVE_SQLDB
+
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_log.h>
 #include <fluent-bit/flb_input.h>
@@ -170,3 +172,5 @@ int flb_tail_db_file_rotate(const char *new_name,
 
     return 0;
 }
+
+#endif

plugins/in_tail/tail_db.h

@@ -21,6 +21,8 @@
 #ifndef FLB_TAIL_DB_H
 #define FLB_TAIL_DB_H
 
+#ifdef FLB_HAVE_SQLDB
+
 #include <fluent-bit/flb_input.h>
 #include <fluent-bit/flb_sqldb.h>
 
@@ -41,3 +43,4 @@ int flb_tail_db_file_rotate(const char *new_name,
                             struct flb_tail_config *ctx);
 
 #endif
+#endif

plugins/in_tail/tail_file.c

@@ -673,7 +673,9 @@ int flb_tail_file_append(char *path, struct stat *st, int mode,
     file->dmode_flush_timeout = 0;
     file->dmode_buf = flb_sds_create_size(ctx->docker_mode == FLB_TRUE ? 65536 : 0);
     file->dmode_lastline = flb_sds_create_size(ctx->docker_mode == FLB_TRUE ? 20000 : 0);
+#ifdef FLB_HAVE_SQLDB
     file->db_id     = 0;
+#endif
     file->skip_next = FLB_FALSE;
     file->skip_warn = FLB_FALSE;
 
@@ -727,9 +729,11 @@ int flb_tail_file_append(char *path, struct stat *st, int mode,
      * Register or update the file entry, likely if the entry already exists
      * into the database, the offset may be updated.
      */
+#ifdef FLB_HAVE_SQLDB
     if (ctx->db) {
         flb_tail_db_file_set(file, ctx);
     }
+#endif
 
     /* Seek if required */
     if (file->offset > 0) {
@@ -894,9 +898,11 @@ int flb_tail_file_chunk(struct flb_tail_file *file)
         file->buf_len -= processed_bytes;
         file->buf_data[file->buf_len] = '\0';
 
+#ifdef FLB_HAVE_SQLDB
         if (file->config->db) {
             flb_tail_db_file_offset(file, file->config);
         }
+#endif
 
         /* Data was consumed but likely some bytes still remain */
         return FLB_TAIL_OK;
@@ -1110,13 +1116,15 @@ int flb_tail_file_rotated(struct flb_tail_file *file)
               file->name, name);
 
     /* Rotate the file in the database */
+#ifdef FLB_HAVE_SQLDB
     if (file->config->db) {
         ret = flb_tail_db_file_rotate(name, file, file->config);
         if (ret == -1) {
             flb_error("[in_tail] could not rotate file %s->%s in database",
                       file->name, name);
         }
     }
+#endif
 
     /* Update local file entry */
     tmp        = file->name;

plugins/in_tail/tail_fs_inotify.c

@@ -120,9 +120,11 @@ static int tail_fs_event(struct flb_input_instance *i_ins,
             file->buf_len = 0;
 
             /* Update offset in the database file */
+#ifdef FLB_HAVE_SQLDB
             if (ctx->db) {
                 flb_tail_db_file_offset(file, ctx);
             }
+#endif
         }
 
         /* Collect the data */