89 lines
2.3 KiB
Ruby
89 lines
2.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class MergeRequestDiffFile < ApplicationRecord
|
|
extend SuppressCompositePrimaryKeyWarning
|
|
|
|
include BulkInsertSafe
|
|
include Gitlab::EncodingHelper
|
|
include DiffFile
|
|
|
|
belongs_to :merge_request_diff, inverse_of: :merge_request_diff_files
|
|
alias_attribute :index, :relative_order
|
|
|
|
scope :by_paths, ->(paths) do
|
|
where("new_path in (?) OR old_path in (?)", paths, paths)
|
|
end
|
|
|
|
def utf8_diff
|
|
fetched_diff = if Feature.enabled?(:externally_stored_diffs_caching_export) &&
|
|
merge_request_diff&.stored_externally?
|
|
diff_export
|
|
else
|
|
diff
|
|
end
|
|
|
|
return '' if fetched_diff.blank?
|
|
|
|
encode_utf8(fetched_diff) if fetched_diff.respond_to?(:encoding)
|
|
end
|
|
|
|
def diff
|
|
content =
|
|
if merge_request_diff&.stored_externally?
|
|
merge_request_diff.opening_external_diff do |file|
|
|
file.seek(external_diff_offset)
|
|
force_encode_utf8(file.read(external_diff_size))
|
|
end
|
|
else
|
|
super
|
|
end
|
|
|
|
return content unless binary?
|
|
|
|
# If the data isn't valid base64, return it as-is, since it's almost certain
|
|
# to be a valid diff. Parsing it as a diff will fail if it's something else.
|
|
#
|
|
# https://gitlab.com/gitlab-org/gitlab/-/issues/240921
|
|
begin
|
|
content.unpack1('m0')
|
|
rescue ArgumentError
|
|
content
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
# This method is meant to be used during Project Export.
|
|
# It is identical to the behaviour in #diff with the only
|
|
# difference of caching externally stored diffs on local disk in
|
|
# temp storage location in order to improve diff export performance.
|
|
def diff_export
|
|
content = merge_request_diff.cached_external_diff do |file|
|
|
file.seek(external_diff_offset)
|
|
|
|
force_encode_utf8(file.read(external_diff_size))
|
|
end
|
|
|
|
# See #diff
|
|
if binary?
|
|
content = begin
|
|
content.unpack1('m0')
|
|
rescue ArgumentError
|
|
content
|
|
end
|
|
end
|
|
|
|
content
|
|
rescue StandardError => e
|
|
log_payload = {
|
|
message: 'Cached external diff export failed',
|
|
merge_request_diff_file_id: id,
|
|
merge_request_diff_id: merge_request_diff&.id
|
|
}
|
|
|
|
Gitlab::ExceptionLogFormatter.format!(e, log_payload)
|
|
Gitlab::AppLogger.warn(log_payload)
|
|
|
|
diff
|
|
end
|
|
end
|