batching benchmark and initial API for #18: error handling and observability of the async API

Author: d-led

CMakeLists.txt

@@ -236,9 +236,10 @@ if(TARGET OpenSSL::SSL AND USE_CONAN)
 
     # Add the include directory directly to our target
     # This is critical because Boost's ASIO SSL tries to include openssl headers directly
+    # Use PRIVATE since OpenSSL is only needed for the library's implementation, not its public API
     if(_OPENSSL_INCLUDE_DIR AND EXISTS "${_OPENSSL_INCLUDE_DIR}")
         target_include_directories(influxdb-cpp-rest PRIVATE "${_OPENSSL_INCLUDE_DIR}")
-        message(STATUS "Added OpenSSL include directory to influxdb-cpp-rest: ${_OPENSSL_INCLUDE_DIR}")
+        message(STATUS "Added OpenSSL include directory to influxdb-cpp-rest (PRIVATE): ${_OPENSSL_INCLUDE_DIR}")
     else()
         message(WARNING "Could not find OpenSSL include directory - compilation may fail")
         message(WARNING "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
@@ -265,6 +266,7 @@ if(USE_CONAN)
             ${CONAN_LIBS}
     )
 endif()
+# OpenSSL includes are inherited from influxdb-cpp-rest via INTERFACE, so no need to add again
 target_compile_definitions(influx-c-rest PRIVATE BUILDING_INFLUX_C_REST)
 
 # Put DLL in bin directory (matching test executable location) so tests can find it
@@ -453,19 +455,19 @@ if(BUILD_BENCHMARK)
     # Benchmark output directory - match test executables location
     if(CMAKE_CONFIGURATION_TYPES)
         # Multi-config generator (Visual Studio, Xcode)
-        set_target_properties(format_benchmark db_insert_benchmark
+        set_target_properties(format_benchmark db_insert_benchmark db_batch_benchmark
             PROPERTIES
             RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
         )
     else()
         # Single-config generator
         if(CMAKE_BUILD_TYPE)
-            set_target_properties(format_benchmark db_insert_benchmark
+            set_target_properties(format_benchmark db_insert_benchmark db_batch_benchmark
                 PROPERTIES
                 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}"
             )
         else()
-            set_target_properties(format_benchmark db_insert_benchmark
+            set_target_properties(format_benchmark db_insert_benchmark db_batch_benchmark
                 PROPERTIES
                 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
             )

README.md

@@ -20,7 +20,7 @@ See [the demo source](src/demo/main.cpp) for the current api example.
 
 The unbatched approach (and without connection reuse) may not be sufficient in some situations, as without batching, about 200 lines/sec can be inserted.
 
-A batching api leans towards thousands inserts per second. Behind the scenes, the API uses [RxCpp](https://github.com/Reactive-Extensions/RxCpp) and [cppformat](https://github.com/fmtlib/fmt).
+An async batching api targets thousands inserts per second. Behind the scenes, the API uses [RxCpp](https://github.com/Reactive-Extensions/RxCpp) and [cppformat](https://github.com/fmtlib/fmt).
 
 ## Status
 

scripts/run-db-batch-insert-benchmark.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Download and extract InfluxDB binary
+# Usage: download-influxdb.sh <version> <architecture>
+# Example: download-influxdb.sh 1.8.10 darwin_amd64
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+
+cd "${PROJECT_ROOT}"
+
+CMAKE_ARGS="-DBUILD_BENCHMARK=ON" ./scripts/build.sh
+
+ ./build/bin/Release/db_batch_benchmark
+ 

scripts/stop-influxdb-native.sh

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# Stop native InfluxDB and optionally clean up storage
+# Usage: stop-influxdb-native.sh [--clean]
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+
+cd "${PROJECT_ROOT}"
+
+CLEAN_STORAGE=false
+if [ "${1:-}" = "--clean" ]; then
+    CLEAN_STORAGE=true
+fi
+
+# Find InfluxDB process
+INFLUXDB_PID=$(pgrep -f "influxd.*-config.*influxdb.conf" || echo "")
+
+if [ -z "${INFLUXDB_PID}" ]; then
+    echo "No InfluxDB process found running with influxdb.conf"
+    # Still try to clean if requested
+    if [ "$CLEAN_STORAGE" = true ]; then
+        if [ -d ".influxdb" ]; then
+            echo "Cleaning up InfluxDB storage..."
+            rm -rf .influxdb
+            echo "✓ InfluxDB storage cleaned"
+        else
+            echo "No .influxdb directory found"
+        fi
+    fi
+    exit 0
+fi
+
+echo "Stopping InfluxDB (PID: ${INFLUXDB_PID})..."
+
+# Try graceful shutdown first
+kill "${INFLUXDB_PID}" 2>/dev/null || true
+
+# Wait for process to exit
+timeout=10
+elapsed=0
+while [ $elapsed -lt $timeout ]; do
+    if ! kill -0 "${INFLUXDB_PID}" 2>/dev/null; then
+        echo "✓ InfluxDB stopped gracefully"
+        break
+    fi
+    sleep 1
+    elapsed=$((elapsed + 1))
+done
+
+# Force kill if still running
+if kill -0 "${INFLUXDB_PID}" 2>/dev/null; then
+    echo "Force killing InfluxDB..."
+    kill -9 "${INFLUXDB_PID}" 2>/dev/null || true
+    sleep 1
+    echo "✓ InfluxDB force stopped"
+fi
+
+# Clean up storage if requested
+if [ "$CLEAN_STORAGE" = true ]; then
+    if [ -d ".influxdb" ]; then
+        echo "Cleaning up InfluxDB storage..."
+        rm -rf .influxdb
+        echo "✓ InfluxDB storage cleaned (removed .influxdb directory)"
+    else
+        echo "No .influxdb directory found"
+    fi
+else
+    echo "Storage preserved at .influxdb/"
+    echo "To clean storage, run: $0 --clean"
+fi
+

scripts/test.sh

@@ -4,11 +4,31 @@ set -euo pipefail
 BUILD_DIR="${BUILD_DIR:-build}"
 BUILD_TYPE="${BUILD_TYPE:-Release}"
 
+# Build before testing to ensure we're using the latest code
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+cd "${PROJECT_ROOT}"
+
+echo "Building project (${BUILD_TYPE})..."
+# First configure (if needed)
+"${SCRIPT_DIR}/build.sh" >/dev/null 2>&1 || true
+
+# Then build the test targets - this will show compilation errors
+echo "Compiling test targets..."
+cd "${BUILD_DIR}"
+if ! make test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth -j4 2>&1; then
+    echo "" >&2
+    echo "Build failed! Fix compilation errors above before running tests." >&2
+    exit 1
+fi
+cd "${PROJECT_ROOT}"
+
 # Determine possible binary directories
+# Prefer BUILD_TYPE-specific directories first (they contain the most recent builds)
 BIN_DIRS=(
-    "${BUILD_DIR}/bin"
     "${BUILD_DIR}/bin/${BUILD_TYPE}"
     "${BUILD_DIR}/${BUILD_TYPE}/bin"
+    "${BUILD_DIR}/bin"
     "${BUILD_DIR}"
 )
 

src/benchmark/CMakeLists.txt

@@ -31,3 +31,14 @@ if(USE_CONAN)
     target_link_libraries(db_insert_benchmark PRIVATE ${CONAN_LIBS})
 endif()
 
+# Database batch strategy benchmark (requires InfluxDB)
+add_executable(db_batch_benchmark db_batch_benchmark.cpp)
+target_compile_features(db_batch_benchmark PRIVATE cxx_std_20)
+target_link_libraries(db_batch_benchmark PRIVATE 
+    benchmark::benchmark
+    influxdb-cpp-rest
+)
+if(USE_CONAN)
+    target_link_libraries(db_batch_benchmark PRIVATE ${CONAN_LIBS})
+endif()
+