Skip to content

Commit 2648a47

Browse files
committed
Change tracking arg name to track_rows_processed
1 parent 7939e6b commit 2648a47

14 files changed

Lines changed: 44 additions & 44 deletions

File tree

sqlmesh/core/console.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 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 and count >= 0:
43284328
if count < 1000:
43294329
return str(count)
43304330

sqlmesh/core/engine_adapter/base.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ def _create_table_from_source_queries(
856856
table_description: t.Optional[str] = None,
857857
column_descriptions: t.Optional[t.Dict[str, str]] = None,
858858
table_kind: t.Optional[str] = None,
859-
track_execution_stats: bool = True,
859+
track_rows_processed: bool = True,
860860
**kwargs: t.Any,
861861
) -> None:
862862
table = exp.to_table(table_name)
@@ -902,15 +902,15 @@ def _create_table_from_source_queries(
902902
replace=replace,
903903
table_description=table_description,
904904
table_kind=table_kind,
905-
track_execution_stats=track_execution_stats,
905+
track_rows_processed=track_rows_processed,
906906
**kwargs,
907907
)
908908
else:
909909
self._insert_append_query(
910910
table_name,
911911
query,
912912
target_columns_to_types or self.columns(table),
913-
track_execution_stats=track_execution_stats,
913+
track_rows_processed=track_rows_processed,
914914
)
915915

916916
# Register comments with commands if the engine supports comments and we weren't able to
@@ -934,7 +934,7 @@ def _create_table(
934934
table_description: t.Optional[str] = None,
935935
column_descriptions: t.Optional[t.Dict[str, str]] = None,
936936
table_kind: t.Optional[str] = None,
937-
track_execution_stats: bool = True,
937+
track_rows_processed: bool = True,
938938
**kwargs: t.Any,
939939
) -> None:
940940
self.execute(
@@ -952,7 +952,7 @@ def _create_table(
952952
table_kind=table_kind,
953953
**kwargs,
954954
),
955-
track_execution_stats=track_execution_stats,
955+
track_rows_processed=track_rows_processed,
956956
)
957957

958958
def _build_create_table_exp(
@@ -1440,7 +1440,7 @@ def insert_append(
14401440
table_name: TableName,
14411441
query_or_df: QueryOrDF,
14421442
target_columns_to_types: t.Optional[t.Dict[str, exp.DataType]] = None,
1443-
track_execution_stats: bool = True,
1443+
track_rows_processed: bool = True,
14441444
source_columns: t.Optional[t.List[str]] = None,
14451445
) -> None:
14461446
source_queries, target_columns_to_types = self._get_source_queries_and_columns_to_types(
@@ -1450,15 +1450,15 @@ def insert_append(
14501450
source_columns=source_columns,
14511451
)
14521452
self._insert_append_source_queries(
1453-
table_name, source_queries, target_columns_to_types, track_execution_stats
1453+
table_name, source_queries, target_columns_to_types, track_rows_processed
14541454
)
14551455

14561456
def _insert_append_source_queries(
14571457
self,
14581458
table_name: TableName,
14591459
source_queries: t.List[SourceQuery],
14601460
target_columns_to_types: t.Optional[t.Dict[str, exp.DataType]] = None,
1461-
track_execution_stats: bool = True,
1461+
track_rows_processed: bool = True,
14621462
) -> None:
14631463
with self.transaction(condition=len(source_queries) > 0):
14641464
target_columns_to_types = target_columns_to_types or self.columns(table_name)
@@ -1468,7 +1468,7 @@ def _insert_append_source_queries(
14681468
table_name,
14691469
query,
14701470
target_columns_to_types,
1471-
track_execution_stats=track_execution_stats,
1471+
track_rows_processed=track_rows_processed,
14721472
)
14731473

14741474
def _insert_append_query(
@@ -1477,13 +1477,13 @@ def _insert_append_query(
14771477
query: Query,
14781478
target_columns_to_types: t.Dict[str, exp.DataType],
14791479
order_projections: bool = True,
1480-
track_execution_stats: bool = True,
1480+
track_rows_processed: bool = True,
14811481
) -> None:
14821482
if order_projections:
14831483
query = self._order_projections_and_filter(query, target_columns_to_types)
14841484
self.execute(
14851485
exp.insert(query, table_name, columns=list(target_columns_to_types)),
1486-
track_execution_stats=track_execution_stats,
1486+
track_rows_processed=track_rows_processed,
14871487
)
14881488

14891489
def insert_overwrite_by_partition(
@@ -1626,7 +1626,7 @@ def _insert_overwrite_by_condition(
16261626
)
16271627
if insert_overwrite_strategy.is_replace_where:
16281628
insert_exp.set("where", where or exp.true())
1629-
self.execute(insert_exp, track_execution_stats=True)
1629+
self.execute(insert_exp, track_rows_processed=True)
16301630

16311631
def update_table(
16321632
self,
@@ -1648,7 +1648,7 @@ def _merge(
16481648
exp.Subquery(this=query), alias=MERGE_SOURCE_ALIAS, copy=False, table=True
16491649
)
16501650
self.execute(
1651-
exp.Merge(this=this, using=using, on=on, whens=whens), track_execution_stats=True
1651+
exp.Merge(this=this, using=using, on=on, whens=whens), track_rows_processed=True
16521652
)
16531653

16541654
def scd_type_2_by_time(
@@ -2398,7 +2398,7 @@ def execute(
23982398
expressions: t.Union[str, exp.Expression, t.Sequence[exp.Expression]],
23992399
ignore_unsupported_errors: bool = False,
24002400
quote_identifiers: bool = True,
2401-
track_execution_stats: bool = False,
2401+
track_rows_processed: bool = False,
24022402
**kwargs: t.Any,
24032403
) -> None:
24042404
"""Execute a sql query."""
@@ -2420,7 +2420,7 @@ def execute(
24202420
expression=e if isinstance(e, exp.Expression) else None,
24212421
quote_identifiers=quote_identifiers,
24222422
)
2423-
self._execute(sql, track_execution_stats, **kwargs)
2423+
self._execute(sql, track_rows_processed, **kwargs)
24242424

24252425
def _attach_correlation_id(self, sql: str) -> str:
24262426
if self.ATTACH_CORRELATION_ID and self.correlation_id:
@@ -2450,12 +2450,12 @@ def _record_execution_stats(
24502450
) -> None:
24512451
QueryExecutionTracker.record_execution(sql, rowcount, bytes_processed)
24522452

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

24562456
if (
24572457
self.SUPPORTS_QUERY_EXECUTION_TRACKING
2458-
and track_execution_stats
2458+
and track_rows_processed
24592459
and QueryExecutionTracker.is_tracking()
24602460
):
24612461
rowcount_raw = getattr(self.cursor, "rowcount", None)
@@ -2512,7 +2512,7 @@ def temp_table(
25122512
exists=True,
25132513
table_description=None,
25142514
column_descriptions=None,
2515-
track_execution_stats=False,
2515+
track_rows_processed=False,
25162516
**kwargs,
25172517
)
25182518

@@ -2764,7 +2764,7 @@ def _replace_by_key(
27642764
insert_statement.set("where", delete_filter)
27652765
insert_statement.set("this", exp.to_table(target_table))
27662766

2767-
self.execute(insert_statement, track_execution_stats=True)
2767+
self.execute(insert_statement, track_rows_processed=True)
27682768
finally:
27692769
self.drop_table(temp_table)
27702770

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
@@ -173,7 +173,7 @@ def _create_table_from_source_queries(
173173
table_description: t.Optional[str] = None,
174174
column_descriptions: t.Optional[t.Dict[str, str]] = None,
175175
table_kind: t.Optional[str] = None,
176-
track_execution_stats: bool = True,
176+
track_rows_processed: bool = True,
177177
**kwargs: t.Any,
178178
) -> None:
179179
"""
@@ -428,7 +428,7 @@ def resolve_target_table(expression: exp.Expression) -> exp.Expression:
428428
on=on.transform(resolve_target_table),
429429
whens=whens.transform(resolve_target_table),
430430
),
431-
track_execution_stats=True,
431+
track_rows_processed=True,
432432
)
433433

434434
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)