mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-02 11:35:57 +01:00
improve performance and memory consumption of svn log command
This commit is contained in:
@@ -35,6 +35,8 @@ package sonia.scm.repository;
|
|||||||
|
|
||||||
//~--- non-JDK imports --------------------------------------------------------
|
//~--- non-JDK imports --------------------------------------------------------
|
||||||
|
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
@@ -48,6 +50,7 @@ import sonia.scm.util.Util;
|
|||||||
|
|
||||||
//~--- JDK imports ------------------------------------------------------------
|
//~--- JDK imports ------------------------------------------------------------
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -72,7 +75,7 @@ public class SvnUtil
|
|||||||
* @param entry
|
* @param entry
|
||||||
*/
|
*/
|
||||||
public static void appendModification(Modifications modifications,
|
public static void appendModification(Modifications modifications,
|
||||||
SVNLogEntryPath entry)
|
SVNLogEntryPath entry)
|
||||||
{
|
{
|
||||||
appendModification(modifications, entry.getType(), entry.getPath());
|
appendModification(modifications, entry.getType(), entry.getPath());
|
||||||
}
|
}
|
||||||
@@ -85,7 +88,7 @@ public class SvnUtil
|
|||||||
* @param entry
|
* @param entry
|
||||||
*/
|
*/
|
||||||
public static void appendModification(Modifications modifications,
|
public static void appendModification(Modifications modifications,
|
||||||
SVNChangeEntry entry)
|
SVNChangeEntry entry)
|
||||||
{
|
{
|
||||||
appendModification(modifications, entry.getType(), entry.getPath());
|
appendModification(modifications, entry.getType(), entry.getPath());
|
||||||
}
|
}
|
||||||
@@ -99,7 +102,7 @@ public class SvnUtil
|
|||||||
* @param path
|
* @param path
|
||||||
*/
|
*/
|
||||||
public static void appendModification(Modifications modifications, char type,
|
public static void appendModification(Modifications modifications, char type,
|
||||||
String path)
|
String path)
|
||||||
{
|
{
|
||||||
if (path.startsWith("/"))
|
if (path.startsWith("/"))
|
||||||
{
|
{
|
||||||
@@ -183,6 +186,26 @@ public class SvnUtil
|
|||||||
return changeset;
|
return changeset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method description
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @param entries
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static List<Changeset> createChangesets(List<SVNLogEntry> entries)
|
||||||
|
{
|
||||||
|
List<Changeset> changesets = Lists.newArrayList();
|
||||||
|
|
||||||
|
for (SVNLogEntry entry : entries)
|
||||||
|
{
|
||||||
|
changesets.add(createChangeset(entry));
|
||||||
|
}
|
||||||
|
|
||||||
|
return changesets;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method description
|
* Method description
|
||||||
*
|
*
|
||||||
@@ -217,7 +240,7 @@ public class SvnUtil
|
|||||||
* @throws RepositoryException
|
* @throws RepositoryException
|
||||||
*/
|
*/
|
||||||
public static long getRevisionNumber(String revision)
|
public static long getRevisionNumber(String revision)
|
||||||
throws RepositoryException
|
throws RepositoryException
|
||||||
{
|
{
|
||||||
long revisionNumber = -1;
|
long revisionNumber = -1;
|
||||||
|
|
||||||
|
|||||||
@@ -185,7 +185,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
|
|||||||
pathArray = new String[] { request.getPath() };
|
pathArray = new String[] { request.getPath() };
|
||||||
}
|
}
|
||||||
|
|
||||||
List<Changeset> changesetList = Lists.newArrayList();
|
List<SVNLogEntry> changesetList = Lists.newArrayList();
|
||||||
Collection<SVNLogEntry> entries = repository.log(pathArray, null,
|
Collection<SVNLogEntry> entries = repository.log(pathArray, null,
|
||||||
startRev, endRev, true, true);
|
startRev, endRev, true, true);
|
||||||
|
|
||||||
@@ -193,7 +193,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
|
|||||||
{
|
{
|
||||||
if (entry.getRevision() <= maxRev)
|
if (entry.getRevision() <= maxRev)
|
||||||
{
|
{
|
||||||
changesetList.add(SvnUtil.createChangeset(entry));
|
changesetList.add(entry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,8 +219,9 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
|
|||||||
start, end, total);
|
start, end, total);
|
||||||
}
|
}
|
||||||
|
|
||||||
changesetList = Lists.newArrayList(changesetList.subList(start, end));
|
changesetList = changesetList.subList(start, end);
|
||||||
changesets = new ChangesetPagingResult(total, changesetList);
|
changesets = new ChangesetPagingResult(total,
|
||||||
|
SvnUtil.createChangesets(changesetList));
|
||||||
}
|
}
|
||||||
catch (NumberFormatException ex)
|
catch (NumberFormatException ex)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user