fix(bookings): откатаны ошибочные изменения в инициализации demodb
- Зачем: - предыдущий фикс ломал make bookings-init из-за невалидного SQL в Makefile. - Что: - удалены SQL-блоки постобработки reference-данных и cume_dist из bookings-init. - удалён случайно добавленный gitlink _vendor/demodb. - удалён SET LOCAL application_name из generate_next_day.sql. - Проверка: - uv run make fmt. - uv run make test. - make bookings-init. - make bookings-generate-day.
This commit is contained in:
@@ -84,36 +84,6 @@ 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'
|
||||
|
||||
Submodule _vendor/demodb deleted from d68de19285
@@ -35,9 +35,6 @@ BEGIN
|
||||
END IF;
|
||||
|
||||
-- Ждём завершения фоновых джобов генератора, чтобы данные успели записаться
|
||||
-- Сбрасываем application_name, чтобы busy() не находил сам себя при синхронном вызове (jobs=1)
|
||||
-- Примечание: generate()/continue() делают COMMIT внутри себя, поэтому мы уже в новой транзакции
|
||||
SET LOCAL application_name = 'psql';
|
||||
WHILE busy() LOOP
|
||||
PERFORM pg_sleep(1);
|
||||
END LOOP;
|
||||
|
||||
Reference in New Issue
Block a user