Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

View render optimization #7

Merged
merged 5 commits into from
Mar 3, 2025
Merged

View render optimization #7

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d88065
in flight view work
bailliekova Jan 23, 2025
65cdb2b
Merge branch 'dev' into load-view-optimization
bailliekova Feb 13, 2025
843cb4d
fix syntax errors
bailliekova Feb 25, 2025
b51aeca
sqlalchemy version of agg functions
bailliekova Feb 25, 2025
eb1f70b
formatting fix
bailliekova Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 42 additions & 27 deletions gerrydb_meta/crud/view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from sqlalchemy import Sequence, cast, exc, func, label, or_, select, union
from sqlalchemy.dialects import postgresql
from sqlalchemy.orm import Session
from sqlalchemy.sql import text, column

from gerrydb_meta import models, schemas
from gerrydb_meta.crud.base import NamespacedCRBase, normalize_path
Expand Down Expand Up @@ -371,32 +372,37 @@ def render(self, db: Session, *, view: models.View) -> ViewRenderContext:
models.GeoSetMember.geo_id,
)
.filter(models.GeoSetMember.set_version_id == view.set_version_id)
.subquery()
.subquery("members_sub")
)
geo_sub = select(models.Geography.geo_id, models.Geography.path).subquery(
"geo_sub"
)
geo_sub = select(models.Geography.geo_id, models.Geography.path).subquery()

# Generate subqueries for joining tabular data.
column_subs = []
agg_selects = []
column_labels = []
for alias, col in columns.items():
value_col = COLUMN_TYPE_TO_VALUE_COLUMN[col.type]
column_sub = (
select(
models.ColumnValue.geo_id,
getattr(models.ColumnValue, value_col).label(alias),
)
.filter(
models.ColumnValue.col_id == col.col_id,
models.ColumnValue.valid_from <= view.at,
or_(
models.ColumnValue.valid_to.is_(None),
models.ColumnValue.valid_to >= view.at,
),
)
.subquery()
col_ids = []
for _, col in columns.items():
agg_selects.append(
func.max(column(COLUMN_TYPE_TO_VALUE_COLUMN[col.type]))
.filter(models.ColumnValue.col_id == col.col_id)
.label(col.canonical_ref.path)
)
column_labels.append(column(col.canonical_ref.path))
col_ids.append(col.col_id)

column_sub = (
select(models.ColumnValue.geo_id, *agg_selects)
.where(
models.ColumnValue.col_id.in_(col_ids),
models.ColumnValue.valid_from <= view.at,
or_(
models.ColumnValue.valid_to.is_(None),
models.ColumnValue.valid_to >= view.at,
),
)
column_subs.append(column_sub)
column_labels.append(column_sub.c[col.canonical_ref.path])
.group_by(models.ColumnValue.geo_id)
.subquery("column_value")
)

timestamp_clauses = [
models.GeoVersion.valid_from <= view.at,
Expand All @@ -406,6 +412,17 @@ def render(self, db: Session, *, view: models.View) -> ViewRenderContext:
),
]

## included for reference: a version without subqueries.
# geo_query=(
# select(models.Geography.path,
# models.GeoVersion.geography,
# *column_labels,
# ).join(models.GeoSetMember, models.GeoSetMember.geo_id==models.Geography.geo_id)
# .join(models.GeoVersion, models.GeoSetMember.geo_id==models.GeoVersion.geo_id)
# .join(column_sub, column_sub.c.geo_id==models.Geography.geo_id)
# .where(models.GeoSetMember.set_version_id == view.set_version_id, *timestamp_clauses)
# )

geo_query = (
select(
geo_sub.c.path,
Expand All @@ -419,11 +436,9 @@ def render(self, db: Session, *, view: models.View) -> ViewRenderContext:
.join(geo_sub, geo_sub.c.geo_id == models.GeoVersion.geo_id)
)

# Join tabular data.
for column_sub in column_subs:
geo_query = geo_query.join(
column_sub, column_sub.c.geo_id == models.GeoVersion.geo_id
)
geo_query = geo_query.join(
column_sub, column_sub.c.geo_id == models.GeoVersion.geo_id
)
geo_query = geo_query.where(*timestamp_clauses)

internal_point_query = (
Expand Down