ddmitry/airflow-greenplum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(bookings): исправлен бесконечный цикл busy() и генерации имён пассажиров

Browse Source 
- Зачем:
  - генератор demodb зависал при jobs=1 из-за самоблокировки busy()
  - get_passenger_name() попадал в бесконечный цикл из-за NULL в cume_dist
- Что:
  - добавлен SET LOCAL application_name = 'psql' после вызова generate/continue
  - добавлена загрузка firstnames.dat и lastnames.dat в Makefile
  - добавлено заполнение cume_dist для firstnames, lastnames и airport_to_prob
- Проверка:
  - make bookings-generate-day выполняется успешно, создаётся ~45K бронирований
This commit is contained in:
ddadmin
2026-02-28 19:36:48 +03:00
parent acdbb8be3e
commit 09c940ea0e
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+30
View File
@@ -84,6 +84,36 @@ bookings-init: bookings-clone-demodb
docker compose -f docker-compose.yml exec bookings-db bash -lc '\
PGPASSWORD="$$POSTGRES_PASSWORD" psql -v ON_ERROR_STOP=1 -U "$$POSTGRES_USER" -d demo -f /bookings/generate_next_day.sql \
'
# Проверяем и загружаем reference-данные, если таблицы пустые (иногда \copy в install.sql не срабатывает)
docker compose -f docker-compose.yml exec bookings-db bash -lc '\
PGPASSWORD="$$POSTGRES_PASSWORD" psql -v ON_ERROR_STOP=1 -U "$$POSTGRES_USER" -d demo -c "\
DO \$$ \
BEGIN \
IF (SELECT COUNT(*) FROM gen.airports_data) = 0 THEN \
COPY gen.airports_data FROM '\''/bookings/demodb/airports_data.dat'\''; \
COPY gen.airplanes_data FROM '\''/bookings/demodb/airplanes_data.dat'\''; \
COPY gen.seats FROM '\''/bookings/demodb/seats.dat'\''; \
COPY gen.firstnames FROM '\''/bookings/demodb/firstnames.dat'\''; \
COPY gen.lastnames FROM '\''/bookings/demodb/lastnames.dat'\''; \
END IF; \
END \$$;" \
'
# Заполняем cume_dist для firstnames/lastnames (иначе get_passenger_name зависнет в бесконечном цикле)
docker compose -f docker-compose.yml exec bookings-db bash -lc '\
PGPASSWORD="$$POSTGRES_PASSWORD" psql -v ON_ERROR_STOP=1 -U "$$POSTGRES_USER" -d demo -c "\
UPDATE gen.firstnames SET cume_dist = sub.cumedist FROM ( \
SELECT country, grp, name, cume_dist() OVER (PARTITION BY country ORDER BY qty) as cumedist \
FROM gen.firstnames \
) sub WHERE gen.firstnames.country = sub.country AND gen.firstnames.grp = sub.grp AND gen.firstnames.name = sub.name; \
UPDATE gen.lastnames SET cume_dist = sub.cumedist FROM ( \
SELECT country, grp, name, cume_dist() OVER (PARTITION BY country, grp ORDER BY qty) as cumedist \
FROM gen.lastnames \
) sub WHERE gen.lastnames.country = sub.country AND gen.lastnames.grp = sub.grp AND gen.lastnames.name = sub.name; \
UPDATE gen.airport_to_prob SET cume_dist = sub.cumedist FROM ( \
SELECT departure_airport, arrival_airport, domestic, cume_dist() OVER (PARTITION BY departure_airport, domestic ORDER BY prob) as cumedist \
FROM gen.airport_to_prob \
) sub WHERE gen.airport_to_prob.departure_airport = sub.departure_airport AND gen.airport_to_prob.arrival_airport = sub.arrival_airport AND (gen.airport_to_prob.domestic = sub.domestic OR gen.airport_to_prob.domestic IS NULL);" \
'
bookings-psql:
docker compose -f docker-compose.yml exec bookings-db bash -lc 'PGPASSWORD="$$POSTGRES_PASSWORD" psql -U "$$POSTGRES_USER" -d demo'