You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/05/08 17:35:41 UTC
[44/50] git commit: [#6133] remove extremely slow methods using
`self.query.find()`
[#6133] remove extremely slow methods using `self.query.find()`
And remove table displaying these values. A few other values of this
table (the 'Value' column) could still be displayed, but showing just
one column in a table would look bad, and these values are basically
available from the main table on the stats page anyway. The methods
for computing those values were left, just unused now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b21778f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b21778f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b21778f7
Branch: refs/heads/tv/docs
Commit: b21778f718934462187b1fdc1d76107c37450176
Parents: 47e7e08
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Sat May 4 22:47:52 2013 -0400
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Mon May 6 21:34:31 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/stats.py | 60 -----------
.../forgeuserstats/controllers/userstats.py | 81 ++++-----------
ForgeUserStats/forgeuserstats/templates/index.html | 44 --------
3 files changed, 22 insertions(+), 163 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b21778f7/Allura/allura/model/stats.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/stats.py b/Allura/allura/model/stats.py
index 06ed07d..cff1abc 100644
--- a/Allura/allura/model/stats.py
+++ b/Allura/allura/model/stats.py
@@ -117,66 +117,6 @@ class Stats(MappedClass):
return round(float(tickets.solved) / tickets.assigned, 2)
return 0
- @classmethod
- def getMaxAndAverageCodeContribution(self):
- res = self.query.find()
- n = res.count()
- if n == 0:
- return 0, 0
- values = [x.getCodeContribution() for x in res]
- maxcontribution=max(values)
- averagecontribution=sum(values) / n
- return maxcontribution, round(averagecontribution, 2)
-
- @classmethod
- def getMaxAndAverageDiscussionContribution(self):
- res = self.query.find()
- n = res.count()
- if n == 0:
- return 0, 0
- values = [x.getDiscussionContribution() for x in res]
- maxcontribution=max(values)
- averagecontribution=sum(values)/n
- return maxcontribution, round(averagecontribution, 2)
-
- @classmethod
- def getMaxAndAverageTicketsSolvingPercentage(self):
- res = self.query.find()
- n = res.count()
- if n == 0:
- return 0, 0
- values = [x.getTicketsContribution() for x in res]
- maxcontribution=max(values)
- averagecontribution=sum(values)/n
- return maxcontribution, round(averagecontribution, 2)
-
- def codeRanking(self):
- res = self.query.find()
- totn = res.count()
- if totn == 0:
- return 0
- codcontr = self.getCodeContribution()
- upper = len([x for x in res if x.getCodeContribution() > codcontr])
- return round((totn - upper) * 100.0 / totn, 2)
-
- def discussionRanking(self):
- res = self.query.find()
- totn = res.count()
- if totn == 0:
- return 0
- disccontr = self.getDiscussionContribution()
- upper=len([x for x in res if x.getDiscussionContribution()>disccontr])
- return round((totn - upper) * 100.0 / totn, 2)
-
- def ticketsRanking(self):
- res = self.query.find()
- totn = res.count()
- if totn == 0:
- return 0
- ticketscontr = self.getTicketsContribution()
- upper=len([x for x in res if x.getTicketsContribution()>ticketscontr])
- return round((totn - upper) * 100.0 / totn, 2)
-
def getCommits(self, category = None):
i = getElementIndex(self.general, category = category)
if i is None:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b21778f7/ForgeUserStats/forgeuserstats/controllers/userstats.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/controllers/userstats.py b/ForgeUserStats/forgeuserstats/controllers/userstats.py
index 5b95954..1cb5505 100644
--- a/ForgeUserStats/forgeuserstats/controllers/userstats.py
+++ b/ForgeUserStats/forgeuserstats/controllers/userstats.py
@@ -45,14 +45,14 @@ class ForgeUserStatsCatController(BaseController):
@with_trailing_slash
def index(self, **kw):
self.user = c.project.user_project_of
- if not self.user:
+ if not self.user:
return None
stats = self.user.stats
if (not stats.visible) and (c.user != self.user):
return dict(user=self.user)
-
+
cat_id = None
- if self.category:
+ if self.category:
cat_id = self.category._id
ret_dict = _getDataForCategory(cat_id, stats)
ret_dict['user'] = self.user
@@ -62,23 +62,23 @@ class ForgeUserStatsCatController(BaseController):
class ForgeUserStatsController(BaseController):
- category = ForgeUserStatsCatController()
-
+ category = ForgeUserStatsCatController()
+
@expose('jinja:forgeuserstats:templates/settings.html')
@with_trailing_slash
def settings(self, **kw):
require_access(c.project, 'admin')
self.user = c.project.user_project_of
- if not self.user:
+ if not self.user:
return dict(user=None)
if not self.user.stats:
UserStats.create(self.user)
return dict(
- user = self.user,
+ user = self.user,
form = StatsPreferencesForm(
action = c.project.url() + 'userstats/change_settings'))
-
+
@expose()
@require_post()
@validate(stats_preferences_form, error_handler=settings)
@@ -86,7 +86,7 @@ class ForgeUserStatsController(BaseController):
require_access(c.project, 'admin')
self.user = c.project.user_project_of
- if not self.user:
+ if not self.user:
return dict(user=None)
if not self.user.stats:
UserStats.create(self.user)
@@ -98,7 +98,7 @@ class ForgeUserStatsController(BaseController):
@with_trailing_slash
def index(self, **kw):
self.user = c.project.user_project_of
- if not self.user:
+ if not self.user:
return dict(user=None)
if not self.user.stats:
UserStats.create(self.user)
@@ -131,25 +131,12 @@ class ForgeUserStatsController(BaseController):
ret_dict['lastmonth_logins'] = stats.getLastMonthLogins()
ret_dict['categories'] = categories
days = ret_dict['days']
- if days >= 30:
+ if days >= 30:
ret_dict['permonthlogins'] = \
round(stats.tot_logins_count*30.0/days,2)
else:
ret_dict['permonthlogins'] = 'n/a'
- ret_dict['codepercentage'] = stats.codeRanking()
- ret_dict['discussionpercentage'] = stats.discussionRanking()
- ret_dict['ticketspercentage'] = stats.ticketsRanking()
- ret_dict['codecontribution'] = stats.getCodeContribution()
- ret_dict['discussioncontribution'] = stats.getDiscussionContribution()
- ret_dict['ticketcontribution'] = stats.getTicketsContribution()
- ret_dict['maxcodecontrib'], ret_dict['averagecodecontrib'] =\
- stats.getMaxAndAverageCodeContribution()
- ret_dict['maxdisccontrib'], ret_dict['averagedisccontrib'] =\
- stats.getMaxAndAverageDiscussionContribution()
- ret_dict['maxticketcontrib'], ret_dict['averageticketcontrib'] =\
- stats.getMaxAndAverageTicketsSolvingPercentage()
-
return ret_dict
@@ -157,7 +144,7 @@ class ForgeUserStatsController(BaseController):
@with_trailing_slash
def commits(self, **kw):
self.user = c.project.user_project_of
- if not self.user:
+ if not self.user:
return dict(user=None)
if not self.user.stats:
UserStats.create(self.user)
@@ -165,17 +152,17 @@ class ForgeUserStatsController(BaseController):
if (not stats.visible) and (c.user != self.user):
return dict(user=self.user)
-
+
commits = stats.getCommitsByCategory()
return dict(
user = self.user,
- data = commits)
+ data = commits)
@expose('jinja:forgeuserstats:templates/artifacts.html')
@with_trailing_slash
def artifacts(self, **kw):
self.user = c.project.user_project_of
- if not self.user:
+ if not self.user:
return dict(user=None)
if not self.user.stats:
UserStats.create(self.user)
@@ -184,7 +171,7 @@ class ForgeUserStatsController(BaseController):
if (not stats.visible) and (c.user != self.user):
return dict(user=self.user)
- stats = self.user.stats
+ stats = self.user.stats
artifacts = stats.getArtifactsByCategory(detailed=True)
return dict(
user = self.user,
@@ -194,7 +181,7 @@ class ForgeUserStatsController(BaseController):
@with_trailing_slash
def tickets(self, **kw):
self.user = c.project.user_project_of
- if not self.user:
+ if not self.user:
return dict(user=None)
if not self.user.stats:
UserStats.create(self.user)
@@ -211,7 +198,7 @@ class ForgeUserStatsController(BaseController):
@expose()
def categories_graph(self):
self.user = c.project.user_project_of
- if not self.user:
+ if not self.user:
return None
categories = {}
@@ -234,39 +221,16 @@ class ForgeUserStatsController(BaseController):
labels.append(label)
i += 1
- return create_histogram(data, labels,
+ return create_histogram(data, labels,
'Number of projects', 'Projects by category')
- @expose()
- def code_ranking_bar(self):
- self.user = c.project.user_project_of
- if not self.user:
- return None
- stats = self.user.stats
- return create_progress_bar(stats.codeRanking())
-
- @expose()
- def discussion_ranking_bar(self):
- self.user = c.project.user_project_of
- if not self.user:
- return None
- stats = self.user.stats
- return create_progress_bar(stats.discussionRanking())
-
- @expose()
- def tickets_ranking_bar(self):
- self.user = c.project.user_project_of
- if not self.user:
- return None
- stats = self.user.stats
- return create_progress_bar(stats.ticketsRanking())
def _getDataForCategory(category, stats):
totcommits = stats.getCommits(category)
tottickets = stats.getTickets(category)
averagetime = tottickets.get('averagesolvingtime')
artifacts_by_type = stats.getArtifactsByType(category)
- totartifacts = artifacts_by_type.get(None)
+ totartifacts = artifacts_by_type.get(None)
if totartifacts:
del artifacts_by_type[None]
else:
@@ -279,7 +243,7 @@ def _getDataForCategory(category, stats):
averagetime = lm_tickets.get('averagesolvingtime')
days = (datetime.utcnow() - stats.registration_date).days
- if days >= 30:
+ if days >= 30:
pmartifacts = dict(
created = round(totartifacts['created']*30.0/days,2),
modified=round(totartifacts['modified']*30.0/days,2))
@@ -297,7 +261,7 @@ def _getDataForCategory(category, stats):
round(value['created']*30.0/days,2)
artifacts_by_type[key]['pmmodified']= \
round(value['modified']*30.0/days,2)
- else:
+ else:
pmartifacts = dict(created='n/a', modified='n/a')
pmcommits = dict(number='n/a', lines='n/a')
pmtickets = dict(
@@ -322,4 +286,3 @@ def _getDataForCategory(category, stats):
artifacts_by_type = artifacts_by_type,
lastmonth_artifacts_by_type = lm_artifacts_by_type,
permonthtickets = pmtickets)
-
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b21778f7/ForgeUserStats/forgeuserstats/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/index.html b/ForgeUserStats/forgeuserstats/templates/index.html
index bc23ec0..2bb6314 100644
--- a/ForgeUserStats/forgeuserstats/templates/index.html
+++ b/ForgeUserStats/forgeuserstats/templates/index.html
@@ -391,50 +391,6 @@
</p>
{% endif %}
{% endif %}
- {% if not category %}
- <h2>Overview</h2>
- <table>
- <thead>
- <tr>
- <th>Field</th>
- <th>Value</th>
- <th>Average per-user value</th>
- <th>Maximum per-user value</th>
- <th>Rank bar</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>Code</td>
- <td>{{codecontribution}} LOC{% if codecontribution != 1 %}s{% endif %}/month</td>
- <td>{{averagecodecontrib}} LOC{% if averagecodecontrib != 1 %}s{% endif %}/month</td>
- <td>{{maxcodecontrib}} LOC{% if maxcodecontrib != 1 %}s{% endif %}/month</td>
- <td><img src="{{c.project.url()}}userstats/code_ranking_bar"/> {{codepercentage}} %</td>
- </tr>
- <tr>
- <td>Discussion</td>
- <td>{{discussioncontribution}} contr./month</td>
- <td>{{averagedisccontrib}} contr./month</td>
- <td>{{maxdisccontrib}} contr./month</td>
- <td><img src="{{c.project.url()}}userstats/discussion_ranking_bar"/> {{discussionpercentage}} %</td>
- </tr>
- <tr>
- <td>Solved issues</td>
- <td>{{ticketcontribution*100}} %</td>
- <td>{{averageticketcontrib*100}} %</td>
- <td>{{maxticketcontrib*100}} %</td>
- <td><img src="{{c.project.url()}}userstats/tickets_ranking_bar"/> {{ticketspercentage}} %</td>
- </tr>
- </tbody>
- </table>
- <h3>Note</h3>
- <p>
- The above table compares the average monthly contribution of this user with the average monthly contributions of the
- other users of the forge. The progressbar and the percentage refer to the user's position in an overall ranking of the
- users of this forge. For example, a value of 100% in the field "Code" is associated to the user who has the highest
- average number of committed LOCs per month. Of course, this doesn't consider the quality of the contributions.
- </p>
- {% endif %}
{% else %}
{% if user %}
<h2>Statistics not available</h2>