activerecord-has_count 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7893887f07e1bbe2bc7da27c608db42bc940882
-  data.tar.gz: ad7e88db1ae15690c451bdbf1d070db28d7ebf57
+  metadata.gz: 5d2c85db920895de37cc5f38524f2fb8ae76b3eb
+  data.tar.gz: 9ad1ad18db8c6fc038328a30490bba0d1593b632
 SHA512:
-  metadata.gz: 49e9c595905967d652903f6eb152b5d1f2e95d38976f88ea8a3928fd49db8639a95ebaaaa57d3867abdc7fdf0a2f6d60ab0ac7a80719599f08bf4fa3def6b408
-  data.tar.gz: 2b08a6920e97ce7a60a8faa7e852530276d41ecf87e949518b14d2ddc5a37faa023fa12c2262f60aa827d5259498f04e70aa2d82e18baf8b2500ddc9b796eed2
+  metadata.gz: 6a100ee2738250cc1049089571609d7d7c166c198576440d4c3d9a52f6da78c5bc0d02dcef8b133e6dc8b7eb9bdc9281aeec53f5d495a33fd31c5f19db054657
+  data.tar.gz: 62e8e5db5e59aa2b792344733501881db3df81e53bea8779634220668335f3f648a0b83dbcaf7018f163f45621199f3fd46bc8e7848a345344ceb84ce2092b3a

data/benchmarks/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem_dir = File.expand_path("../../", __FILE__)
 
 gem "activerecord", "~> 4.0"
-gem "activerecord-import"
 gem "activerecord-has_count", path: gem_dir
 gem "pry"
 gem "mysql2"

data/benchmarks/benchmark.rb

@@ -1,7 +1,6 @@
 require "benchmark"
 require "pry"
 require "active_record"
-require "activerecord-import"
 require "activerecord-has_count"
 
 spec_dir = File.expand_path("../../spec", __FILE__)
@@ -11,57 +10,88 @@ database_yml = File.join(spec_dir, "database.yml")
 ActiveRecord::Base.configurations["bench"] = YAML.load_file(database_yml)["bench"]
 ActiveRecord::Base.establish_connection :bench
 
-ActiveRecord::Schema.define do
-  create_table :tweets, force: true do |t|
-    t.column :created_at, :datetime
-    t.column :updated_at, :datetime
-  end
+def silently_execute(&block)
+  stdout_old = $stdout.dup
+  $stdout.reopen("/tmp/bench")
+  block.call
+  $stdout.flush
+  $stdout.reopen stdout_old
+end
+
+def assert_equal(expect, actual)
+  raise "Expected #{expect}, but got #{actual}" if expect != actual
+end
 
-  create_table :replies, force: true do |t|
-    t.column :tweet_id, :integer
-    t.column :created_at, :datetime
-    t.column :updated_at, :datetime
+silently_execute do
+  ActiveRecord::Schema.define do
+    create_table :tweets, force: true do |t|
+      t.column :replies_count_cache, :integer
+      t.column :created_at, :datetime
+      t.column :updated_at, :datetime
+    end
+
+    create_table :replies, force: true do |t|
+      t.column :tweet_id, :integer
+      t.column :created_at, :datetime
+      t.column :updated_at, :datetime
+    end
+    add_index :replies, [:tweet_id], name: "index_replies_on_tweet_id", using: :btree
   end
 end
 
 [Tweet, Reply].each(&:delete_all)
 
-TWEET_COUNT = 5
-REPLY_COUNT = 10000
+TWEET_COUNT = 10
+REPLY_COUNT = 1000
 
 TWEET_COUNT.times do
-  tweet = Tweet.create
+  tweet = Tweet.create(replies_count_cache: 0)
 
   replies = REPLY_COUNT.times.map do
-    Reply.new(tweet: tweet)
+    Reply.create(tweet: tweet)
   end
-  Reply.import(replies, validate: false)
 end
 
-Benchmark.bmbm do |bench|
-  bench.report("COUNT association") do
+Benchmark.bm do |bench|
+  bench.report("counter_cache      ") do
+    tweets = Tweet.first(TWEET_COUNT)
+
+    tweets.each do |t|
+      assert_equal(REPLY_COUNT, t.replies_count_cache)
+    end
+  end
+
+  bench.report("N+1 COUNT query    ") do
     tweets = Tweet.first(TWEET_COUNT)
 
-    tweets.each { |t| t.replies.count }
+    tweets.each do |t|
+      assert_equal(REPLY_COUNT, t.replies.count)
+    end
   end
 
-  bench.report("LEFT JOIN") do
+  bench.report("LEFT JOIN          ") do
     tweets = Tweet.joins('LEFT JOIN replies ON tweets.id = replies.tweet_id').
       select('tweets.*, COUNT(replies.id) AS replies_count').
       group('tweets.id').first(TWEET_COUNT)
 
-    tweets.each { |t| t.replies_count }
+    tweets.each do |t|
+      assert_equal(REPLY_COUNT, t.replies_count)
+    end
   end
 
   bench.report("preloaded has_count") do
     tweets = Tweet.preload(:replies_count).first(TWEET_COUNT)
 
-    tweets.each { |t| t.replies_count }
+    tweets.each do |t|
+      assert_equal(REPLY_COUNT, t.replies_count)
+    end
   end
 
-  bench.report("size of preloaded association") do
+  bench.report("preloaded has_many ") do
     tweets = Tweet.preload(:replies).first(TWEET_COUNT)
 
-    tweets.each { |t| t.replies.size }
+    tweets.each do |t|
+      assert_equal(REPLY_COUNT, t.replies.size)
+    end
   end
 end

data/lib/active_record/associations/preloader/has_count.rb

@@ -20,6 +20,21 @@ module ActiveRecord
             association.target = count
           end
         end
+
+        def load_slices(slices)
+          @preloaded_records = slices.flat_map { |slice|
+            records_for(slice)
+          }
+
+          @preloaded_records.map { |record|
+            key = record
+            [record, key]
+          }
+        end
+
+        def query_scope(ids)
+          scope.where(association_key.in(ids)).pluck(association_key_name)
+        end
       end
 
       private

data/lib/activerecord-has_count/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HasCount
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/models/reply.rb

@@ -1,3 +1,3 @@
 class Reply < ActiveRecord::Base
-  belongs_to :tweet
+  belongs_to :tweet, counter_cache: :replies_count_cache
 end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ ActiveRecord::Base.establish_connection :test
 
 ActiveRecord::Schema.define do
   create_table :tweets, force: true do |t|
-    t.column :user_id, :integer
+    t.column :replies_count_cache, :integer
     t.column :created_at, :datetime
     t.column :updated_at, :datetime
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-has_count
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord