Skip to content

Commit c192c05

Browse files
committed
Change tracking arg name to track_rows_processed
1 parent 6b201da commit c192c05

File tree

14 files changed

+44
-44
lines changed

14 files changed

+44
-44
lines changed

sqlmesh/core/console.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4272,7 +4272,7 @@ def _calculate_annotation_str_len(
42724272
# Convert number of bytes to a human-readable string
42734273
# https://github.com/dbt-labs/dbt-adapters/blob/34fd178539dcb6f82e18e738adc03de7784c032f/dbt-bigquery/src/dbt/adapters/bigquery/connections.py#L165
42744274
def _format_bytes(num_bytes: t.Optional[int]) -> str:
4275-
if num_bytes and num_bytes > 0:
4275+
if num_bytes and num_bytes >= 0:
42764276
if num_bytes < 1024:
42774277
return f"{num_bytes} bytes"
42784278

@@ -4290,7 +4290,7 @@ def _format_bytes(num_bytes: t.Optional[int]) -> str:
42904290
# Abbreviate integer count. Example: 1,000,000,000 -> 1b
42914291
# https://github.com/dbt-labs/dbt-adapters/blob/34fd178539dcb6f82e18e738adc03de7784c032f/dbt-bigquery/src/dbt/adapters/bigquery/connections.py#L178
42924292
def _abbreviate_integer_count(count: t.Optional[int]) -> str:
4293-
if count and count > 0:
4293+
if count and count >= 0:
42944294
if count < 1000:
42954295
return str(count)
42964296

sqlmesh/core/engine_adapter/base.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ def _create_table_from_source_queries(
830830
table_description: t.Optional[str] = None,
831831
column_descriptions: t.Optional[t.Dict[str, str]] = None,
832832
table_kind: t.Optional[str] = None,
833-
track_execution_stats: bool = True,
833+
track_rows_processed: bool = True,
834834
**kwargs: t.Any,
835835
) -> None:
836836
table = exp.to_table(table_name)
@@ -876,15 +876,15 @@ def _create_table_from_source_queries(
876876
replace=replace,
877877
table_description=table_description,
878878
table_kind=table_kind,
879-
track_execution_stats=track_execution_stats,
879+
track_rows_processed=track_rows_processed,
880880
**kwargs,
881881
)
882882
else:
883883
self._insert_append_query(
884884
table_name,
885885
query,
886886
target_columns_to_types or self.columns(table),
887-
track_execution_stats=track_execution_stats,
887+
track_rows_processed=track_rows_processed,
888888
)
889889

890890
# Register comments with commands if the engine supports comments and we weren't able to
@@ -908,7 +908,7 @@ def _create_table(
908908
table_description: t.Optional[str] = None,
909909
column_descriptions: t.Optional[t.Dict[str, str]] = None,
910910
table_kind: t.Optional[str] = None,
911-
track_execution_stats: bool = True,
911+
track_rows_processed: bool = True,
912912
**kwargs: t.Any,
913913
) -> None:
914914
self.execute(
@@ -926,7 +926,7 @@ def _create_table(
926926
table_kind=table_kind,
927927
**kwargs,
928928
),
929-
track_execution_stats=track_execution_stats,
929+
track_rows_processed=track_rows_processed,
930930
)
931931

932932
def _build_create_table_exp(
@@ -1401,7 +1401,7 @@ def insert_append(
14011401
table_name: TableName,
14021402
query_or_df: QueryOrDF,
14031403
target_columns_to_types: t.Optional[t.Dict[str, exp.DataType]] = None,
1404-
track_execution_stats: bool = True,
1404+
track_rows_processed: bool = True,
14051405
source_columns: t.Optional[t.List[str]] = None,
14061406
) -> None:
14071407
source_queries, target_columns_to_types = self._get_source_queries_and_columns_to_types(
@@ -1411,15 +1411,15 @@ def insert_append(
14111411
source_columns=source_columns,
14121412
)
14131413
self._insert_append_source_queries(
1414-
table_name, source_queries, target_columns_to_types, track_execution_stats
1414+
table_name, source_queries, target_columns_to_types, track_rows_processed
14151415
)
14161416

14171417
def _insert_append_source_queries(
14181418
self,
14191419
table_name: TableName,
14201420
source_queries: t.List[SourceQuery],
14211421
target_columns_to_types: t.Optional[t.Dict[str, exp.DataType]] = None,
1422-
track_execution_stats: bool = True,
1422+
track_rows_processed: bool = True,
14231423
) -> None:
14241424
with self.transaction(condition=len(source_queries) > 0):
14251425
target_columns_to_types = target_columns_to_types or self.columns(table_name)
@@ -1429,7 +1429,7 @@ def _insert_append_source_queries(
14291429
table_name,
14301430
query,
14311431
target_columns_to_types,
1432-
track_execution_stats=track_execution_stats,
1432+
track_rows_processed=track_rows_processed,
14331433
)
14341434

14351435
def _insert_append_query(
@@ -1438,13 +1438,13 @@ def _insert_append_query(
14381438
query: Query,
14391439
target_columns_to_types: t.Dict[str, exp.DataType],
14401440
order_projections: bool = True,
1441-
track_execution_stats: bool = True,
1441+
track_rows_processed: bool = True,
14421442
) -> None:
14431443
if order_projections:
14441444
query = self._order_projections_and_filter(query, target_columns_to_types)
14451445
self.execute(
14461446
exp.insert(query, table_name, columns=list(target_columns_to_types)),
1447-
track_execution_stats=track_execution_stats,
1447+
track_rows_processed=track_rows_processed,
14481448
)
14491449

14501450
def insert_overwrite_by_partition(
@@ -1587,7 +1587,7 @@ def _insert_overwrite_by_condition(
15871587
)
15881588
if insert_overwrite_strategy.is_replace_where:
15891589
insert_exp.set("where", where or exp.true())
1590-
self.execute(insert_exp, track_execution_stats=True)
1590+
self.execute(insert_exp, track_rows_processed=True)
15911591

15921592
def update_table(
15931593
self,
@@ -1609,7 +1609,7 @@ def _merge(
16091609
exp.Subquery(this=query), alias=MERGE_SOURCE_ALIAS, copy=False, table=True
16101610
)
16111611
self.execute(
1612-
exp.Merge(this=this, using=using, on=on, whens=whens), track_execution_stats=True
1612+
exp.Merge(this=this, using=using, on=on, whens=whens), track_rows_processed=True
16131613
)
16141614

16151615
def scd_type_2_by_time(
@@ -2359,7 +2359,7 @@ def execute(
23592359
expressions: t.Union[str, exp.Expression, t.Sequence[exp.Expression]],
23602360
ignore_unsupported_errors: bool = False,
23612361
quote_identifiers: bool = True,
2362-
track_execution_stats: bool = False,
2362+
track_rows_processed: bool = False,
23632363
**kwargs: t.Any,
23642364
) -> None:
23652365
"""Execute a sql query."""
@@ -2381,7 +2381,7 @@ def execute(
23812381
expression=e if isinstance(e, exp.Expression) else None,
23822382
quote_identifiers=quote_identifiers,
23832383
)
2384-
self._execute(sql, track_execution_stats, **kwargs)
2384+
self._execute(sql, track_rows_processed, **kwargs)
23852385

23862386
def _attach_correlation_id(self, sql: str) -> str:
23872387
if self.ATTACH_CORRELATION_ID and self.correlation_id:
@@ -2411,12 +2411,12 @@ def _record_execution_stats(
24112411
) -> None:
24122412
QueryExecutionTracker.record_execution(sql, rowcount, bytes_processed)
24132413

2414-
def _execute(self, sql: str, track_execution_stats: bool = False, **kwargs: t.Any) -> None:
2414+
def _execute(self, sql: str, track_rows_processed: bool = False, **kwargs: t.Any) -> None:
24152415
self.cursor.execute(sql, **kwargs)
24162416

24172417
if (
24182418
self.SUPPORTS_QUERY_EXECUTION_TRACKING
2419-
and track_execution_stats
2419+
and track_rows_processed
24202420
and QueryExecutionTracker.is_tracking()
24212421
):
24222422
rowcount_raw = getattr(self.cursor, "rowcount", None)
@@ -2473,7 +2473,7 @@ def temp_table(
24732473
exists=True,
24742474
table_description=None,
24752475
column_descriptions=None,
2476-
track_execution_stats=False,
2476+
track_rows_processed=False,
24772477
**kwargs,
24782478
)
24792479

@@ -2725,7 +2725,7 @@ def _replace_by_key(
27252725
insert_statement.set("where", delete_filter)
27262726
insert_statement.set("this", exp.to_table(target_table))
27272727

2728-
self.execute(insert_statement, track_execution_stats=True)
2728+
self.execute(insert_statement, track_rows_processed=True)
27292729
finally:
27302730
self.drop_table(temp_table)
27312731

sqlmesh/core/engine_adapter/bigquery.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ def _db_call(self, func: t.Callable[..., t.Any], *args: t.Any, **kwargs: t.Any)
10511051
def _execute(
10521052
self,
10531053
sql: str,
1054-
track_execution_stats: bool = False,
1054+
track_rows_processed: bool = False,
10551055
**kwargs: t.Any,
10561056
) -> None:
10571057
"""Execute a sql query."""
@@ -1097,7 +1097,7 @@ def _execute(
10971097
self.cursor._set_rowcount(query_results)
10981098
self.cursor._set_description(query_results.schema)
10991099

1100-
if track_execution_stats and QueryExecutionTracker.is_tracking():
1100+
if track_rows_processed and QueryExecutionTracker.is_tracking():
11011101
num_rows = None
11021102
if query_job.statement_type == "CREATE_TABLE_AS_SELECT":
11031103
# since table was just created, number rows in table == number rows processed

sqlmesh/core/engine_adapter/clickhouse.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def _insert_overwrite_by_condition(
294294
)
295295

296296
try:
297-
self.execute(existing_records_insert_exp, track_execution_stats=True)
297+
self.execute(existing_records_insert_exp, track_rows_processed=True)
298298
finally:
299299
if table_partition_exp:
300300
self.drop_table(partitions_temp_table_name)
@@ -489,7 +489,7 @@ def _create_table(
489489
table_description: t.Optional[str] = None,
490490
column_descriptions: t.Optional[t.Dict[str, str]] = None,
491491
table_kind: t.Optional[str] = None,
492-
track_execution_stats: bool = True,
492+
track_rows_processed: bool = True,
493493
**kwargs: t.Any,
494494
) -> None:
495495
"""Creates a table in the database.
@@ -526,7 +526,7 @@ def _create_table(
526526
column_descriptions,
527527
table_kind,
528528
empty_ctas=(self.engine_run_mode.is_cloud and expression is not None),
529-
track_execution_stats=track_execution_stats,
529+
track_rows_processed=track_rows_processed,
530530
**kwargs,
531531
)
532532

sqlmesh/core/engine_adapter/duckdb.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def _create_table(
156156
table_description: t.Optional[str] = None,
157157
column_descriptions: t.Optional[t.Dict[str, str]] = None,
158158
table_kind: t.Optional[str] = None,
159-
track_execution_stats: bool = True,
159+
track_rows_processed: bool = True,
160160
**kwargs: t.Any,
161161
) -> None:
162162
catalog = self.get_current_catalog()
@@ -180,7 +180,7 @@ def _create_table(
180180
table_description,
181181
column_descriptions,
182182
table_kind,
183-
track_execution_stats=track_execution_stats,
183+
track_rows_processed=track_rows_processed,
184184
**kwargs,
185185
)
186186

sqlmesh/core/engine_adapter/redshift.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def _create_table_from_source_queries(
174174
table_description: t.Optional[str] = None,
175175
column_descriptions: t.Optional[t.Dict[str, str]] = None,
176176
table_kind: t.Optional[str] = None,
177-
track_execution_stats: bool = True,
177+
track_rows_processed: bool = True,
178178
**kwargs: t.Any,
179179
) -> None:
180180
"""
@@ -429,7 +429,7 @@ def resolve_target_table(expression: exp.Expression) -> exp.Expression:
429429
on=on.transform(resolve_target_table),
430430
whens=whens.transform(resolve_target_table),
431431
),
432-
track_execution_stats=True,
432+
track_rows_processed=True,
433433
)
434434

435435
def _normalize_decimal_value(self, expr: exp.Expression, precision: int) -> exp.Expression:

sqlmesh/core/engine_adapter/snowflake.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def _create_table(
169169
table_description: t.Optional[str] = None,
170170
column_descriptions: t.Optional[t.Dict[str, str]] = None,
171171
table_kind: t.Optional[str] = None,
172-
track_execution_stats: bool = True,
172+
track_rows_processed: bool = True,
173173
**kwargs: t.Any,
174174
) -> None:
175175
table_format = kwargs.get("table_format")
@@ -189,7 +189,7 @@ def _create_table(
189189
table_description=table_description,
190190
column_descriptions=column_descriptions,
191191
table_kind=table_kind,
192-
track_execution_stats=track_execution_stats,
192+
track_rows_processed=track_rows_processed,
193193
**kwargs,
194194
)
195195

sqlmesh/core/engine_adapter/spark.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ def _create_table(
433433
table_description: t.Optional[str] = None,
434434
column_descriptions: t.Optional[t.Dict[str, str]] = None,
435435
table_kind: t.Optional[str] = None,
436-
track_execution_stats: bool = True,
436+
track_rows_processed: bool = True,
437437
**kwargs: t.Any,
438438
) -> None:
439439
table_name = (
@@ -462,7 +462,7 @@ def _create_table(
462462
target_columns_to_types=target_columns_to_types,
463463
table_description=table_description,
464464
column_descriptions=column_descriptions,
465-
track_execution_stats=track_execution_stats,
465+
track_rows_processed=track_rows_processed,
466466
**kwargs,
467467
)
468468
table_name = (

sqlmesh/core/engine_adapter/trino.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ def _create_table(
358358
table_description: t.Optional[str] = None,
359359
column_descriptions: t.Optional[t.Dict[str, str]] = None,
360360
table_kind: t.Optional[str] = None,
361-
track_execution_stats: bool = True,
361+
track_rows_processed: bool = True,
362362
**kwargs: t.Any,
363363
) -> None:
364364
super()._create_table(
@@ -370,7 +370,7 @@ def _create_table(
370370
table_description=table_description,
371371
column_descriptions=column_descriptions,
372372
table_kind=table_kind,
373-
track_execution_stats=track_execution_stats,
373+
track_rows_processed=track_rows_processed,
374374
**kwargs,
375375
)
376376

sqlmesh/core/state_sync/db/environment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def update_environment(self, environment: Environment) -> None:
7878
self.environments_table,
7979
_environment_to_df(environment),
8080
target_columns_to_types=self._environment_columns_to_types,
81-
track_execution_stats=False,
81+
track_rows_processed=False,
8282
)
8383

8484
def update_environment_statements(
@@ -109,7 +109,7 @@ def update_environment_statements(
109109
self.environment_statements_table,
110110
_environment_statements_to_df(environment_name, plan_id, environment_statements),
111111
target_columns_to_types=self._environment_statements_columns_to_types,
112-
track_execution_stats=False,
112+
track_rows_processed=False,
113113
)
114114

115115
def invalidate_environment(self, name: str, protect_prod: bool = True) -> None:

0 commit comments

Comments
 (0)