Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved object cache. Use self.changes to cover same feature. Reduced number of sql statements.

Browse source
This commit is contained in:
Martin Edenhofer 2015-02-01 13:36:22 +01:00
parent 7810ead783
commit 6eb460ac8a
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/models/application_model.rb
View file

@ -9,8 +9,8 @@ class ApplicationModel < ActiveRecord::Base
self.abstract_class = true self.abstract_class = true
before_create :check_attributes_protected, :check_limits, :cache_delete, :fill_up_user_create before_create :check_attributes_protected, :check_limits, :cache_delete, :fill_up_user_create
before_update :check_limits, :cache_delete_before, :fill_up_user_update before_update :check_limits, :fill_up_user_update
before_destroy :cache_delete_before, :destroy_dependencies before_destroy :destroy_dependencies
after_create :cache_delete after_create :cache_delete
after_update :cache_delete after_update :cache_delete
@ -225,19 +225,34 @@ returns
# puts 'g ' + group.class.to_s # puts 'g ' + group.class.to_s
if o.respond_to?('cache_delete') then o.cache_delete end if o.respond_to?('cache_delete') then o.cache_delete end
end end
def cache_delete_before
old_object = self.class.where( :id => self.id ).first
if old_object
old_object.cache_delete
end
self.cache_delete
end
def cache_delete def cache_delete
# delete id caches
key = self.class.to_s + '::' + self.id.to_s key = self.class.to_s + '::' + self.id.to_s
Cache.delete( key.to_s ) Cache.delete( key.to_s )
key = self.class.to_s + ':f:' + self.id.to_s key = self.class.to_s + ':f:' + self.id.to_s
Cache.delete( key.to_s ) Cache.delete( key.to_s )
# delete old name / login caches
if self.changed?
if self.changes.has_key?('name')
name = self.changes['name'][0].to_s
key = self.class.to_s + '::' + name
Cache.delete( key.to_s )
key = self.class.to_s + ':f:' + name
Cache.delete( key.to_s )
end
if self.changes.has_key?('login')
name = self.changes['login'][0].to_s
key = self.class.to_s + '::' + name
Cache.delete( key.to_s )
key = self.class.to_s + ':f:' + name
Cache.delete( key.to_s )
end
end
# delete name / login caches
if self[:name] if self[:name]
key = self.class.to_s + '::' + self.name.to_s key = self.class.to_s + '::' + self.name.to_s
Cache.delete( key.to_s ) Cache.delete( key.to_s )
@ -260,6 +275,7 @@ returns
end end
Cache.write( key.to_s, data ) Cache.write( key.to_s, data )
end end
def self.cache_get(data_id, full = false) def self.cache_get(data_id, full = false)
if !full if !full
key = self.to_s + '::' + data_id.to_s key = self.to_s + '::' + data_id.to_s

2
test/unit/object_cache_test.rb
View file

@ -56,4 +56,4 @@ class ObjectCacheTest < ActiveSupport::TestCase
assert_equal( nil, group_lookup_id, 'verify by lookup.id' ) assert_equal( nil, group_lookup_id, 'verify by lookup.id' )
end end
end end