From a4322cc8b59aa53586508cc3893b103252a50548 Mon Sep 17 00:00:00 2001 From: joocer Date: Sun, 22 Dec 2024 19:13:12 +0000 Subject: [PATCH 1/2] #2104 --- opteryx/operators/async_read_node.py | 2 ++ opteryx/operators/function_dataset_node.py | 2 ++ opteryx/operators/read_node.py | 1 + 3 files changed, 5 insertions(+) diff --git a/opteryx/operators/async_read_node.py b/opteryx/operators/async_read_node.py index 8ecb027d..4d1db354 100644 --- a/opteryx/operators/async_read_node.py +++ b/opteryx/operators/async_read_node.py @@ -168,6 +168,7 @@ def execute(self, morsel, **kwargs) -> Generator: # due to a read-after-free type error start = time.monotonic_ns() blob_bytes = self.pool.read_and_release(reference, zero_copy=False) + self.statistics.bytes_read += len(blob_bytes) decoded = decoder( blob_bytes, projection=self.columns, selection=self.predicates ) @@ -193,6 +194,7 @@ def execute(self, morsel, **kwargs) -> Generator: self.statistics.blobs_read += 1 self.statistics.rows_read += morsel.num_rows + self.statistics.bytes_processed += morsel.nbytes yield morsel except Exception as err: diff --git a/opteryx/operators/function_dataset_node.py b/opteryx/operators/function_dataset_node.py index d1b2f113..d3043b8c 100644 --- a/opteryx/operators/function_dataset_node.py +++ b/opteryx/operators/function_dataset_node.py @@ -143,5 +143,7 @@ def execute(self, morsel, **kwargs) -> Generator: table = data self.statistics.columns_read += len(table.column_names) + self.statistics.rows_read += table.num_rows + self.statistics.bytes_processed += table.nbytes yield table diff --git a/opteryx/operators/read_node.py b/opteryx/operators/read_node.py index e9c44a87..c614c1b7 100644 --- a/opteryx/operators/read_node.py +++ b/opteryx/operators/read_node.py @@ -222,6 +222,7 @@ def execute(self, morsel, **kwargs) -> Generator: self.statistics.time_reading_blobs += time.monotonic_ns() - start_clock self.statistics.blobs_read += 1 self.statistics.rows_read += morsel.num_rows + self.statistics.bytes_processed += morsel.nbytes yield morsel start_clock = time.monotonic_ns() if morsel: From cb275e43ac91a5451deeed98654946a154f1c8f8 Mon Sep 17 00:00:00 2001 From: XB500 Date: Sun, 22 Dec 2024 19:13:34 +0000 Subject: [PATCH 2/2] Opteryx Version 0.19.0-alpha.910 --- opteryx/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opteryx/__version__.py b/opteryx/__version__.py index 616afef5..a17ea216 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -1,4 +1,4 @@ -__build__ = 909 +__build__ = 910 # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.