From 35be0cad1a427fd5c476710ce2535f665386eaa0 Mon Sep 17 00:00:00 2001 From: Karl-Aksel Puulmann Date: Tue, 2 Apr 2024 09:22:15 +0300 Subject: [PATCH] PR feedback --- lib/workers/clickhouse_clean_sites.ex | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/workers/clickhouse_clean_sites.ex b/lib/workers/clickhouse_clean_sites.ex index 3ab6502cf..e29e2493f 100644 --- a/lib/workers/clickhouse_clean_sites.ex +++ b/lib/workers/clickhouse_clean_sites.ex @@ -30,6 +30,8 @@ defmodule Plausible.Workers.ClickhouseCleanSites do "imported_visitors" ] + @settings if Mix.env() in [:test, :small_test], do: [mutations_sync: 2], else: [] + def perform(_job) do deleted_sites = get_deleted_sites_with_clickhouse_data() @@ -41,10 +43,10 @@ defmodule Plausible.Workers.ClickhouseCleanSites do site_ids_expr = deleted_sites |> Enum.map_join(", ", &to_string/1) for table <- @tables_to_clear do - IngestRepo.query( - "ALTER TABLE #{table} DELETE WHERE site_id IN (#{site_ids_expr})", + IngestRepo.query!( + "ALTER TABLE #{table} DELETE WHERE site_id IN #{site_ids_expr}", [], - if(Mix.env() == :test, do: [mutations_sync: 2], else: []) + settings: @settings ) end end @@ -54,15 +56,13 @@ defmodule Plausible.Workers.ClickhouseCleanSites do def get_deleted_sites_with_clickhouse_data() do pg_sites = - from(s in Plausible.Site, select: %{id: s.id}) + from(s in Plausible.Site, select: s.id) |> Plausible.Repo.all() - |> Enum.map(&(&1 |> Map.fetch!(:id))) |> MapSet.new() ch_sites = - from(e in "events_v2", group_by: e.site_id, select: %{site_id: e.site_id}) + from(e in "events_v2", group_by: e.site_id, select: e.site_id) |> Plausible.ClickhouseRepo.all(timeout: :infinity) - |> Enum.map(& &1.site_id) |> MapSet.new() MapSet.difference(ch_sites, pg_sites) |> MapSet.to_list()