quasardb 3.14.2.dev5__cp311-cp311-macosx_11_0_arm64.whl → 3.14.2.dev6__cp311-cp311-macosx_11_0_arm64.whl

quasardb/CMakeFiles/CMakeDirectoryInformation.cmake

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

quasardb/Makefile

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.31
+# Generated by "Unix Makefiles" Generator, CMake Version 4.0
 
 # Default target executed when no arguments are given to make.
 default_target: all
@@ -48,10 +48,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake
+CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake
 
 # The command to remove a file.
-RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
+RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
 
 # Escaping for special characters.
 EQUALS = =
@@ -68,7 +68,7 @@ CMAKE_BINARY_DIR = /Users/teamcity/buildAgent/work/938b0bdf6727d1ad/build/temp.m
 # Special rule for the target edit_cache
 edit_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -78,7 +78,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -97,37 +97,37 @@ list_install_components/fast: list_install_components
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/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..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/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..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local
 
 # Special rule for the target install/local
 install/local/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local/fast
 
 # Special rule for the target install/strip
 install/strip: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip
 
 # Special rule for the target install/strip
 install/strip/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip/fast
 
 # The main all target

quasardb/cmake_install.cmake

@@ -34,7 +34,7 @@ endif()
 
 # Set path to fallback-tool for dependency-resolution.
 if(NOT DEFINED CMAKE_OBJDUMP)
-  set(CMAKE_OBJDUMP "/usr/local/clang16/bin/llvm-objdump")
+  set(CMAKE_OBJDUMP "/usr/bin/objdump")
 endif()
 
 if(NOT CMAKE_INSTALL_LOCAL_ONLY)

quasardb/date/CMakeFiles/CMakeDirectoryInformation.cmake

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

quasardb/date/CMakeFiles/Export/a52b05f964b070ee926bcad51d3288af/dateTargets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "3.1.0")
    message(FATAL_ERROR "CMake >= 3.1.0 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.1.0...3.29)
+cmake_policy(VERSION 3.1.0...3.30)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------

quasardb/date/Makefile

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.31
+# Generated by "Unix Makefiles" Generator, CMake Version 4.0
 
 # Default target executed when no arguments are given to make.
 default_target: all
@@ -48,10 +48,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake
+CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake
 
 # The command to remove a file.
-RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
+RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
 
 # Escaping for special characters.
 EQUALS = =
@@ -68,7 +68,7 @@ CMAKE_BINARY_DIR = /Users/teamcity/buildAgent/work/938b0bdf6727d1ad/build/temp.m
 # Special rule for the target edit_cache
 edit_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -78,7 +78,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -97,37 +97,37 @@ list_install_components/fast: list_install_components
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/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..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/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..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local
 
 # Special rule for the target install/local
 install/local/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local/fast
 
 # Special rule for the target install/strip
 install/strip: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip
 
 # Special rule for the target install/strip
 install/strip/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip/fast
 
 # The main all target

quasardb/date/cmake_install.cmake

@@ -34,7 +34,7 @@ endif()
 
 # Set path to fallback-tool for dependency-resolution.
 if(NOT DEFINED CMAKE_OBJDUMP)
-  set(CMAKE_OBJDUMP "/usr/local/clang16/bin/llvm-objdump")
+  set(CMAKE_OBJDUMP "/usr/bin/objdump")
 endif()
 
 if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)

quasardb/date/dateTargets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "3.0.0")
    message(FATAL_ERROR "CMake >= 3.0.0 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.0.0...3.29)
+cmake_policy(VERSION 3.0.0...3.30)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------

quasardb/numpy/__init__.py

@@ -29,6 +29,7 @@
 
 import logging
 import time
+import warnings
 
 import quasardb
 import quasardb.table_cache as table_cache
@@ -482,6 +483,33 @@ def _coerce_retries(retries) -> quasardb.RetryOptions:
         )
 
 
+def _kwarg_deprecation_warning(
+    old_kwarg, old_value, new_kwargs, new_values, stacklevel
+):
+    new_declaration = ", ".join(
+        f"{new_kwarg}={new_value}"
+        for new_kwarg, new_value in zip(new_kwargs, new_values)
+    )
+    warnings.warn(
+        f"The argument '{old_kwarg}' <{type(old_value).__name__}> is deprecated and will be removed in a future version. "
+        f"Please use '{new_declaration}' instead.",
+        DeprecationWarning,
+        stacklevel=stacklevel + 1,
+    )
+
+
+def _type_check(var, var_name, target_type, raise_error=True, allow_none=True):
+    if allow_none and var is None:
+        return True
+    if not isinstance(var, target_type):
+        if raise_error:
+            raise quasardb.quasardb.InvalidArgumentError(
+                f"Invalid '{var_name}' type, expected: {target_type}, got: {type(var)}"
+            )
+        return False
+    return True
+
+
 def ensure_ma(xs, dtype=None):
     if isinstance(dtype, list):
         assert isinstance(xs, list) == True
@@ -630,14 +658,17 @@ def write_arrays(
     *,
     dtype=None,
     index=None,
+    # TODO: Set the default push_mode after removing _async, fast and truncate
+    push_mode=None,
     _async=False,
     fast=False,
     truncate=False,
+    truncate_range=None,
     deduplicate=False,
     deduplication_mode="drop",
     infer_types=True,
     writer=None,
-    write_through=False,
+    write_through=True,
     retries=3,
     # We accept additional kwargs that will be passed through the writer.push() methods
     **kwargs,
@@ -705,13 +736,32 @@ def write_arrays(
       Defaults to True. For production use cases where you want to avoid implicit conversions,
       we recommend setting this to False.
 
+    push_mode: optional quasardb.WriterPushMode
+      The mode used for inserting data. Can be either a string or a `WriterPushMode` enumeration item.
+      Available options:
+      * `Truncate`: Truncate (also referred to as upsert) the data in-place. Will detect time range
+        to truncate from the time range inside the dataframe.
+      * `Async`: Uses asynchronous insertion API where commits are buffered server-side and
+        acknowledged before they are written to disk. If you insert to the same table from
+        multiple processes, setting this to True may improve performance.
+      * `Fast`: Whether to use 'fast push'. If you incrementally add small batches of data to table,
+        you may see better performance if you set this to True.
+      * `Transactional`: Ensures full transactional consistency.
+
+      Defaults to `Transactional`.
+
     truncate: optional bool
+      **DEPRECATED** – Use `push_mode=WriterPushMode.Truncate` instead.
       Truncate (also referred to as upsert) the data in-place. Will detect time range to truncate
       from the time range inside the dataframe.
 
       Defaults to False.
 
+    truncate_range: optional tuple
+      Time range to truncate from the time range inside the dataframe.
+
     _async: optional bool
+      **DEPRECATED** – Use `push_mode=WriterPushMode.Async` instead.
       If true, uses asynchronous insertion API where commits are buffered server-side and
       acknowledged before they are written to disk. If you insert to the same table from
       multiple processes, setting this to True may improve performance.
@@ -719,6 +769,7 @@ def write_arrays(
       Defaults to False.
 
     fast: optional bool
+      **DEPRECATED** – Use `push_mode=WriterPushMode.Fast` instead.
       Whether to use 'fast push'. If you incrementally add small batches of data to table,
       you may see better performance if you set this to True.
 
@@ -747,32 +798,57 @@ def write_arrays(
 
     if table:
         logger.debug("table explicitly provided, assuming single-table write")
-        return write_arrays(
-            [(table, data)],
-            cluster,
-            table=None,
-            dtype=dtype,
-            index=index,
-            _async=_async,
-            fast=fast,
-            truncate=truncate,
-            deduplicate=deduplicate,
-            deduplication_mode=deduplication_mode,
-            infer_types=infer_types,
-            write_through=write_through,
-            writer=writer,
-            retries=retries,
-            **kwargs,
+        data = [(table, data)]
+        table = None
+
+    _type_check(push_mode, "push_mode", target_type=quasardb.WriterPushMode)
+    deprecation_stacklevel = kwargs.pop("deprecation_stacklevel", 1) + 1
+
+    if isinstance(truncate, tuple):
+        # Especial case, truncate might be a tuple indicating the range.
+        _kwarg_deprecation_warning(
+            "truncate",
+            truncate,
+            ["push_mode", "truncate_range"],
+            [quasardb.WriterPushMode.Truncate, truncate],
+            deprecation_stacklevel,
         )
+        truncate_range = truncate_range or truncate
+        truncate = True
+
+    kwarg_to_mode = {
+        # "kwarg": (kwarg_type, kwarg_push_mode, is_deprecated)
+        "fast": (bool, quasardb.WriterPushMode.Fast, True),
+        "_async": (bool, quasardb.WriterPushMode.Async, True),
+        "truncate": (bool, quasardb.WriterPushMode.Truncate, True),
+        "truncate_range": (tuple, quasardb.WriterPushMode.Truncate, False),
+    }
 
-    ret = []
+    for kwarg, info in kwarg_to_mode.items():
+        expected_type, mode, deprecated = info
+        kwarg_value = locals()[kwarg]
+        _type_check(kwarg_value, kwarg, target_type=expected_type)
+
+        if kwarg_value:
+            if push_mode and push_mode != mode:
+                raise quasardb.quasardb.InvalidArgumentError(
+                    f"Found '{kwarg}' in kwargs, but push mode is already set to {push_mode}"
+                )
+            push_mode = mode
+            if deprecated:
+                _kwarg_deprecation_warning(
+                    kwarg, kwarg_value, ["push_mode"], [mode], deprecation_stacklevel
+                )
+
+    if not push_mode:
+        push_mode = quasardb.WriterPushMode.Transactional
 
     # Create batch column info from dataframe
     if writer is None:
         writer = cluster.writer()
 
+    ret = []
     n_rows = 0
-
     push_data = quasardb.WriterData()
 
     for table, data_ in data:
@@ -787,6 +863,12 @@ def write_arrays(
         assert len(dtype) is len(cinfos)
 
         if index is None and isinstance(data_, dict) and "$timestamp" in data_:
+            # Create shallow copy of `data_` so that we don't modify the reference, i.e.
+            # delete keys.
+            #
+            # This ensures that the user can call the same function multiple times without
+            # side-effects.
+            data_ = data_.copy()
             index_ = data_.pop("$timestamp")
             assert "$timestamp" not in data_
         elif index is not None:
@@ -837,22 +919,13 @@ def write_arrays(
     push_kwargs["deduplication_mode"] = deduplication_mode
     push_kwargs["write_through"] = write_through
     push_kwargs["retries"] = retries
+    push_kwargs["push_mode"] = push_mode
+    if truncate_range:
+        push_kwargs["range"] = truncate_range
 
     logger.debug("pushing %d rows", n_rows)
     start = time.time()
 
-    if fast is True:
-        push_kwargs["push_mode"] = quasardb.WriterPushMode.Fast
-    elif truncate is True:
-        push_kwargs["push_mode"] = quasardb.WriterPushMode.Truncate
-    elif isinstance(truncate, tuple):
-        push_kwargs["push_mode"] = quasardb.WriterPushMode.Truncate
-        push_kwargs["range"] = truncate
-    elif _async is True:
-        push_kwargs["push_mode"] = quasardb.WriterPushMode.Async
-    else:
-        push_kwargs["push_mode"] = quasardb.WriterPushMode.Transactional
-
     writer.push(push_data, **push_kwargs)
 
     logger.debug("pushed %d rows in %s seconds", n_rows, (time.time() - start))

quasardb/pandas/__init__.py

@@ -419,6 +419,7 @@ def write_dataframes(dfs, cluster, *, create=False, shard_size=None, **kwargs):
 
         data_by_table.append((table, data))
 
+    kwargs["deprecation_stacklevel"] = kwargs.get("deprecation_stacklevel", 1) + 1
     return qdbnp.write_arrays(data_by_table, cluster, table=None, index=None, **kwargs)
 
 
@@ -427,6 +428,7 @@ def write_dataframe(df, cluster, table, **kwargs):
     Store a single dataframe into a table. Takes the same arguments as `write_dataframes`, except only
     a single df/table combination.
     """
+    kwargs["deprecation_stacklevel"] = kwargs.get("deprecation_stacklevel", 1) + 1
     write_dataframes([(table, df)], cluster, **kwargs)
 
 
@@ -438,6 +440,7 @@ def write_pinned_dataframe(*args, **kwargs):
         "write_pinned_dataframe is deprecated and will be removed in a future release."
     )
     logger.warn("Please use write_dataframe directly instead")
+    kwargs["deprecation_stacklevel"] = 2
     return write_dataframe(*args, **kwargs)
 
 

quasardb/pybind11/CMakeFiles/CMakeDirectoryInformation.cmake

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

quasardb/pybind11/Makefile

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.31
+# Generated by "Unix Makefiles" Generator, CMake Version 4.0
 
 # Default target executed when no arguments are given to make.
 default_target: all
@@ -48,10 +48,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake
+CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake
 
 # The command to remove a file.
-RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
+RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
 
 # Escaping for special characters.
 EQUALS = =
@@ -68,7 +68,7 @@ CMAKE_BINARY_DIR = /Users/teamcity/buildAgent/work/938b0bdf6727d1ad/build/temp.m
 # Special rule for the target edit_cache
 edit_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -78,7 +78,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -97,37 +97,37 @@ list_install_components/fast: list_install_components
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/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..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/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..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local
 
 # Special rule for the target install/local
 install/local/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local/fast
 
 # Special rule for the target install/strip
 install/strip: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip
 
 # Special rule for the target install/strip
 install/strip/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip/fast
 
 # The main all target

quasardb/pybind11/cmake_install.cmake

@@ -34,7 +34,7 @@ endif()
 
 # Set path to fallback-tool for dependency-resolution.
 if(NOT DEFINED CMAKE_OBJDUMP)
-  set(CMAKE_OBJDUMP "/usr/local/clang16/bin/llvm-objdump")
+  set(CMAKE_OBJDUMP "/usr/bin/objdump")
 endif()
 
 string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT

quasardb/range-v3/CMakeFiles/CMakeDirectoryInformation.cmake

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

quasardb/range-v3/CMakeFiles/Export/d94ef200eca10a819b5858b33e808f5b/range-v3-targets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "3.0.0")
    message(FATAL_ERROR "CMake >= 3.0.0 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.0.0...3.29)
+cmake_policy(VERSION 3.0.0...3.30)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------

quasardb/range-v3/CMakeFiles/range.v3.headers.dir/build.make

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.31
+# Generated by "Unix Makefiles" Generator, CMake Version 4.0
 
 # Delete rule output on recipe failure.
 .DELETE_ON_ERROR:
@@ -44,10 +44,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake
+CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake
 
 # The command to remove a file.
-RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
+RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
 
 # Escaping for special characters.
 EQUALS = =

quasardb/range-v3/Makefile

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.31
+# Generated by "Unix Makefiles" Generator, CMake Version 4.0
 
 # Default target executed when no arguments are given to make.
 default_target: all
@@ -48,10 +48,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake
+CMAKE_COMMAND = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake
 
 # The command to remove a file.
-RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
+RM = /Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -E rm -f
 
 # Escaping for special characters.
 EQUALS = =
@@ -68,7 +68,7 @@ CMAKE_BINARY_DIR = /Users/teamcity/buildAgent/work/938b0bdf6727d1ad/build/temp.m
 # Special rule for the target edit_cache
 edit_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -78,7 +78,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -97,37 +97,37 @@ list_install_components/fast: list_install_components
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/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..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/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..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local
 
 # Special rule for the target install/local
 install/local/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local/fast
 
 # Special rule for the target install/strip
 install/strip: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip
 
 # Special rule for the target install/strip
 install/strip/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
-	/Users/teamcity/buildAgent/temp/buildTmp/build-env-k6rf7kt7/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/Users/teamcity/buildAgent/temp/buildTmp/build-env-f5dh6jbm/lib/python3.11/site-packages/cmake/data/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip/fast
 
 # The main all target

quasardb/range-v3/cmake_install.cmake

@@ -34,7 +34,7 @@ endif()
 
 # Set path to fallback-tool for dependency-resolution.
 if(NOT DEFINED CMAKE_OBJDUMP)
-  set(CMAKE_OBJDUMP "/usr/local/clang16/bin/llvm-objdump")
+  set(CMAKE_OBJDUMP "/usr/bin/objdump")
 endif()
 
 if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)

quasardb/range-v3/range-v3-config.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "3.0.0")
    message(FATAL_ERROR "CMake >= 3.0.0 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.0.0...3.29)
+cmake_policy(VERSION 3.0.0...3.30)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------

quasardb/stats.py

@@ -1,14 +1,20 @@
 import re
+
 import quasardb
 import logging
+from collections import defaultdict
 from datetime import datetime
+from enum import Enum
 
 logger = logging.getLogger("quasardb.stats")
 
-
+MAX_KEYS = 4 * 1024 * 1024  # 4 million max keys
 stats_prefix = "$qdb.statistics."
+
+# Compile these regexes once for speed
 user_pattern = re.compile(r"\$qdb.statistics.(.*).uid_([0-9]+)$")
 total_pattern = re.compile(r"\$qdb.statistics.(.*)$")
+user_clean_pattern = re.compile(r"\.uid_\d+")
 
 
 def is_user_stat(s):
@@ -50,49 +56,29 @@ def of_node(dconn):
     """
 
     start = datetime.now()
-    raw = {k: _get_stat(dconn, k) for k in dconn.prefix_get(stats_prefix, 1000)}
 
-    ret = {"by_uid": _by_uid(raw), "cumulative": _cumulative(raw)}
+    ks = _get_all_keys(dconn)
+    idx = _index_keys(dconn, ks)
+    raw = {k: _get_stat_value(dconn, k) for k in ks}
+
+    ret = {"by_uid": _by_uid(raw, idx), "cumulative": _cumulative(raw, idx)}
 
     check_duration = datetime.now() - start
 
-    ret["cumulative"]["check.online"] = 1
-    ret["cumulative"]["check.duration_ms"] = int(check_duration.total_seconds() * 1000)
+    ret["cumulative"]["check.online"] = {
+        "value": 1,
+        "type": Type.ACCUMULATOR,
+        "unit": Unit.NONE,
+    }
+    ret["cumulative"]["check.duration_ms"] = {
+        "value": int(check_duration.total_seconds() * 1000),
+        "type": Type.ACCUMULATOR,
+        "unit": Unit.MILLISECONDS,
+    }
 
     return ret
 
 
-_stat_types = {
-    "node_id": ("constant", None),
-    "operating_system": ("constant", None),
-    "partitions_count": ("constant", "count"),
-    "cpu.system": ("counter", "ns"),
-    "cpu.user": ("counter", "ns"),
-    "cpu.idle": ("counter", "ns"),
-    "startup": ("constant", None),
-    "startup_time": ("constant", None),
-    "shutdown_time": ("constant", None),
-    "network.current_users_count": ("gauge", "count"),
-    "hardware_concurrency": ("gauge", "count"),
-    "check.online": ("gauge", "count"),
-    "check.duration_ms": ("constant", "ms"),
-    "requests.bytes_in": ("counter", "bytes"),
-    "requests.bytes_out": ("counter", "bytes"),
-    "requests.errors_count": ("counter", "count"),
-    "requests.successes_count": ("counter", "count"),
-    "requests.total_count": ("counter", "count"),
-    "async_pipelines.merge.bucket_count": ("counter", "count"),
-    "async_pipelines.merge.duration_us": ("counter", "us"),
-    "async_pipelines.write.successes_count": ("counter", "count"),
-    "async_pipelines.write.failures_count": ("counter", "count"),
-    "async_pipelines.write.time_us": ("counter", "us"),
-    "async_pipelines.merge.max_bucket_count": ("gauge", "count"),
-    "async_pipelines.merge.max_depth_count": ("gauge", "count"),
-    "async_pipelines.merge.requests_count": ("counter", "count"),
-    "evicted.count": ("counter", "count"),
-    "pageins.count": ("counter", "count"),
-}
-
 async_pipeline_bytes_pattern = re.compile(
     r"async_pipelines.pipe_[0-9]+.merge_map.bytes"
 )
@@ -101,39 +87,6 @@ async_pipeline_count_pattern = re.compile(
 )
 
 
-def _stat_type(stat_id):
-    if stat_id in _stat_types:
-        return _stat_types[stat_id]
-    elif stat_id.endswith("total_ns"):
-        return ("counter", "ns")
-    elif stat_id.endswith("total_bytes"):
-        return ("counter", "bytes")
-    elif stat_id.endswith("read_bytes"):
-        return ("counter", "bytes")
-    elif stat_id.endswith("written_bytes"):
-        return ("counter", "bytes")
-    elif stat_id.endswith("total_count"):
-        return ("counter", "count")
-    elif stat_id.startswith("network.sessions."):
-        return ("gauge", "count")
-    elif stat_id.startswith("memory."):
-        # memory statistics are all gauges i think, describes how much memory currently allocated where
-        return ("gauge", "bytes")
-    elif stat_id.startswith("persistence.") or stat_id.startswith("disk"):
-        # persistence are also all gauges, describes mostly how much is currently available/used on storage
-        return ("gauge", "bytes")
-    elif stat_id.startswith("license."):
-        return ("gauge", None)
-    elif stat_id.startswith("engine_"):
-        return ("constant", None)
-    elif async_pipeline_bytes_pattern.match(stat_id):
-        return ("gauge", "bytes")
-    elif async_pipeline_count_pattern.match(stat_id):
-        return ("gauge", "count")
-    else:
-        return None
-
-
 def stat_type(stat_id):
     """
     Returns the statistic type by a stat id. Returns one of:
@@ -144,66 +97,193 @@ def stat_type(stat_id):
 
     This is useful for determining which value should be reported in a dashboard.
     """
-    return _stat_type(stat_id)
-
+    import warnings
 
-def _calculate_delta_stat(stat_id, prev, cur):
-    logger.info(
-        "calculating delta for stat_id = {}, prev = {}. cur = {}".format(
-            stat_id, prev, cur
-        )
+    warnings.warn(
+        "The 'stat_type' method is deprecated and will be removed in a future release."
+        "The stat type and unit are now part of the return value of invocations to the 'of_node' and 'by_node' methods.",
+        DeprecationWarning,
+        stacklevel=2,
     )
 
-    stat_type = _stat_type(stat_id)
-    if stat_type == "counter":
-        return cur - prev
-    elif stat_type == "gauge":
-        return cur
-    else:
-        return None
+    return None
 
 
-def _calculate_delta_stats(prev_stats, cur_stats):
-    ret = {}
-    for stat_id in cur_stats.keys():
-        try:
-            prev_stat = cur_stats[stat_id]
-            cur_stat = cur_stats[stat_id]
+def _get_all_keys(dconn, n=1024):
+    """
+    Returns all keys from a single node.
 
-            value = _calculate_delta_stat(stat_id, prev_stat, cur_stat)
-            if value is not None:
-                ret[stat_id] = value
+    Parameters:
+    dconn: quasardb.Node
+      Direct node connection to the node we wish to connect to.
 
-        except KeyError:
-            # Stat likely was not present yet in prev_stats
-            pass
+    n: int
+      Number of keys to retrieve.
+    """
+    xs = None
+    increase_rate = 8
+    # keep getting keys while number of results exceeds the given "n"
+    while xs is None or len(xs) >= n:
+        if xs is not None:
+            n = n * increase_rate
+        if n >= MAX_KEYS:
+            raise Exception(f"ERROR: Cannot fetch more than {MAX_KEYS} keys.")
+        xs = dconn.prefix_get(stats_prefix, n)
 
-    return ret
+    return xs
+
+
+class Type(Enum):
+    ACCUMULATOR = 1
+    GAUGE = 2
+    LABEL = 3
+
+
+class Unit(Enum):
+    NONE = 0
+    COUNT = 1
+
+    # Size units
+    BYTES = 32
+
+    # Time/duration units
+    EPOCH = 64
+    NANOSECONDS = 65
+    MICROSECONDS = 66
+    MILLISECONDS = 67
+    SECONDS = 68
+
+
+_type_string_to_enum = {
+    "accumulator": Type.ACCUMULATOR,
+    "gauge": Type.GAUGE,
+    "label": Type.LABEL,
+}
+
+_unit_string_to_enum = {
+    "none": Unit.NONE,
+    "count": Unit.COUNT,
+    "bytes": Unit.BYTES,
+    "epoch": Unit.EPOCH,
+    "nanoseconds": Unit.NANOSECONDS,
+    "microseconds": Unit.MICROSECONDS,
+    "milliseconds": Unit.MILLISECONDS,
+    "seconds": Unit.SECONDS,
+}
+
+
+def _lookup_enum(dconn, k, m):
+    """
+    Utility function to avoid code duplication: automatically looks up a key's value
+    from QuasarDB and looks it up in provided dict.
+    """
+
+    x = dconn.blob(k).get()
+    x = _clean_blob(x)
+
+    if x not in m:
+        raise Exception(f"Unrecognized unit/type {x} from key {k}")
+
+    return m[x]
 
 
-def calculate_delta(prev, cur):
+def _lookup_type(dconn, k):
     """
-    Calculates the 'delta' between two successive statistic measurements.
+    Looks up and parses/validates the metric type.
     """
-    ret = {}
-    for node_id in cur.keys():
-        ret[node_id] = _calculate_delta_stats(
-            prev[node_id]["cumulative"], cur[node_id]["cumulative"]
-        )
+    assert k.endswith(".type")
+
+    return _lookup_enum(dconn, k, _type_string_to_enum)
+
+
+def _lookup_unit(dconn, k):
+    """
+    Looks up and parses/validates the metric type.
+    """
+    assert k.endswith(".unit")
+
+    return _lookup_enum(dconn, k, _unit_string_to_enum)
+
+
+def _index_keys(dconn, ks):
+    """
+    Takes all statistics keys that are retrieved, and "indexes" them in such a way
+    that we end up with a dict of all statistic keys, their type and their unit.
+    """
+
+    ###
+    # The keys generally look like this, for example:
+    #
+    # $qdb.statistics.requests.out_bytes
+    # $qdb.statistics.requests.out_bytes.type
+    # $qdb.statistics.requests.out_bytes.uid_1
+    # $qdb.statistics.requests.out_bytes.uid_1.type
+    # $qdb.statistics.requests.out_bytes.uid_1.unit
+    # $qdb.statistics.requests.out_bytes.unit
+    #
+    # For this purpose, we simply get rid of the "uid" part, as the per-uid metrics are guaranteed
+    # to be of the exact same type as all the others. So after trimming those, the keys will look
+    # like this:
+    #
+    # $qdb.statistics.requests.out_bytes
+    # $qdb.statistics.requests.out_bytes.type
+    # $qdb.statistics.requests.out_bytes
+    # $qdb.statistics.requests.out_bytes.type
+    # $qdb.statistics.requests.out_bytes.unit
+    # $qdb.statistics.requests.out_bytes.unit
+    #
+    # And after deduplication like this:
+    #
+    # $qdb.statistics.requests.out_bytes
+    # $qdb.statistics.requests.out_bytes.type
+    # $qdb.statistics.requests.out_bytes.unit
+    #
+    # In which case we'll store `requests.out_bytes` as the statistic type, and look up the type
+    # and unit for those metrics and add a placeholder value.
+
+    ret = defaultdict(lambda: {"value": None, "type": None, "unit": None})
+
+    for k in ks:
+        # Remove any 'uid_[0-9]+' part from the string
+        k_ = user_clean_pattern.sub("", k)
+
+        matches = total_pattern.match(k_)
+
+        parts = matches.groups()[0].rsplit(".", 1)
+        metric_id = parts[0]
+
+        if len(parts) > 1 and parts[1] == "type":
+            if ret[metric_id]["type"] == None:
+                # We haven't seen this particular statistic yet
+                ret[metric_id]["type"] = _lookup_type(dconn, k)
+        elif len(parts) > 1 and parts[1] == "unit":
+            if ret[metric_id]["unit"] == None:
+                # We haven't seen this particular statistic yet
+                ret[metric_id]["unit"] = _lookup_unit(dconn, k)
+        else:
+            # It's a value, we look those up later
+            pass
 
     return ret
 
 
 def _clean_blob(x):
+    """
+    Utility function that decodes a blob as an UTF-8 string, as the direct node C API
+    does not yet support 'string' types and as such all statistics are stored as blobs.
+    """
     x_ = x.decode("utf-8", "replace")
 
     # remove trailing zero-terminator
     return "".join(c for c in x_ if ord(c) != 0)
 
 
-def _get_stat(dconn, k):
+def _get_stat_value(dconn, k):
     # Ugly, but works: try to retrieve as integer, if not an int, retrieve as
     # blob
+    #
+    # XXX(leon): we could use the index we built to get a much stronger hint
+    #            on what the type is.
     try:
         return dconn.integer(k).get()
 
@@ -216,30 +296,63 @@ def _get_stat(dconn, k):
         return _clean_blob(dconn.blob(k).get())
 
 
-def _by_uid(stats):
+def _by_uid(stats, idx):
     xs = {}
     for k, v in stats.items():
         matches = user_pattern.match(k)
         if is_user_stat(k) and matches:
             (metric, uid_str) = matches.groups()
+
+            if metric.split(".")[-1] in ["type", "unit"]:
+                # We already indexed the type and unit in our idx, this is not interesting
+                continue
+
+            if metric.startswith("serialized"):
+                # Internal stuff we don't care about nor cannot do anything with
+                continue
+
+            if not metric in idx:
+                raise Exception(f"Metric not in internal index: {metric}")
+
+            # Parse user id
             uid = int(uid_str)
+
+            # Prepare our metric dict
+            x = idx[metric].copy()
+            x["value"] = v
+
             if uid not in xs:
                 xs[uid] = {}
 
-            if not metric.startswith("serialized"):
-                xs[uid][metric] = v
+            xs[uid][metric] = x
 
     return xs
 
 
-def _cumulative(stats):
+def _cumulative(stats, idx):
     xs = {}
 
     for k, v in stats.items():
         matches = total_pattern.match(k)
         if is_cumulative_stat(k) and matches:
             metric = matches.groups()[0]
-            if not metric.startswith("serialized"):
-                xs[metric] = v
+
+            if metric.split(".")[-1] in ["type", "unit"]:
+                # We already indexed the type and unit in our idx, this is not interesting
+                continue
+
+            if metric.startswith("serialized"):
+                # Internal stuff we don't care about nor cannot do anything with
+                continue
+
+            if not metric in idx:
+                raise Exception(f"Metric not in internal index: {metric}")
+
+            x = idx[metric].copy()
+            x["value"] = v
+            xs[metric] = x
 
     return xs
+
+
+# async_pipelines.buffer.total_bytes

{quasardb-3.14.2.dev5.dist-info → quasardb-3.14.2.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: quasardb
-Version: 3.14.2.dev5
+Version: 3.14.2.dev6
 Summary: Python API for quasardb
 Home-page: https://www.quasardb.net/
 Author: quasardb SAS
@@ -35,6 +35,7 @@ Dynamic: classifier
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

{quasardb-3.14.2.dev5.dist-info → quasardb-3.14.2.dev6.dist-info}/RECORD

@@ -1,45 +1,45 @@
-quasardb/Makefile,sha256=5blOMWObCwXAn-JFuMn3KzNZkHhENkhgl-GJ8j88prw,8317
+quasardb/Makefile,sha256=Dl9SlCwLD4BnQ7Pb6-vJeqSs1xNjuICmLhsOJmckqis,8316
 quasardb/__init__.py,sha256=x_gazIFMlZ35Op_6Dh0YuKhslM9GlVH2UfjluLsMwf4,4614
-quasardb/cmake_install.cmake,sha256=ldtkace99ElFrVIuj1bnQ3GF1oE1003X9A1fyfuvoA8,1999
+quasardb/cmake_install.cmake,sha256=Rq9yM6rzPHnFGxs4XZlCwBDwzgfKJJBgrm15hca5ZdY,1980
 quasardb/firehose.py,sha256=_kSHuu2rTDHij1RpPLfsnbaiX_rSw-hurhBw54VNS2w,3350
-quasardb/libqdb_api.dylib,sha256=8ThPKhWDokAYMHIeLEe0cXKIBOIiq3tkYtrJf-HrFx4,36197568
+quasardb/libqdb_api.dylib,sha256=K9ULhfPVyVTakctCESIli-CsTotOl6moxsL0d4tVXqA,46908656
 quasardb/pool.py,sha256=ph4gxwaOcvQ0QqrTO9oVu5Vqy-7t1CweakrgfsmvprM,8474
-quasardb/quasardb.cpython-311-darwin.so,sha256=KrQzbzLcLy8-tAqobd4Oe9kGB7W50E2dqTLMr41JJQo,917392
-quasardb/stats.py,sha256=SoLZzsD2sw4vdHSfqK4dyrGxDzjlVzbboKCpDeYOXbc,7294
+quasardb/quasardb.cpython-311-darwin.so,sha256=gWsCOsMgloGQxK9-SLh0cYXNUf__p3YAUVe7fc23d1Y,901632
+quasardb/stats.py,sha256=XfMBSQoFbTNAFeyElhAXQRVFueHscmf5cg4zKSWnY2I,9750
 quasardb/table_cache.py,sha256=gYX4wqx4v4uKUE-GE24g-ZOi-OtE67IVDdUcNCIik-w,1511
-quasardb/CMakeFiles/CMakeDirectoryInformation.cmake,sha256=mFgHn_IVgYL5fvIDHeMuu6AT9E4XMFmhed6b_Hw4Iak,732
+quasardb/CMakeFiles/CMakeDirectoryInformation.cmake,sha256=-b3ebWONj-FoHjOI4n6Z5o6H1n_1o3ibqF3BohoGnj8,731
 quasardb/CMakeFiles/progress.marks,sha256=micfKpFrC27mzsskJvCzIG7wdFeL5V2byU9vP-Orhqo,2
-quasardb/date/Makefile,sha256=3sFoq0K3pq46tKoAwFLsaYea1OEfDsGoAr5kKeKuGT0,8342
-quasardb/date/cmake_install.cmake,sha256=BM8F7gRVkL6hF4Cp_RFsE8udMP6eDdninqHtLkib0FE,3580
+quasardb/date/Makefile,sha256=nMR8rez701sOALPUf4slMDX5ajRiiffk2-jRWB1CEwg,8341
+quasardb/date/cmake_install.cmake,sha256=A5ohfBk6-ofbNDRq4JqIHQEi2L4lntUe9d89RY5Y-3w,3561
 quasardb/date/dateConfigVersion.cmake,sha256=rL5Cp_r_23Yu8HmjowwKIH04sxxMwdBZ7no3tr4cx14,2762
-quasardb/date/dateTargets.cmake,sha256=UTTH7zSPDb_tkscV25dahdEEX0Bw_t2SozDUBKy7mHI,2869
-quasardb/date/CMakeFiles/CMakeDirectoryInformation.cmake,sha256=mFgHn_IVgYL5fvIDHeMuu6AT9E4XMFmhed6b_Hw4Iak,732
+quasardb/date/dateTargets.cmake,sha256=LowYrYv6cqMxByqm9k4ekO1LnnIiSUJL0IQMrfISydE,2869
+quasardb/date/CMakeFiles/CMakeDirectoryInformation.cmake,sha256=-b3ebWONj-FoHjOI4n6Z5o6H1n_1o3ibqF3BohoGnj8,731
 quasardb/date/CMakeFiles/progress.marks,sha256=micfKpFrC27mzsskJvCzIG7wdFeL5V2byU9vP-Orhqo,2
-quasardb/date/CMakeFiles/Export/a52b05f964b070ee926bcad51d3288af/dateTargets.cmake,sha256=rWNkRmrNRa8_x5hIZdFw8rJ_aLoigP5fUoRmXaKSyys,4211
+quasardb/date/CMakeFiles/Export/a52b05f964b070ee926bcad51d3288af/dateTargets.cmake,sha256=GvSd4PT0WpHLXzmbXs24xB-ekxbiMhN_B_4Te90CIQc,4211
 quasardb/extensions/__init__.py,sha256=FUHR0i62qt5NkOXn7eiMZrzWXo9mQNr1xVz3VSCa9QU,112
 quasardb/extensions/writer.py,sha256=uRL4fVkucd7vwdFySnPLpH4DuNK4bVtXCSRxQk4YJ-g,5567
-quasardb/numpy/__init__.py,sha256=N-RIdmUPVUsxTe_Og3v1jv2tO3nCjyP2yUC9bKU2Iag,30581
-quasardb/pandas/__init__.py,sha256=HXzFKT-nmkG65jcA850GgB8Toc9ArVwtAF4LQA5iW_M,15989
-quasardb/pybind11/Makefile,sha256=m8EPCrYG_UDZRJQKx33j4BTuRwAWLPChbBAbEAbFB3s,8362
-quasardb/pybind11/cmake_install.cmake,sha256=KNj4YkvjxHctz76yUbAsu9fnfJZC_7d4GeLYJn-hTBk,1504
-quasardb/pybind11/CMakeFiles/CMakeDirectoryInformation.cmake,sha256=mFgHn_IVgYL5fvIDHeMuu6AT9E4XMFmhed6b_Hw4Iak,732
+quasardb/numpy/__init__.py,sha256=f1Umha37ZOaRlb3akQjS8ycSN7feQw9yTTWAIF2mqvM,33915
+quasardb/pandas/__init__.py,sha256=6MaY_JvFdkvbuZGWRwN132zDXRogAcrKcZOLbXWnHVg,16196
+quasardb/pybind11/Makefile,sha256=EgmXeg9YeWlhRB3vtt7Ut41W_GgSVq4xeD1y7oEY4Ok,8361
+quasardb/pybind11/cmake_install.cmake,sha256=PDOcFiCEXYF1bJL8tzRcMWIiIVqD-n8ua_zDXfQOnDQ,1485
+quasardb/pybind11/CMakeFiles/CMakeDirectoryInformation.cmake,sha256=-b3ebWONj-FoHjOI4n6Z5o6H1n_1o3ibqF3BohoGnj8,731
 quasardb/pybind11/CMakeFiles/progress.marks,sha256=micfKpFrC27mzsskJvCzIG7wdFeL5V2byU9vP-Orhqo,2
-quasardb/range-v3/Makefile,sha256=OoucwE1-AIuaBhEO_Fg_898LhbDCobbAP2Um2behjt0,9731
-quasardb/range-v3/cmake_install.cmake,sha256=oetQfWz8XAMkAL8mV8fHP9oQpZyrvS1583ZeCxD00ts,4550
+quasardb/range-v3/Makefile,sha256=WrjmR4OiY8Nw-HK9irhZSFHBpe2xDauAJ_WofZ28Rh8,9730
+quasardb/range-v3/cmake_install.cmake,sha256=rniqlcrytS76_oxUsmsSnJdgTNZTRCFWZiYi7uUz9PQ,4531
 quasardb/range-v3/range-v3-config-version.cmake,sha256=xGi8nCg5dIl5VmCOtTEVVa-dwABxKxLEd1Mx-bUvLLM,3249
-quasardb/range-v3/range-v3-config.cmake,sha256=iiZBJD9yisikJNYDR84f3siZY7xRddr6z48_0R5jj7c,3423
-quasardb/range-v3/CMakeFiles/CMakeDirectoryInformation.cmake,sha256=mFgHn_IVgYL5fvIDHeMuu6AT9E4XMFmhed6b_Hw4Iak,732
+quasardb/range-v3/range-v3-config.cmake,sha256=x2OIgfSL5bagNUvMFMuIwJxXOVtz50D_4ZpawrD3-UA,3423
+quasardb/range-v3/CMakeFiles/CMakeDirectoryInformation.cmake,sha256=-b3ebWONj-FoHjOI4n6Z5o6H1n_1o3ibqF3BohoGnj8,731
 quasardb/range-v3/CMakeFiles/progress.marks,sha256=micfKpFrC27mzsskJvCzIG7wdFeL5V2byU9vP-Orhqo,2
-quasardb/range-v3/CMakeFiles/Export/d94ef200eca10a819b5858b33e808f5b/range-v3-targets.cmake,sha256=V-vcw4htrvk0Sf8A5IKO2_meFGd26tUGbt-Y2R8kZk4,5265
+quasardb/range-v3/CMakeFiles/Export/d94ef200eca10a819b5858b33e808f5b/range-v3-targets.cmake,sha256=J-PEbAp6ZILGVs6hgb_XBUVayBHMyacZTGvz2l259bo,5265
 quasardb/range-v3/CMakeFiles/range.v3.headers.dir/DependInfo.cmake,sha256=ssojOAtcndfwexIOMvsRoVek3vdNgBmUVZscjIj5L1U,585
-quasardb/range-v3/CMakeFiles/range.v3.headers.dir/build.make,sha256=JkiH6eRhtyliIEaw9aVkOih4RjiHfstR3FfyhkE02N0,4459
+quasardb/range-v3/CMakeFiles/range.v3.headers.dir/build.make,sha256=D6C3GvajGshb4kAtXXYmdLKE3jNDyg-RApNuigcV9eU,4458
 quasardb/range-v3/CMakeFiles/range.v3.headers.dir/cmake_clean.cmake,sha256=3b0pZoiofoRzAiY1l7OLw203ZXp-mm1FUlQHob6i7aU,160
 quasardb/range-v3/CMakeFiles/range.v3.headers.dir/compiler_depend.make,sha256=Oge9eptzOB-hllw_Tye4o5wiXsIsdq1xm1GGCe0oGFM,126
 quasardb/range-v3/CMakeFiles/range.v3.headers.dir/compiler_depend.ts,sha256=orKrKpvHulgFBjBgzdeRvCpv0fV7cTffTdaHNqijFJg,120
 quasardb/range-v3/CMakeFiles/range.v3.headers.dir/progress.make,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 quasardb/range-v3/include/range/v3/version.hpp,sha256=d-ToEdR3GnC_p_0RAeS77xL-SVx6EKHgTlWJ9PUQlSQ,586
-quasardb-3.14.2.dev5.dist-info/LICENSE.md,sha256=_drOadIrIX8mzUZcnTJBTpUQih5gwdRAGK8ZKanYD6k,1467
-quasardb-3.14.2.dev5.dist-info/METADATA,sha256=zRtHEBSC3to6u7sCd2cZoSyf4XLlDr7KE1_2cVlTd2U,1443
-quasardb-3.14.2.dev5.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
-quasardb-3.14.2.dev5.dist-info/top_level.txt,sha256=wlprix4hCywuF1PkgKWYdZeJKq_kgJOqkAvukm_sZQ8,9
-quasardb-3.14.2.dev5.dist-info/RECORD,,
+quasardb-3.14.2.dev6.dist-info/licenses/LICENSE.md,sha256=_drOadIrIX8mzUZcnTJBTpUQih5gwdRAGK8ZKanYD6k,1467
+quasardb-3.14.2.dev6.dist-info/METADATA,sha256=3lgDPzrOiU-WoBg2yHBVrdBMshwFAJrI-kNdQDV8QzI,1465
+quasardb-3.14.2.dev6.dist-info/WHEEL,sha256=RGmqfcbp12luPjiDM8mezinyU_RW3Bfc2FnRbfVfvNM,109
+quasardb-3.14.2.dev6.dist-info/top_level.txt,sha256=wlprix4hCywuF1PkgKWYdZeJKq_kgJOqkAvukm_sZQ8,9
+quasardb-3.14.2.dev6.dist-info/RECORD,,

{quasardb-3.14.2.dev5.dist-info → quasardb-3.14.2.dev6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_11_0_arm64