out_azure_blob: fix compilation if FLB_SQLDB (sqlite3) is disabled

Signed-off-by: Thomas Devoogdt <[email protected]>

Author: ThomasDevoogdt

include/fluent-bit/flb_event.h

@@ -29,7 +29,10 @@
 #define FLB_EVENT_TYPE_METRICS    FLB_INPUT_CHUNK_TYPE_METRICS
 #define FLB_EVENT_TYPE_TRACES     FLB_INPUT_CHUNK_TYPE_TRACES
 #define FLB_EVENT_TYPE_PROFILES   FLB_INPUT_CHUNK_TYPE_PROFILES
+
+#ifdef FLB_HAVE_SQLDB
 #define FLB_EVENT_TYPE_BLOBS      FLB_INPUT_CHUNK_TYPE_BLOBS
+#endif
 
 #define FLB_EVENT_TYPE_HAS_TRACE FLB_INPUT_CHUNK_HAS_TRACE
 

plugins/out_azure_blob/azure_blob.c

@@ -25,7 +25,6 @@
 #include <fluent-bit/flb_config_map.h>
 #include <fluent-bit/flb_gzip.h>
 #include <fluent-bit/flb_base64.h>
-#include <fluent-bit/flb_sqldb.h>
 #include <fluent-bit/flb_input_blob.h>
 #include <fluent-bit/flb_log_event_decoder.h>
 #include <fluent-bit/flb_plugin.h>
@@ -34,13 +33,16 @@
 #include <msgpack.h>
 
 #include "azure_blob.h"
-#include "azure_blob_db.h"
 #include "azure_blob_uri.h"
 #include "azure_blob_conf.h"
 #include "azure_blob_appendblob.h"
 #include "azure_blob_blockblob.h"
 #include "azure_blob_http.h"
 
+#ifdef FLB_HAVE_SQLDB
+#include "azure_blob_db.h"
+#endif
+
 #define CREATE_BLOB  1337
 
 /* thread_local_storage for workers */
@@ -151,6 +153,7 @@ static int create_blob(struct flb_azure_blob *ctx, char *name)
     return FLB_OK;
 }
 
+#ifdef FLB_HAVE_SQLDB
 static int delete_blob(struct flb_azure_blob *ctx, char *name)
 {
     int ret;
@@ -225,6 +228,7 @@ static int delete_blob(struct flb_azure_blob *ctx, char *name)
     flb_upstream_conn_release(u_conn);
     return FLB_OK;
 }
+#endif
 
 static int http_send_blob(struct flb_config *config, struct flb_azure_blob *ctx,
                           flb_sds_t ref_name,
@@ -380,11 +384,13 @@ static int send_blob(struct flb_config *config,
             uri = azb_block_blob_uri(ctx, tag, block_id, ms);
             ref_name = flb_sds_printf(&ref_name, "file=%s.%" PRIu64, name, ms);
         }
+#ifdef FLB_HAVE_SQLDB
         else if (event_type == FLB_EVENT_TYPE_BLOBS) {
             block_id = azb_block_blob_id_blob(ctx, name, part_id);
             uri = azb_block_blob_uri(ctx, name, block_id, 0);
             ref_name = flb_sds_printf(&ref_name, "file=%s:%" PRIu64, name, part_id);
         }
+#endif
     }
 
     if (!uri) {
@@ -416,10 +422,12 @@ static int send_blob(struct flb_config *config,
             return FLB_ERROR;
         }
     }
+#ifdef FLB_HAVE_SQLDB
     else if (event_type == FLB_EVENT_TYPE_BLOBS) {
         payload_buf = data;
         payload_size = bytes;
     }
+#endif
 
     ret = http_send_blob(config, ctx, ref_name, uri, block_id, event_type, payload_buf, payload_size);
     flb_plg_debug(ctx->ins, "http_send_blob()=%i", ret);
@@ -635,6 +643,7 @@ static int cb_azure_blob_init(struct flb_output_instance *ins,
     return 0;
 }
 
+#ifdef FLB_HAVE_SQLDB
 static int blob_chunk_register_parts(struct flb_azure_blob *ctx, uint64_t file_id, size_t total_size)
 {
     int ret;
@@ -1034,6 +1043,7 @@ static int azb_timer_create(struct flb_azure_blob *ctx)
 
     return 0;
 }
+#endif
 
 static void cb_azure_blob_flush(struct flb_event_chunk *event_chunk,
                                 struct flb_output_flush *out_flush,
@@ -1081,6 +1091,7 @@ static void cb_azure_blob_flush(struct flb_event_chunk *event_chunk,
             }
         }
     }
+#ifdef FLB_HAVE_SQLDB
     else if (event_chunk->type == FLB_EVENT_TYPE_BLOBS) {
         /*
          * For Blob types, we use the flush callback to enqueue the file, then cb_azb_blob_file_upload()
@@ -1091,6 +1102,7 @@ static void cb_azure_blob_flush(struct flb_event_chunk *event_chunk,
             FLB_OUTPUT_RETURN(FLB_RETRY);
         }
     }
+#endif
 
     /* FLB_RETRY, FLB_OK, FLB_ERROR */
     FLB_OUTPUT_RETURN(ret);
@@ -1129,11 +1141,13 @@ static int cb_worker_init(void *data, struct flb_config *config)
         FLB_TLS_SET(worker_info, info);
     }
 
+#ifdef FLB_HAVE_SQLDB
     ret = azb_timer_create(ctx);
     if (ret == -1) {
         flb_plg_error(ctx->ins, "failed to create upload timer");
         return -1;
     }
+#endif
 
     return 0;
 }

plugins/out_azure_blob/azure_blob.h

@@ -23,7 +23,10 @@
 #include <fluent-bit/flb_output_plugin.h>
 #include <fluent-bit/flb_upstream.h>
 #include <fluent-bit/flb_sds.h>
+
+#ifdef FLB_HAVE_SQLDB
 #include <fluent-bit/flb_sqldb.h>
+#endif
 
 /* Content-Type */
 #define AZURE_BLOB_CT          "Content-Type"

plugins/out_azure_blob/azure_blob_blockblob.c

@@ -22,6 +22,7 @@
 #include <fluent-bit/flb_time.h>
 #include <fluent-bit/flb_sds.h>
 #include <fluent-bit/flb_hash.h>
+#include <fluent-bit/flb_utils.h>
 #include <fluent-bit/flb_crypto_constants.h>
 
 #include <math.h>

plugins/out_azure_blob/azure_blob_conf.c

@@ -20,10 +20,14 @@
 #include <fluent-bit/flb_output_plugin.h>
 #include <fluent-bit/flb_base64.h>
 #include <fluent-bit/flb_pack.h>
+#include <fluent-bit/flb_utils.h>
 
 #include "azure_blob.h"
 #include "azure_blob_conf.h"
+
+#ifdef FLB_HAVE_SQLDB
 #include "azure_blob_db.h"
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -748,6 +752,7 @@ struct flb_azure_blob *flb_azure_blob_conf_create(struct flb_output_instance *in
         }
     }
 
+#ifdef FLB_HAVE_SQLDB
     /* database file for blob signal handling */
     if (ctx->database_file) {
         ctx->db = azb_db_open(ctx, ctx->database_file);
@@ -757,6 +762,7 @@ struct flb_azure_blob *flb_azure_blob_conf_create(struct flb_output_instance *in
     }
 
     pthread_mutex_init(&ctx->file_upload_commit_file_parts, NULL);
+#endif
 
     flb_plg_info(ctx->ins,
                  "account_name=%s, container_name=%s, blob_type=%s, emulator_mode=%s, endpoint=%s, auth_type=%s",
@@ -812,7 +818,9 @@ void flb_azure_blob_conf_destroy(struct flb_azure_blob *ctx)
         flb_upstream_destroy(ctx->u);
     }
 
-
+#ifdef FLB_HAVE_SQLDB
     azb_db_close(ctx);
+#endif
+
     flb_free(ctx);
 }