Changeset - c1c1cf772337
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Marcin Kuzminski - 15 years ago 2010-10-12 16:39:53
marcin@python-works.com
moved out sqlalchemy cache from meta to the config files.
added caching query for permissions.
6 files changed with 62 insertions and 45 deletions:
development.ini
14
3
production.ini
15
4
rhodecode/config/deployment.ini_tmpl
12
1
rhodecode/lib/auth.py
9
3
rhodecode/model/caching_query.py
11
3
rhodecode/model/meta.py
1
31
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
################################################################################
 
################################################################################
 
# rhodecode - Pylons environment configuration                                    #
 
# rhodecode - Pylons environment configuration                                 #
 
#                                                                              #
 
# The %(here)s variable will be replaced with the parent directory of this file#
 
################################################################################
 

			




	
	
	
		
 
[DEFAULT]

			




	
	
	
		
 
debug = true

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
## Uncomment and replace with the address which should receive                ## 

			




	
	
	
		
 
## any error reports after application crash								  ##

			




	
	
	
		
 
## Additionally those settings will be used by rhodecode mailing system          ##

			




	
	
	
		
 
## Additionally those settings will be used by rhodecode mailing system       ##

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
#email_to = admin@localhost

			




	
	
	
		
 
#error_email_from = paste_error@localhost

			




	
	
	
		
 
#app_email_from = rhodecode-noreply@localhost

			




	
	
	
		
 
#error_message =

			




	
	
	
		
 

			




	
	
		
 
@@ -46,20 +46,31 @@ cache_dir = %(here)s/data

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###         BEAKER CACHE        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 
beaker.cache.data_dir=/%(here)s/data/cache/data

			




	
	
	
		
 
beaker.cache.lock_dir=/%(here)s/data/cache/lock

			




	
	
	
		
 
beaker.cache.regions=super_short_term,short_term,long_term

			




	
	
	
		
 
beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long

			




	
	
	
		
 
beaker.cache.long_term.type=memory

			




	
	
	
		
 
beaker.cache.long_term.expire=36000

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.short_term.type=memory

			




	
	
	
		
 
beaker.cache.short_term.expire=60

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.super_short_term.type=memory

			




	
	
	
		
 
beaker.cache.super_short_term.expire=10

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_short.type=memory

			




	
	
	
		
 
beaker.cache.sql_cache_short.expire=5

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_med.type=memory

			




	
	
	
		
 
beaker.cache.sql_cache_med.expire=360

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_long.type=file

			




	
	
	
		
 
beaker.cache.sql_cache_long.expire=3600

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###       BEAKER SESSION        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 
## Type of storage used for the session, current types are 

			




	
	
	
		
 
## "dbm", "file", "memcached", "database", and "memory". 

			




	
	
	
		
 
## The storage uses the Container API 

			




        

    


    
    

    

        

                

                    production.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
################################################################################

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
# rhodecode - Pylons environment configuration                                    #

			




	
	
	
		
 
# rhodecode - Pylons environment configuration                                 #

			




	
	
	
		
 
#                                                                              # 

			




	
	
	
		
 
# The %(here)s variable will be replaced with the parent directory of this file#

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 

			




	
	
	
		
 
[DEFAULT]

			




	
	
	
		
 
debug = true

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
## Uncomment and replace with the address which should receive                ## 

			




	
	
	
		
 
## any error reports after application crash								  ##

			




	
	
	
		
 
## Additionally those settings will be used by rhodecode mailing system          ##

			




	
	
	
		
 
## any error reports after application crash                                  ##

			




	
	
	
		
 
## Additionally those settings will be used by rhodecode mailing system       ##

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
#email_to = admin@localhost

			




	
	
	
		
 
#error_email_from = paste_error@localhost

			




	
	
	
		
 
#app_email_from = rhodecode-noreply@localhost

			




	
	
	
		
 
#error_message =

			




	
	
	
		
 

			




	
	
		
 
@@ -46,20 +46,31 @@ cache_dir = %(here)s/data

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###         BEAKER CACHE        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 
beaker.cache.data_dir=/%(here)s/data/cache/data

			




	
	
	
		
 
beaker.cache.lock_dir=/%(here)s/data/cache/lock

			




	
	
	
		
 
beaker.cache.regions=super_short_term,short_term,long_term

			




	
	
	
		
 
beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long

			




	
	
	
		
 
beaker.cache.long_term.type=memory

			




	
	
	
		
 
beaker.cache.long_term.expire=36000

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.short_term.type=memory

			




	
	
	
		
 
beaker.cache.short_term.expire=60

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.super_short_term.type=memory

			




	
	
	
		
 
beaker.cache.super_short_term.expire=10

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_short.type=memory

			




	
	
	
		
 
beaker.cache.sql_cache_short.expire=5

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_med.type=memory

			




	
	
	
		
 
beaker.cache.sql_cache_med.expire=360

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_long.type=file

			




	
	
	
		
 
beaker.cache.sql_cache_long.expire=3600

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###       BEAKER SESSION        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 
## Type of storage used for the session, current types are 

			




	
	
	
		
 
## dbm, file, memcached, database, and memory. 

			




	
	
	
		
 
## The storage uses the Container API 

			




        

    


    
    

    

        

                

                    rhodecode/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -47,20 +47,31 @@ app_instance_uuid = ${app_instance_uuid}

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###         BEAKER CACHE        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 
beaker.cache.data_dir=/%(here)s/data/cache/data

			




	
	
	
		
 
beaker.cache.lock_dir=/%(here)s/data/cache/lock

			




	
	
	
		
 
beaker.cache.regions=super_short_term,short_term,long_term

			




	
	
	
		
 
beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long

			




	
	
	
		
 
beaker.cache.long_term.type=memory

			




	
	
	
		
 
beaker.cache.long_term.expire=36000

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.short_term.type=memory

			




	
	
	
		
 
beaker.cache.short_term.expire=60

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.super_short_term.type=memory

			




	
	
	
		
 
beaker.cache.super_short_term.expire=10

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_short.type=memory

			




	
	
	
		
 
beaker.cache.sql_cache_short.expire=5

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_med.type=memory

			




	
	
	
		
 
beaker.cache.sql_cache_med.expire=360

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.sql_cache_long.type=file

			




	
	
	
		
 
beaker.cache.sql_cache_long.expire=3600

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###       BEAKER SESSION        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 
## Type of storage used for the session, current types are 

			




	
	
	
		
 
## dbm, file, memcached, database, and memory. 

			




	
	
	
		
 
## The storage uses the Container API 

			




        

    


    
    

    

        

                

                    rhodecode/lib/auth.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,12 +24,13 @@ Created on April 4, 2010

			




	
	
	
		
 
"""

			




	
	
	
		
 
from beaker.cache import cache_region

			




	
	
	
		
 
from pylons import config, session, url, request

			




	
	
	
		
 
from pylons.controllers.util import abort, redirect

			




	
	
	
		
 
from rhodecode.lib.utils import get_repo_slug

			




	
	
	
		
 
from rhodecode.model import meta

			




	
	
	
		
 
from rhodecode.model.caching_query import FromCache

			




	
	
	
		
 
from rhodecode.model.db import User, RepoToPerm, Repository, Permission, \

			




	
	
	
		
 
    UserToPerm

			




	
	
	
		
 
from sqlalchemy.exc import OperationalError

			




	
	
	
		
 
from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound

			




	
	
	
		
 
import bcrypt

			




	
	
	
		
 
from decorator import decorator

			




	
	
		
 
@@ -138,13 +139,15 @@ def fill_data(user):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Fills user data with those from database and log out user if not present

			




	
	
	
		
 
    in database

			




	
	
	
		
 
    @param user:

			




	
	
	
		
 
    """

			




	
	
	
		
 
    sa = meta.Session

			




	
	
	
		
 
    dbuser = sa.query(User).get(user.user_id)

			




	
	
	
		
 
    dbuser = sa.query(User).options(FromCache('sql_cache_short',

			




	
	
	
		
 
                                              'getuser_%s' % user.user_id))\

			




	
	
	
		
 
        .get(user.user_id)

			




	
	
	
		
 
    if dbuser:

			




	
	
	
		
 
        user.username = dbuser.username

			




	
	
	
		
 
        user.is_admin = dbuser.admin

			




	
	
	
		
 
        user.name = dbuser.name

			




	
	
	
		
 
        user.lastname = dbuser.lastname

			




	
	
	
		
 
        user.email = dbuser.email

			




	
	
		
 
@@ -163,17 +166,20 @@ def fill_perms(user):

			




	
	
	
		
 
    user.permissions['repositories'] = {}

			




	
	
	
		
 
    user.permissions['global'] = set()

			




	
	
	
		
 
    

			




	
	
	
		
 
    #===========================================================================

			




	
	
	
		
 
    # fetch default permissions

			




	
	
	
		
 
    #===========================================================================

			




	
	
	
		
 
    default_user = sa.query(User)\

			




	
	
	
		
 
        .options(FromCache('sql_cache_short','getuser_%s' % 'default'))\

			




	
	
	
		
 
        .filter(User.username == 'default').scalar()

			




	
	
	
		
 
                                            

			




	
	
	
		
 
    default_perms = sa.query(RepoToPerm, Repository, Permission)\

			




	
	
	
		
 
        .join((Repository, RepoToPerm.repository_id == Repository.repo_id))\

			




	
	
	
		
 
        .join((Permission, RepoToPerm.permission_id == Permission.permission_id))\

			




	
	
	
		
 
        .filter(RepoToPerm.user == sa.query(User).filter(User.username == 

			




	
	
	
		
 
                                            'default').scalar()).all()

			




	
	
	
		
 
        .filter(RepoToPerm.user == default_user).all()

			




	
	
	
		
 
                                            

			




	
	
	
		
 
    if user.is_admin:

			




	
	
	
		
 
        #=======================================================================

			




	
	
	
		
 
        # #admin have all default rights set to admin        

			




	
	
	
		
 
        #=======================================================================

			




	
	
	
		
 
        user.permissions['global'].add('hg.admin')

			




        

    


    
    

    

        

                

                    rhodecode/model/caching_query.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -15,15 +15,17 @@ The three new concepts introduced here a

			




	
	
	
		
 
   a Query.

			




	
	
	
		
 

			




	
	
	
		
 
The rest of what's here are standard SQLAlchemy and

			




	
	
	
		
 
Beaker constructs.

			




	
	
	
		
 
   

			




	
	
	
		
 
"""

			




	
	
	
		
 
from beaker.exceptions import BeakerException

			




	
	
	
		
 
from sqlalchemy.orm.interfaces import MapperOption

			




	
	
	
		
 
from sqlalchemy.orm.query import Query

			




	
	
	
		
 
from sqlalchemy.sql import visitors

			




	
	
	
		
 
import beaker

			




	
	
	
		
 

			




	
	
	
		
 
class CachingQuery(Query):

			




	
	
	
		
 
    """A Query subclass which optionally loads full results from a Beaker 

			




	
	
	
		
 
    cache region.

			




	
	
	
		
 
    

			




	
	
	
		
 
    The CachingQuery stores additional state that allows it to consult

			




	
	
		
 
@@ -102,13 +104,19 @@ class CachingQuery(Query):

			




	
	
	
		
 
        cache.put(cache_key, value)        

			




	
	
	
		
 

			




	
	
	
		
 
def query_callable(manager):

			




	
	
	
		
 
    def query(*arg, **kw):

			




	
	
	
		
 
        return CachingQuery(manager, *arg, **kw)

			




	
	
	
		
 
    return query

			




	
	
	
		
 
    

			




	
	
	
		
 

			




	
	
	
		
 
def get_cache_region(name, region):

			




	
	
	
		
 
        if region not in beaker.cache.cache_regions:

			




	
	
	
		
 
            raise BeakerException('Cache region not configured: %s' % region)

			




	
	
	
		
 
        kw = beaker.cache.cache_regions[region]

			




	
	
	
		
 
        return beaker.cache.Cache._get_cache(name, kw)

			




	
	
	
		
 
        

			




	
	
	
		
 
def _get_cache_parameters(query):

			




	
	
	
		
 
    """For a query with cache_region and cache_namespace configured,

			




	
	
	
		
 
    return the correspoinding Cache instance and cache key, based

			




	
	
	
		
 
    on this query's current criterion and parameter values.

			




	
	
	
		
 

			




	
	
	
		
 
    """

			




	
	
		
 
@@ -122,14 +130,14 @@ def _get_cache_parameters(query):

			




	
	
	
		
 
    if cache_key is None:

			




	
	
	
		
 
        # cache key - the value arguments from this query's parameters.

			




	
	
	
		
 
        args = _params_from_query(query)

			




	
	
	
		
 
        cache_key = " ".join([str(x) for x in args])

			




	
	
	
		
 

			




	
	
	
		
 
    # get cache

			




	
	
	
		
 
    cache = query.cache_manager.get_cache_region(namespace, region)

			




	
	
	
		
 

			




	
	
	
		
 
    #cache = query.cache_manager.get_cache_region(namespace, region)

			




	
	
	
		
 
    cache = get_cache_region(namespace, region)

			




	
	
	
		
 
    # optional - hash the cache_key too for consistent length

			




	
	
	
		
 
    # import uuid

			




	
	
	
		
 
    # cache_key= str(uuid.uuid5(uuid.NAMESPACE_DNS, cache_key))

			




	
	
	
		
 

			




	
	
	
		
 
    return cache, cache_key

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/model/meta.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -25,39 +25,9 @@ Base = declarative_base()

			




	
	
	
		
 
#For another db...

			




	
	
	
		
 
#Base2 = declarative_base()

			




	
	
	
		
 

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
# CACHE OPTIONS

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
cache_base = jn(dn(dn(dn(abspath(__file__)))), 'data')

			




	
	
	
		
 
cache_dir = jn(cache_base, 'cache')

			




	
	
	
		
 

			




	
	
	
		
 
if not os.path.isdir(cache_base):

			




	
	
	
		
 
    os.mkdir(cache_base)

			




	
	
	
		
 

			




	
	
	
		
 
if not os.path.isdir(cache_dir):

			




	
	
	
		
 
    os.mkdir(cache_dir)

			




	
	
	
		
 
# set start_time to current time

			




	
	
	
		
 
# to re-cache everything

			




	
	
	
		
 
# upon application startup

			




	
	
	
		
 
start_time = time.time()

			




	
	
	
		
 
# configure the "sqlalchemy" cache region.

			




	
	
	
		
 
cache_manager.regions['sql_cache_short'] = {

			




	
	
	
		
 
        'type':'memory',

			




	
	
	
		
 
        'data_dir':cache_dir,

			




	
	
	
		
 
        'expire':10,

			




	
	
	
		
 
        'start_time':start_time

			




	
	
	
		
 
    }

			




	
	
	
		
 
cache_manager.regions['sql_cache_med'] = {

			




	
	
	
		
 
        'type':'memory',

			




	
	
	
		
 
        'data_dir':cache_dir,

			




	
	
	
		
 
        'expire':360,

			




	
	
	
		
 
        'start_time':start_time

			




	
	
	
		
 
    }

			




	
	
	
		
 
cache_manager.regions['sql_cache_long'] = {

			




	
	
	
		
 
        'type':'file',

			




	
	
	
		
 
        'data_dir':cache_dir,

			




	
	
	
		
 
        'expire':3600,

			




	
	
	
		
 
        'start_time':start_time

			




	
	
	
		
 
    }

			




	
	
	
		
 
#Configured globally in .ini files

			




	
	
	
		
 
#to use cache use this in query

			




	
	
	
		
 
#.options(FromCache("sqlalchemy_cache_type", "cachekey"))

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.