Revert "Merge pull request ManageIQ#17927 from lpichler/memoize_cols_…

…on_metric_rollup" This reverts commit 345a318, reversing changes made to ac675f5.
agrare · Sep 12, 2018 · 4e051f3 · 4e051f3
1 parent 378577a
commit 4e051f3
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/app/models/chargeable_field.rb b/app/models/chargeable_field.rb
@@ -93,9 +93,7 @@ def rate_name
   end
 
   def self.cols_on_metric_rollup
-    @cols_on_metric_rollup ||= begin
-      (%w(id tag_names resource_id) + chargeable_cols_on_metric_rollup).uniq
-    end
+    (%w(id tag_names resource_id) + chargeable_cols_on_metric_rollup).uniq
   end
 
   def self.col_index(column)
@@ -138,10 +136,8 @@ def self.seed_data
   end
 
   def self.chargeable_cols_on_metric_rollup
-    @chargeable_cols_on_metric_rollup ||= begin
-      existing_cols = MetricRollup.attribute_names
-      chargeable_cols = pluck(:metric) & existing_cols
-      chargeable_cols.map! { |x| VIRTUAL_COL_USES[x] || x }.sort.uniq
-    end
+    existing_cols = MetricRollup.attribute_names
+    chargeable_cols = pluck(:metric) & existing_cols
+    chargeable_cols.map! { |x| VIRTUAL_COL_USES[x] || x }.sort
   end
 end