Skip to content

Commit 0e1350c

Browse files
committed
Report 0 rows correctly
1 parent ddb5249 commit 0e1350c

2 files changed

Lines changed: 25 additions & 6 deletions

File tree

sqlmesh/core/console.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4189,15 +4189,15 @@ def _create_evaluation_model_annotation(
41894189
if execution_stats:
41904190
rows_processed = execution_stats.total_rows_processed
41914191
execution_stats_str += (
4192-
f"{_abbreviate_integer_count(rows_processed)} row{'s' if rows_processed > 1 else ''}"
4193-
if rows_processed
4192+
f"{_abbreviate_integer_count(rows_processed)} row{'s' if rows_processed != 1 else ''}"
4193+
if rows_processed is not None and rows_processed >= 0
41944194
else ""
41954195
)
41964196

41974197
bytes_processed = execution_stats.total_bytes_processed
41984198
execution_stats_str += (
41994199
f"{', ' if execution_stats_str else ''}{_format_bytes(bytes_processed)}"
4200-
if bytes_processed
4200+
if bytes_processed is not None and bytes_processed >= 0
42014201
else ""
42024202
)
42034203
execution_stats_str = f" ({execution_stats_str})" if execution_stats_str else ""
@@ -4306,7 +4306,7 @@ def _calculate_annotation_str_len(
43064306
# Convert number of bytes to a human-readable string
43074307
# https://github.com/dbt-labs/dbt-adapters/blob/34fd178539dcb6f82e18e738adc03de7784c032f/dbt-bigquery/src/dbt/adapters/bigquery/connections.py#L165
43084308
def _format_bytes(num_bytes: t.Optional[int]) -> str:
4309-
if num_bytes and num_bytes >= 0:
4309+
if num_bytes is not None and num_bytes >= 0:
43104310
if num_bytes < 1024:
43114311
return f"{num_bytes} bytes"
43124312

@@ -4324,7 +4324,7 @@ def _format_bytes(num_bytes: t.Optional[int]) -> str:
43244324
# Abbreviate integer count. Example: 1,000,000,000 -> 1b
43254325
# https://github.com/dbt-labs/dbt-adapters/blob/34fd178539dcb6f82e18e738adc03de7784c032f/dbt-bigquery/src/dbt/adapters/bigquery/connections.py#L178
43264326
def _abbreviate_integer_count(count: t.Optional[int]) -> str:
4327-
if count and count >= 0:
4327+
if count is not None and count >= 0:
43284328
if count < 1000:
43294329
return str(count)
43304330

tests/core/engine_adapter/integration/test_integration.py

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
import sys
77
import typing as t
88
import shutil
9-
from datetime import datetime, timedelta
9+
from datetime import date, datetime, timedelta
1010
from unittest.mock import patch
1111
import numpy as np # noqa: TID253
1212
import pandas as pd # noqa: TID253
1313
import pytest
1414
import pytz
15+
import time_machine
1516
from sqlglot import exp, parse_one
1617
from sqlglot.optimizer.normalize_identifiers import normalize_identifiers
1718
from sqlglot.optimizer.qualify_columns import quote_identifiers
@@ -2429,6 +2430,24 @@ def capture_execution_stats(
24292430
assert actual_execution_stats["incremental_model"].total_bytes_processed
24302431
assert actual_execution_stats["full_model"].total_bytes_processed
24312432

2433+
# run that loads 0 rows in incremental model
2434+
with patch.object(
2435+
context.console, "update_snapshot_evaluation_progress", capture_execution_stats
2436+
):
2437+
with time_machine.travel(date.today() + timedelta(days=1)):
2438+
context.run()
2439+
2440+
if ctx.engine_adapter.SUPPORTS_QUERY_EXECUTION_TRACKING:
2441+
assert actual_execution_stats["incremental_model"].total_rows_processed == 0
2442+
# snowflake doesn't track rows for CTAS
2443+
assert actual_execution_stats["full_model"].total_rows_processed == (
2444+
None if ctx.mark.startswith("snowflake") else 3
2445+
)
2446+
2447+
if ctx.mark.startswith("bigquery"):
2448+
assert actual_execution_stats["incremental_model"].total_bytes_processed
2449+
assert actual_execution_stats["full_model"].total_bytes_processed
2450+
24322451
# make and validate unmodified dev environment
24332452
no_change_plan: Plan = context.plan_builder(
24342453
environment="test_dev",

0 commit comments

Comments
 (0)