quasardb 3.13.6__cp38-cp38-macosx_10_14_x86_64.whl → 3.13.7__cp38-cp38-macosx_10_14_x86_64.whl

quasardb/CMakeFiles/CMakeDirectoryInformation.cmake

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.21
+# Generated by "Unix Makefiles" Generator, CMake Version 3.24
 
 # Relative path conversion top directories.
 set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/teamcity/buildAgent/work/283bde3fda0d76e7/thirdparty")

quasardb/CMakeLists.txt

@@ -3,11 +3,12 @@ project(quasardb)
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
-set(CMAKE_VERBOSE_MAKEFILE TRUE)
+set(CMAKE_VERBOSE_MAKEFILE FALSE)
 
 include(CheckIPOSupported)
 
 option(QDB_LINK_STATIC_LIB "Link qdb_api_static instead of dynamic qdb_api." OFF)
+option(QDB_TESTS_ENABLED "Build quasardb test suite?" OFF)
 
 set(PACKAGE_NAME quasardb)
 
@@ -33,11 +34,7 @@ endif()
 #
 ###
 
-
 set(QDB_API_NAME qdb_api)
-if (CMAKE_BUILD_TYPE STREQUAL Debug)
-  set(QDB_API_NAME qdb_apid)
-endif()
 
 message(STATUS "[qdb-api-python] Using qdb api name ${QDB_API_NAME}")
 
@@ -151,6 +148,7 @@ if(CLANG OR GNU)
     add_compile_options(
       -Wno-register
       -Wall
+      -fconcepts-diagnostics-depth=3
 
       $<$<CONFIG:Debug>:-Og>
       $<$<CONFIG:Release>:-O3>
@@ -265,13 +263,15 @@ endif()
 ###
 
 message(STATUS "[qdb-api-python] Including thirdparty libraries with binary directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-add_subdirectory(../thirdparty/ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-
 include_directories(SYSTEM ../thirdparty/date/include)
 include_directories(SYSTEM ../thirdparty/range-v3/include)
 
+add_subdirectory(../thirdparty/ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+
 include_directories(SYSTEM qdb/include)
 include_directories(${CMAKE_SOURCE_DIR})
+include_directories(../quasardb/)
+
 
 #
 # step 2: copy the libraries
@@ -321,43 +321,43 @@ if(NOT QDB_LINK_STATIC_LIB)
   endif()
 endif()
 
-# step 3: build
-pybind11_add_module(
-  quasardb
-
+set(QDB_FILES
+  batch_inserter.hpp
+  blob.hpp
   cluster.hpp
+  concepts.hpp
   continuous.cpp
   continuous.hpp
+  convert.hpp
+  double.hpp
   error.hpp
   entry.hpp
-  blob.hpp
   handle.hpp
+  logger.hpp
+  logger.cpp
   masked_array.hpp
+  module.hpp
+  module.cpp
+  node.hpp
   numpy.hpp
   numpy.cpp
   object_tracker.hpp
   options.hpp
   pinned_writer.cpp
   pinned_writer.hpp
-  qdb_client.cpp
   query.hpp
   query.cpp
+  string.hpp
   table.cpp
   table.hpp
   table_reader.hpp
-  batch_inserter.hpp
-  convert.hpp
-  traits.hpp
-  concepts.hpp
   tag.hpp
+  timestamp.hpp
+  traits.hpp
   utils.cpp
   utils.hpp
-  version.hpp
-  version.cpp
-  logger.hpp
-  logger.cpp
-  detail/ts_column.hpp
   detail/qdb_resource.hpp
+  detail/ts_column.hpp
   reader/ts_row.hpp
   reader/ts_value.hpp
   utils/blob_deque.hpp
@@ -366,6 +366,27 @@ pybind11_add_module(
   utils/stable_sort.hpp
 )
 
+set(QDB_TEST_FILES "")
+
+if(QDB_TESTS_ENABLED)
+  message(WARNING "\
+------------------------------------------------------------------ \
+[qdb-api-python] Tests enabled -- do not enable for release builds \
+------------------------------------------------------------------ \ ")
+  set(QDB_TEST_FILES
+
+    ../tests/conftest.cpp
+    ../tests/conftest.hpp
+    ../tests/test_convert.cpp)
+endif()
+
+# step 3: build
+pybind11_add_module(
+  quasardb
+
+  ${QDB_FILES}
+  ${QDB_TEST_FILES})
+
 target_compile_definitions(quasardb PUBLIC QDB_PY_VERSION="${QDB_PY_VERSION}")
 if(QDB_LINK_STATIC_LIB)
   add_definitions(-DQDB_API_STATIC_LINK=1)

quasardb/Makefile

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.21
+# Generated by "Unix Makefiles" Generator, CMake Version 3.24
 
 # Default target executed when no arguments are given to make.
 default_target: all
@@ -31,9 +31,6 @@ default_target: all
 
 .SUFFIXES: .hpux_make_needs_suffix_list
 
-# Produce verbose output by default.
-VERBOSE = 1
-
 # Command-line flag to silence nested $(MAKE).
 $(VERBOSE)MAKESILENT = -s
 
@@ -68,6 +65,47 @@ CMAKE_BINARY_DIR = /Users/teamcity/buildAgent/work/283bde3fda0d76e7/build/temp.m
 #=============================================================================
 # Targets provided globally by CMake.
 
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/opt/local/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/opt/local/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+.PHONY : list_install_components/fast
+
+# Special rule for the target install
+install: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/opt/local/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/opt/local/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
 # Special rule for the target install/local
 install/local: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
@@ -92,47 +130,6 @@ install/strip/fast: preinstall/fast
 	/opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip/fast
 
-# Special rule for the target install
-install: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
-.PHONY : install
-
-# Special rule for the target install
-install/fast: preinstall/fast
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
-.PHONY : install/fast
-
-# Special rule for the target list_install_components
-list_install_components:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
-.PHONY : list_install_components
-
-# Special rule for the target list_install_components
-list_install_components/fast: list_install_components
-.PHONY : list_install_components/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
 # The main all target
 all: cmake_check_build_system
 	cd /Users/teamcity/buildAgent/work/283bde3fda0d76e7/build/temp.macosx-12.0-x86_64-cpython-38 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/teamcity/buildAgent/work/283bde3fda0d76e7/build/temp.macosx-12.0-x86_64-cpython-38/CMakeFiles /Users/teamcity/buildAgent/work/283bde3fda0d76e7/build/lib.macosx-12.0-x86_64-cpython-38/quasardb//CMakeFiles/progress.marks

quasardb/__init__.py

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

quasardb/add_boost_test.cmake

@@ -0,0 +1,43 @@
+function(add_boost_test_executable NAME COMPONENT)
+    add_executable(${NAME}
+        ${ARGN}
+    )
+
+    # set_target_properties(${NAME} PROPERTIES
+    #     DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
+
+    target_link_libraries(${NAME}
+        boost_unit_test_framework
+    )
+
+    if($<CONFIG:SanitizeValgrind>)
+        add_test(
+            NAME ${NAME}
+            COMMAND
+                valgrind>
+                $<$<PLATFORM_ID:Darwin>:--dsymutil=yes>
+                --gen-suppressions=all
+                ./${NAME}
+                --log_level=test_suite
+                --report_level=detailed
+                --build_info=yes
+                --detect_memory_leaks=0
+        )
+    else()
+        add_test(
+            NAME ${NAME}
+            COMMAND
+                ${NAME}
+                --log_level=test_suite
+                --report_level=detailed
+                --build_info=yes
+                --detect_memory_leaks=0
+        )
+    endif()
+
+    install(TARGETS ${NAME}
+        RUNTIME DESTINATION bin COMPONENT ${COMPONENT}
+        LIBRARY DESTINATION lib COMPONENT ${COMPONENT}
+        ARCHIVE DESTINATION lib COMPONENT ${COMPONENT}
+    )
+endfunction()

quasardb/batch_column.hpp

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

quasardb/cluster.hpp

@@ -2,7 +2,7 @@
  *
  * Official Python API
  *
- * Copyright (c) 2009-2022, quasardb SAS. All rights reserved.
+ * Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,6 +33,7 @@
 #include "batch_inserter.hpp"
 #include "blob.hpp"
 #include "continuous.hpp"
+#include "double.hpp"
 #include "error.hpp"
 #include "handle.hpp"
 #include "integer.hpp"
@@ -42,11 +43,12 @@
 #include "perf.hpp"
 #include "pinned_writer.hpp"
 #include "query.hpp"
+#include "string.hpp"
 #include "table.hpp"
 #include "table_reader.hpp"
 #include "tag.hpp"
+#include "timestamp.hpp"
 #include "utils.hpp"
-#include "version.hpp"
 #include <qdb/node.h>
 #include <qdb/prefix.h>
 #include <qdb/suffix.h>
@@ -62,24 +64,27 @@ class cluster
 {
 public:
     cluster(const std::string & uri,
-        const std::string & user_name          = {},
-        const std::string & user_private_key   = {},
-        const std::string & cluster_public_key = {},
-        std::chrono::milliseconds timeout      = std::chrono::minutes{1},
-        bool do_version_check                  = true)
+        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           = 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")
     {
-        // Check that the C API version installed on the target system matches
-        // the one used during the build
-        if (do_version_check)
+        if (do_version_check == true)
         {
-            check_qdb_c_api_version(qdb_version());
+            _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);
+        options().apply_credentials(user_name, user_private_key, cluster_public_key, //
+            user_security_file, cluster_public_key_file);
 
         options().set_timeout(timeout);
 
@@ -175,11 +180,26 @@ public:
         return qdb::blob_entry{_handle, alias};
     }
 
+    qdb::string_entry string(const std::string & alias)
+    {
+        return qdb::string_entry{_handle, alias};
+    }
+
     qdb::integer_entry integer(const std::string & alias)
     {
         return qdb::integer_entry{_handle, alias};
     }
 
+    qdb::double_entry double_(const std::string & alias)
+    {
+        return qdb::double_entry{_handle, alias};
+    }
+
+    qdb::timestamp_entry timestamp(const std::string & alias)
+    {
+        return qdb::timestamp_entry{_handle, alias};
+    }
+
     qdb::table table(const std::string & alias)
     {
         return qdb::table{_handle, alias};
@@ -360,17 +380,19 @@ static inline void register_cluster(Module & m)
 
     py::class_<qdb::cluster>(m, "Cluster",
         "Represents a connection to the QuasarDB cluster. ") //
-        .def(py::init<const std::string &, const std::string &, const std::string &,
-                 const std::string &, std::chrono::milliseconds, bool>(), //
+        .def(
+            py::init<const std::string &, const std::string &, const std::string &, const std::string &,
+                const std::string &, const std::string &, std::chrono::milliseconds, bool>(), //
             py::arg("uri"),                                               //
             py::arg("user_name")          = std::string{},                //
             py::arg("user_private_key")   = std::string{},                //
             py::arg("cluster_public_key") = std::string{},                //
+            py::arg("user_security_file") = std::string{},                //
+            py::arg("cluster_public_key_file") = std::string{},           //
             py::arg("timeout")            = std::chrono::minutes{1},      //
-            py::arg("do_version_check")   = true)                           //
+            py::arg("do_version_check")   = false)                        //
         .def("__enter__", &qdb::cluster::enter)                           //
-        .def("__exit__",
-            &qdb::cluster::exit) //                                                                   //
+        .def("__exit__", &qdb::cluster::exit)                                           //
         .def("is_open", &qdb::cluster::is_open)                                         //
         .def("uri", &qdb::cluster::uri)                                                 //
         .def("node", &qdb::cluster::node)                                               //
@@ -381,7 +403,10 @@ static inline void register_cluster(Module & m)
         .def("node_topology", &qdb::cluster::node_topology)                             //
         .def("tag", &qdb::cluster::tag)                                                 //
         .def("blob", &qdb::cluster::blob)                                               //
+        .def("string", &qdb::cluster::string)                                           //
         .def("integer", &qdb::cluster::integer)                                         //
+        .def("double", &qdb::cluster::double_)                                          //
+        .def("timestamp", &qdb::cluster::timestamp)                                     //
         .def("ts", &qdb::cluster::table)                                                //
         .def("table", &qdb::cluster::table)                                             //
         .def("ts_batch", &qdb::cluster::inserter)                                       //

quasardb/cmake_install.cmake

@@ -34,7 +34,7 @@ endif()
 
 # Set default install directory permissions.
 if(NOT DEFINED CMAKE_OBJDUMP)
-  set(CMAKE_OBJDUMP "/Library/Developer/CommandLineTools/usr/bin/objdump")
+  set(CMAKE_OBJDUMP "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/objdump")
 endif()
 
 if(NOT CMAKE_INSTALL_LOCAL_ONLY)

quasardb/concepts.hpp

@@ -19,12 +19,28 @@ concept range_t =
 
 template <typename R, typename T>
 concept input_range_t =
-    // Ensure we are a range
+    // Ensure we are an input range
     ranges::input_range<R>
 
     // Ensure the range carries the correct type.
     && range_t<R, T>;
 
+template <typename R, typename T>
+concept forward_range_t =
+    // Ensure we are a forward range
+    ranges::forward_range<R>
+
+    // And delegate the rest of the checks
+    && input_range_t<R, T>;
+
+template <typename R, typename T>
+concept sized_range_t =
+    // Ensure we are a sized range
+    ranges::sized_range<R>
+
+    // And delegate the rest of the checks
+    && range_t<R, T>;
+
 namespace py = pybind11;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -98,21 +114,19 @@ static_assert(not qdb_primitive<qdb_ts_string_point>);
 template <typename Dtype>
 concept dtype = std::is_base_of_v<traits::dtype<Dtype::kind>, Dtype>
 
-                && std::is_enum_v<decltype(Dtype::kind)>
+    && std::is_enum_v<decltype(Dtype::kind)>
 
     ;
 
 template <typename Dtype>
-concept fixed_width_dtype =
-    dtype<Dtype>
+concept fixed_width_dtype = dtype<Dtype>
 
     // Check base class
     && std::is_base_of_v<traits::fixed_width_dtype<Dtype::kind, Dtype::size>, Dtype>;
 
 // Test dtypes against their size
 template <typename Dtype, py::ssize_t Size>
-concept dtype_of_width = fixed_width_dtype<Dtype> && Dtype::size ==
-Size;
+concept dtype_of_width = fixed_width_dtype<Dtype> && Dtype::size == Size;
 
 // 64bit dtype
 template <typename Dtype>
@@ -133,14 +147,14 @@ concept dtype8 = dtype_of_width<Dtype, 1>;
 template <typename Dtype>
 concept datetime64_dtype = fixed_width_dtype<Dtype>
 
-                           // Verify base class is datetime64_dtype
-                           && std::is_base_of_v<traits::datetime64_dtype<Dtype::precision>, Dtype>
+    // Verify base class is datetime64_dtype
+    && std::is_base_of_v<traits::datetime64_dtype<Dtype::precision>, Dtype>
 
-                           // datetime64 is always a 64bit object
-                           && dtype64<Dtype>
+    // datetime64 is always a 64bit object
+    && dtype64<Dtype>
 
-                           // It needs to have a precision
-                           && std::is_enum_v<decltype(Dtype::precision)>;
+    // It needs to have a precision
+    && std::is_enum_v<decltype(Dtype::precision)>;
 
 template <typename Dtype>
 concept variable_width_dtype =
@@ -159,11 +173,11 @@ concept variable_width_dtype =
 template <typename Dtype>
 concept object_dtype = dtype<Dtype>
 
-                       // Objects are always fixed width (64-bit pointers, effectively)
-                       && fixed_width_dtype<Dtype>
+    // Objects are always fixed width (64-bit pointers, effectively)
+    && fixed_width_dtype<Dtype>
 
-                       // Verify base class
-                       && std::is_base_of_v<traits::object_dtype<typename Dtype::value_type>, Dtype>;
+    // Verify base class
+    && std::is_base_of_v<traits::object_dtype<typename Dtype::value_type>, Dtype>;
 
 // Trivial dtypes are useful for deciding whether you can use fast memcpy-based
 // conversions, e.g. when numpy's int64 has the exact same representation as

quasardb/continuous.hpp

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