lekss361/gendesign
1
0
Fork 0
Code Issues 83 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request 'Схлопывание дублей домов: ФИАС-проход больше не сливает дома из разных городов, а «17Ар-н Академический» находит своего двойника' (#3558) from fix/houses-dedup into main
Some checks failed
Deploy Trade-In / test (push) Has been cancelled
Details
Deploy Trade-In / build-backend (push) Blocked by required conditions
Details
Deploy Trade-In / deploy (push) Blocked by required conditions
Details
Deploy Trade-In / perimeter-smoke (push) Blocked by required conditions
Details
Deploy Trade-In / deploy-status (push) Blocked by required conditions
Details
Deploy Trade-In / changes (push) Successful in 31s
Details
Deploy Trade-In / build-frontend (push) Has been skipped
Details
Deploy Trade-In / build-browser (push) Has been skipped
Details

Browse source
This commit is contained in:
bot-backend 2026-09-17 11:17:35 +00:00
commit f9bebdf40f
4 changed files with 311 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
tradein-mvp/backend/app/services/house_dedup_merge.py
View file

@ -25,14 +25,17 @@ WHAT this is:
«улица Вайнера, 66» share one cluster_key. Rows whose canon is NULL/blank are never clustered
(cluster_key NULL → ignored). Only canons shared by >1 house_id form a cluster.
GEO GUARD (anti over-merge, CANON PASS ONLY — #2187): because the canon strips город/район,
GEO GUARD (anti over-merge, BOTH PASSES — #2690): because the canon strips город/район,
two different buildings with the same street+number in different region-66 towns (e.g. «Ленина
5») would share a canon. To avoid merging them, within a canon-cluster a house is a LOSER only
if it is within 250 m of the keeper (ST_DistanceSphere on the WGS84 geom). Same-canon houses
>250 m away — or with NULL geom on either side — are left as separate rows (conservative). The
FIAS pass deliberately SKIPS this guard: a shared ФИАС/ГАР UUID IS the building identity and
strictly outranks geo-proximity, so same-fias rows merge even with NULL geom on a side or
>250 m apart (the geom-first keeper rule simultaneously repairs the broken coordinate).
5») would share a canon. To avoid merging them, within a cluster a house is a LOSER only
if it is within 250 m of the keeper (ST_DistanceSphere on the WGS84 geom). Same-key houses
>250 m away — or with NULL geom on either side — are left as separate rows (conservative).
The FIAS pass used to skip this guard (#2187, «a shared ФИАС UUID IS the building identity»).
That premise is false: house_fias_id is DaData's answer to OUR address string (KEY section
below), so a street+number without a town gets the same UUID as the same street+number in
another town. Prod run 2026-09-05 (house_merge_log, merge_pass='fias'): 408 merges, 129 of
them >250 m apart, 53 >3 km, worst 362 km («р-н Синарский, улица Кирова, 4» of
Каменск-Уральский into Екатеринбург), plus 67 with no coordinates on a side.
TWO PASSES (2026-07-02 follow-up): the SAME cluster→keeper→re-point→carry-identity→delete
pipeline now runs TWICE inside one transaction, parametrised by the cluster-key expression
@ -45,10 +48,8 @@ TWO PASSES (2026-07-02 follow-up): the SAME cluster→keeper→re-point→carry-
2. CANON pass — the canonical-address clustering above, now with a CROSS-FIAS GUARD: within a
canon cluster a loser is NOT merged when it AND the keeper both carry a non-null but
DIFFERENT house_fias_id — provably different buildings the canon collapsed (the
slash-collapse class). Critical anti-over-merge fix. The 250 m geo guard applies to the
CANON pass ONLY (#2187): the FIAS pass merges on UUID identity regardless of geom — a
боевой прогон left 130 same-fias groups (335 houses, 1 529 listings) split because the
guard blocked them (NULL geom on a side, or >250 m from a broken coordinate).
slash-collapse class). Critical anti-over-merge fix. The 250 m geo guard applies to
BOTH passes (#2690; the fias-pass exemption of #2187 is reverted — see GEO GUARD).
IDENTITY CARRY-OVER (each pass, BEFORE deleting losers): the keeper's NULL identity / geo-QC
fields are filled from its losers with COALESCE semantics (keeper value wins; donor = the
@ -114,9 +115,9 @@ MERGE JOURNAL — the merge is REVERSIBLE (#2690, migration 230):
keeper rule and no guard. It only makes whatever the pass decides reversible — which is the
precondition for revisiting those decisions at all (#2690, #1772).
distance_m is recorded on BOTH passes, including the fias pass whose geo guard is off. That
asymmetry — merge allowed without a proximity check — was invisible in data before; now
«how many merges happened beyond N metres, on which key» is one query.
distance_m is recorded on BOTH passes. It is what exposed the fias pass merging without a
proximity check (#2690, 2026-09-05): «how many merges happened beyond N metres, on which key»
is one query.
KEY — there is no second, address-independent observation. Measured on prod 2026-08-10 (#2690):
#2690 asked for a cluster key that does not come from the normalized address, so that two
@ -311,35 +312,15 @@ def _ranked_cte(cluster_key_case: str) -> str:
)"""
def _mapping_sql(cluster_key_case: str, *, apply_geo_guard: bool = True) -> str:
def _mapping_sql(cluster_key_case: str) -> str:
"""Render the loser→keeper mapping SQL for one pass, given its cluster-key CASE expression.
Only cluster keys shared by >1 house_id form a cluster; the keeper is rn=1 per cluster, losers
are rn>1. The CROSS-FIAS guard always applies (a no-op for the fias pass, where every clustered
row shares one fias by construction).
apply_geo_guard (#2187): the 250 m ST_DistanceSphere guard is emitted ONLY when True.
- CANON pass → True: the canon strips город/район, so same-street-number buildings in
different region-66 towns share a canon; the guard stops the cross-town over-merge.
- FIAS pass → False: a shared ФИАС/ГАР UUID IS the building identity and strictly outranks
proximity, so same-fias rows merge even with NULL geom on a side or >250 m apart (the
geom-first keeper rule simultaneously repairs the broken coordinate).
row shares one fias by construction). So does the 250 m GEO GUARD — on BOTH passes (#2690):
neither key is independent of our address string, so neither may merge what proximity rejects.
`cluster_key_case` is a STATIC module constant (never runtime data) — no value injection.
"""
geo_guard = (
"""
-- GEO GUARD (canon pass only — #2187). tradein_canon_addr strips город/район, so two
-- different buildings sharing a street+number canon («Ленина 5» in different region-66
-- towns) collapse to one cluster_key. A loser merges only when geographically next to the
-- keeper (<=250 m — covers one building's geocode spread, prod: Мраморская 34к4 dupes at
-- 222 m; region-66 towns are km+ apart → 250 m is safe from cross-town). >250 m, or NULL
-- geom on either side, → left as separate rows (conservative — never over-merges).
AND keeper_geom IS NOT NULL
AND loser_geom IS NOT NULL
AND ST_DistanceSphere(loser_geom, keeper_geom) <= 250"""
if apply_geo_guard
else ""
)
return f"""
CREATE TEMP TABLE _1772_dup_mapping ON COMMIT DROP AS
{_ranked_cte(cluster_key_case)}
@ -350,16 +331,22 @@ def _mapping_sql(cluster_key_case: str, *, apply_geo_guard: bool = True) -> str:
--
-- cluster_key / distance_m are carried out of the mapping for the MERGE JOURNAL (#2690):
-- cluster_key records WHICH key value fired, distance_m how far apart the two rows were.
-- distance_m is computed even when the geo guard is OFF for this pass — that is precisely
-- the case where nothing else records the distance, and #2690 had no way to ask
-- «how many merges happened at distances the guard would have blocked» from data.
-- distance_m is what showed the fias pass merging 362 km apart while it had no guard (#2690).
SELECT id AS loser_id, keeper_id, norm_address, cluster_key,
CASE WHEN keeper_geom IS NOT NULL AND loser_geom IS NOT NULL
THEN ST_DistanceSphere(loser_geom, keeper_geom)
END AS distance_m
FROM ranked
WHERE rn > 1
AND id <> keeper_id{geo_guard}
AND id <> keeper_id
-- GEO GUARD (both passes — #2690). Neither cluster key tells towns apart: the canon strips
-- город/район, and house_fias_id is DaData's answer to that same town-less address. A loser
-- merges only when geographically next to the keeper (<=250 m — covers one building's
-- geocode spread, prod: Мраморская 34к4 dupes at 222 m; region-66 towns are km+ apart).
-- >250 m, or NULL geom on either side, → left as separate rows (conservative).
AND keeper_geom IS NOT NULL
AND loser_geom IS NOT NULL
AND ST_DistanceSphere(loser_geom, keeper_geom) <= 250
AND NOT (
NULLIF(loser_fias, '') IS NOT NULL
AND NULLIF(keeper_fias, '') IS NOT NULL
@ -368,12 +355,10 @@ def _mapping_sql(cluster_key_case: str, *, apply_geo_guard: bool = True) -> str:
"""
# Canon-pass mapping — geo guard ON (cross-town over-merge protection for street+number canons).
# Canon-pass mapping.
_BUILD_MAPPING_SQL = text(_mapping_sql(_CANON_KEY_EXPR))
# Fias-pass mapping — same pipeline, clustered by the ФИАС building UUID (runs first). Geo guard
# OFF (#2187): a shared ГАР UUID IS the building identity and outranks proximity — same-fias rows
# merge even with NULL geom or >250 m apart (the geom-first keeper rule fixes broken coords).
_BUILD_MAPPING_SQL_FIAS = text(_mapping_sql(_FIAS_KEY_EXPR, apply_geo_guard=False))
# Fias-pass mapping — same pipeline and same guards, clustered by the ФИАС UUID (runs first).
_BUILD_MAPPING_SQL_FIAS = text(_mapping_sql(_FIAS_KEY_EXPR))
# ── RESIDUAL CENSUS (#2690 п.2/п.4) ───────────────────────────────────────────
#
@ -870,7 +855,6 @@ def _run_merge_pass(
*,
build_sql: Any,
pass_label: str,
geo_guard: bool,
batch_id: str,
run_id: int | None,
initiator: str,
@ -911,7 +895,7 @@ def _run_merge_pass(
"run_id": run_id,
"initiator": initiator,
"merge_pass": pass_label,
"geo_guard": geo_guard,
"geo_guard": True, # both passes are guarded since #2690
},
)
@ -1032,8 +1016,8 @@ def merge_duplicate_houses(
Re-implements migration 108's proven collision-safe pipeline as a RECURRING TWO-PASS job:
1. FIAS pass — cluster by lower(NULLIF(house_fias_id, '')) (catches slash-collapse /
посёлок canon bugs the address canon misses).
2. CANON pass — cluster by canonical address (250 m geo guard + cross-fias anti-over-merge
guard).
2. CANON pass — cluster by canonical address.
Both passes carry the 250 m geo guard and the cross-fias anti-over-merge guard.
Each pass: pick keeper → re-point children (UNIQUE-collision-safe) → carry identity onto the
keeper → delete losers → backfill sources/aliases. BOTH passes run in ONE transaction.
dry_run=True computes counts then ROLLS BACK (no writes). Idempotent: a clean table yields an
@ -1057,7 +1041,6 @@ def merge_duplicate_houses(
db,
build_sql=_BUILD_MAPPING_SQL_FIAS,
pass_label="fias",
geo_guard=False,
batch_id=batch_id,
run_id=run_id,
initiator=initiator,
@ -1068,7 +1051,6 @@ def merge_duplicate_houses(
db,
build_sql=_BUILD_MAPPING_SQL,
pass_label="canon",
geo_guard=True,
batch_id=batch_id,
run_id=run_id,
initiator=initiator,

99
tradein-mvp/backend/data/sql/311_canon_strip_district_glued_to_house_number.sql Normal file
View file

@ -0,0 +1,99 @@
-- 311_canon_strip_district_glued_to_house_number.sql
--
-- CONTEXT (#1772): один дом живёт в нескольких записях houses, аналоги из того же дома
-- разъезжаются. Схлопывание house_dedup_merge кластеризует по tradein_canon_addr, а канон
-- промахивается на адресах, где район ПРИКЛЕЕН к номеру дома без запятой (наследие слипа
-- «29р-н» из #1773 — источник починен, но записанные дома сохранили склеенный адрес):
-- «Екатеринбург, ул. Евгения Савкова, 17Ар-н Академический» → «евгениясавкова17арнакадемический»
-- «Екатеринбург, ул. Евгения Савкова, 44Бр-н Академический» → «евгениясавкова44накадемический»
-- Во втором случае хуже, чем шум: токен-срез S5 принимает «бр» (бульвар) и съедает литеру Б.
-- Срез S4 (мигр. 147) снимает «р-н ...» только как отдельный сегмент перед запятой, поэтому
-- двойник «ул. Евгения Савкова,17А» (канон «евгениясавкова17а») с этим домом не кластеризуется
-- никогда, и перепись остатка (residual_*) такие пары не видит — у них РАЗНЫЙ канон.
--
-- WHAT: CREATE OR REPLACE FUNCTION tradein_canon_addr(text) — тело мигр. 147 плюс один шаг
-- S0b сразу после lower+ё→е: «<цифра>[литера]р-н <название>» до запятой/конца → «<цифра>[литера]».
-- Якорь на цифре обязателен: без него «мкр-н Кутузовский, 2» теряет «р-н ...» и превращается
-- в «мк2» (прод 17.09: срез «р-н [^,]*» без якоря менял канон у 1024 домов вместо 44; в выборке
-- 30 изменений вне шаблона 29 — «мкр-н …», одно — хвост «· р-н Верх-Исетский»).
-- Литера сохраняется: «17Ар-н» → «17а», «17А» не схлопывается с «17».
--
-- Замер на проде 2026-09-17 (read-only, выражение шага inline в SELECT):
-- houses: канон меняется у 44 из 49 159 — ровно у 44 домов с шаблоном «[0-9][а-я]?р-н »;
-- у 20 из них появляется двойник с тем же каноном в пределах 250 м (0–222 м, все — тот же
-- адрес в другом написании, напр. «Академика Вавилова, 9р-н Академический» ↔ «улица
-- Академика Вавилова, 9», 0 м, 705 и 105 объявлений); разных ФИАС ни в одной паре нет.
-- gar_house_flats: 0 из 3,27 млн строк содержат шаблон → канон ГАР-стороны не меняется,
-- значения функционального индекса остаются верными.
--
-- DEPENDENCIES (existing prod objects):
-- - tradein_canon_addr(text) — мигр. 144/147 (заменяем тело, IMMUTABLE, сигнатура та же).
-- - gar_house_flats_canon_idx — функциональный индекс на tradein_canon_addr(norm_address)
-- WHERE flat_count > 0 (мигр. 144). Postgres не перестраивает функциональный индекс при
-- смене тела функции: СТАРЫЕ ключи остаются, новые строки получают ключ нового тела.
-- Старый ключ неверен ровно у строк, где срабатывает S0b (lower+ё→е ~ '[0-9][а-я]?р-н ').
-- Прод 17.09: 0 из 201 513 индексируемых строк → сегодня REINDEX ничего не меняет.
-- Оставлен в ТОЙ ЖЕ транзакции, что и замена тела: замер не покрывает строки, загруженные
-- между 17.09 и деплоем, а атомарная пара «тело + индекс» не оставляет окна со старыми ключами.
--
-- ЦЕНА REINDEX (прод 17.09, только чтение): таблица 3,27 млн строк / 942 МБ heap, индекс 8,8 МБ.
-- Эквивалент перестройки — seq scan + tradein_canon_addr по flat_count > 0 в один поток — 5,6 с
-- (скан 0,96 с, вычисление ключей ~4,6 с). Всё это время REINDEX держит SHARE на таблице и
-- ACCESS EXCLUSIVE на индексе: планировщик любого запроса к gar_house_flats ждёт. Читают и
-- пишут таблицу только ручной ГАР-загрузчик и ре-матч (app/services/gar_flats_loader.py; в
-- scrape_schedules их нет; в pg_stat_statements с 27.08 — только INSERT загрузчика и ручные
-- замеры) — путь запроса пользователя не задет.
-- lock_timeout 5s ограничивает ОЖИДАНИЕ лока (#2752): если в момент деплоя идёт загрузка ГАР,
-- миграция падает целиком (тело откатывается вместе с REINDEX), деплой красный, повторить позже.
--
-- Почему не REINDEX CONCURRENTLY (раннер гонит файл psql'ем в autocommit, так что вне
-- BEGIN/COMMIT он возможен, образец — 270): CIC ждёт ВСЕ транзакции базы старше своего
-- снимка, а сборщики держат «idle in transaction» минутами (17.09: 3 мин) — деплой висит без
-- lock_timeout, который CIC не терпит; оборванный CIC оставляет невалидный *_ccnew и красный
-- деплой с ручной чисткой на проде; тело функции коммитится раньше индекса. Ради ~5 с лока на
-- таблице пакетного загрузчика это хуже.
--
-- POST-DEPLOY: ничего запускать не нужно. Следующий прогон расписания house_dedup_merge
-- (еженедельно) сольёт пары, прошедшие страж 250 м, с журналом в house_merge_log.
--
-- SAFETY / IDEMPOTENCY: CREATE OR REPLACE + REINDEX INDEX — повторный прогон no-op. Раннер деплоя
-- гонит файл через psql ON_ERROR_STOP=on без --single-transaction → BEGIN/COMMIT в файле.
BEGIN;
SET LOCAL lock_timeout = '5s';
CREATE OR REPLACE FUNCTION tradein_canon_addr(s text) RETURNS text AS $func$
SELECT regexp_replace( -- S6: оставить только [а-я0-9]
regexp_replace( -- S5: срез типов улиц (токены на границе не-кириллицы)
regexp_replace( -- S5b: срез маркера дома «д[.]» перед номером
regexp_replace( -- S4b: срез «мкр/пос/поселок ...,» только если следом улица
regexp_replace( -- S4: срез префикс-сегментов (каскад через lookahead)
regexp_replace( -- S3: срез суффикс-сегмента «<Имя> м-н,»
regexp_replace( -- S2: срез суффикс-сегмента «<...> обл/область,»
regexp_replace( -- S1b: «б-р» → «бульвар»
regexp_replace( -- S1a: «пр-т/пр-кт/пр кт/пркт» → «проспект»
regexp_replace( -- S0b: «17Ар-н Академический» → «17а» (#1772)
translate(lower(coalesce(s, '')), 'ё', 'е'), -- S0: lower + ё→е
'([0-9][а-я]?)р-н [^,]*', '\1', 'g'),
'(^|[^а-я])пр[-. ]?к?т([^а-я]|$)', '\1проспект\2', 'g'),
'(^|[^а-я])б-р([^а-я]|$)', '\1бульвар\2', 'g'),
'(^|,)[^,]* обл[а-я]*\.?(?=,)', '\1', 'g'),
'(^|,)[^,]* м-н(?=,)', '\1', 'g'),
'(^|,)\s*(россия|екатеринбург|город|жилой район|жилрайон|пгт|снт|р-н|м-н|г)([. ][^,]*)?(?=,)', '\1', 'g'),
'(^|,)\s*(мкр|поселок|пос)[. ][^,]*(?=,[^,]*[а-я])', '\1', 'g'),
'(^|[^а-я])д\.?(?= *[0-9])', '\1', 'g'),
'(^|[^а-я])(улица|ул|переулок|пер|проспект|пркт|пр|бульвар|бр|шоссе|ш|проезд|набережная|наб|площадь|пл|тупик|туп|аллея|микрорайон|мкр)([^а-я]|$)', '\1\3', 'g'),
'[^а-я0-9]', '', 'g');
$func$ LANGUAGE sql IMMUTABLE;
COMMENT ON FUNCTION tradein_canon_addr(text) IS
'Канонический ключ адреса для ГАР↔houses матча и схлопывания дублей домов (мигр. 144 + 147 + 311): '
'lower+ё→е, срез района, приклеенного к номеру дома («17Ар-н Академический» → «17а»), '
'нормализация проспект/бульвар (пр-т/пр-кт/б-р), срез гео-префиксов '
'(Россия/обл/Екатеринбург/г/мкр/м-н/пос/жилой район/р-н/снт/пгт) и маркера дома «д.», '
'затем срез типов улиц как токенов на границе не-кириллицы → оставляет только [а-я0-9].';
REINDEX INDEX gar_house_flats_canon_idx;
COMMIT;

4
tradein-mvp/backend/tests/skip_allowlist.txt
View file

@ -34,9 +34,11 @@ tests/test_audit_api.py::test_real_accounts_and_analytics_aggregate_inserted_row
tests/test_gar_flats_loader.py::test_upsert_and_canon_match_populates_gar_flat_count
tests/test_gar_flats_loader.py::test_no_city_filter_ambiguous_canon_not_matched
tests/test_house_dedup_merge.py::test_real_canon_clusterkey_and_geo_guard_merge_semantics
tests/test_house_dedup_merge.py::test_real_canon_strips_district_glued_to_house_number
tests/test_house_dedup_merge.py::test_real_fias_pass_cross_guard_and_identity_carryover
tests/test_house_dedup_merge.py::test_real_fias_pass_ignores_geo_guard
tests/test_house_dedup_merge.py::test_real_fias_pass_keeps_geo_guard
tests/test_house_dedup_merge.py::test_real_merge_is_reversible_via_journal
tests/test_house_dedup_merge.py::test_real_migration_311_gives_up_on_busy_gar_table_instead_of_queueing
tests/test_house_dedup_merge.py::test_real_merge_repoints_dedups_deletes_and_is_idempotent
tests/test_user_events.py::test_real_record_event_inserts_row
tests/test_3469_showcase_schedule.py::test_live_migration_puts_showcase_into_schedules_and_digest

259
tradein-mvp/backend/tests/test_house_dedup_merge.py
View file

@ -121,7 +121,7 @@ def test_keeper_listing_count_puts_nulls_last() -> None:
assert "listing_cnt DESC NULLS LAST" in order
# Оба места, где применяется порядок (ROW_NUMBER-ранг и first_value-выбор keeper'а),
# берут одну и ту же константу — иначе ранг и keeper разъедутся построчно.
mapping = _flat(hdm._mapping_sql(hdm._FIAS_KEY_EXPR, apply_geo_guard=False))
mapping = _flat(hdm._mapping_sql(hdm._FIAS_KEY_EXPR))
assert mapping.count("listing_cnt DESC NULLS LAST") >= 2
@ -274,56 +274,31 @@ def test_fias_pass_clusters_by_house_fias_id() -> None:
assert "'addr:'" not in flat
def test_fias_pass_drops_geo_guard_canon_pass_keeps_it() -> None:
"""#2187: ФИАС identity strictly outranks geo-proximity, so the fias-pass mapping must NOT
carry the 250 m distance guard (same-fias rows merge even with NULL geom on a side or >250 m
apart), while the canon-pass mapping MUST keep it (cross-town over-merge protection)."""
fias = _flat(_FIAS_MAPPING_SQL)
canon = _flat(_MAPPING_SQL)
# canon pass keeps the full geo guard (distance + NULL-geom safety on both sides).
assert "ST_DistanceSphere(loser_geom, keeper_geom) <= 250" in canon
assert "keeper_geom IS NOT NULL" in canon
assert "loser_geom IS NOT NULL" in canon
# fias pass drops the distance guard AND the NULL-geom exclusions entirely.
#
# Asserted on the guard PREDICATE, not on the bare function name: since #2690 the mapping also
# MEASURES the keeper↔loser distance into `distance_m` for the merge journal, on both passes.
# Measuring is the opposite of guarding — the fias pass is precisely where nothing else records
# how far apart the merged rows were — so the name alone can no longer stand in for the guard.
assert "ST_DistanceSphere(loser_geom, keeper_geom) <= 250" not in fias
def test_both_passes_carry_the_geo_guard() -> None:
"""#2690: the fias pass carries the same 250 m guard as the canon pass (#2187 is reverted).
house_fias_id is DaData's answer to our own address string, so it does not tell towns apart
any better than the canon does — prod 2026-09-05 the unguarded fias pass merged 53 pairs
more than 3 km apart.
The value-level proof is test_real_fias_pass_keeps_geo_guard; this pins the rendered SQL.
"""
guard = (
"AND keeper_geom IS NOT NULL AND loser_geom IS NOT NULL "
"AND ST_DistanceSphere(loser_geom, keeper_geom) <= 250"
)
assert guard in canon
assert guard not in fias
# the cross-fias anti-over-merge guard is untouched in the canon pass.
assert "lower(loser_fias) <> lower(keeper_fias)" in canon
def test_mapping_sql_geo_guard_param_toggles_only_distance_filter() -> None:
"""_mapping_sql(apply_geo_guard=...) toggles ONLY the 250 m distance filter; the cross-fias
guard is emitted regardless, and the default is True (canon-safe)."""
guard = "ST_DistanceSphere(loser_geom, keeper_geom) <= 250"
with_guard = _flat(hdm._mapping_sql(hdm._CANON_KEY_EXPR, apply_geo_guard=True))
without_guard = _flat(hdm._mapping_sql(hdm._CANON_KEY_EXPR, apply_geo_guard=False))
assert guard in with_guard
assert guard not in without_guard
# default = True (the canon pass must never lose its guard by omission).
assert guard in _flat(hdm._mapping_sql(hdm._CANON_KEY_EXPR))
# ...while the journal's distance MEASUREMENT is emitted either way (#2690).
assert "AS distance_m" in with_guard and "AS distance_m" in without_guard
# cross-fias guard present in BOTH renderings (independent of the geo guard).
assert "lower(loser_fias) <> lower(keeper_fias)" in with_guard
assert "lower(loser_fias) <> lower(keeper_fias)" in without_guard
assert guard in _flat(_MAPPING_SQL)
assert guard in _flat(_FIAS_MAPPING_SQL)
for sql in (_MAPPING_SQL, _FIAS_MAPPING_SQL):
# the journal's distance MEASUREMENT and the cross-fias guard stay on both passes.
assert "AS distance_m" in sql
assert "lower(loser_fias) <> lower(keeper_fias)" in _flat(sql)
def test_both_passes_share_one_pipeline_no_copy_paste() -> None:
"""The two mappings differ ONLY in the cluster key + the (canon-only) geo guard — no copy-paste.
"""The two mappings differ ONLY in the cluster key — no copy-paste.
#2187: the 250 m distance guard is emitted for the canon pass ONLY; the fias pass drops it (a
shared ГАР UUID IS the building identity and outranks proximity). Everything else — the CTE
skeleton, keeper rule, per-partition geom/fias exposure and the cross-fias guard — is identical.
The CTE skeleton, keeper rule, per-partition geom/fias exposure, the cross-fias guard and (since
#2690) the 250 m geo guard are identical.
"""
canon = _flat(_MAPPING_SQL)
fias = _flat(_FIAS_MAPPING_SQL)
@ -338,11 +313,8 @@ def test_both_passes_share_one_pipeline_no_copy_paste() -> None:
"lower(loser_fias) <> lower(keeper_fias)",
):
assert token in canon and token in fias
# the 250 m distance guard is CANON-ONLY (#2187) — fias identity outranks proximity.
assert "ST_DistanceSphere(loser_geom, keeper_geom) <= 250" in canon
assert "ST_DistanceSphere(loser_geom, keeper_geom) <= 250" not in fias
# ...but the journal's distance MEASUREMENT is on both — measuring is not guarding.
assert "AS distance_m" in canon and "AS distance_m" in fias
# the rendered SQL is the same text once the cluster key is swapped back.
assert fias.replace(_flat(hdm._FIAS_KEY_EXPR), _flat(hdm._CANON_KEY_EXPR)) == canon
def test_cross_fias_guard_blocks_slash_collapse_over_merge() -> None:
@ -1022,6 +994,123 @@ def test_real_canon_clusterkey_and_geo_guard_merge_semantics() -> None:
db.close()
@pytest.mark.skipif(_live_session() is None, reason="no reachable Postgres test DB")
def test_real_canon_strips_district_glued_to_house_number() -> None:
"""#1772: a district glued to the house number («17Ар-н Академический») is canon noise.
Prod 2026-09-17: 44 houses carry such an address (the «29р-н» slip of #1773); the canon kept
the tail («евгениясавкова17арнакадемический») or even ate the letter («44Бр-н» → «44н…»),
so the twin «ул. Евгения Савкова,17А» never shared a cluster and the merge could not see it.
Asserted on the function the migrations installed (311), not on a Python mirror of it.
"""
from sqlalchemy import text as _t
db = _live_session()
assert db is not None
def canon(s: str) -> str:
return db.execute(_t("SELECT tradein_canon_addr(:s)"), {"s": s}).scalar()
try:
assert canon("Екатеринбург, ул. Евгения Савкова, 17Ар-н Академический") == (
"евгениясавкова17а"
)
assert canon("ул. Евгения Савкова,17А") == "евгениясавкова17а"
assert canon("Екатеринбург, ул. Евгения Савкова, 44Бр-н Академический") == (
"евгениясавкова44б"
)
assert canon("Екатеринбург, Рассветная ул., 8/1р-н Кировский") == "рассветная81"
# the letter is a different building: «17А» never collapses into «17»
assert canon("ул. Евгения Савкова, 17") == "евгениясавкова17"
# the digit anchor keeps «мкр-н» intact (an unanchored «р-н …» strip gives «мк2»)
assert canon("Мкр-н Кутузовский, 2") == "нкутузовский2"
assert canon("р-н Ленинский, улица Цвиллинга, 7/6") == "цвиллинга76"
# End to end: the glued row and its clean twin (same point) merge; «17» without the
# letter, at the same point, stays a separate building.
db.execute(
_t(
"INSERT INTO houses (id, source, ext_house_id, url, address, lat, lon) VALUES "
"(900040,'avito','EXT-1772-G','u',"
" 'Екатеринбург, ул. Савкова1772, 17Ар-н Академический',56.84,60.6),"
"(900041,'cian','EXT-1772-T','u','ул. Савкова1772,17А',56.84,60.6),"
"(900042,'cian','EXT-1772-N','u','ул. Савкова1772, 17',56.84,60.6)"
)
)
db.execute(
_t(
"INSERT INTO listings "
"(id, source, source_url, source_id, dedup_hash, price_rub, house_id_fk) VALUES "
"(910040,'avito','http://t/1772/g','L-1772-G','dh-1772-g',7000000,900040)"
)
)
db.commit()
out = hdm.merge_duplicate_houses(db, dry_run=False)
ids = {
r.id for r in db.execute(_t("SELECT id FROM houses WHERE id BETWEEN 900040 AND 900042"))
}
assert ids == {900040, 900042}, sorted(ids)
assert out["losers_deleted"] == 1
journal = db.execute(
_t(
"SELECT merge_pass, cluster_key, loser_id, keeper_id FROM house_merge_log "
"WHERE loser_id BETWEEN 900040 AND 900042"
)
).all()
assert [tuple(j) for j in journal] == [("canon", "addr:савкова177217а", 900041, 900040)]
finally:
db.rollback()
db.execute(_t("DELETE FROM listings WHERE id = 910040"))
db.execute(_t("DELETE FROM house_sources WHERE house_id BETWEEN 900040 AND 900042"))
db.execute(_t("DELETE FROM house_address_aliases WHERE house_id BETWEEN 900040 AND 900042"))
db.execute(_t("DELETE FROM house_merge_log WHERE loser_id BETWEEN 900000 AND 900299"))
db.execute(_t("DELETE FROM houses WHERE id BETWEEN 900040 AND 900042"))
db.commit()
db.close()
@pytest.mark.skipif(_live_session() is None, reason="no reachable Postgres test DB")
def test_real_migration_311_gives_up_on_busy_gar_table_instead_of_queueing() -> None:
"""Migration 311 under a running GAR load fails in ~5 s and rolls back whole (#2752).
Its REINDEX needs SHARE on gar_house_flats; the loader's INSERT holds ROW EXCLUSIVE. Without
lock_timeout the deploy waits for the load and every query on the table queues behind it.
The file is run the way the deploy runner runs it (autocommit, BEGIN/COMMIT inside); the
blocker lets go after 12 s, so a missing timeout shows up as a migration that succeeds.
"""
import threading
import time
import psycopg
db = _live_session()
assert db is not None
dsn = db.get_bind().url.set(drivername="postgresql").render_as_string(hide_password=False)
db.close()
sql = (_SQL_DIR / "311_canon_strip_district_glued_to_house_number.sql").read_text("utf-8")
body_version = "SELECT xmin::text FROM pg_proc WHERE proname = 'tradein_canon_addr'"
with psycopg.connect(dsn, autocommit=True) as deploy, psycopg.connect(dsn) as loader:
before = deploy.execute(body_version).fetchone()
loader.execute("LOCK TABLE gar_house_flats IN ROW EXCLUSIVE MODE")
release = threading.Timer(12, loader.rollback)
release.start()
started = time.monotonic()
try:
with pytest.raises(psycopg.errors.LockNotAvailable):
deploy.execute(sql)
finally:
release.cancel()
release.join()
loader.rollback()
assert time.monotonic() - started < 10
deploy.execute("ROLLBACK")
# CREATE OR REPLACE rewrites the pg_proc row: an unchanged xmin = the body was rolled back
assert deploy.execute(body_version).fetchone() == before
@pytest.mark.skipif(_live_session() is None, reason="no reachable Postgres test DB")
def test_real_fias_pass_cross_guard_and_identity_carryover() -> None:
"""End-to-end on a real DB for the #1772 follow-up (fias pass + cross-fias guard + carry-over):
@ -1130,19 +1219,17 @@ def test_real_fias_pass_cross_guard_and_identity_carryover() -> None:
@pytest.mark.skipif(_live_session() is None, reason="no reachable Postgres test DB")
def test_real_fias_pass_ignores_geo_guard() -> None:
"""End-to-end on a real DB for #2187 — the FIAS pass drops the 250 m geo guard:
def test_real_fias_pass_keeps_geo_guard() -> None:
"""End-to-end on a real DB for #2690 — the FIAS pass obeys the same 250 m geo guard:
A. same house_fias_id, loser has NULL geom (no lat/lon) → MERGED (fias identity outranks
the missing coordinate; the geom-first keeper survives + the loser's listing re-points).
B. same house_fias_id, ~5 km apart (>250 m) → MERGED (fias identity outranks
proximity — a scattered/broken coordinate no longer blocks the merge).
C. same canon, NO fias, ~5 km apart (>250 m) → NOT merged (the canon pass STILL
enforces the geo guard — the fix is fias-only, canon behaviour is unchanged).
A. same house_fias_id, loser has NULL geom (no lat/lon) → NOT merged (guard cannot judge).
B. same house_fias_id, ~5 km apart (>250 m) → NOT merged (prod 2026-09-05: the
unguarded pass merged «р-н Синарский, улица Кирова, 4» into Екатеринбург, 362 km).
C. same house_fias_id, DIFFERENT canon, ~10 m apart → MERGED (the pass still works —
without C, «nothing merged» would pass even if the fias pass were dead).
A/B use distinct synthetic streets so ONLY the shared fias groups them (the canon never does);
C shares one address so only the canon pass can group it. Streets «*2187» avoid prod aliases.
Latitude delta 0.045° at ~56.84° ≈ 5 km (>250 m).
Distinct synthetic streets «*2690» so ONLY the shared fias groups each pair (never the canon).
Latitude delta 0.045° at ~56.84° ≈ 5 km; 0.00009° ≈ 10 m.
"""
from sqlalchemy import text as _t
@ -1153,49 +1240,53 @@ def test_real_fias_pass_ignores_geo_guard() -> None:
_t(
"INSERT INTO houses "
"(id, source, ext_house_id, url, address, lat, lon, house_fias_id) VALUES "
# A — same fias, loser NULL geom → fias pass merges despite the missing coordinate
"(900030,'avito','EXT-2187-A-K','u','ФиасГеоA2187, 1',56.84,60.6,'F-A-2187'),"
"(900031,'cian', 'EXT-2187-A-L','u','ФиасГеоAL2187, 2',NULL,NULL,'F-A-2187'),"
# B — same fias, ~5 km apart (>250 m) → fias pass merges despite the distance
"(900032,'avito','EXT-2187-B-K','u','ФиасГеоB2187, 3',56.84,60.6,'F-B-2187'),"
"(900033,'cian', 'EXT-2187-B-L','u','ФиасГеоBL2187, 4',56.885,60.6,'F-B-2187'),"
# C — same canon, NO fias, ~5 km apart → canon pass STILL blocks (guard unchanged)
"(900034,'avito','EXT-2187-C-1','u','КанонГео2187, 5', 56.84000,60.60000,NULL),"
"(900035,'cian', 'EXT-2187-C-2','u','КанонГео2187, 5', 56.88500,60.60000,NULL)"
"(900030,'avito','EXT-2690-A-K','u','ФиасГеоA2690, 1',56.84,60.6,'F-A-2690'),"
"(900031,'cian', 'EXT-2690-A-L','u','ФиасГеоAL2690, 2',NULL,NULL,'F-A-2690'),"
"(900032,'avito','EXT-2690-B-K','u','ФиасГеоB2690, 3',56.84,60.6,'F-B-2690'),"
"(900033,'cian', 'EXT-2690-B-L','u','ФиасГеоBL2690, 4',56.885,60.6,'F-B-2690'),"
"(900034,'avito','EXT-2690-C-K','u','ФиасГеоC2690, 5',56.84,60.6,'F-C-2690'),"
"(900035,'cian', 'EXT-2690-C-L','u','ФиасГеоCL2690, 6',56.84009,60.6,'F-C-2690')"
)
)
# A loser gets a listing so we prove the re-point still fires with a NULL-geom loser.
db.execute(
_t(
"INSERT INTO listings "
"(id, source, source_url, source_id, dedup_hash, price_rub, house_id_fk) VALUES "
"(910031,'cian','http://t/2187/al','L-2187-AL','dh-2187-al',6000000,900031)"
"(910031,'cian','http://t/2690/al','L-2690-AL','dh-2690-al',6000000,900031),"
"(910035,'cian','http://t/2690/cl','L-2690-CL','dh-2690-cl',6000000,900035)"
)
)
db.commit()
out = hdm.merge_duplicate_houses(db, dry_run=False)
assert out["losers_deleted"] >= 2 # A + B both merged by the fias pass
ids = [
ids = {
r.id
for r in db.execute(
_t("SELECT id FROM houses WHERE id BETWEEN 900030 AND 900035 ORDER BY id")
_t("SELECT id FROM houses WHERE id BETWEEN 900030 AND 900035")
).all()
}
assert ids == {900030, 900031, 900032, 900033, 900035}, sorted(ids)
assert out["losers_deleted"] == 1
# A: the NULL-geom row keeps its own listing; C: the row WITH the listing is the keeper.
lst = dict(
db.execute(
_t("SELECT id, house_id_fk FROM listings WHERE id IN (910031, 910035)")
).all()
)
assert lst == {910031: 900031, 910035: 900035}
journal = db.execute(
_t(
"SELECT merge_pass, geo_guard, loser_id, keeper_id, round(distance_m) AS d "
"FROM house_merge_log WHERE loser_id BETWEEN 900030 AND 900035"
)
).all()
assert [(j.merge_pass, j.geo_guard, j.loser_id, j.keeper_id, j.d) for j in journal] == [
("fias", True, 900034, 900035, 10)
]
# A: same-fias, loser NULL geom → MERGED (the geo guard would have blocked on NULL geom).
assert 900030 in ids and 900031 not in ids, "same-fias NULL-geom loser must merge"
# B: same-fias, >250 m apart → MERGED (the geo guard would have blocked on distance).
assert 900032 in ids and 900033 not in ids, "same-fias >250 m apart must merge"
# C: same-canon, no fias, >250 m apart → NOT merged (canon geo guard unchanged by #2187).
assert 900034 in ids and 900035 in ids, "canon-only pair >250 m apart must NOT merge"
# A: the NULL-geom loser's listing re-pointed onto the surviving geom-first keeper.
repointed = db.execute(_t("SELECT house_id_fk FROM listings WHERE id = 910031")).scalar()
assert repointed == 900030
finally:
db.rollback()
db.execute(_t("DELETE FROM listings WHERE id = 910031"))
db.execute(_t("DELETE FROM listings WHERE id IN (910031, 910035)"))
db.execute(_t("DELETE FROM house_sources WHERE house_id BETWEEN 900030 AND 900035"))
db.execute(_t("DELETE FROM house_address_aliases WHERE house_id BETWEEN 900030 AND 900035"))
# journal rows have no FK and are never cascaded away — sweep them explicitly,