counter_culture 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19dc37789d383bb90f0f02f4c23c60b05db6a5db
-  data.tar.gz: f7514a2a2d9bfd9c525dbec1fbfa88b5c03ae11c
+  metadata.gz: 49818f60f158767b321543319b23233b8cd9de64
+  data.tar.gz: fa82dfc09339559393f83f7a426899bc92651083
 SHA512:
-  metadata.gz: 377e5dce3e1cdcb30992e3f3361e9aa330a3333d5e527d2d9ebf02f2f37b1ddb78e61e38aae3c5dc951ede2f5fefb7fb50fbe8e0355da366c2d665f51cb0fbd6
-  data.tar.gz: dfa309282057df45419d50f62bcf6f951e8195f3ed3f60c36116da51ff8a6b66780e0c038c752178507d56085a052e81a3f8214f017c2a526353dcd29700c3f7
+  metadata.gz: ca9a78a08b38cb57ebc8a87f7e726546ceb569d0ed788fe9fef44ec1f5741d02636d632b2eb7f9e87b36eed0b70a0e6ba94d20d5b71dd4ea2b33b78c18030e8a
+  data.tar.gz: e6caf2341d843e143f2143853753ff6733ad493fc81cf461a14212893e5739eb9627a981b922cad28b38851ee11d4d2ca08e2e67a63ac7d5036d25a1f7c6c1c9

data/CHANGELOG.md

@@ -1,6 +1,11 @@
-## 0.1.22 (May 24, 2014)
+## 0.1.33 (May 24, 2014)
 
 Bugfixes:
+  - fixes problems fixing conditional counter caches with batching
+
+## 0.1.22 (May 24, 2014)
+
+Improvements:
   - support for single-table inheritance in counter_culture_fix_counts
 
 ## 0.1.21 (May 24, 2014)

data/VERSION

@@ -1 +1 @@
-0.1.22
+0.1.23

data/counter_culture.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 0.1.22 ruby lib
+# stub: counter_culture 0.1.23 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.22"
+  s.version = "0.1.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
@@ -38,6 +38,8 @@ Gem::Specification.new do |s|
     "spec/counter_culture_spec.rb",
     "spec/models/category.rb",
     "spec/models/company.rb",
+    "spec/models/conditional_dependent.rb",
+    "spec/models/conditional_main.rb",
     "spec/models/has_string_id.rb",
     "spec/models/industry.rb",
     "spec/models/product.rb",

data/lib/counter_culture.rb

@@ -74,62 +74,63 @@ module CounterCulture
           # column name otherwise
           # which class does this relation ultimately point to? that's where we have to start
           klass = relation_klass(hash[:relation])
+          query = klass
+
+          # if a delta column is provided use SUM, otherwise use COUNT
+          count_select = hash[:delta_column] ? "SUM(COALESCE(#{self.table_name}.#{hash[:delta_column]},0))" : "COUNT(#{self.table_name}.id)"
 
-          # we are only interested in the id and the count of related objects (that's this class itself)
-          if hash[:delta_column]
-            query = klass.select("#{klass.table_name}.id, SUM(COALESCE(#{self.table_name}.#{hash[:delta_column]},0)) AS count")
-          else
-            query = klass.select("#{klass.table_name}.id, COUNT(#{self.table_name}.id                              ) AS count")
-          end
           # respect the deleted_at column if it exists
           query = query.where("#{self.table_name}.deleted_at IS NULL") if self.column_names.include?('deleted_at')
 
           column_names = hash[:column_names] || {nil => hash[:counter_cache_name]}
           raise ":column_names must be a Hash of conditions and column names" unless column_names.is_a?(Hash)
 
+          # we need to work our way back from the end-point of the relation to this class itself;
+          # make a list of arrays pointing to the second-to-last, third-to-last, etc.
+          reverse_relation = (1..hash[:relation].length).to_a.reverse.inject([]) {|a,i| a << hash[:relation][0,i]; a }
+
+          # store joins in an array so that we can later apply column-specific conditions
+          joins = reverse_relation.map do |cur_relation|
+            reflect = relation_reflect(cur_relation)
+            joins_query = "LEFT JOIN #{reflect.active_record.table_name} ON #{reflect.table_name}.id = #{reflect.active_record.table_name}.#{reflect.foreign_key}"
+            # adds 'type' condition to JOIN clause if the current model is a child in a Single Table Inheritance
+            joins_query = "#{joins_query} AND #{reflect.active_record.table_name}.type IN ('#{self.name}')" if self.column_names.include?('type') and not(self.descends_from_active_record?)
+            joins_query
+          end
+
           # iterate over all the possible counter cache column names
           column_names.each do |where, column_name|
-            # if there are additional conditions, add them here
-            counts_query = query.where(where)
-
-            # we need to work our way back from the end-point of the relation to this class itself;
-            # make a list of arrays pointing to the second-to-last, third-to-last, etc.
-            reverse_relation = []
-            (1..hash[:relation].length).to_a.reverse.each {|i| reverse_relation<< hash[:relation][0,i] }
-
-            # we need to join together tables until we get back to the table this class itself
-            # lives in
-            reverse_relation.each do |cur_relation|
-              reflect = relation_reflect(cur_relation)
-              joins_query = "LEFT JOIN #{reflect.active_record.table_name} ON #{reflect.table_name}.id = #{reflect.active_record.table_name}.#{reflect.foreign_key}"
-              # adds 'type' condition to JOIN clause if the current model is a child in a Single Table Inheritance
-              joins_query = "#{joins_query} AND #{reflect.active_record.table_name}.type IN ('#{self.name}')" if self.column_names.include?('type') and not(self.descends_from_active_record?)
-              counts_query = counts_query.joins(joins_query)
+            # select id and count (from above) as well as cache column ('column_name') for later comparison
+            counts_query = query.select("#{klass.table_name}.id, #{count_select} AS count, #{klass.table_name}.#{column_name}")
+
+            # we need to join together tables until we get back to the table this class itself lives in
+            # conditions must also be applied to the join on which we are counting
+            joins.each_with_index do |join,index|
+              join += " AND (#{sanitize_sql_for_conditions(where)})" if index == joins.size - 1 && where
+              counts_query = counts_query.joins(join)
             end
 
             # iterate in batches; otherwise we might run out of memory when there's a lot of
             # instances and we try to load all their counts at once
             start = 0
             batch_size = options[:batch_size] || 1000
-            while (records = klass.reorder(full_primary_key(klass) + " ASC").offset(start).limit(batch_size)).any?
-              # collect the counts for this batch in an id => count hash; this saves time relative
-              # to running one query per record
-              counts = counts_query.reorder(full_primary_key(klass) + " ASC").offset(start).limit(batch_size).group(full_primary_key(klass)).inject({}){|memo, model| memo[model.id] = model.count || 0; memo}
 
+            while (records = counts_query.reorder(full_primary_key(klass) + " ASC").offset(start).limit(batch_size).group(full_primary_key(klass)).to_a).any?
               # now iterate over all the models and see whether their counts are right
               records.each do |model|
-                if model.read_attribute(column_name) != (counts[model.id] || 0)
+                count = model.read_attribute('count') || 0
+                if model.read_attribute(column_name) != count
                   # keep track of what we fixed, e.g. for a notification email
                   fixed<< {
                     :entity => klass.name,
                     :id => model.id,
                     :what => column_name,
                     :wrong => model.send(column_name),
-                    :right => counts[model.id]
+                    :right => count
                   }
                   # use update_all because it's faster and because a fixed counter-cache shouldn't
                   # update the timestamp
-                  klass.where(:id => model.id).update_all(column_name => counts[model.id] || 0)
+                  klass.where(:id => model.id).update_all(column_name => count)
                 end
               end
 

data/spec/counter_culture_spec.rb

@@ -10,6 +10,8 @@ require 'models/category'
 require 'models/has_string_id'
 require 'models/simple_main'
 require 'models/simple_dependent'
+require 'models/conditional_main'
+require 'models/conditional_dependent'
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :deletion
@@ -1092,6 +1094,24 @@ describe "CounterCulture" do
     SimpleMain.find_each { |main| main.simple_dependents_count.should == 3 }
   end
 
+  it "should correctly fix the counter caches for thousands of records when counter is conditional" do
+    # first, clean up
+    ConditionalDependent.delete_all
+    ConditionalMain.delete_all
+
+    1000.times do |i|
+      main = ConditionalMain.create
+      3.times { main.conditional_dependents.create(:condition => main.id % 2 == 0) }
+    end
+
+    ConditionalMain.find_each { |main| main.conditional_dependents_count.should == (main.id % 2 == 0 ? 3 : 0) }
+
+    ConditionalMain.order('random()').limit(50).update_all :conditional_dependents_count => 1
+    ConditionalDependent.counter_culture_fix_counts :batch_size => 100
+
+    ConditionalMain.find_each { |main| main.conditional_dependents_count.should == (main.id % 2 == 0 ? 3 : 0) }
+  end
+
   it "should correctly fix the counter caches when no dependent record exists for some of main records" do
     # first, clean up
     SimpleDependent.delete_all

data/spec/models/conditional_dependent.rb

@@ -0,0 +1,7 @@
+class ConditionalDependent < ActiveRecord::Base
+  belongs_to :conditional_main
+
+  counter_culture :conditional_main,
+    column_name: Proc.new {|m| m.condition? ? 'conditional_dependents_count' : nil },
+    column_names: { ['conditional_dependents.condition = ?', true] => 'conditional_dependents_count' }
+end

data/spec/models/conditional_main.rb

@@ -0,0 +1,3 @@
+class ConditionalMain < ActiveRecord::Base
+  has_many :conditional_dependents
+end

data/spec/schema.rb

@@ -100,4 +100,17 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime "updated_at"
   end
 
+  create_table "conditional_mains", :force => true do |t|
+    t.integer "conditional_dependents_count", :null => false, :default => 0
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "conditional_dependents", :force => true do |t|
+    t.integer "conditional_main_id"
+    t.boolean "condition", default: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Magnus von Koeller
@@ -167,6 +167,8 @@ files:
 - spec/counter_culture_spec.rb
 - spec/models/category.rb
 - spec/models/company.rb
+- spec/models/conditional_dependent.rb
+- spec/models/conditional_main.rb
 - spec/models/has_string_id.rb
 - spec/models/industry.rb
 - spec/models/product.rb