Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-03 20:15:52 +01:00
Code Issues Packages Projects Releases Activity

improve performance of git repository api

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-06-21 19:56:35 +02:00
parent afbbcfc75d
commit 13c6eb978c
13 changed files with 345 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java
View File

@@ -35,11 +35,8 @@ package sonia.scm.repository.spi;
import org.eclipse.jgit.lib.Repository;
import sonia.scm.repository.GitUtil;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException;
/**
@@ -53,14 +50,16 @@ public class AbstractGitCommand
* Constructs ...
*
*
*
* @param context
* @param repository
* @param repositoryDirectory
*/
protected AbstractGitCommand(sonia.scm.repository.Repository repository,
File repositoryDirectory)
protected AbstractGitCommand(GitContext context,
sonia.scm.repository.Repository repository)
{
this.repository = repository;
this.repositoryDirectory = repositoryDirectory;
this.context = context;
}
//~--- methods --------------------------------------------------------------
@@ -75,14 +74,14 @@ public class AbstractGitCommand
*/
protected Repository open() throws IOException
{
return GitUtil.open(repositoryDirectory);
return context.open();
}
//~--- fields ---------------------------------------------------------------
/** Field description */
protected sonia.scm.repository.Repository repository;
protected GitContext context;
/** Field description */
protected File repositoryDirectory;
protected sonia.scm.repository.Repository repository;
}

115
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java
View File

@@ -53,7 +53,6 @@ import sonia.scm.repository.RepositoryException;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -78,12 +77,14 @@ public class GitBlameCommand extends AbstractGitCommand implements BlameCommand
* Constructs ...
*
*
*
* @param context
* @param repository
* @param repositoryDirectory
*/
public GitBlameCommand(Repository repository, File repositoryDirectory)
public GitBlameCommand(GitContext context, Repository repository)
{
super(repository, repositoryDirectory);
super(context, repository);
}
//~--- get methods ----------------------------------------------------------
@@ -111,70 +112,56 @@ public class GitBlameCommand extends AbstractGitCommand implements BlameCommand
Preconditions.checkArgument(!Strings.isNullOrEmpty(request.getPath()),
"path is empty or null");
org.eclipse.jgit.blame.BlameResult gitBlameResult = null;
sonia.scm.repository.BlameResult blameResult = null;
org.eclipse.jgit.lib.Repository gr = null;
org.eclipse.jgit.lib.Repository gr = open();
org.eclipse.jgit.api.BlameCommand blame = new Git(gr).blame();
try
blame.setFilePath(request.getPath());
ObjectId revId = GitUtil.getRevisionId(gr, request.getRevision());
blame.setStartCommit(revId);
org.eclipse.jgit.blame.BlameResult gitBlameResult = blame.call();
if (gitBlameResult == null)
{
gr = open();
org.eclipse.jgit.api.BlameCommand blame = new Git(gr).blame();
blame.setFilePath(request.getPath());
ObjectId revId = GitUtil.getRevisionId(gr, request.getRevision());
blame.setStartCommit(revId);
gitBlameResult = blame.call();
if (gitBlameResult == null)
{
throw new RepositoryException(
"could not create blame result for path ".concat(
request.getPath()));
}
List<BlameLine> blameLines = new ArrayList<BlameLine>();
int total = gitBlameResult.getResultContents().size();
int i = 0;
for (; i < total; i++)
{
RevCommit commit = gitBlameResult.getSourceCommit(i);
if (commit != null)
{
PersonIdent author = gitBlameResult.getSourceAuthor(i);
BlameLine blameLine = new BlameLine();
blameLine.setLineNumber(i + 1);
blameLine.setAuthor(new Person(author.getName(),
author.getEmailAddress()));
blameLine.setDescription(commit.getShortMessage());
long when = GitUtil.getCommitTime(commit);
blameLine.setWhen(when);
String rev = commit.getId().getName();
blameLine.setRevision(rev);
String content = gitBlameResult.getResultContents().getString(i);
blameLine.setCode(content);
blameLines.add(blameLine);
}
}
blameResult = new sonia.scm.repository.BlameResult(i, blameLines);
}
finally
{
GitUtil.close(gr);
throw new RepositoryException(
"could not create blame result for path ".concat(request.getPath()));
}
return blameResult;
List<BlameLine> blameLines = new ArrayList<BlameLine>();
int total = gitBlameResult.getResultContents().size();
int i = 0;
for (; i < total; i++)
{
RevCommit commit = gitBlameResult.getSourceCommit(i);
if (commit != null)
{
PersonIdent author = gitBlameResult.getSourceAuthor(i);
BlameLine blameLine = new BlameLine();
blameLine.setLineNumber(i + 1);
blameLine.setAuthor(new Person(author.getName(),
author.getEmailAddress()));
blameLine.setDescription(commit.getShortMessage());
long when = GitUtil.getCommitTime(commit);
blameLine.setWhen(when);
String rev = commit.getId().getName();
blameLine.setRevision(rev);
String content = gitBlameResult.getResultContents().getString(i);
blameLine.setCode(content);
blameLines.add(blameLine);
}
}
return new sonia.scm.repository.BlameResult(i, blameLines);
}
}

81
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
View File

@@ -61,7 +61,6 @@ import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -92,12 +91,14 @@ public class GitBrowseCommand extends AbstractGitCommand
* Constructs ...
*
*
*
* @param context
* @param repository
* @param repositoryDirectory
*/
public GitBrowseCommand(Repository repository, File repositoryDirectory)
public GitBrowseCommand(GitContext context, Repository repository)
{
super(repository, repositoryDirectory);
super(context, repository);
}
//~--- get methods ----------------------------------------------------------
@@ -109,53 +110,49 @@ public class GitBrowseCommand extends AbstractGitCommand
* @param request
*
* @return
*
* @throws IOException
* @throws RepositoryException
*/
@Override
public BrowserResult getBrowserResult(BrowseCommandRequest request) throws IOException, RepositoryException
public BrowserResult getBrowserResult(BrowseCommandRequest request)
throws IOException, RepositoryException
{
if ( logger.isDebugEnabled() ){
if (logger.isDebugEnabled())
{
logger.debug("try to create browse result for {}", request);
}
BrowserResult result = null;
org.eclipse.jgit.lib.Repository repo = null;
org.eclipse.jgit.lib.Repository repo = open();
ObjectId revId = null;
try
if (Util.isEmpty(request.getRevision()))
{
repo = open();
ObjectId revId = null;
if (Util.isEmpty(request.getRevision()))
{
revId = GitUtil.getRepositoryHead(repo);
}
else
{
revId = GitUtil.getRevisionId(repo, request.getRevision());
}
if (revId != null)
{
result = getResult(repo, revId, request.getPath());
}
else
{
if (Util.isNotEmpty(request.getRevision()))
{
logger.error("could not find revision {}", request.getRevision());
}
else if (logger.isWarnEnabled())
{
logger.warn("coul not find head of repository, empty?");
}
result = new BrowserResult(Constants.HEAD, null, null,
new ArrayList<FileObject>());
}
revId = GitUtil.getRepositoryHead(repo);
}
finally
else
{
GitUtil.close(repo);
revId = GitUtil.getRevisionId(repo, request.getRevision());
}
if (revId != null)
{
result = getResult(repo, revId, request.getPath());
}
else
{
if (Util.isNotEmpty(request.getRevision()))
{
logger.error("could not find revision {}", request.getRevision());
}
else if (logger.isWarnEnabled())
{
logger.warn("coul not find head of repository, empty?");
}
result = new BrowserResult(Constants.HEAD, null, null,
new ArrayList<FileObject>());
}
return result;
@@ -457,8 +454,8 @@ public class GitBrowseCommand extends AbstractGitCommand
try
{
new GitCatCommand(repository, repositoryDirectory).getContent(repo,
revision, PATH_MODULES, baos);
new GitCatCommand(context, repository).getContent(repo, revision,
PATH_MODULES, baos);
subRepositories = GitSubModuleParser.parse(baos.toString());
}
catch (PathNotFoundException ex)

22
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java
View File

@@ -52,7 +52,6 @@ import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -75,13 +74,15 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand
* Constructs ...
*
*
*
* @param context
* @param repository
* @param repositoryDirectory
*/
public GitCatCommand(sonia.scm.repository.Repository repository,
File repositoryDirectory)
public GitCatCommand(GitContext context,
sonia.scm.repository.Repository repository)
{
super(repository, repositoryDirectory);
super(context, repository);
}
//~--- get methods ----------------------------------------------------------
@@ -107,18 +108,11 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand
org.eclipse.jgit.lib.Repository repo = null;
try
{
repo = open();
repo = open();
ObjectId revId = GitUtil.getRevisionId(repo, request.getRevision());
ObjectId revId = GitUtil.getRevisionId(repo, request.getRevision());
getContent(repo, revId, request.getPath(), output);
}
finally
{
GitUtil.close(repo);
}
getContent(repo, revId, request.getPath(), output);
}
/**

121
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java Normal file
View File

@@ -0,0 +1,121 @@
/**
* Copyright (c) 2010, Sebastian Sdorra All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. 2. Redistributions in
* binary form must reproduce the above copyright notice, this list of
* conditions and the following disclaimer in the documentation and/or other
* materials provided with the distribution. 3. Neither the name of SCM-Manager;
* nor the names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* http://bitbucket.org/sdorra/scm-manager
*
*/
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.GitUtil;
//~--- JDK imports ------------------------------------------------------------
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
/**
*
* @author Sebastian Sdorra
*/
public class GitContext implements Closeable
{
/**
* the logger for GitContext
*/
private static final Logger logger =
LoggerFactory.getLogger(GitContext.class);
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
*
* @param directory
*/
public GitContext(File directory)
{
this.directory = directory;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*/
@Override
public void close()
{
if (logger.isTraceEnabled())
{
logger.trace("close git repository {}", directory);
}
GitUtil.close(repository);
repository = null;
}
/**
* Method description
*
*
* @return
*
* @throws IOException
*/
public org.eclipse.jgit.lib.Repository open() throws IOException
{
if (repository == null)
{
if (logger.isTraceEnabled())
{
logger.trace("open git repository {}", directory);
}
repository = GitUtil.open(directory);
}
return repository;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private File directory;
/** Field description */
private org.eclipse.jgit.lib.Repository repository;
}

13
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java
View File

@@ -52,7 +52,6 @@ import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.OutputStream;
import java.util.List;
@@ -76,12 +75,14 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand
* Constructs ...
*
*
*
* @param context
* @param repository
* @param repositoryDirectory
*/
public GitDiffCommand(Repository repository, File repositoryDirectory)
public GitDiffCommand(GitContext context, Repository repository)
{
super(repository, repositoryDirectory);
super(context, repository);
}
//~--- get methods ----------------------------------------------------------
@@ -96,14 +97,14 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand
@Override
public void getDiffResult(DiffCommandRequest request, OutputStream output)
{
org.eclipse.jgit.lib.Repository gr = null;
RevWalk walk = null;
TreeWalk treeWalk = null;
DiffFormatter formatter = null;
try
{
gr = open();
org.eclipse.jgit.lib.Repository gr = open();
walk = new RevWalk(gr);
RevCommit commit = walk.parseCommit(gr.resolve(request.getRevision()));
@@ -155,6 +156,7 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand
}
catch (Exception ex)
{
// TODO throw exception
logger.error("could not create diff", ex);
}
@@ -163,7 +165,6 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand
GitUtil.release(walk);
GitUtil.release(treeWalk);
GitUtil.release(formatter);
GitUtil.close(gr);
}
}
}

12
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
View File

@@ -54,7 +54,6 @@ import sonia.scm.util.IOUtil;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -79,13 +78,14 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
* Constructs ...
*
*
*
* @param context
* @param repository
* @param repositoryDirectory
*/
GitLogCommand(sonia.scm.repository.Repository repository,
File repositoryDirectory)
GitLogCommand(GitContext context, sonia.scm.repository.Repository repository)
{
super(repository, repositoryDirectory);
super(context, repository);
}
//~--- get methods ----------------------------------------------------------
@@ -164,12 +164,11 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
}
ChangesetPagingResult changesets = null;
org.eclipse.jgit.lib.Repository gr = null;
GitChangesetConverter converter = null;
try
{
gr = open();
org.eclipse.jgit.lib.Repository gr = open();
if (!gr.getAllRefs().isEmpty())
{
@@ -260,7 +259,6 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
finally
{
IOUtil.close(converter);
GitUtil.close(gr);
}
return changesets;

32
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
View File

@@ -41,7 +41,7 @@ import sonia.scm.repository.api.Command;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException;
import java.util.Set;
@@ -70,7 +70,21 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
Repository repository)
{
this.repository = repository;
this.repositoryDirectory = handler.getDirectory(repository);
context = new GitContext(handler.getDirectory(repository));
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @throws IOException
*/
@Override
public void close() throws IOException
{
context.close();
}
//~--- get methods ----------------------------------------------------------
@@ -84,7 +98,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
@Override
public BlameCommand getBlameCommand()
{
return new GitBlameCommand(repository, repositoryDirectory);
return new GitBlameCommand(context, repository);
}
/**
@@ -96,7 +110,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
@Override
public BrowseCommand getBrowseCommand()
{
return new GitBrowseCommand(repository, repositoryDirectory);
return new GitBrowseCommand(context, repository);
}
/**
@@ -108,7 +122,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
@Override
public CatCommand getCatCommand()
{
return new GitCatCommand(repository, repositoryDirectory);
return new GitCatCommand(context, repository);
}
/**
@@ -120,7 +134,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
@Override
public DiffCommand getDiffCommand()
{
return new GitDiffCommand(repository, repositoryDirectory);
return new GitDiffCommand(context, repository);
}
/**
@@ -132,7 +146,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
@Override
public LogCommand getLogCommand()
{
return new GitLogCommand(repository, repositoryDirectory);
return new GitLogCommand(context, repository);
}
/**
@@ -150,8 +164,8 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
//~--- fields ---------------------------------------------------------------
/** Field description */
private Repository repository;
private GitContext context;
/** Field description */
private File repositoryDirectory;
private Repository repository;
}