kallithea Changeset - 7bffccee3a49

Changeset - 7bffccee3a49

Parent rev.

Child rev.

[Not reviewed]

default

0 11 0

Søren Løvborg - 9 years ago 2016-09-23 14:05:42
sorenl@unity3d.com

db: inline calls to get_all

This method saves basically no typing, compared to "query().all()".
Additionally, "all()" returns a list, forcing all records to be loaded
into a memory at the same time, but some callers just need to iterate
over the objects one at a time, in which case "query()" alone is more
efficient. In one case, the caller can even use "count()" and avoid
loading any objects from the database at all.

11 files changed with 16 insertions and 20 deletions:

kallithea/controllers/admin/settings.py

kallithea/controllers/api/api.py

kallithea/lib/paster_commands/update_repoinfo.py

kallithea/model/db.py

kallithea/model/repo.py

kallithea/tests/api/api_base.py

kallithea/tests/fixture.py

kallithea/tests/functional/test_admin_gists.py

kallithea/tests/functional/test_home.py

kallithea/tests/models/test_user_groups.py

kallithea/tests/other/manual_test_vcs_operations.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -164,13 +164,13 @@ class SettingsController(BaseController) @@
             log.debug('rescanning repo location with destroy obsolete=%s, '
                       'install git hooks=%s and '
                       'overwrite git hooks=%s' % (rm_obsolete, install_git_hooks, overwrite_git_hooks))
             if invalidate_cache:
                 log.debug('invalidating all repositories cache')
-                for repo in Repository.get_all():
+                for repo in Repository.query():
                     ScmModel().mark_for_invalidation(repo.repo_name)
             filesystem_repos = ScmModel().repo_scan()
             added, removed = repo2db_mapper(filesystem_repos, rm_obsolete,
                                             install_git_hooks=install_git_hooks,
                                             user=c.authuser.username,

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -440,13 +440,13 @@ class ApiController(JSONRPCController): @@
         if isinstance(userid, Optional):
             user = None
         else:
             user = get_user_or_error(userid)
         # show all locks
-        for r in Repository.get_all():
+        for r in Repository.query():
             userid, time_ = r.locked
             if time_:
                 _api_data = r.get_api_data()
                 # if we use userfilter just show the locks for this user
                 if user is not None:
                     if safe_int(userid) == user.user_id:
@@ @@ -845,13 +845,13 @@ class ApiController(JSONRPCController): @@
             result : [<user_group_obj>,...]
             error : null
         """
         result = []
         _perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin',)
-        for user_group in UserGroupList(UserGroup.get_all(),
+        for user_group in UserGroupList(UserGroup.query().all(),
                                         perm_set=_perms):
             result.append(user_group.get_api_data())
         return result
     @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
     def create_user_group(self, group_name, description=Optional(''),
@@ @@ -1269,13 +1269,13 @@ class ApiController(JSONRPCController): @@
             error:  null
         """
         result = []
         if not HasPermissionAny('hg.admin')():
             repos = RepoModel().get_all_user_repos(user=self.authuser.user_id)
         else:
-            repos = Repository.get_all()
+            repos = Repository.query()
         for repo in repos:
             result.append(repo.get_api_data())
         return result
     # permission check inside
@@ @@ -1947,13 +1947,13 @@ class ApiController(JSONRPCController): @@
     def get_repo_groups(self):
         """
         Returns all repository groups
         """
         result = []
-        for repo_group in RepoGroup.get_all():
+        for repo_group in RepoGroup.query():
             result.append(repo_group.get_api_data())
         return result
     @HasPermissionAnyDecorator('hg.admin')
     def create_repo_group(self, group_name, description=Optional(''),
                           owner=Optional(OAttr('apiuser')),

kallithea/lib/paster_commands/update_repoinfo.py

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ class Command(BasePasterCommand): @@
     def command(self):
         #get SqlAlchemy session
         self._init_session()
         if self.options.repo_update_list is None:
-            repo_list = Repository.get_all()
+            repo_list = Repository.query().all()
         else:
             repo_names = [safe_unicode(n.strip())
                           for n in self.options.repo_update_list.split(',')]
             repo_list = list(Repository.query()
                 .filter(Repository.repo_name.in_(repo_names)))
         RepoModel.update_repoinfo(repositories=repo_list)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -157,16 +157,12 @@ class BaseModel(object): @@
         res = cls.query().get(id_)
         if res is None:
             raise HTTPNotFound
         return res
     @classmethod
     def get_all(cls):
         return cls.query().all()
     @classmethod
     def delete(cls, id_):
         obj = cls.query().get(id_)
         Session().delete(obj)
     def __repr__(self):
         if hasattr(self, '__unicode__'):

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -176,13 +176,13 @@ class RepoModel(BaseModel): @@
         kwargs.update(dict(_=_, h=h, c=c))
         return tmpl.render(*args, **kwargs)
     @classmethod
     def update_repoinfo(cls, repositories=None):
         if repositories is None:
-            repositories = Repository.get_all()
+            repositories = Repository.query()
         for repo in repositories:
             repo.update_changeset_cache()
     def get_repos_as_dict(self, repos_list=None, admin=False, perm_check=True,
                           super_user_actions=False, short_name=False):
         _render = self._render_datatable

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -877,13 +877,13 @@ class _BaseTestApi(object): @@
     def test_api_get_repos(self):
         id_, params = _build_data(self.apikey, 'get_repos')
         response = api_call(self, params)
         result = []
-        for repo in Repository.get_all():
+        for repo in Repository.query():
             result.append(repo.get_api_data())
         ret = jsonify(result)
         expected = ret
         self._compare_ok(id_, expected, given=response.body)

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -249,13 +249,13 @@ class Fixture(object): @@
+        )
         Session().commit()
         return gist
     def destroy_gists(self, gistid=None):
-        for g in Gist.get_all():
+        for g in Gist.query():
             if gistid:
                 if gistid == g.gist_access_id:
                     GistModel().delete(g)
             else:
                 GistModel().delete(g)
         Session().commit()

kallithea/tests/functional/test_admin_gists.py

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ def _create_gist(f_name, content='some g @@
     return gist
 class TestGistsController(TestController):
     def teardown_method(self, method):
-        for g in Gist.get_all():
+        for g in Gist.query():
             GistModel().delete(g)
         Session().commit()
     def test_index(self):
         self.log_user()
         response = self.app.get(url('gists'))

kallithea/tests/functional/test_home.py

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ class TestHomeController(TestController) @@
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))
         #if global permission is set
         response.mustcontain('Add Repository')
         # html in javascript variable:
-        response.mustcontain('var data = {"totalRecords": %s' % len(Repository.get_all()))
+        response.mustcontain('var data = {"totalRecords": %s' % Repository.query().count())
         response.mustcontain(r'href=\"/%s\"' % HG_REPO)
         response.mustcontain(r'<span class="repotag">git')
         response.mustcontain(r'<i class=\"icon-globe\"')
         response.mustcontain("""fixes issue with having custom format for git-log""")

kallithea/tests/models/test_user_groups.py

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ fixture = Fixture() @@
 class TestUserGroups(TestController):
     def teardown_method(self, method):
         # delete all groups
-        for gr in UserGroup.get_all():
+        for gr in UserGroup.query():
             fixture.destroy_user_group(gr)
         Session().commit()
     @parametrize('pre_existing,regular_should_be,external_should_be,groups,expected', [
         ([], [], [], [], []),
         ([], [u'regular'], [], [], [u'regular']),  # no changes of regular
@@ @@ -27,13 +27,13 @@ class TestUserGroups(TestController): @@
         ([], [u'regular'], [u'other'], [], [u'regular']),  # remove not used
         ([u'some_other'], [u'regular'], [u'other', u'container'], [u'container', u'container2'], [u'regular', u'container', u'container2']),
     ])
     def test_enforce_groups(self, pre_existing, regular_should_be,
                             external_should_be, groups, expected):
         # delete all groups
-        for gr in UserGroup.get_all():
+        for gr in UserGroup.query():
             fixture.destroy_user_group(gr)
         Session().commit()
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
         for gr in pre_existing:
             gr = fixture.create_user_group(gr)

kallithea/tests/other/manual_test_vcs_operations.py

➞

Show inline comments

@@ @@ -269,13 +269,13 @@ class TestVCSOperations(TestController): @@
         # commit some stuff into this repo
         fork_name = '%s_fork%s' % (GIT_REPO, _RandomNameSequence().next())
         fixture.create_fork(GIT_REPO, fork_name)
         clone_url = _construct_url(fork_name).split()[0]
         stdout, stderr = _add_files_and_push('git', DEST, clone_url=clone_url)
-        print [(x.repo_full_path,x.repo_path) for x in Repository.get_all()] # TODO: what is this for
+        print [(x.repo_full_path,x.repo_path) for x in Repository.query()] # TODO: what is this for
         _check_proper_git_push(stdout, stderr)
     def test_push_invalidates_cache_hg(self):
         key = CacheInvalidation.query().filter(CacheInvalidation.cache_key
                                                ==HG_REPO).scalar()
         if not key:
@@ @@ -524,13 +524,13 @@ class TestVCSOperations(TestController): @@
             Session().commit()
             clone_url = _construct_url(HG_REPO)
             stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url)
             assert 'abort: HTTP Error 403: Forbidden' in stderr
         finally:
             #release IP restrictions
-            for ip in UserIpMap.get_all():
+            for ip in UserIpMap.query():
                 UserIpMap.delete(ip.ip_id)
             Session().commit()
         # IP permissions are cached, need to invalidate this cache explicitly
         invalidate_all_caches()
@@ @@ -552,13 +552,13 @@ class TestVCSOperations(TestController): @@
             clone_url = _construct_url(GIT_REPO)
             stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url)
             # The message apparently changed in Git 1.8.3, so match it loosely.
             assert re.search(r'\b403\b', stderr)
         finally:
             #release IP restrictions
-            for ip in UserIpMap.get_all():
+            for ip in UserIpMap.query():
                 UserIpMap.delete(ip.ip_id)
             Session().commit()
         # IP permissions are cached, need to invalidate this cache explicitly
         invalidate_all_caches()

0 comments (0 inline, 0 general)