C API extended for #8

Author: d-led

scripts/test.sh

@@ -32,9 +32,11 @@ BIN_DIRS=(
     "${BUILD_DIR}"
 )
 
-# Set library path
-export LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH:-}"
-export DYLD_LIBRARY_PATH="${BUILD_DIR}:${DYLD_LIBRARY_PATH:-}"
+# Set library path - prefer bin directories first to pick up latest built dylibs
+BIN_RELEASE="${BUILD_DIR}/bin/${BUILD_TYPE}"
+BIN_GENERIC="${BUILD_DIR}/bin"
+export LD_LIBRARY_PATH="${BIN_RELEASE}:${BIN_GENERIC}:${BUILD_DIR}:${LD_LIBRARY_PATH:-}"
+export DYLD_LIBRARY_PATH="${BIN_RELEASE}:${BIN_GENERIC}:${BUILD_DIR}:${DYLD_LIBRARY_PATH:-}"
 
 # Also add build directory to PATH for shared libraries
 export PATH="${BUILD_DIR}:${PATH}"

src/influx-c-rest/influx_c_rest_async.cpp

@@ -7,10 +7,13 @@
 //
 
 #include "influx_c_rest_async.h"
+#include "influx_c_rest_config.h"
+#include "influx_c_rest_lines.h"
 
 #include "../influxdb-cpp-rest/influxdb_simple_api.h"
 #include "../influxdb-cpp-rest/influxdb_simple_async_api.h"
 #include "../influxdb-cpp-rest/influxdb_line.h"
+#include "../influxdb-cpp-rest/influxdb_config.h"
 
 #include <memory>
 #include <cassert>
@@ -52,6 +55,37 @@ extern "C" {
         return res;
     }
 
+    extern "C" INFLUX_C_REST influx_c_rest_async_t *influx_c_rest_async_new_config(const char* url, const char* name, influx_c_rest_config_t * config) {
+        assert(url);
+        assert(name);
+        assert(config);
+
+        try {
+            void* config_ptr = influx_c_rest_config_get_internal(config);
+            influxdb::api::db_config* cpp_config = static_cast<influxdb::api::db_config*>(config_ptr);
+            influx_c_rest_async_t *res = new influx_c_rest_async_t {
+                std::make_unique<influxdb::async_api::simple_db>(url, name, *cpp_config)
+            };
+
+            assert(res);
+            return res;
+        } catch (std::exception& e) {
+            std::cerr << e.what() << std::endl;
+            return nullptr;
+        }
+    }
+
+    extern "C" INFLUX_C_REST influx_c_rest_async_t *influx_c_rest_async_new_auth_config(const char* url, const char* name, const char* username, const char* password, influx_c_rest_config_t * config) {
+        assert(username);
+        assert(password);
+        assert(config);
+        auto res = influx_c_rest_async_new_config(url, name, config);
+        if (res) {
+            res->asyncdb->with_authentication(username, password);
+        }
+        return res;
+    }
+
     extern "C" INFLUX_C_REST int influx_c_rest_async_drop(influx_c_rest_async_t * self) {
         assert(self);
         assert(self->asyncdb.get());
@@ -93,4 +127,33 @@ extern "C" {
         assert(line);
         self->asyncdb->insert(influxdb::api::line(std::string(line), self->timestamp));
     }
+
+    extern "C" INFLUX_C_REST void influx_c_rest_async_insert_lines(influx_c_rest_async_t * self, influx_c_rest_lines_t * lines) {
+        assert(self);
+        assert(self->asyncdb.get());
+        assert(lines);
+        void* line_ptr = influx_c_rest_lines_get_internal(lines);
+        influxdb::api::line* line_obj = static_cast<influxdb::api::line*>(line_ptr);
+        self->asyncdb->insert(*line_obj);
+    }
+
+    extern "C" INFLUX_C_REST void influx_c_rest_async_insert_lines_default_timestamp(influx_c_rest_async_t * self, influx_c_rest_lines_t * lines) {
+        assert(self);
+        assert(self->asyncdb.get());
+        assert(lines);
+        void* line_ptr = influx_c_rest_lines_get_internal(lines);
+        influxdb::api::line* line_obj = static_cast<influxdb::api::line*>(line_ptr);
+        influxdb::api::line line_with_timestamp(line_obj->get(), self->timestamp);
+        self->asyncdb->insert(line_with_timestamp);
+    }
+
+    extern "C" INFLUX_C_REST void influx_c_rest_async_wait_quiet_ms(influx_c_rest_async_t * self, unsigned quiet_period_ms) {
+        assert(self);
+        assert(self->asyncdb.get());
+        try {
+            self->asyncdb->wait_for_submission(std::chrono::milliseconds(quiet_period_ms));
+        } catch (std::exception& e) {
+            std::cerr << e.what() << std::endl;
+        }
+    }
 }

src/influx-c-rest/influx_c_rest_async.h

@@ -11,17 +11,26 @@ extern "C" {
 #endif
 
     typedef struct _influx_c_rest_async_t influx_c_rest_async_t;
+    typedef struct _influx_c_rest_config_t influx_c_rest_config_t;
+    typedef struct _influx_c_rest_lines_t influx_c_rest_lines_t;
 
     /* lifetime */
     INFLUX_C_REST influx_c_rest_async_t *influx_c_rest_async_new(const char* url, const char* name);
     INFLUX_C_REST influx_c_rest_async_t *influx_c_rest_async_new_auth(const char* url, const char* name, const char* username, const char* password);
+    INFLUX_C_REST influx_c_rest_async_t *influx_c_rest_async_new_config(const char* url, const char* name, influx_c_rest_config_t * config);
+    INFLUX_C_REST influx_c_rest_async_t *influx_c_rest_async_new_auth_config(const char* url, const char* name, const char* username, const char* password, influx_c_rest_config_t * config);
     INFLUX_C_REST void influx_c_rest_async_destroy(influx_c_rest_async_t * self);
 
     /* behavior */
     INFLUX_C_REST int influx_c_rest_async_drop(influx_c_rest_async_t * self);
     INFLUX_C_REST int influx_c_rest_async_create(influx_c_rest_async_t * self);
     INFLUX_C_REST void influx_c_rest_async_insert(influx_c_rest_async_t * self, const char* line);
     INFLUX_C_REST void influx_c_rest_async_insert_default_timestamp(influx_c_rest_async_t * self, const char* line);
+    INFLUX_C_REST void influx_c_rest_async_insert_lines(influx_c_rest_async_t * self, influx_c_rest_lines_t * lines);
+    INFLUX_C_REST void influx_c_rest_async_insert_lines_default_timestamp(influx_c_rest_async_t * self, influx_c_rest_lines_t * lines);
+
+    /* synchronization */
+    INFLUX_C_REST void influx_c_rest_async_wait_quiet_ms(influx_c_rest_async_t * self, unsigned quiet_period_ms);
 
 #if defined(__cplusplus)
 }

src/influx-c-rest/influx_c_rest_config.cpp

@@ -0,0 +1,70 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+
+#include "influx_c_rest_config.h"
+
+#include "../influxdb-cpp-rest/influxdb_config.h"
+
+#include <memory>
+#include <cassert>
+#include <iostream>
+
+extern "C" {
+
+    struct _influx_c_rest_config_t {
+        influxdb::api::db_config config;
+    };
+
+    INFLUX_C_REST influx_c_rest_config_t *influx_c_rest_config_new(void) {
+        try {
+            influx_c_rest_config_t *res = new influx_c_rest_config_t();
+            assert(res);
+            return res;
+        } catch (std::exception& e) {
+            std::cerr << e.what() << std::endl;
+            return nullptr;
+        }
+    }
+
+    INFLUX_C_REST void influx_c_rest_config_destroy(influx_c_rest_config_t * self) {
+        assert(self);
+        delete self;
+    }
+
+    INFLUX_C_REST void influx_c_rest_config_set_batch_max_lines(influx_c_rest_config_t * self, unsigned max_lines) {
+        assert(self);
+        self->config.batch.max_lines = max_lines;
+    }
+
+    INFLUX_C_REST void influx_c_rest_config_set_batch_max_time_ms(influx_c_rest_config_t * self, unsigned max_time_ms) {
+        assert(self);
+        self->config.batch.max_time_ms = max_time_ms;
+    }
+
+    INFLUX_C_REST void influx_c_rest_config_set_http_keepalive(influx_c_rest_config_t * self, int keepalive) {
+        assert(self);
+        self->config.http.keepalive = (keepalive != 0);
+    }
+
+    INFLUX_C_REST void influx_c_rest_config_set_http_timeout_ms(influx_c_rest_config_t * self, unsigned timeout_ms) {
+        assert(self);
+        self->config.http.timeout_ms = timeout_ms;
+    }
+
+    INFLUX_C_REST void influx_c_rest_config_set_http_max_connections_per_host(influx_c_rest_config_t * self, unsigned max_connections) {
+        assert(self);
+        self->config.http.max_connections_per_host = max_connections;
+    }
+
+    INFLUX_C_REST void* influx_c_rest_config_get_internal(influx_c_rest_config_t * self) {
+        assert(self);
+        return &self->config;
+    }
+
+}
+

src/influx-c-rest/influx_c_rest_config.h

@@ -0,0 +1,34 @@
+/* * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#pragma once
+
+#include "influx_c_rest_api.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+    typedef struct _influx_c_rest_config_t influx_c_rest_config_t;
+
+    /* lifetime */
+    INFLUX_C_REST influx_c_rest_config_t *influx_c_rest_config_new(void);
+    INFLUX_C_REST void influx_c_rest_config_destroy(influx_c_rest_config_t * self);
+
+    /* batch configuration */
+    INFLUX_C_REST void influx_c_rest_config_set_batch_max_lines(influx_c_rest_config_t * self, unsigned max_lines);
+    INFLUX_C_REST void influx_c_rest_config_set_batch_max_time_ms(influx_c_rest_config_t * self, unsigned max_time_ms);
+
+    /* http configuration */
+    INFLUX_C_REST void influx_c_rest_config_set_http_keepalive(influx_c_rest_config_t * self, int keepalive);
+    INFLUX_C_REST void influx_c_rest_config_set_http_timeout_ms(influx_c_rest_config_t * self, unsigned timeout_ms);
+    INFLUX_C_REST void influx_c_rest_config_set_http_max_connections_per_host(influx_c_rest_config_t * self, unsigned max_connections);
+
+    /* internal access - returns pointer to internal config structure */
+    INFLUX_C_REST void* influx_c_rest_config_get_internal(influx_c_rest_config_t * self);
+
+#if defined(__cplusplus)
+}
+#endif
+