Skip to content

blob_db: fix build failure when FLB_SQLDB is flipped off #12158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RaJiska wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −2
Open

blob_db: fix build failure when FLB_SQLDB is flipped off #12158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/fluent-bit/flb_blob_db.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@
#ifndef FLB_BLOB_DB_H
#define FLB_BLOB_DB_H

#include <stdint.h>
#include <cfl/cfl_sds.h>
#include <fluent-bit/flb_lock.h>

struct flb_config;

#define SQL_PRAGMA_FOREIGN_KEYS "PRAGMA foreign_keys = ON;"

#define SQL_CREATE_BLOB_FILES \
Expand Down
2 changes: 2 additions & 0 deletions plugins/in_systemd/systemd_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
#include <fluent-bit/flb_info.h>
#include <fluent-bit/flb_input.h>
#include <fluent-bit/flb_config.h>
#ifdef FLB_HAVE_SQLDB
#include <fluent-bit/flb_sqldb.h>
#endif
#include <fluent-bit/flb_log_event_encoder.h>

#include <systemd/sd-journal.h>
Expand Down
30 changes: 28 additions & 2 deletions src/flb_blob_db.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
* limitations under the License.
*/

#include <fluent-bit/flb_blob_db.h>

#ifdef FLB_HAVE_SQLDB

#include <fluent-bit/flb_sqldb.h>
#include <fluent-bit/flb_blob_db.h>

static int prepare_stmts(struct flb_blob_db *context)
{
Expand Down Expand Up @@ -1512,7 +1513,8 @@ int flb_blob_db_file_part_get_next(struct flb_blob_db *context,
cfl_sds_t *file_path,
cfl_sds_t *destination,
cfl_sds_t *remote_file_id,
cfl_sds_t *tag)
cfl_sds_t *tag,
int *part_count)
{
return FLB_BLOB_DB_ERROR_NO_BACKEND_AVAILABLE;
}
Expand Down Expand Up @@ -1559,4 +1561,28 @@ int flb_blob_db_file_fetch_part_count(struct flb_blob_db *context,
return FLB_BLOB_DB_ERROR_NO_BACKEND_AVAILABLE;
}

int flb_blob_db_lock(struct flb_blob_db *context)
{
return FLB_BLOB_DB_ERROR_NO_BACKEND_AVAILABLE;
}

int flb_blob_db_unlock(struct flb_blob_db *context)
{
return FLB_BLOB_DB_ERROR_NO_BACKEND_AVAILABLE;
}

int flb_blob_file_update_remote_id(struct flb_blob_db *context,
uint64_t id,
cfl_sds_t remote_id)
{
return FLB_BLOB_DB_ERROR_NO_BACKEND_AVAILABLE;
}

int flb_blob_db_file_part_update_remote_id(struct flb_blob_db *context,
uint64_t id,
cfl_sds_t remote_id)
{
return FLB_BLOB_DB_ERROR_NO_BACKEND_AVAILABLE;
}

#endif
Loading