From 1f973b434d971a4451c6b8b3c36dd3527dc44baa Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 25 Dec 2025 10:52:39 +0000 Subject: [PATCH] Fix new rubocop warnings --- app/helpers/heatmap_helper.rb | 4 +- lib/tasks/backfill_changeset_stats.rake | 188 ++++++++++++------------ 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/app/helpers/heatmap_helper.rb b/app/helpers/heatmap_helper.rb index f50d91f43..f7cefcca1 100644 --- a/app/helpers/heatmap_helper.rb +++ b/app/helpers/heatmap_helper.rb @@ -14,8 +14,8 @@ module HeatmapHelper .chunk_while { |before, after| before == after } .map(&:first) .map do |month| - month_offset += 12 if month == 1 - month + month_offset + month_offset += 12 if month == 1 + month + month_offset end { diff --git a/lib/tasks/backfill_changeset_stats.rake b/lib/tasks/backfill_changeset_stats.rake index 0855bc2cc..e3e54a1ad 100644 --- a/lib/tasks/backfill_changeset_stats.rake +++ b/lib/tasks/backfill_changeset_stats.rake @@ -17,103 +17,103 @@ namespace :db do num_created_relations + num_modified_relations + num_deleted_relations) != num_changes') .in_batches(:of => chunk_size) do |batch| - ids = batch.ids - print "Processing changesets #{ids.first} to #{ids.last} ..." + ids = batch.ids + print "Processing changesets #{ids.first} to #{ids.last} ..." - id_list = "{#{ids.join(',')}}" + id_list = "{#{ids.join(',')}}" - # Backfill enhanced changeset stats - sql = <<~SQL.squish - WITH changes AS ( - SELECT - nodes.changeset_id, - CASE WHEN nodes.version = 1 THEN 1 ELSE 0 END AS num_created_nodes, - CASE WHEN nodes.version > 1 AND nodes.visible THEN 1 ELSE 0 END AS num_modified_nodes, - CASE WHEN nodes.version > 1 AND NOT nodes.visible THEN 1 ELSE 0 END AS num_deleted_nodes, - 0 AS num_created_ways, - 0 AS num_modified_ways, - 0 AS num_deleted_ways, - 0 AS num_created_relations, - 0 AS num_modified_relations, - 0 AS num_deleted_relations - FROM nodes - WHERE nodes.changeset_id = ANY($1::bigint[]) - UNION ALL - SELECT - ways.changeset_id, - 0 AS num_created_nodes, - 0 AS num_modified_nodes, - 0 AS num_deleted_nodes, - CASE WHEN ways.version = 1 THEN 1 ELSE 0 END AS num_created_ways, - CASE WHEN ways.version > 1 AND ways.visible THEN 1 ELSE 0 END AS num_modified_ways, - CASE WHEN ways.version > 1 AND NOT ways.visible THEN 1 ELSE 0 END AS num_deleted_ways, - 0 AS num_created_relations, - 0 AS num_modified_relations, - 0 AS num_deleted_relations - FROM ways - WHERE ways.changeset_id = ANY($1::bigint[]) - UNION ALL - SELECT - relations.changeset_id, - 0 AS num_created_nodes, - 0 AS num_modified_nodes, - 0 AS num_deleted_nodes, - 0 AS num_created_ways, - 0 AS num_modified_ways, - 0 AS num_deleted_ways, - CASE WHEN relations.version = 1 THEN 1 ELSE 0 END AS num_created_relations, - CASE WHEN relations.version > 1 AND relations.visible THEN 1 ELSE 0 END AS num_modified_relations, - CASE WHEN relations.version > 1 AND NOT relations.visible THEN 1 ELSE 0 END AS num_deleted_relations - FROM relations - WHERE relations.changeset_id = ANY($1::bigint[]) - ), - total AS ( - SELECT - changes.changeset_id, - SUM(changes.num_created_nodes) AS num_created_nodes, - SUM(changes.num_modified_nodes) AS num_modified_nodes, - SUM(changes.num_deleted_nodes) AS num_deleted_nodes, - SUM(changes.num_created_ways) AS num_created_ways, - SUM(changes.num_modified_ways) AS num_modified_ways, - SUM(changes.num_deleted_ways) AS num_deleted_ways, - SUM(changes.num_created_relations) AS num_created_relations, - SUM(changes.num_modified_relations) AS num_modified_relations, - SUM(changes.num_deleted_relations) AS num_deleted_relations - FROM changes - GROUP BY changes.changeset_id - ) - UPDATE changesets - SET num_created_nodes = total.num_created_nodes, - num_modified_nodes = total.num_modified_nodes, - num_deleted_nodes = total.num_deleted_nodes, - num_created_ways = total.num_created_ways, - num_modified_ways = total.num_modified_ways, - num_deleted_ways = total.num_deleted_ways, - num_created_relations = total.num_created_relations, - num_modified_relations = total.num_modified_relations, - num_deleted_relations = total.num_deleted_relations, - num_changes = total.num_created_nodes + - total.num_modified_nodes + - total.num_deleted_nodes + - total.num_created_ways + - total.num_modified_ways + - total.num_deleted_ways + - total.num_created_relations + - total.num_modified_relations + - total.num_deleted_relations - FROM total - WHERE changesets.id = total.changeset_id - SQL + # Backfill enhanced changeset stats + sql = <<~SQL.squish + WITH changes AS ( + SELECT + nodes.changeset_id, + CASE WHEN nodes.version = 1 THEN 1 ELSE 0 END AS num_created_nodes, + CASE WHEN nodes.version > 1 AND nodes.visible THEN 1 ELSE 0 END AS num_modified_nodes, + CASE WHEN nodes.version > 1 AND NOT nodes.visible THEN 1 ELSE 0 END AS num_deleted_nodes, + 0 AS num_created_ways, + 0 AS num_modified_ways, + 0 AS num_deleted_ways, + 0 AS num_created_relations, + 0 AS num_modified_relations, + 0 AS num_deleted_relations + FROM nodes + WHERE nodes.changeset_id = ANY($1::bigint[]) + UNION ALL + SELECT + ways.changeset_id, + 0 AS num_created_nodes, + 0 AS num_modified_nodes, + 0 AS num_deleted_nodes, + CASE WHEN ways.version = 1 THEN 1 ELSE 0 END AS num_created_ways, + CASE WHEN ways.version > 1 AND ways.visible THEN 1 ELSE 0 END AS num_modified_ways, + CASE WHEN ways.version > 1 AND NOT ways.visible THEN 1 ELSE 0 END AS num_deleted_ways, + 0 AS num_created_relations, + 0 AS num_modified_relations, + 0 AS num_deleted_relations + FROM ways + WHERE ways.changeset_id = ANY($1::bigint[]) + UNION ALL + SELECT + relations.changeset_id, + 0 AS num_created_nodes, + 0 AS num_modified_nodes, + 0 AS num_deleted_nodes, + 0 AS num_created_ways, + 0 AS num_modified_ways, + 0 AS num_deleted_ways, + CASE WHEN relations.version = 1 THEN 1 ELSE 0 END AS num_created_relations, + CASE WHEN relations.version > 1 AND relations.visible THEN 1 ELSE 0 END AS num_modified_relations, + CASE WHEN relations.version > 1 AND NOT relations.visible THEN 1 ELSE 0 END AS num_deleted_relations + FROM relations + WHERE relations.changeset_id = ANY($1::bigint[]) + ), + total AS ( + SELECT + changes.changeset_id, + SUM(changes.num_created_nodes) AS num_created_nodes, + SUM(changes.num_modified_nodes) AS num_modified_nodes, + SUM(changes.num_deleted_nodes) AS num_deleted_nodes, + SUM(changes.num_created_ways) AS num_created_ways, + SUM(changes.num_modified_ways) AS num_modified_ways, + SUM(changes.num_deleted_ways) AS num_deleted_ways, + SUM(changes.num_created_relations) AS num_created_relations, + SUM(changes.num_modified_relations) AS num_modified_relations, + SUM(changes.num_deleted_relations) AS num_deleted_relations + FROM changes + GROUP BY changes.changeset_id + ) + UPDATE changesets + SET num_created_nodes = total.num_created_nodes, + num_modified_nodes = total.num_modified_nodes, + num_deleted_nodes = total.num_deleted_nodes, + num_created_ways = total.num_created_ways, + num_modified_ways = total.num_modified_ways, + num_deleted_ways = total.num_deleted_ways, + num_created_relations = total.num_created_relations, + num_modified_relations = total.num_modified_relations, + num_deleted_relations = total.num_deleted_relations, + num_changes = total.num_created_nodes + + total.num_modified_nodes + + total.num_deleted_nodes + + total.num_created_ways + + total.num_modified_ways + + total.num_deleted_ways + + total.num_created_relations + + total.num_modified_relations + + total.num_deleted_relations + FROM total + WHERE changesets.id = total.changeset_id + SQL - binds = [ - ActiveRecord::Relation::QueryAttribute.new( - "ids", - id_list, - ActiveRecord::Type::String.new - ) - ] - rows_affected = ActiveRecord::Base.connection.exec_update(sql, "UpdateStats", binds) - puts " #{rows_affected} changesets updated." + binds = [ + ActiveRecord::Relation::QueryAttribute.new( + "ids", + id_list, + ActiveRecord::Type::String.new + ) + ] + rows_affected = ActiveRecord::Base.connection.exec_update(sql, "UpdateStats", binds) + puts " #{rows_affected} changesets updated." end puts "\nDone." -- 2.39.5