Skip to content

The Unified and Autonomous Development Platform

Add source line statistics

Robin Shenb7b2ae1fb7f9
diff --git a/core/src/main/java/io/onedev/server/git/LineStats.java b/core/src/main/java/io/onedev/server/git/LineStats.java
deleted file mode 100644
index 967b9754c7..0000000000
--- a/core/src/main/java/io/onedev/server/git/LineStats.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package io.onedev.server.git;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.util.Day;
-
-public class LineStats implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final Map<Day, Map<String, Integer>> linesByDay;
-
- private transient Map<String, Map<Day, Integer>> linesByLanguage;
-
- public LineStats(Map<Day, Map<String, Integer>> linesByDay) {
- this.linesByDay = linesByDay;
- }
-
- /**
- * Get source lines by day and language
- * @return
- */
- public Map<Day, Map<String, Integer>> getLinesByDay() {
- return linesByDay;
- }
-
- @Nullable
- public Day getFirstDay() {
- if (!linesByDay.isEmpty())
- return Collections.min(linesByDay.keySet());
- else
- return null;
- }
-
- @Nullable
- public Day getLastDay() {
- if (!linesByDay.isEmpty())
- return Collections.max(linesByDay.keySet());
- else
- return null;
- }
-
- /**
- * Get lines by language and day
- * @return
- */
- public Map<String, Map<Day, Integer>> getLinesByLanguage() {
- if (linesByLanguage == null) {
- linesByLanguage = new HashMap<>();
- for (Map.Entry<Day, Map<String, Integer>> outerEntry: linesByDay.entrySet()) {
- Day day = outerEntry.getKey();
- for (Map.Entry<String, Integer> innerEntry: outerEntry.getValue().entrySet()) {
- String language = innerEntry.getKey();
- int lines = innerEntry.getValue();
- Map<Day, Integer> linesOfLanguage = linesByLanguage.get(language);
- if (linesOfLanguage == null) {
- linesOfLanguage = new HashMap<>();
- linesByLanguage.put(language, linesOfLanguage);
- }
- linesOfLanguage.put(day, lines);
- }
- }
- }
- return linesByLanguage;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java
index 83fdb14847..a4bf39ba6b 100644
--- a/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java
@@ -8,7 +8,6 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.git.Contribution;
import io.onedev.server.git.Contributor;
-import io.onedev.server.git.LineStats;
import io.onedev.server.git.NameAndEmail;
import io.onedev.server.model.Project;
import io.onedev.server.util.Day;
@@ -78,7 +77,7 @@ public interface CommitInfoManager {
* @return
* line statistics data
*/
- LineStats getLineStats(Project project);
+ Map<Day, Map<String, Integer>> getLineIncrements(Project project);
Collection<ObjectId> getFixCommits(Project project, Long issueNumber);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
index 29c077d71a..6cf7f0b74f 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
@@ -47,7 +47,6 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.git.Contribution;
import io.onedev.server.git.Contributor;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.LineStats;
import io.onedev.server.git.NameAndEmail;
import io.onedev.server.git.command.FileChange;
import io.onedev.server.git.command.GitCommit;
@@ -850,41 +849,24 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
}
@Override
- public LineStats getLineStats(Project project) {
+ public Map<Day, Map<String, Integer>> getLineIncrements(Project project) {
Environment env = getEnv(project.getId().toString());
Store store = getStore(env, DEFAULT_STORE);
- return env.computeInReadonlyTransaction(new TransactionalComputable<LineStats>() {
+ return env.computeInReadonlyTransaction(new TransactionalComputable<Map<Day, Map<String, Integer>>>() {
@Override
- public LineStats compute(Transaction txn) {
+ public Map<Day, Map<String, Integer>> compute(Transaction txn) {
+ Map<Day, Map<String, Integer>> lineIncrements = new HashMap<>();
byte[] bytes = readBytes(store, txn, LINE_STATS_KEY);
- Map<Day, Map<String, Integer>> linesByDay = new HashMap<>();
if (bytes != null) {
@SuppressWarnings("unchecked")
Map<Integer, Map<String, Integer>> storedMap =
(Map<Integer, Map<String, Integer>>) SerializationUtils.deserialize(bytes);
- List<Integer> sortedDays = new ArrayList<>(storedMap.keySet());
- Collections.sort(sortedDays);
- Map<String, Integer> accumulatedLines = new HashMap<>();
- for (Integer day: sortedDays) {
- Map<String, Integer> linesOnDay = storedMap.get(day);
- for (Map.Entry<String, Integer> entry: linesOnDay.entrySet()) {
- Integer value = accumulatedLines.get(entry.getKey());
- if (value != null)
- value += entry.getValue();
- else
- value = entry.getValue();
- entry.setValue(value);
- }
- for (Map.Entry<String, Integer> entry: accumulatedLines.entrySet())
- linesOnDay.putIfAbsent(entry.getKey(), entry.getValue());
- accumulatedLines = linesOnDay;
- }
for (Map.Entry<Integer, Map<String, Integer>> entry: storedMap.entrySet())
- linesByDay.put(new Day(entry.getKey()), entry.getValue());
+ lineIncrements.put(new Day(entry.getKey()), entry.getValue());
}
- return new LineStats(linesByDay);
+ return lineIncrements;
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
index 102775784f..8282efa736 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
@@ -8,7 +8,7 @@
<option>Deletions</option>
</select>
</div>
- <div class="note">Contributions to master, excluding merge commits</div>
+ <div class="note">Contributions to default branch, excluding merge commits</div>
<div class="overall chart"></div>
<div class="top-contributors container-fluid"></div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html
index b508c60ab7..4c23069eb8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html
@@ -1,8 +1,5 @@
<wicket:extend>
<div id="source-lines">
- <div wicket:id="languages" class="well">
- <h4 wicket:id="language"></h4>
- <table wicket:id="lines"></table>
- </div>
+ <div class="chart"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
index 4f2034ec74..74eaa6962d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
@@ -1,164 +1,42 @@
package io.onedev.server.web.page.project.stats;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.HashMap;
import java.util.Map;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import io.onedev.server.OneDev;
-import io.onedev.server.git.LineStats;
import io.onedev.server.manager.CommitInfoManager;
-import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Day;
-import io.onedev.server.web.WebConstants;
@SuppressWarnings("serial")
public class SourceLinesPage extends ProjectStatsPage {
- private IModel<LineStats> lineStatsModel = new LoadableDetachableModel<LineStats>() {
-
- @Override
- protected LineStats load() {
- return OneDev.getInstance(CommitInfoManager.class).getLineStats(getProject());
- }
-
- };
-
public SourceLinesPage(PageParameters params) {
super(params);
}
- @Override
- protected void onDetach() {
- lineStatsModel.detach();
- super.onDetach();
- }
-
- private LineStats getLineStats() {
- return lineStatsModel.getObject();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new ListView<String>("languages", new LoadableDetachableModel<List<String>>() {
-
- @Override
- protected List<String> load() {
- Day lastDay = getLineStats().getLastDay();
- if (lastDay != null) {
- Map<String, Integer> linesOnDay = getLineStats().getLinesByDay().get(lastDay);
- List<String> languages = new ArrayList<>(linesOnDay.keySet());
- Collections.sort(languages, new Comparator<String>() {
-
- @Override
- public int compare(String o1, String o2) {
- return linesOnDay.get(o2) - linesOnDay.get(o1);
- }
-
- });
- return languages;
- } else {
- return new ArrayList<>();
- }
- }
-
- }) {
-
- @Override
- protected void populateItem(ListItem<String> item) {
- item.add(new Label("language", item.getModelObject()));
-
- List<IColumn<Day, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<Day, Void>(Model.of("Date")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<Day>> cellItem, String componentId,
- IModel<Day> rowModel) {
- cellItem.add(new Label(componentId, DateUtils.formatDate(rowModel.getObject().getDate())));
- }
- });
-
- columns.add(new AbstractColumn<Day, Void>(Model.of("Lines")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<Day>> cellItem, String componentId,
- IModel<Day> rowModel) {
- String language = item.getModelObject();
- Day day = rowModel.getObject();
- int lines = getLineStats().getLinesByLanguage().get(language).get(day);
- cellItem.add(new Label(componentId, lines));
- }
-
- });
-
- SortableDataProvider<Day, Void> dataProvider = new SortableDataProvider<Day, Void>() {
-
- private List<Day> getDays() {
- List<Day> days = new ArrayList<>();
- days = new ArrayList<>(getLineStats().getLinesByLanguage().get(item.getModelObject()).keySet());
- Collections.sort(days);
- return days;
- }
-
- @Override
- public Iterator<? extends Day> iterator(long first, long count) {
- List<Day> days = getDays();
- if (first + count <= days.size())
- return days.subList((int)first, (int)(first+count)).iterator();
- else
- return days.subList((int)first, days.size()).iterator();
- }
-
- @Override
- public long size() {
- return getDays().size();
- }
-
- @Override
- public IModel<Day> model(Day object) {
- return Model.of(object);
- }
- };
-
- DataTable<Day, Void> linesTable =
- new DataTable<Day, Void>("lines", columns, dataProvider, WebConstants.PAGE_SIZE);
-
- linesTable.addTopToolbar(new HeadersToolbar<>(linesTable, dataProvider));
- linesTable.addBottomToolbar(new AjaxNavigationToolbar(linesTable));
- linesTable.setOutputMarkupId(true);
- item.add(linesTable);
- }
-
- });
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.stats.lineStats.onDomReady();"));
+
+ Map<Day, Map<String, Integer>> lineIncrements = OneDev.getInstance(CommitInfoManager.class).getLineIncrements(getProject());
+ Map<Long, Map<String, Integer>> data = new HashMap<>();
+ for (Map.Entry<Day, Map<String, Integer>> entry: lineIncrements.entrySet()) {
+ data.put(entry.getKey().getDate().getTime(), entry.getValue());
+ }
+ try {
+ String jsonOfData = OneDev.getInstance(ObjectMapper.class).writeValueAsString(data);
+ String script = String.format("onedev.server.stats.sourceLines.onDomReady(%s);", jsonOfData);
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
index dc2e7c8b9a..3360cc482c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
@@ -3,7 +3,7 @@
padding-bottom: 8px;
border-bottom: 1px solid #EEE;
}
-#project-contribs .note {
+#project-stats .note {
margin-bottom: 20px;
color: #666;
font-size: 16px;
@@ -69,3 +69,13 @@
background: #F9F9F9;
height: 300px;
}
+#source-lines>.chart {
+ height: 600px;
+ background: #F9F9F9;
+ border: 1px solid #EEE;
+}
+#source-lines .no-data {
+ text-align: center;
+ font-size: 36px;
+ font-style: italic;
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
index 411d28febc..c5d49e666d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
@@ -1,4 +1,17 @@
onedev.server.stats = {
+ formatYAxisLabel: function(value, index, useKilo) {
+ if (index == 0)
+ useKilo = false;
+ else if (index == 1 && value >= 1000)
+ useKilo = true;
+ return {
+ useKilo: useKilo,
+ value: useKilo? (value/1000).toFixed(1) + " k": value
+ }
+ },
+ formatDate: function(date) {
+ return date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
+ },
contribs: {
onDomReady : function(overallContributions, topContributorsDataUrl) {
var $contribs = $("#project-contribs");
@@ -26,15 +39,11 @@ onedev.server.stats = {
currentDay.setDate(currentDay.getDate()+1);
}
- function formatDate(date) {
- return date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
- }
-
var fromDay = days[0];
var toDay = days[days.length-1];
function updateDateRange() {
- $contribs.find(".date-range").text(formatDate(fromDay) + " ~ " + formatDate(toDay));
+ $contribs.find(".date-range").text(onedev.server.stats.formatDate(fromDay) + " ~ " + onedev.server.stats.formatDate(toDay));
}
var $contribType = $contribs.find(".contrib-type");
@@ -45,7 +54,7 @@ onedev.server.stats = {
var overallXAxisData = [];
for (var i=0; i<days.length; i++) {
- overallXAxisData.push(formatDate(days[i]));
+ overallXAxisData.push(onedev.server.stats.formatDate(days[i]));
}
function getOverallSeriesData() {
@@ -61,26 +70,15 @@ onedev.server.stats = {
return data;
}
- var useKiloForOverallChart;
-
- function formatYAxisLabel(value, index, useKilo) {
- if (index == 0)
- useKilo = false;
- else if (index == 1 && value >= 1000)
- useKilo = true;
- return {
- useKilo: useKilo,
- value: useKilo? (value/1000).toFixed(1) + " k": value
- }
- }
-
var grid = {
left: '80px',
right: '40px',
top: '40px',
bottom: '40px'
};
-
+
+ var useKiloForOverallChart;
+
var overallChartOption = {
grid: grid,
xAxis: {
@@ -95,7 +93,7 @@ onedev.server.stats = {
},
axisLabel: {
formatter: function(value, index) {
- var result = formatYAxisLabel(value, index, useKiloForOverallChart);
+ var result = onedev.server.stats.formatYAxisLabel(value, index, useKiloForOverallChart);
useKiloForOverallChart = result.useKilo;
return result.value;
}
@@ -167,7 +165,7 @@ onedev.server.stats = {
var xAxisData = [];
for (var i=0; i<days.length; i++) {
if (days[i] >= fromDay && days[i] <= toDay)
- xAxisData.push(formatDate(days[i]));
+ xAxisData.push(onedev.server.stats.formatDate(days[i]));
}
var maxValue = 0;
@@ -237,7 +235,7 @@ onedev.server.stats = {
boundaryGap: [0, (maxValue-maxValueOfContributor)/maxValueOfContributor],
axisLabel: {
formatter: function(value, index) {
- var result = formatYAxisLabel(value, index, useKilo);
+ var result = onedev.server.stats.formatYAxisLabel(value, index, useKilo);
useKilo = result.useKilo;
return result.value;
}
@@ -248,6 +246,7 @@ onedev.server.stats = {
color: "#EEAD08",
symbol: 'none',
smooth: true,
+ sampling: 'average',
animation: false,
areaStyle: {
color: "#EEAD08"
@@ -297,6 +296,137 @@ onedev.server.stats = {
}
},
sourceLines: {
- onDomReady: function() {}
+ onDomReady: function(lineIncrements) {
+ var numOfTopLanguages = 10;
+
+ var $chart = $("#source-lines>.chart");
+ if (lineIncrements.length == 0) {
+ $chart.append("<div class='no-data'>No data</div>");
+ return;
+ }
+
+ var languageLines = {};
+ var incrementDays = [];
+ for (var dayMillis in lineIncrements) {
+ delete lineIncrements[dayMillis]["@class"];
+ incrementDays.push(new Date(parseInt(dayMillis)));
+ var incrementsOnDay = lineIncrements[dayMillis];
+ for (var language in incrementsOnDay) {
+ var increment = incrementsOnDay[language];
+ var dailyLinesByLanguages = languageLines[language];
+ if (dailyLinesByLanguages != undefined)
+ dailyLinesByLanguages += increment;
+ else
+ dailyLinesByLanguages = increment;
+ languageLines[language] = dailyLinesByLanguages;
+ }
+ }
+ incrementDays.sort(function(a, b) {
+ return a - b;
+ });
+
+ var languages = Object.keys(languageLines);
+ languages.sort(function(a, b) {
+ return languageLines[b] - languageLines[a];
+ });
+
+ var topLanguages = languages.slice(0, numOfTopLanguages);
+
+ var lastDay = incrementDays[incrementDays.length-1];
+ var currentDay = incrementDays[0];
+ var dailyLinesByLanguages = {};
+ for (var i in topLanguages)
+ dailyLinesByLanguages[topLanguages[i]] = [];
+ var xAxisData = [];
+ while (currentDay <= lastDay) {
+ var incrementsOnCurrentDay = lineIncrements[currentDay.getTime()];
+ for (var language in dailyLinesByLanguages) {
+ var dailyLines = dailyLinesByLanguages[language];
+ var increments;
+ if (incrementsOnCurrentDay)
+ increments = incrementsOnCurrentDay[language];
+ if (increments == undefined)
+ increments = 0;
+
+ if (dailyLines.length != 0)
+ dailyLines.push(dailyLines[dailyLines.length-1] + increments);
+ else
+ dailyLines.push(increments);
+ }
+ xAxisData.push(onedev.server.stats.formatDate(currentDay));
+ currentDay = new Date(currentDay.getTime());
+ currentDay.setDate(currentDay.getDate()+1);
+ }
+
+ var chart = echarts.init($chart[0]);
+
+ var useKilo;
+ var option = {
+ title: {
+ text: 'Source lines of code on default branch',
+ left: 'center',
+ top: 10
+ },
+ grid: {
+ left: '60px',
+ right: '40px',
+ top: '80px',
+ bottom: '40px'
+ },
+ xAxis: {
+ type: 'category',
+ data: xAxisData,
+ boundaryGap: false
+ },
+ yAxis: {
+ minInterval: 1,
+ axisLine: {
+ show:false
+ },
+ boundaryGap: [0, 0],
+ axisLabel: {
+ formatter: function(value, index) {
+ var result = onedev.server.stats.formatYAxisLabel(value, index, useKilo);
+ useKilo = result.useKilo;
+ return result.value;
+ }
+ },
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ top: 40,
+ data: []
+ },
+ series: []
+ };
+
+ var colors = ["#53a8fd", "#19A519", "#EEAD08", "#09c112", "#ff4242", "#b00000", "#af29f8", "#ee6c1e", "#ef56cd", "#630596", "#8e4509", "#9b0f7b"];
+ var colorIndex = 0;
+ for (language in dailyLinesByLanguages) {
+ option.series.push({
+ name: language,
+ type: 'line',
+ color: colors[colorIndex],
+ symbol: 'none',
+ sampling: 'average',
+ smooth: true,
+ animation: false,
+ data: dailyLinesByLanguages[language],
+ });
+ option.legend.data.push({
+ name: language,
+ });
+
+ if (++colorIndex == colors.length)
+ colorIndex = 0;
+ }
+ chart.setOption(option);
+
+ $(window).resize(function() {
+ chart.resize();
+ });
+ }
}
}
\ No newline at end of file