erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 677a17dcef into a50c8e951f

Browse source
This commit is contained in:
Matt Jankowski 2024-07-31 14:07:10 +00:00 committed by GitHub
commit 8c5dc87452
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 105 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/lib/admin/metrics/measure/instance_accounts_measure.rb
View file

@ -27,25 +27,11 @@ class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure
nil nil
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }] Account
end .select(:id)
.where(account_domain_sql, domain: params[:domain])
def sql_query_string .where(daily_period(:accounts))
<<~SQL.squish
SELECT axis.*, (
WITH new_accounts AS (
SELECT accounts.id
FROM accounts
WHERE date_trunc('day', accounts.created_at)::date = axis.period
AND #{account_domain_sql(params[:include_subdomains])}
)
SELECT count(*) FROM new_accounts
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL
end end
def params def params

26
app/lib/admin/metrics/measure/instance_followers_measure.rb
View file

@ -27,26 +27,12 @@ class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measur
nil nil
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }] Follow
end .select(:id)
.joins(:account)
def sql_query_string .where(account_domain_sql, domain: params[:domain])
<<~SQL.squish .where(daily_period(:follows))
SELECT axis.*, (
WITH new_followers AS (
SELECT follows.id
FROM follows
INNER JOIN accounts ON follows.account_id = accounts.id
WHERE date_trunc('day', follows.created_at)::date = axis.period
AND #{account_domain_sql(params[:include_subdomains])}
)
SELECT count(*) FROM new_followers
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL
end end
def params def params

26
app/lib/admin/metrics/measure/instance_follows_measure.rb
View file

@ -27,26 +27,12 @@ class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure:
nil nil
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }] Follow
end .select(:id)
.joins(:target_account)
def sql_query_string .where(account_domain_sql, domain: params[:domain])
<<~SQL.squish .where(daily_period(:follows))
SELECT axis.*, (
WITH new_follows AS (
SELECT follows.id
FROM follows
INNER JOIN accounts ON follows.target_account_id = accounts.id
WHERE date_trunc('day', follows.created_at)::date = axis.period
AND #{account_domain_sql(params[:include_subdomains])}
)
SELECT count(*) FROM new_follows
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL
end end
def params def params

30
app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
View file

@ -36,25 +36,23 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
nil nil
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }] MediaAttachment
.select(media_size_total)
.joins(:account)
.where(account_domain_sql, domain: params[:domain])
.where(daily_period(:media_attachments))
end end
def sql_query_string def select_target
<<~SQL.squish <<~SQL.squish
SELECT axis.*, ( COALESCE(SUM(size), 0)
WITH new_media_attachments AS ( SQL
SELECT COALESCE(media_attachments.file_file_size, 0) + COALESCE(media_attachments.thumbnail_file_size, 0) AS size end
FROM media_attachments
INNER JOIN accounts ON accounts.id = media_attachments.account_id def media_size_total
WHERE date_trunc('day', media_attachments.created_at)::date = axis.period <<~SQL.squish
AND #{account_domain_sql(params[:include_subdomains])} COALESCE(media_attachments.file_file_size, 0) + COALESCE(media_attachments.thumbnail_file_size, 0) AS size
)
SELECT COALESCE(SUM(size), 0) FROM new_media_attachments
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL SQL
end end

26
app/lib/admin/metrics/measure/instance_reports_measure.rb
View file

@ -27,26 +27,12 @@ class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure:
nil nil
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }] Report
end .select(:id)
.joins(:target_account)
def sql_query_string .where(account_domain_sql, domain: params[:domain])
<<~SQL.squish .where(daily_period(:reports))
SELECT axis.*, (
WITH new_reports AS (
SELECT reports.id
FROM reports
INNER JOIN accounts ON accounts.id = reports.target_account_id
WHERE date_trunc('day', reports.created_at)::date = axis.period
AND #{account_domain_sql(params[:include_subdomains])}
)
SELECT count(*) FROM new_reports
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL
end end
def params def params

28
app/lib/admin/metrics/measure/instance_statuses_measure.rb
View file

@ -27,27 +27,13 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
nil nil
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain], earliest_status_id: earliest_status_id, latest_status_id: latest_status_id }] Status
end .select(:id)
.joins(:account)
def sql_query_string .where(account_domain_sql, domain: params[:domain])
<<~SQL.squish .where(status_range_sql, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id)
SELECT axis.*, ( .where(daily_period(:statuses))
WITH new_statuses AS (
SELECT statuses.id
FROM statuses
INNER JOIN accounts ON accounts.id = statuses.account_id
WHERE statuses.id BETWEEN :earliest_status_id AND :latest_status_id
AND #{account_domain_sql(params[:include_subdomains])}
AND date_trunc('day', statuses.created_at)::date = axis.period
)
SELECT count(*) FROM new_statuses
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL
end end
def earliest_status_id def earliest_status_id

22
app/lib/admin/metrics/measure/new_users_measure.rb
View file

@ -17,23 +17,9 @@ class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMe
User.where(created_at: previous_time_period).count User.where(created_at: previous_time_period).count
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at }] User
end .select(:id)
.where(daily_period(:users))
def sql_query_string
<<~SQL.squish
SELECT axis.*, (
WITH new_users AS (
SELECT users.id
FROM users
WHERE date_trunc('day', users.created_at)::date = axis.period
)
SELECT count(*) FROM new_users
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL
end end
end end

22
app/lib/admin/metrics/measure/opened_reports_measure.rb
View file

@ -17,23 +17,9 @@ class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::B
Report.where(created_at: previous_time_period).count Report.where(created_at: previous_time_period).count
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at }] Report
end .select(:id)
.where(daily_period(:reports))
def sql_query_string
<<~SQL.squish
SELECT axis.*, (
WITH new_reports AS (
SELECT reports.id
FROM reports
WHERE date_trunc('day', reports.created_at)::date = axis.period
)
SELECT count(*) FROM new_reports
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL
end end
end end

50
app/lib/admin/metrics/measure/query_helper.rb
View file

@ -15,19 +15,49 @@ module Admin::Metrics::Measure::QueryHelper
ActiveRecord::Base.sanitize_sql_array(sql_array) ActiveRecord::Base.sanitize_sql_array(sql_array)
end end
def generated_series_days def sql_array
Arel.sql( [sql_query_string, { start_at: @start_at, end_at: @end_at }]
<<~SQL.squish
SELECT generate_series(:start_at::timestamp, :end_at::timestamp, '1 day')::date AS period
SQL
)
end end
def account_domain_sql(include_subdomains) def sql_query_string
if include_subdomains <<~SQL.squish
"accounts.domain IN (SELECT domain FROM instances WHERE reverse('.' || domain) LIKE reverse('.' || :domain::text))" SELECT axis.*, (
WITH data_source AS (#{data_source.to_sql})
SELECT #{select_target} FROM data_source
) AS value
FROM (
SELECT generate_series(:start_at::timestamp, :end_at::timestamp, '1 day')::date AS period
) AS axis
SQL
end
def select_target
<<~SQL.squish
COUNT(*)
SQL
end
def daily_period(table, column = :created_at)
<<~SQL.squish
DATE_TRUNC('day', #{table}.#{column})::date = axis.period
SQL
end
def status_range_sql
<<~SQL.squish
statuses.id BETWEEN :earliest_status_id AND :latest_status_id
SQL
end
def account_domain_sql
if params[:include_subdomains]
<<~SQL.squish
accounts.domain IN (SELECT domain FROM instances WHERE reverse('.' || domain) LIKE reverse('.' || :domain::text))
SQL
else else
'accounts.domain = :domain::text' <<~SQL.squish
accounts.domain = :domain::text
SQL
end end
end end
end end

22
app/lib/admin/metrics/measure/resolved_reports_measure.rb
View file

@ -17,23 +17,9 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure:
Report.resolved.where(action_taken_at: previous_time_period).count Report.resolved.where(action_taken_at: previous_time_period).count
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at }] Report
end .select(:id)
.where(daily_period(:reports, :action_taken_at))
def sql_query_string
<<~SQL.squish
SELECT axis.*, (
WITH resolved_reports AS (
SELECT reports.id
FROM reports
WHERE date_trunc('day', reports.action_taken_at)::date = axis.period
)
SELECT count(*) FROM resolved_reports
) AS value
FROM (
#{generated_series_days}
) AS axis
SQL
end end
end end

31
app/lib/admin/metrics/measure/tag_servers_measure.rb
View file

@ -21,28 +21,15 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
tag.statuses.where('statuses.id BETWEEN ? AND ?', Mastodon::Snowflake.id_at(@start_at - length_of_period, with_random: false), Mastodon::Snowflake.id_at(@end_at - length_of_period, with_random: false)).joins(:account).count('distinct accounts.domain') tag.statuses.where('statuses.id BETWEEN ? AND ?', Mastodon::Snowflake.id_at(@start_at - length_of_period, with_random: false), Mastodon::Snowflake.id_at(@end_at - length_of_period, with_random: false)).joins(:account).count('distinct accounts.domain')
end end
def sql_array def data_source
[sql_query_string, { start_at: @start_at, end_at: @end_at, tag_id: tag.id, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id }] Status
end .select('accounts.domain')
.distinct
def sql_query_string .reorder(nil)
<<~SQL.squish .joins(:tags, :account)
SELECT axis.*, ( .where(statuses_tags: { tag_id: tag.id })
WITH tag_servers AS ( .where(status_range_sql, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id)
SELECT DISTINCT accounts.domain .where(daily_period(:statuses))
FROM statuses
INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
INNER JOIN accounts ON statuses.account_id = accounts.id
WHERE statuses_tags.tag_id = :tag_id
AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
AND date_trunc('day', statuses.created_at)::date = axis.period
)
SELECT COUNT(*) FROM tag_servers
) AS value
FROM (
#{generated_series_days}
) as axis
SQL
end end
def earliest_status_id def earliest_status_id