From 834d429e849b590ee7a283909eda9affed065387 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 7 Sep 2011 15:06:42 -0700 Subject: LRU should cache per process in postgresql. fixes #1339 --- .../connection_adapters/postgresql_adapter.rb | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters') diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 272663a91d..5402918b1d 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -251,34 +251,38 @@ module ActiveRecord def initialize(connection, max) super @counter = 0 - @cache = {} + @cache = Hash.new { |h,pid| h[pid] = {} } end - def each(&block); @cache.each(&block); end - def key?(key); @cache.key?(key); end - def [](key); @cache[key]; end - def length; @cache.length; end + def each(&block); cache.each(&block); end + def key?(key); cache.key?(key); end + def [](key); cache[key]; end + def length; cache.length; end def next_key "a#{@counter + 1}" end def []=(sql, key) - while @max <= @cache.size - dealloc(@cache.shift.last) + while @max <= cache.size + dealloc(cache.shift.last) end @counter += 1 - @cache[sql] = key + cache[sql] = key end def clear - @cache.each_value do |stmt_key| + cache.each_value do |stmt_key| dealloc stmt_key end - @cache.clear + cache.clear end private + def cache + @cache[$$] + end + def dealloc(key) @connection.query "DEALLOCATE #{key}" end -- cgit v1.2.3