Skip to content

Commit

Permalink
Don't pull back all records when detecting metrics
Browse files Browse the repository at this point in the history
This avoids `recs.to_a` and uses `recs.klass` instead

https://bugzilla.redhat.com/show_bug.cgi?id=1251259
  • Loading branch information
kbrock committed Mar 7, 2017
1 parent 659c7cf commit 9dab1c4
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion app/models/metric/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@ def self.sanitize_start_end_time(interval, interval_name, start_time, end_time)
end

def self.remove_duplicate_timestamps(recs)
return recs if recs.empty? || !recs.all? { |r| r.kind_of?(Metric) || r.kind_of?(MetricRollup) }
if recs.respond_to?(:klass) # active record relation
return recs unless recs.klass.kind_of?(Metric) || recs.klass.kind_of?(MetricRollup)
elsif recs.empty? || !recs.all? { |r| r.kind_of?(Metric) || r.kind_of?(MetricRollup) }
return recs
end

recs = recs.sort_by { |r| r.resource_type + r.resource_id.to_s + r.timestamp.iso8601 }

Expand Down

0 comments on commit 9dab1c4

Please sign in to comment.