4ebbfe5d3e
The st_commits and st_diffs columns on merge_request_diffs historically held the YAML-serialised data for a merge request diff, in a variety of formats. Since 9.5, these have been migrated in the background to two new tables: merge_request_diff_commits and merge_request_diff_files. That has the advantage that we can actually query the data (for instance, to find out how many commits we've stored), and that it can't be in a variety of formats, but must match the new schema. This is the final step of that journey, where we drop those columns and remove all references to them. This is a breaking change to the importer, because we can no longer import diffs created in the old format, and we cannot guarantee the export will be in the new format unless it was generated after this commit.
57 lines
1.5 KiB
Ruby
57 lines
1.5 KiB
Ruby
module Gitlab
|
|
module CycleAnalytics
|
|
class PlanEventFetcher < BaseEventFetcher
|
|
def initialize(*args)
|
|
@projections = [mr_diff_table[:id],
|
|
issue_metrics_table[:first_mentioned_in_commit_at]]
|
|
|
|
super(*args)
|
|
end
|
|
|
|
def events_query
|
|
base_query
|
|
.join(mr_diff_table)
|
|
.on(mr_diff_table[:merge_request_id].eq(mr_table[:id]))
|
|
|
|
super
|
|
end
|
|
|
|
private
|
|
|
|
def merge_request_diff_commits
|
|
@merge_request_diff_commits ||=
|
|
MergeRequestDiffCommit
|
|
.where(merge_request_diff_id: event_result.map { |event| event['id'] })
|
|
.group_by(&:merge_request_diff_id)
|
|
end
|
|
|
|
def serialize(event)
|
|
commit = first_time_reference_commit(event)
|
|
|
|
return unless commit
|
|
|
|
serialize_commit(event, commit, query)
|
|
end
|
|
|
|
def first_time_reference_commit(event)
|
|
return nil unless event && merge_request_diff_commits
|
|
|
|
commits = merge_request_diff_commits[event['id'].to_i]
|
|
|
|
return nil if commits.blank?
|
|
|
|
commits.find do |commit|
|
|
next unless commit[:committed_date] && event['first_mentioned_in_commit_at']
|
|
|
|
commit[:committed_date].to_i == DateTime.parse(event['first_mentioned_in_commit_at'].to_s).to_i
|
|
end
|
|
end
|
|
|
|
def serialize_commit(event, commit, query)
|
|
commit = Commit.from_hash(commit.to_hash, @project)
|
|
|
|
AnalyticsCommitSerializer.new(project: @project, total_time: event['total_time']).represent(commit)
|
|
end
|
|
end
|
|
end
|
|
end
|