quasardb 3.14.1.dev5__tar.gz → 3.14.1.dev6__tar.gz

{quasardb-3.14.1.dev5 → quasardb-3.14.1.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quasardb
-Version: 3.14.1.dev5
+Version: 3.14.1.dev6
 Summary: Python API for quasardb
 Home-page: https://www.quasardb.net/
 Author: quasardb SAS

{quasardb-3.14.1.dev5 → quasardb-3.14.1.dev6}/quasardb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quasardb
-Version: 3.14.1.dev5
+Version: 3.14.1.dev6
 Summary: Python API for quasardb
 Home-page: https://www.quasardb.net/
 Author: quasardb SAS

{quasardb-3.14.1.dev5 → quasardb-3.14.1.dev6}/quasardb.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ tests/test_batch_inserter.py
 tests/test_bench_pinned_writer.py
 tests/test_blob.py
 tests/test_buf_size.py
+tests/test_compaction.py
 tests/test_connection.py
 tests/test_continuous.py
 tests/test_convert.py
@@ -35,6 +36,7 @@ tests/test_getTimeout.py
 tests/test_info.py
 tests/test_integer.py
 tests/test_logging.py
+tests/test_metrics.py
 tests/test_node.py
 tests/test_numpy.py
 tests/test_options.py

{quasardb-3.14.1.dev5 → quasardb-3.14.1.dev6}/setup.py

@@ -21,7 +21,7 @@ from setuptools.command.install import install
 from pkg_resources import get_build_platform
 from wheel.bdist_wheel import bdist_wheel as old_bdist_wheel
 
-qdb_version = "3.14.1.dev5"
+qdb_version = "3.14.1.dev6"
 
 # package_modules are our 'extra' files. Our cmake configuration copies our QDB_API_LIB
 # into our source directory, and by adding this to `package_modules` we tell setuptools to
@@ -59,19 +59,6 @@ class CMakeBuild(build_ext):
         for ext in self.extensions:
             self.build_extension(ext)
 
-    def find_osx_sysroot(self):
-        # Override sysroot, because otherwise bdist (setuptools) will set it to the latest SDK.
-        # Cf. https://github.com/pypa/setuptools/blob/eb75ea6eb827acf1be6c350850b350de7b500efd/setuptools/_distutils/unixccompiler.py#L326-L350 # noqa
-
-        # Paths can be different depending on XCode version installed:
-        # /Library/Developer/CommandLineTools/SDKs/MacOSX11.sdk
-        # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.sdk
-        sdk = '10.14'
-        out = subprocess.check_output(
-            ['xcrun', '--sdk', 'macosx' + sdk, '--show-sdk-path'])
-        print(out.decode().strip())
-        return out.decode().strip()
-
     def build_extension(self, ext):
         self.do_build_extension(ext)
 
@@ -88,9 +75,6 @@ class CMakeBuild(build_ext):
             '-DQDB_PY_VERSION=' + qdb_version
         ]
 
-        if platform.system() == "Darwin":
-            cmake_args += ['-DCMAKE_OSX_SYSROOT:PATH=' + self.find_osx_sysroot()]
-
         # If certain environment variables are set, we pass them along
         # to cmake. This allows for greater flexibility for an end-user
         # to configure builds.

quasardb-3.14.1.dev6/tests/test_compaction.py

@@ -0,0 +1,24 @@
+# pylint: disable=C0103,C0111,C0302,W0212
+import datetime
+
+import pytest
+import quasardb
+
+
+def test_can_compact_full_and_abort(qdbd_connection):
+    try:
+        qdbd_connection.compact_full()
+    finally:
+        qdbd_connection.compact_abort()
+        qdbd_connection.wait_for_compaction()
+
+def test_can_get_compaction_progress(qdbd_connection):
+    try:
+        qdbd_connection.compact_full()
+
+        progress = qdbd_connection.compact_progress()
+        assert progress > 0 and progress <= 100
+
+    finally:
+        qdbd_connection.compact_abort()
+        qdbd_connection.wait_for_compaction()

{quasardb-3.14.1.dev5 → quasardb-3.14.1.dev6}/tests/test_logging.py

@@ -31,7 +31,7 @@ def test_native_logging_output(blob_entry, random_blob, caplog):
 
     assert found(caplog.records)
 
-
+@pytest.mark.skip(reason="TODO: Should only be enabled for CMAKE_BUILD_TYPE=Debug")
 def test_invalid_utf8_logs_qdb3361(qdbd_connection, caplog):
     caplog.set_level(logging.DEBUG)
 

quasardb-3.14.1.dev6/tests/test_metrics.py

@@ -0,0 +1,68 @@
+# pylint: disable=C0103,C0111,C0302,W0212
+
+import quasardb
+import quasardb.pandas as qdbpd
+
+from quasardb import metrics
+import pytest
+
+def test_clear_metrics(qdbd_connection):
+    metrics.clear()
+
+    totals = metrics.totals()
+    assert len(totals) == 0
+
+def test_scoped_measure(qdbd_connection):
+
+    with metrics.Measure() as measure:
+        scoped = measure.get()
+        assert len(scoped) == 0
+
+
+def test_batch_push_metrics(qdbpd_write_fn, df_with_table, qdbd_connection):
+    (_, _, df, table) = df_with_table
+
+    with metrics.Measure() as measure:
+        assert len(measure.get()) == 0
+        qdbpd_write_fn(df, qdbd_connection, table)
+
+        m = measure.get()
+        assert len(m) > 0
+
+        assert "qdb_batch_push" in m
+        assert m['qdb_batch_push'] > 0
+
+def test_query_metrics(qdbpd_write_fn, df_with_table, qdbd_connection):
+    (_, _, df, table) = df_with_table
+    qdbpd_write_fn(df, qdbd_connection, table)
+
+    with metrics.Measure() as measure:
+        assert len(measure.get()) == 0
+
+        qdbpd.query(qdbd_connection, "select * from \"{}\"".format(table.get_name()))
+
+        m = measure.get()
+        assert len(m) > 0
+
+        assert "qdb_query" in m
+        assert m['qdb_query'] > 0
+
+def test_accumulating_metrics_within_scope(qdbpd_write_fn, df_with_table, qdbd_connection):
+    (_, _, df, table) = df_with_table
+    qdbpd_write_fn(df, qdbd_connection, table)
+
+    with metrics.Measure() as measure:
+        assert len(measure.get()) == 0
+
+        # First query
+        qdbpd.query(qdbd_connection, "select * from \"{}\"".format(table.get_name()))
+
+        m1 = measure.get()
+        assert m1['qdb_query'] > 0
+
+        # Second query
+        qdbpd.query(qdbd_connection, "select * from \"{}\"".format(table.get_name()))
+        m2 = measure.get()
+
+        # The crux of the test, we expect this metric to accumulate
+        assert m2['qdb_query'] > m1['qdb_query']