dstandish commented on code in PR #26942:
URL: https://github.com/apache/airflow/pull/26942#discussion_r990718192
##########
airflow/www/views.py:
##########
@@ -3574,13 +3600,32 @@ def datasets_summary(self):
DatasetModel.id,
DatasetModel.uri,
)
- .filter(DatasetModel.uri.ilike(f"%{uri_pattern}%"))
.order_by(*order_by)
- .offset(offset)
- .limit(limit)
- .all()
- ]
- data = {"datasets": datasets, "total_entries": total_entries}
+ )
+
+ if uri_pattern:
+ count_query =
count_query.filter(DatasetModel.uri.ilike(f"%{uri_pattern}%"))
+ query =
query.filter(DatasetModel.uri.ilike(f"%{uri_pattern}%"))
+
+ if updated_after:
+ count_query = count_query.outerjoin(
+ DatasetEvent, DatasetEvent.dataset_id == DatasetModel.id
+ ).filter(DatasetEvent.timestamp >= updated_after)
+ query = query.filter(DatasetEvent.timestamp >= updated_after)
+ if updated_before:
+ count_query = count_query.outerjoin(
+ DatasetEvent, DatasetEvent.dataset_id == DatasetModel.id
+ ).filter(DatasetEvent.timestamp <= updated_before)
+ query = query.filter(DatasetEvent.timestamp <= updated_before)
Review Comment:
if user provides both `before` and `after` filters, it looks like you would
add two joins to the same table but you only need one. or maybe sqlalchemy is
smart enough to add only one? if not, you could avoid by doing something like
this instead.
```suggestion
if uri_pattern:
count_query =
count_query.filter(DatasetModel.uri.ilike(f"%{uri_pattern}%"))
query =
query.filter(DatasetModel.uri.ilike(f"%{uri_pattern}%"))
if updated_after:
count_query = count_query.outerjoin(
DatasetEvent, DatasetEvent.dataset_id == DatasetModel.id
).filter(DatasetEvent.timestamp >= updated_after)
query = query.filter(DatasetEvent.timestamp >= updated_after)
if updated_before:
count_query = count_query.outerjoin(
DatasetEvent, DatasetEvent.dataset_id == DatasetModel.id
).filter(DatasetEvent.timestamp <= updated_before)
query = query.filter(DatasetEvent.timestamp <=
updated_before)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
