quasardb 3.14.1.dev5__cp312-cp312-win32.whl → 3.14.2.dev0__cp312-cp312-win32.whl

quasardb/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.9.4)
 project(quasardb)
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
 set(CMAKE_VERBOSE_MAKEFILE FALSE)
 
 include(CheckIPOSupported)
@@ -325,6 +325,7 @@ set(QDB_FILES
   batch_inserter.hpp
   blob.hpp
   cluster.hpp
+  cluster.cpp
   concepts.hpp
   continuous.cpp
   continuous.hpp
@@ -333,9 +334,12 @@ set(QDB_FILES
   error.hpp
   entry.hpp
   handle.hpp
+  handle.cpp
   logger.hpp
   logger.cpp
   masked_array.hpp
+  metrics.hpp
+  metrics.cpp
   module.hpp
   module.cpp
   node.hpp

quasardb/__init__.py

@@ -1,6 +1,6 @@
 # pylint: disable=C0103,C0111,C0302,R0903
 
-# Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+# Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

quasardb/batch_column.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/batch_inserter.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/blob.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/cluster.cpp

@@ -0,0 +1,89 @@
+#include "cluster.hpp"
+#include "metrics.hpp"
+#include <chrono>
+#include <thread>
+
+namespace qdb
+{
+
+cluster::cluster(const std::string & uri,
+    const std::string & user_name,
+    const std::string & user_private_key,
+    const std::string & cluster_public_key,
+    const std::string & user_security_file,
+    const std::string & cluster_public_key_file,
+    std::chrono::milliseconds timeout,
+    bool do_version_check)
+    : _uri{uri}
+    , _handle{make_handle_ptr()}
+    , _json_loads{pybind11::module::import("json").attr("loads")}
+    , _logger("quasardb.cluster")
+{
+    if (do_version_check == true)
+    {
+        _logger.warn(
+            "do_version_check parameter has been deprecated and a no-op. It will be removed from a "
+            "future release");
+    }
+
+    options().apply_credentials(user_name, user_private_key, cluster_public_key, //
+        user_security_file, cluster_public_key_file);
+
+    options().set_timeout(timeout);
+
+    // HACKS(leon): we need to ensure there is always one callback active
+    //              for qdb. Callbacks can be lost when the last active session
+    //              gets closed. As such, the most pragmatic place to 'check'
+    //              for this callback is when establishing a new connection.
+    qdb::native::swap_callback();
+
+    _logger.info("Connecting to cluster %s", _uri);
+    _handle->connect(_uri);
+}
+
+void cluster::close()
+{
+    _logger.info("Closing connection to cluster");
+
+    try
+    {
+        if (is_open() == true) [[likely]]
+        {
+            _handle->close();
+        }
+    }
+    catch (qdb::invalid_handle_exception const & e)
+    {
+        // This can happen if, for example, we call close() after an error occured; in those
+        // circumstances, we fully expect the connection to already be invalid, and we should
+        // not care if this specific exception is raised.
+        _logger.warn("Connection already closed");
+    }
+
+    _handle.reset();
+
+    assert(is_open() == false);
+}
+
+void cluster::wait_for_compaction()
+{
+
+    // We define this function in the .cpp file so we can avoid including chrono and thread
+    // in the header file.
+
+    using namespace std::chrono_literals;
+
+    for (;;)
+    {
+        std::uint64_t progress = compact_progress();
+
+        if (progress == 0) [[unlikely]]
+        {
+            break;
+        }
+
+        std::this_thread::sleep_for(100ms);
+    }
+}
+
+}; // namespace qdb

quasardb/cluster.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,58 +72,10 @@ public:
         const std::string & user_security_file      = {},
         const std::string & cluster_public_key_file = {},
         std::chrono::milliseconds timeout           = std::chrono::minutes{1},
-        bool do_version_check                       = false)
-        : _uri{uri}
-        , _handle{make_handle_ptr()}
-        , _json_loads{pybind11::module::import("json").attr("loads")}
-        , _logger("quasardb.cluster")
-    {
-        if (do_version_check == true)
-        {
-            _logger.warn(
-                "do_version_check parameter has been deprecated and a no-op. It will be removed from a "
-                "future release");
-        }
-
-        options().apply_credentials(user_name, user_private_key, cluster_public_key, //
-            user_security_file, cluster_public_key_file);
-
-        options().set_timeout(timeout);
-
-        // HACKS(leon): we need to ensure there is always one callback active
-        //              for qdb. Callbacks can be lost when the last active session
-        //              gets closed. As such, the most pragmatic place to 'check'
-        //              for this callback is when establishing a new connection.
-        qdb::native::swap_callback();
-
-        _logger.info("Connecting to cluster %s", _uri);
-        _handle->connect(_uri);
-    }
+        bool do_version_check                       = false);
 
 public:
-    void close()
-    {
-        _logger.info("Closing connection to cluster");
-
-        try
-        {
-            if (is_open() == true) [[likely]]
-            {
-                _handle->close();
-            }
-        }
-        catch (qdb::invalid_handle_exception const & e)
-        {
-            // This can happen if, for example, we call close() after an error occured; in those
-            // circumstances, we fully expect the connection to already be invalid, and we should
-            // not care if this specific exception is raised.
-            _logger.warn("Connection already closed");
-        }
-
-        _handle.reset();
-
-        assert(is_open() == false);
-    }
+    void close();
 
     bool is_open() const
     {
@@ -463,6 +415,37 @@ public:
                                               static_cast<int>(timeout_ms.count())));
     }
 
+    void compact_full()
+    {
+        check_open();
+
+        qdb_compact_params_t params{};
+        params.options = qdb_compact_full;
+
+        qdb::qdb_throw_if_error(*_handle, qdb_cluster_compact(*_handle, &params));
+    }
+
+    // Returns 0 when finished / no compaction running
+    std::uint64_t compact_progress()
+    {
+        check_open();
+
+        std::uint64_t progress;
+
+        qdb::qdb_throw_if_error(*_handle, qdb_cluster_get_compact_progress(*_handle, &progress));
+
+        return progress;
+    }
+
+    void compact_abort()
+    {
+        check_open();
+
+        qdb::qdb_throw_if_error(*_handle, qdb_cluster_abort_compact(*_handle));
+    }
+
+    void wait_for_compaction();
+
 public:
     std::vector<std::string> endpoints()
     {
@@ -558,6 +541,10 @@ static inline void register_cluster(Module & m)
         .def("purge_all", &qdb::cluster::purge_all)                                           //
         .def("trim_all", &qdb::cluster::trim_all)                                             //
         .def("purge_cache", &qdb::cluster::purge_cache)                                       //
+        .def("compact_full", &qdb::cluster::compact_full)                                     //
+        .def("compact_progress", &qdb::cluster::compact_progress)                             //
+        .def("compact_abort", &qdb::cluster::compact_abort)                                   //
+        .def("wait_for_compaction", &qdb::cluster::wait_for_compaction)                       //
         .def("endpoints", &qdb::cluster::endpoints);                                          //
 }
 

quasardb/continuous.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/convert/array.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/convert/point.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/convert/range.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/convert/value.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/convert.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/detail/qdb_resource.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -104,6 +104,16 @@ public:
         return *p_;
     }
 
+    ValueType * operator->()
+    {
+        return p_;
+    }
+
+    constexpr ValueType const * operator->() const
+    {
+        return p_;
+    }
+
     constexpr ValueType const & operator*() const
     {
         return *p_;

quasardb/detail/ts_column.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/direct_blob.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/direct_handle.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/direct_integer.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/double.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/entry.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/error.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/handle.cpp

@@ -0,0 +1,29 @@
+#include "handle.hpp"
+#include "metrics.hpp"
+
+namespace qdb
+{
+
+void handle::connect(const std::string & uri)
+{
+    qdb_error_t err;
+    {
+        metrics::scoped_capture{"qdb_connect"};
+        err = qdb_connect(handle_, uri.c_str());
+    }
+    qdb::qdb_throw_if_error(handle_, err);
+}
+
+void handle::close()
+{
+    if (handle_ != nullptr)
+    {
+        metrics::scoped_capture{"qdb_close"};
+        qdb_close(handle_);
+        handle_ = nullptr;
+    }
+
+    assert(handle_ == nullptr);
+}
+
+}; // namespace qdb

quasardb/handle.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,26 +54,14 @@ public:
         close();
     }
 
-    void connect(const std::string & uri)
-    {
-        qdb::qdb_throw_if_error(handle_, qdb_connect(handle_, uri.c_str()));
-    }
+    void connect(const std::string & uri);
 
     operator qdb_handle_t() const noexcept
     {
         return handle_;
     }
 
-    void close()
-    {
-        if (handle_ != nullptr)
-        {
-            qdb_close(handle_);
-            handle_ = nullptr;
-        }
-
-        assert(handle_ == nullptr);
-    }
+    void close();
 
     constexpr inline bool is_open() const
     {

quasardb/integer.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/logger.cpp

@@ -11,6 +11,8 @@ void qdb::native::swap_callback()
 {
     // Potential race condition avoidance!
     std::lock_guard<std::mutex> guard(_buffer_lock);
+
+#ifndef NDEBUG
     qdb_error_t error;
 
     error = qdb_log_remove_callback(local_callback_id);
@@ -26,6 +28,7 @@ void qdb::native::swap_callback()
         // fprintf(stderr, "unable to add new callback: %s (%#x)\n", qdb_error(error), error);
         // fflush(stderr);
     }
+#endif
 
     _logger = qdb::logger("quasardb.native");
 }

quasardb/logger.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/masked_array.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2024, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

quasardb/metrics.cpp

@@ -0,0 +1,103 @@
+#include "metrics.hpp"
+#include <mutex>
+
+namespace qdb
+{
+
+static metrics_container_t metrics_totals_ = metrics_container_t{};
+static std::mutex metrics_lock_            = std::mutex{};
+
+metrics::scoped_capture::~scoped_capture()
+{
+    using std::chrono::nanoseconds;
+
+    time_point_t stop = clock_t::now();
+
+    auto duration = std::chrono::duration_cast<nanoseconds>(stop - start_);
+
+    metrics::record(test_id_, duration.count());
+}
+
+metrics::measure::measure()
+    : start_{metrics::totals()}
+{}
+
+metrics_container_t metrics::measure::get() const
+{
+    metrics_container_t cur = metrics::totals();
+
+    metrics_container_t ret{};
+
+    for (auto i : cur)
+    {
+        assert(ret.find(i.first) == ret.end());
+
+        metrics_container_t::const_iterator prev = start_.find(i.first);
+
+        if (prev == start_.end())
+        {
+            // Previously, metric didn't exist yet, as such it's entirely new
+            // and all accumulated time was within the scope.
+            ret.emplace(i.first, i.second);
+        }
+        else if (i.second > prev->second)
+        {
+            // Accumulated time actually increased, record difference
+            ret.emplace(i.first, i.second - prev->second);
+        }
+        else
+        {
+            // Integrity check: we can only increase totals over time, never decrease
+            assert(i.second == prev->second);
+        }
+    };
+
+    return ret;
+};
+
+/* static */ void metrics::record(std::string const & test_id, std::uint64_t nsec)
+{
+    std::lock_guard<std::mutex> guard(metrics_lock_);
+
+    metrics_container_t::iterator pos = metrics_totals_.lower_bound(test_id);
+
+    if (pos == metrics_totals_.end() || pos->first != test_id) [[unlikely]]
+    {
+        pos = metrics_totals_.emplace_hint(pos, test_id, 0);
+
+        assert(pos->second == 0);
+    }
+
+    assert(pos->first == test_id);
+    pos->second += nsec;
+}
+
+/* static */ metrics_container_t metrics::totals()
+{
+    std::lock_guard<std::mutex> guard(metrics_lock_);
+    return metrics_totals_;
+}
+
+/* static */ void metrics::clear()
+{
+    std::lock_guard<std::mutex> guard(metrics_lock_);
+    metrics_totals_.clear();
+}
+
+void register_metrics(py::module_ & m)
+{
+
+    py::module_ metrics_module =
+        m.def_submodule("metrics", "Keep track of low-level performance metrics")
+            .def("totals", &qdb::metrics::totals)
+            .def("clear", &qdb::metrics::clear);
+
+    auto metrics_measure = py::class_<qdb::metrics::measure>(
+        metrics_module, "Measure", "Track all metrics within a block of code")
+                               .def(py::init())
+                               .def("__enter__", &qdb::metrics::measure::enter)
+                               .def("__exit__", &qdb::metrics::measure::exit)
+                               .def("get", &qdb::metrics::measure::get);
+};
+
+}; // namespace qdb