A platform for community discussion. Free, open, simple.
PERF: Rewrite DAU/MAU rolling count as a non-correlated sweep (#40692)
Natalie Tay4cbade511adb
diff --git a/app/models/user_visit.rb b/app/models/user_visit.rbindex d337ae8c59a..ce325fd0e58 100644--- a/app/models/user_visit.rb+++ b/app/models/user_visit.rb@@ -16,21 +16,63 @@ class UserVisit < ActiveRecord::Basedef self.count_by_active_users(start_date, end_date)sql = <<~SQL- WITH dau AS (- SELECT date_trunc('day', user_visits.visited_at)::DATE AS date,- count(distinct user_visits.user_id) AS dau+ WITH visits_in_mau_range AS (+ SELECT user_id, visited_at AS dFROM user_visits- WHERE user_visits.visited_at::DATE >= :start_date::DATE AND user_visits.visited_at <= :end_date::DATE- GROUP BY date_trunc('day', user_visits.visited_at)::DATE- ORDER BY date_trunc('day', user_visits.visited_at)::DATE+ WHERE visited_at >= :start_date::DATE - 29+ AND visited_at <= :end_date::DATE+ ),+ visit_island_starts AS (+ SELECT user_id, d,+ CASE+ WHEN lag(d) OVER (PARTITION BY user_id ORDER BY d) >= d - 30 THEN 0+ ELSE 1+ END AS new_island+ FROM visits_in_mau_range+ ),+ visit_islands AS (+ SELECT user_id, d, sum(new_island) OVER (PARTITION BY user_id ORDER BY d) AS grp+ FROM visit_island_starts+ ),+ active_ranges AS (+ SELECT min(d) AS start_d, max(d) + 29 AS end_d+ FROM visit_islands+ GROUP BY user_id, grp+ ),+ active_range_events AS (+ SELECT start_d AS day, 1 AS delta FROM active_ranges+ UNION ALL+ SELECT end_d + 1 AS day, -1 AS delta FROM active_ranges+ ),+ daily_active_deltas AS (+ SELECT day, sum(delta) AS delta+ FROM active_range_events+ GROUP BY day+ ),+ days AS (+ SELECT generate_series(+ (SELECT min(day) FROM daily_active_deltas),+ :end_date::DATE,+ INTERVAL '1 day'+ )::DATE AS day+ ),+ rolling_mau AS (+ SELECT days.day,+ sum(coalesce(daily_active_deltas.delta, 0)) OVER (ORDER BY days.day) AS mau+ FROM days+ LEFT JOIN daily_active_deltas ON daily_active_deltas.day = days.day+ ),+ dau AS (+ SELECT visited_at AS date, count(*) AS dau+ FROM user_visits+ WHERE visited_at >= :start_date::DATE+ AND visited_at <= :end_date::DATE+ GROUP BY visited_at)-- SELECT date, dau,- (SELECT count(distinct user_visits.user_id)- FROM user_visits- WHERE user_visits.visited_at::DATE BETWEEN dau.date - 29 AND dau.date- ) AS mau+ SELECT dau.date, dau.dau, rolling_mau.mauFROM dau+ JOIN rolling_mau ON rolling_mau.day = dau.date+ ORDER BY dau.dateSQLDB.query_hash(sql, start_date: start_date, end_date: end_date)diff --git a/spec/models/user_visit_spec.rb b/spec/models/user_visit_spec.rbindex ce69d15543f..475f87b339b 100644--- a/spec/models/user_visit_spec.rb+++ b/spec/models/user_visit_spec.rb@@ -39,4 +39,85 @@ RSpec.describe UserVisit doexpect(UserVisit.by_day(2.days.ago, Time.zone.now)).not_to include(4.days.ago.to_date => 1)endend++ describe ".count_by_active_users" do+ fab!(:user_a, :user)+ fab!(:user_b, :user)+ fab!(:user_c, :user)++ # base day; all visits are placed relative to it so the 30-day rolling+ # window (visited_at BETWEEN day - 29 AND day) can be pinned exactly.+ let(:base) { Date.new(2026, 6, 1) }++ def visit(user, day)+ user.user_visits.create!(visited_at: day)+ end++ def mau_on(rows, day)+ rows.find { |r| r["date"] == day }&.fetch("mau")+ end++ def dau_on(rows, day)+ rows.find { |r| r["date"] == day }&.fetch("dau")+ end++ it "reports DAU and a 30-day rolling distinct MAU per active day" do+ visit(user_a, base)+ visit(user_b, base)+ visit(user_a, base + 24) # within 30 days of base -> same MAU coverage+ visit(user_c, base + 60) # far later -> its own window++ rows = UserVisit.count_by_active_users(base, base + 60)++ # base: a, b visited today and in window -> dau 2, mau 2+ expect(dau_on(rows, base)).to eq(2)+ expect(mau_on(rows, base)).to eq(2)++ # base+24: only a visited today; window [base-5, base+24] still sees a & b -> mau 2+ expect(dau_on(rows, base + 24)).to eq(1)+ expect(mau_on(rows, base + 24)).to eq(2)++ # base+60: window [base+31, base+60] sees only c -> dau 1, mau 1+ expect(dau_on(rows, base + 60)).to eq(1)+ expect(mau_on(rows, base + 60)).to eq(1)+ end++ it "treats the rolling window as 29-days-inclusive / 30-days-exclusive" do+ visit(user_a, base)+ visit(user_b, base)+ visit(user_c, base + 29) # probe day exactly 29 days after a/b+ visit(user_a, base + 30) # probe day exactly 30 days after a/b's first visit++ rows = UserVisit.count_by_active_users(base, base + 30)++ # day base+29: window [base, base+29] still includes a & b (29 inclusive) plus c+ expect(mau_on(rows, base + 29)).to eq(3)++ # day base+30: window [base+1, base+30] excludes b's only visit (base, now 30 days out);+ # a is back today, c is still in range -> a & c only+ expect(mau_on(rows, base + 30)).to eq(2)+ end++ it "counts a user once across overlapping visits and separately across a >30-day gap" do+ visit(user_a, base)+ visit(user_a, base + 10) # overlaps -> still one user in coverage+ visit(user_a, base + 100) # gap > 30 days -> new island, but still the same single user+ visit(user_b, base + 100)++ rows = UserVisit.count_by_active_users(base, base + 100)++ expect(mau_on(rows, base)).to eq(1)+ expect(mau_on(rows, base + 10)).to eq(1)+ expect(mau_on(rows, base + 100)).to eq(2)+ end++ it "only emits rows for days that had at least one visit" do+ visit(user_a, base)+ visit(user_b, base + 5)++ rows = UserVisit.count_by_active_users(base, base + 10)++ expect(rows.map { |r| r["date"] }).to contain_exactly(base, base + 5)+ end+ endend