Skip to content

The Unified and Autonomous Development Platform

Various efforts to prevent the connection pool exhausted issue

robin shen98eedaa7fe2c
diff --git a/core/pom.xml b/core/pom.xml
index f6b542a818..a6bb904ed0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -81,17 +81,11 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-hikaricp</artifactId>
<version>${hibernate.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP-java6</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
- <version>2.6.2</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -291,7 +285,7 @@
</dependencies>
<properties>
<moduleClass>com.gitplex.server.CoreModule</moduleClass>
- <hibernate.version>5.1.0.Final</hibernate.version>
+ <hibernate.version>5.2.10.Final</hibernate.version>
<shiro.version>1.2.2</shiro.version>
<jgit.version>4.7.0.201704051617-r</jgit.version>
<flexmark.version>0.18.3</flexmark.version>
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.java
index 7d05973f6e..f4bece0ba1 100644
--- a/core/src/main/java/com/gitplex/server/CoreModule.java
+++ b/core/src/main/java/com/gitplex/server/CoreModule.java
@@ -7,6 +7,8 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import javax.inject.Singleton;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
import javax.persistence.OneToMany;
import javax.persistence.Transient;
import javax.persistence.Version;
@@ -25,6 +27,8 @@ import org.apache.shiro.web.servlet.ShiroFilter;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.hibernate.CallbackException;
import org.hibernate.Interceptor;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.hibernate.collection.internal.PersistentBag;
import org.hibernate.type.Type;
@@ -122,7 +126,9 @@ import com.gitplex.server.persistence.IdManager;
import com.gitplex.server.persistence.PersistListener;
import com.gitplex.server.persistence.PersistManager;
import com.gitplex.server.persistence.PrefixedNamingStrategy;
+import com.gitplex.server.persistence.SessionFactoryProvider;
import com.gitplex.server.persistence.SessionInterceptor;
+import com.gitplex.server.persistence.SessionProvider;
import com.gitplex.server.persistence.TransactionInterceptor;
import com.gitplex.server.persistence.UnitOfWork;
import com.gitplex.server.persistence.annotation.Sessional;
@@ -231,6 +237,10 @@ public class CoreModule extends AbstractPluginModule {
bind(NotificationManager.class).to(DefaultNotificationManager.class);
bind(CacheManager.class).to(DefaultCacheManager.class);
bind(VerificationManager.class).to(DefaultVerificationManager.class);
+ bind(Session.class).toProvider(SessionProvider.class);
+ bind(EntityManager.class).toProvider(SessionProvider.class);
+ bind(SessionFactory.class).toProvider(SessionFactoryProvider.class);
+ bind(EntityManagerFactory.class).toProvider(SessionFactoryProvider.class);
contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);
diff --git a/core/src/main/java/com/gitplex/server/command/UpgradeCommand.java b/core/src/main/java/com/gitplex/server/command/UpgradeCommand.java
index 5e50ac9bec..236da81a12 100644
--- a/core/src/main/java/com/gitplex/server/command/UpgradeCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/UpgradeCommand.java
@@ -417,6 +417,16 @@ public class UpgradeCommand extends DefaultPersistManager {
"com.gitplex.launcher.bootstrap.Bootstrap");
FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, Charsets.UTF_8);
+ File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");
+ String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, Charsets.UTF_8);
+ hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false",
+ "hibernate.hikari.autoCommit=true");
+ hibernateProps = StringUtils.replace(hibernateProps,
+ "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider",
+ "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider\r\n"
+ + "hibernate.connection.autocommit=true");
+ FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, Charsets.UTF_8);
+
FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"),
new File(upgradeDir, "conf/wrapper-license.conf"));
FileUtils.copyFile(new File(Bootstrap.installDir, "readme.txt"), new File(upgradeDir, "readme.txt"));
diff --git a/core/src/main/java/com/gitplex/server/git/GitFilter.java b/core/src/main/java/com/gitplex/server/git/GitFilter.java
index d6d4f8e188..cea60abd4f 100644
--- a/core/src/main/java/com/gitplex/server/git/GitFilter.java
+++ b/core/src/main/java/com/gitplex/server/git/GitFilter.java
@@ -35,12 +35,11 @@ import com.gitplex.server.manager.ConfigManager;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.StorageManager;
import com.gitplex.server.manager.WorkExecutor;
+import com.gitplex.server.model.Project;
import com.gitplex.server.model.User;
import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.security.SecurityUtils;
-import com.gitplex.server.model.Project;
import com.gitplex.server.util.concurrent.PrioritizedRunnable;
-import com.gitplex.server.util.facade.ProjectFacade;
import com.gitplex.server.util.serverconfig.ServerConfig;
@Singleton
@@ -80,8 +79,7 @@ public class GitFilter implements Filter {
return StringUtils.stripStart(pathInfo, "/");
}
- @Sessional
- protected ProjectFacade getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)
+ private Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)
throws IOException {
projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");
@@ -101,7 +99,7 @@ public class GitFilter implements Filter {
throw new GitException(String.format("Unable to find project %s", projectName));
}
- return project.getFacade();
+ return project;
}
private void doNotCache(HttpServletResponse response) {
@@ -110,14 +108,14 @@ public class GitFilter implements Filter {
response.setHeader("Cache-Control", "no-cache, max-age=0, must-revalidate");
}
- protected void processPacks(final HttpServletRequest request, final HttpServletResponse response)
+ private void processPacks(final HttpServletRequest request, final HttpServletResponse response)
throws ServletException, IOException, InterruptedException, ExecutionException {
String pathInfo = getPathInfo(request);
String service = StringUtils.substringAfterLast(pathInfo, "/");
String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");
- ProjectFacade project = getProject(request, response, projectInfo);
+ Project project = getProject(request, response, projectInfo);
doNotCache(response);
response.setHeader("Content-Type", "application/x-" + service + "-result");
@@ -185,12 +183,12 @@ public class GitFilter implements Filter {
pack.end();
}
- protected void processRefs(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ private void processRefs(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
pathInfo = StringUtils.stripStart(pathInfo, "/");
String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());
- ProjectFacade project = getProject(request, response, projectInfo);
+ Project project = getProject(request, response, projectInfo);
String service = request.getParameter("service");
File gitDir = storageManager.getProjectGitDir(project.getId());
@@ -213,6 +211,7 @@ public class GitFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
}
+ @Sessional
@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
diff --git a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
index 8a717dd4c5..4613e67a98 100644
--- a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
@@ -26,7 +26,7 @@ import com.gitplex.server.model.PullRequestUpdate;
import com.gitplex.server.model.User;
import com.gitplex.server.model.support.BranchProtection;
import com.gitplex.server.model.support.TagProtection;
-import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.security.ProjectPrivilege;
import com.gitplex.server.security.permission.ProjectPermission;
import com.gitplex.server.util.StringUtils;
@@ -62,7 +62,7 @@ public class GitPreReceiveCallback extends HttpServlet {
output.writeLine();
}
- @Transactional
+ @Sessional
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String clientIp = request.getHeader("X-Forwarded-For");
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
index 72e61ec2f2..eac6498e9e 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
@@ -53,29 +53,30 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
@Override
public File getAttachmentDir(ProjectFacade project, String attachmentDirUUID) {
- File attachmentDir = getPermanentAttachmentDir(project, attachmentDirUUID);
+ File projectAttachmentDir = storageManager.getProjectAttachmentDir(project.getId());
+ File attachmentDir = getPermanentAttachmentDir(projectAttachmentDir, attachmentDirUUID);
if (attachmentDir.exists())
return attachmentDir;
else
- return getTempAttachmentDir(project, attachmentDirUUID);
+ return getTempAttachmentDir(projectAttachmentDir, attachmentDirUUID);
}
- private File getPermanentAttachmentDir(ProjectFacade project, String attachmentDirUUID) {
+ private File getPermanentAttachmentDir(File projectAttachmentDir, String attachmentDirUUID) {
String category = attachmentDirUUID.substring(0, 2);
- return new File(storageManager.getProjectAttachmentDir(project.getId()), "permanent/" + category + "/" + attachmentDirUUID);
+ return new File(projectAttachmentDir, "permanent/" + category + "/" + attachmentDirUUID);
}
- private File getTempAttachmentDir(ProjectFacade project) {
- return new File(storageManager.getProjectAttachmentDir(project.getId()), "temp");
+ private File getTempAttachmentDir(File projectAttachmentDir) {
+ return new File(projectAttachmentDir, "temp");
}
- private File getTempAttachmentDir(ProjectFacade project, String attachmentDirUUID) {
- return new File(getTempAttachmentDir(project), attachmentDirUUID);
+ private File getTempAttachmentDir(File projectAttachmentDir, String attachmentDirUUID) {
+ return new File(getTempAttachmentDir(projectAttachmentDir), attachmentDirUUID);
}
- private void makeAttachmentPermanent(ProjectFacade project, String attachmentDirUUID) {
- File tempAttachmentDir = getTempAttachmentDir(project, attachmentDirUUID);
- File permanentAttachmentDir = getPermanentAttachmentDir(project, attachmentDirUUID);
+ private void makeAttachmentPermanent(File projectAttachmentDir, String attachmentDirUUID) {
+ File tempAttachmentDir = getTempAttachmentDir(projectAttachmentDir, attachmentDirUUID);
+ File permanentAttachmentDir = getPermanentAttachmentDir(projectAttachmentDir, attachmentDirUUID);
if (tempAttachmentDir.exists() && !permanentAttachmentDir.exists()) {
try {
FileUtils.moveDirectory(tempAttachmentDir, permanentAttachmentDir);
@@ -100,7 +101,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
public void execute() {
try {
for (Project project: dao.findAll(Project.class)) {
- File tempDir = getTempAttachmentDir(project.getFacade());
+ File tempDir = getTempAttachmentDir(storageManager.getProjectAttachmentDir(project.getId()));
if (tempDir.exists()) {
for (File file: tempDir.listFiles()) {
if (System.currentTimeMillis() - file.lastModified() > TEMP_PRESERVE_PERIOD) {
@@ -123,23 +124,26 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
@Listen
public void on(EntityPersisted event) {
if (event.isNew()) {
+ File projectAttachmentDir;
+ String attachmentUUID;
if (event.getEntity() instanceof PullRequest) {
PullRequest request = (PullRequest) event.getEntity();
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- makeAttachmentPermanent(request.getTargetProject().getFacade(), request.getUUID());
- }
-
- });
+ projectAttachmentDir = storageManager.getProjectAttachmentDir(request.getTargetProject().getId());
+ attachmentUUID = request.getUUID();
} else if (event.getEntity() instanceof CodeComment) {
CodeComment comment = (CodeComment) event.getEntity();
+ projectAttachmentDir = storageManager.getProjectAttachmentDir(comment.getProject().getId());
+ attachmentUUID = comment.getUUID();
+ } else {
+ projectAttachmentDir = null;
+ attachmentUUID = null;
+ }
+ if (projectAttachmentDir != null && attachmentUUID != null) {
dao.doAfterCommit(new Runnable() {
@Override
public void run() {
- makeAttachmentPermanent(comment.getProject().getFacade(), comment.getUUID());
+ makeAttachmentPermanent(projectAttachmentDir, attachmentUUID);
}
});
@@ -150,14 +154,27 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
@Transactional
@Listen
public void on(EntityRemoved event) {
+ File dirToDelete;
if (event.getEntity() instanceof Project) {
Project project = (Project) event.getEntity();
- FileUtils.deleteDir(storageManager.getProjectAttachmentDir(project.getId()));
+ dirToDelete = storageManager.getProjectAttachmentDir(project.getId());
} else if (event.getEntity() instanceof CodeComment) {
CodeComment comment = (CodeComment) event.getEntity();
- File permanentAttachmentDir = getPermanentAttachmentDir(comment.getProject().getFacade(), comment.getUUID());
- if (permanentAttachmentDir.exists())
- FileUtils.deleteDir(permanentAttachmentDir);
+ dirToDelete = getPermanentAttachmentDir(
+ storageManager.getProjectAttachmentDir(comment.getProject().getId()), comment.getUUID());
+ } else {
+ dirToDelete = null;
+ }
+ if (dirToDelete != null) {
+ dao.doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ if (dirToDelete.exists())
+ FileUtils.deleteDir(dirToDelete);
+ }
+
+ });
}
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java
index af0a2b8ee4..126ba6928c 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java
@@ -108,59 +108,78 @@ public class DefaultCacheManager implements CacheManager {
@Transactional
@Listen
public void on(EntityPersisted event) {
+ Object facade;
+
+ if (event.getEntity() instanceof Project) {
+ facade = ((Project) event.getEntity()).getFacade();
+ } else if (event.getEntity() instanceof User) {
+ facade = ((User) event.getEntity()).getFacade();
+ } else if (event.getEntity() instanceof Group) {
+ facade = ((Group) event.getEntity()).getFacade();
+ } else if (event.getEntity() instanceof Membership) {
+ facade = ((Membership) event.getEntity()).getFacade();
+ } else if (event.getEntity() instanceof UserAuthorization) {
+ facade = ((UserAuthorization) event.getEntity()).getFacade();
+ } else if (event.getEntity() instanceof GroupAuthorization) {
+ facade = ((GroupAuthorization) event.getEntity()).getFacade();
+ } else {
+ facade = null;
+ }
+
dao.doAfterCommit(new Runnable() {
@Override
public void run() {
- if (event.getEntity() instanceof Project) {
+ if (facade instanceof ProjectFacade) {
+ ProjectFacade project = (ProjectFacade) facade;
projectsLock.writeLock().lock();
try {
- ProjectFacade project = ((Project) event.getEntity()).getFacade();
- projects.put(event.getEntity().getId(), project);
+ projects.put(project.getId(), project);
projectIdsByName.inverse().put(project.getId(), project.getName());
} finally {
projectsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof User) {
+ } else if (facade instanceof UserFacade) {
+ UserFacade user = (UserFacade) facade;
usersLock.writeLock().lock();
try {
- UserFacade user = ((User) event.getEntity()).getFacade();
- users.put(event.getEntity().getId(), user);
+ users.put(user.getId(), user);
userIdsByName.inverse().put(user.getId(), user.getName());
if (user.getEmail() != null)
userIdsByEmail.inverse().put(user.getId(), user.getEmail());
} finally {
usersLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof Group) {
+ } else if (facade instanceof GroupFacade) {
+ GroupFacade group = (GroupFacade) facade;
groupsLock.writeLock().lock();
try {
- GroupFacade group = ((Group) event.getEntity()).getFacade();
- groups.put(event.getEntity().getId(), group);
+ groups.put(group.getId(), group);
groupIdsByName.inverse().put(group.getId(), group.getName());
} finally {
groupsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof Membership) {
+ } else if (facade instanceof MembershipFacade) {
+ MembershipFacade membership = (MembershipFacade) facade;
membershipsLock.writeLock().lock();
try {
- memberships.put(event.getEntity().getId(), ((Membership) event.getEntity()).getFacade());
+ memberships.put(membership.getId(), membership);
} finally {
membershipsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof UserAuthorization) {
+ } else if (facade instanceof UserAuthorizationFacade) {
+ UserAuthorizationFacade userAuthorization = (UserAuthorizationFacade) facade;
userAuthorizationsLock.writeLock().lock();
try {
- userAuthorizations.put(event.getEntity().getId(),
- ((UserAuthorization) event.getEntity()).getFacade());
+ userAuthorizations.put(userAuthorization.getId(), userAuthorization);
} finally {
userAuthorizationsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof GroupAuthorization) {
+ } else if (facade instanceof GroupAuthorizationFacade) {
+ GroupAuthorizationFacade groupAuthorization = (GroupAuthorizationFacade) facade;
groupAuthorizationsLock.writeLock().lock();
try {
- groupAuthorizations.put(event.getEntity().getId(),
- ((GroupAuthorization) event.getEntity()).getFacade());
+ groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization);
} finally {
groupAuthorizationsLock.writeLock().unlock();
}
@@ -168,27 +187,31 @@ public class DefaultCacheManager implements CacheManager {
}
});
+
}
@Transactional
@Listen
public void on(EntityRemoved event) {
+ Long id = event.getEntity().getId();
+ Class<?> clazz = event.getEntity().getClass();
+
dao.doAfterCommit(new Runnable() {
@Override
public void run() {
- if (event.getEntity() instanceof Project) {
+ if (Project.class.isAssignableFrom(clazz)) {
projectsLock.writeLock().lock();
try {
- projects.remove(event.getEntity().getId());
- projectIdsByName.inverse().remove(event.getEntity().getId());
+ projects.remove(id);
+ projectIdsByName.inverse().remove(id);
} finally {
projectsLock.writeLock().unlock();
}
userAuthorizationsLock.writeLock().lock();
try {
for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().getProjectId().equals(event.getEntity().getId()))
+ if (it.next().getValue().getProjectId().equals(id))
it.remove();
}
} finally {
@@ -197,25 +220,25 @@ public class DefaultCacheManager implements CacheManager {
groupAuthorizationsLock.writeLock().lock();
try {
for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().getProjectId().equals(event.getEntity().getId()))
+ if (it.next().getValue().getProjectId().equals(id))
it.remove();
}
} finally {
groupAuthorizationsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof User) {
+ } else if (User.class.isAssignableFrom(clazz)) {
usersLock.writeLock().lock();
try {
- users.remove(event.getEntity().getId());
- userIdsByName.inverse().remove(event.getEntity().getId());
- userIdsByEmail.inverse().remove(event.getEntity().getId());
+ users.remove(id);
+ userIdsByName.inverse().remove(id);
+ userIdsByEmail.inverse().remove(id);
} finally {
usersLock.writeLock().unlock();
}
userAuthorizationsLock.writeLock().lock();
try {
for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().getUserId().equals(event.getEntity().getId()))
+ if (it.next().getValue().getUserId().equals(id))
it.remove();
}
} finally {
@@ -224,24 +247,24 @@ public class DefaultCacheManager implements CacheManager {
membershipsLock.writeLock().lock();
try {
for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().getUserId().equals(event.getEntity().getId()))
+ if (it.next().getValue().getUserId().equals(id))
it.remove();
}
} finally {
membershipsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof Group) {
+ } else if (Group.class.isAssignableFrom(clazz)) {
groupsLock.writeLock().lock();
try {
- groups.remove(event.getEntity().getId());
- groupIdsByName.inverse().remove(event.getEntity().getId());
+ groups.remove(id);
+ groupIdsByName.inverse().remove(id);
} finally {
groupsLock.writeLock().unlock();
}
groupAuthorizationsLock.writeLock().lock();
try {
for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().getGroupId().equals(event.getEntity().getId()))
+ if (it.next().getValue().getGroupId().equals(id))
it.remove();
}
} finally {
@@ -250,34 +273,34 @@ public class DefaultCacheManager implements CacheManager {
membershipsLock.writeLock().lock();
try {
for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().getGroupId().equals(event.getEntity().getId()))
+ if (it.next().getValue().getGroupId().equals(id))
it.remove();
}
} finally {
membershipsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof Membership) {
+ } else if (Membership.class.isAssignableFrom(clazz)) {
membershipsLock.writeLock().lock();
try {
- memberships.remove(event.getEntity().getId());
+ memberships.remove(id);
} finally {
membershipsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof UserAuthorization) {
+ } else if (UserAuthorization.class.isAssignableFrom(clazz)) {
userAuthorizationsLock.writeLock().lock();
try {
- userAuthorizations.remove(event.getEntity().getId());
+ userAuthorizations.remove(id);
} finally {
userAuthorizationsLock.writeLock().unlock();
}
- } else if (event.getEntity() instanceof GroupAuthorization) {
+ } else if (GroupAuthorization.class.isAssignableFrom(clazz)) {
groupAuthorizationsLock.writeLock().lock();
try {
- groupAuthorizations.remove(event.getEntity().getId());
+ groupAuthorizations.remove(id);
} finally {
groupAuthorizationsLock.writeLock().unlock();
}
- }
+ }
}
});
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
index 34398af2ee..ee8424f6cd 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
@@ -90,8 +90,6 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa
private final UnitOfWork unitOfWork;
- private final Dao dao;
-
private final CodeCommentManager codeCommentManager;
@Inject
@@ -99,7 +97,6 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa
PullRequestUpdateManager pullRequestUpdateManager, CodeCommentManager codeCommentManager,
BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, PullRequestManager pullRequestManager,
CodeCommentRelationManager codeCommentRelationManager) {
- this.dao = dao;
this.projectManager = projectManager;
this.storageManager = storageManager;
this.pullRequestUpdateManager = pullRequestUpdateManager;
@@ -137,15 +134,8 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa
@Listen
public void on(EntityRemoved event) {
if (event.getEntity() instanceof Project) {
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- Long projectId = event.getEntity().getId();
- removeEnv(projectId.toString());
- }
-
- });
+ Long projectId = event.getEntity().getId();
+ removeEnv(projectId.toString());
}
}
@@ -312,24 +302,10 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa
if (event.isNew()) {
if (event.getEntity() instanceof PullRequestUpdate) {
Project project = ((PullRequestUpdate) event.getEntity()).getRequest().getTargetProject();
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- batchWorkManager.submit(getBatchWorker(project), new Prioritized(PRIORITY));
- }
-
- });
+ batchWorkManager.submit(getBatchWorker(project), new Prioritized(PRIORITY));
} else if (event.getEntity() instanceof CodeComment) {
Project project = ((CodeComment)event.getEntity()).getProject();
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- batchWorkManager.submit(getBatchWorker(project), new Prioritized(PRIORITY));
- }
-
- });
+ batchWorkManager.submit(getBatchWorker(project), new Prioritized(PRIORITY));
}
}
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
index 463be117d3..c7feab25a7 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
@@ -15,7 +15,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.Stack;
-import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue;
@@ -122,8 +121,6 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
private final UnitOfWork unitOfWork;
- private final Dao dao;
-
private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();
private final Map<Long, Integer> commitCountCache = new ConcurrentHashMap<>();
@@ -139,14 +136,14 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
this.storageManager = storageManager;
this.batchWorkManager = batchWorkManager;
this.unitOfWork = unitOfWork;
- this.dao = dao;
this.executorService = executorService;
}
- private void doCollect(Long projectId, Repository repository, ObjectId commitId, boolean divide) {
- Environment env = getEnv(projectId.toString());
+ private void doCollect(Project project, ObjectId commitId, boolean divide) {
+ Environment env = getEnv(project.getId().toString());
Store defaultStore = getStore(env, DEFAULT_STORE);
+ Repository repository = project.getRepository();
if (divide) {
List<ObjectId> intermediateCommitIds = new ArrayList<>();
List<String> revisions = new ArrayList<>();
@@ -176,10 +173,10 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
}
for (int i=intermediateCommitIds.size()-1; i>=0; i--) {
- doCollect(projectId, repository, intermediateCommitIds.get(i), false);
+ doCollect(project, intermediateCommitIds.get(i), false);
}
- doCollect(projectId, repository, commitId, false);
+ doCollect(project, commitId, false);
} else {
Store commitsStore = getStore(env, COMMITS_STORE);
Store contributionsStore = getStore(env, CONTRIBUTIONS_STORE);
@@ -370,19 +367,19 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
if (newCommitCount != prevCommitCount) {
bytes = SerializationUtils.serialize(newCommitCount);
defaultStore.put(txn, COMMIT_COUNT_KEY, new ArrayByteIterable(bytes));
- commitCountCache.put(projectId, newCommitCount);
+ commitCountCache.put(project.getId(), newCommitCount);
}
if (!authors.equals(prevAuthors)) {
bytes = SerializationUtils.serialize((Serializable) authors);
defaultStore.put(txn, AUTHORS_KEY, new ArrayByteIterable(bytes));
- authorsCache.remove(projectId);
+ authorsCache.remove(project.getId());
}
if (!committers.equals(prevCommitters)) {
bytes = SerializationUtils.serialize((Serializable) committers);
defaultStore.put(txn, COMMITTERS_KEY, new ArrayByteIterable(bytes));
- committersCache.remove(projectId);
+ committersCache.remove(project.getId());
}
if (files.size() > MAX_COLLECTING_FILES) {
@@ -393,7 +390,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
}
bytes = SerializationUtils.serialize((Serializable) files);
defaultStore.put(txn, FILES_KEY, new ArrayByteIterable(bytes));
- filesCache.remove(projectId);
+ filesCache.remove(project.getId());
bytes = new byte[20];
commitId.copyRawTo(bytes, 0);
@@ -634,54 +631,37 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
@Listen
public void on(EntityRemoved event) {
if (event.getEntity() instanceof Project) {
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- Long projectId = event.getEntity().getId();
- removeEnv(projectId.toString());
- filesCache.remove(projectId);
- commitCountCache.remove(projectId);
- authorsCache.remove(projectId);
- }
-
- });
+ Long projectId = event.getEntity().getId();
+ removeEnv(projectId.toString());
+ filesCache.remove(projectId);
+ commitCountCache.remove(projectId);
+ authorsCache.remove(projectId);
}
}
- private BatchWorker getBatchWorker(Project project) {
- Long projectId = project.getId();
+ private BatchWorker getBatchWorker(Long projectId) {
return new BatchWorker("project-" + projectId + "-collectCommitInfo") {
@Override
public void doWorks(Collection<Prioritized> works) {
- AtomicReference<List<CollectingWork>> collectingWorksRef = new AtomicReference<>(null);
- AtomicReference<String> projectNameRef = new AtomicReference<>(null);
- AtomicReference<Repository> repositoryRef = new AtomicReference<>(null);
-
- unitOfWork.call(new Callable<Void>() {
+ unitOfWork.run(new Runnable() {
@Override
- public Void call() throws Exception {
+ public void run() {
Project project = projectManager.load(projectId);
- projectNameRef.set(project.getName());
- repositoryRef.set(project.getRepository());
-
List<CollectingWork> collectingWorks = new ArrayList<>();
for (Object work: works)
collectingWorks.add((CollectingWork)work);
Collections.sort(collectingWorks, new CommitTimeComparator());
- collectingWorksRef.set(collectingWorks);
- return null;
+
+ for (CollectingWork work: collectingWorks) {
+ logger.debug("Collecting commit information up to ref '{}' in project '{}'...",
+ work.getRefName(), project.getName());
+ doCollect(project, work.getCommit().copy(), true);
+ }
}
});
-
- for (CollectingWork work: collectingWorksRef.get()) {
- logger.debug("Collecting commit information up to ref '{}' in project '{}'...",
- work.getRefName(), projectNameRef.get());
- doCollect(projectId, repositoryRef.get(), work.getCommit().copy(), true);
- }
}
};
@@ -723,7 +703,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
Collections.sort(works, new CommitTimeComparator());
for (CollectingWork work: works)
- batchWorkManager.submit(getBatchWorker(project), work);
+ batchWorkManager.submit(getBatchWorker(project.getId()), work);
}
@Sessional
@@ -735,6 +715,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
}
}
+ @Sessional
@Listen
public void on(RefUpdated event) {
if (!event.getNewObjectId().equals(ObjectId.zeroId())
@@ -744,12 +725,13 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
RevCommit commit = GitUtils.parseCommit(revWalk, event.getNewObjectId());
if (commit != null) {
CollectingWork work = new CollectingWork(PRIORITY, commit, event.getRefName());
- batchWorkManager.submit(getBatchWorker(event.getProject()), work);
+ batchWorkManager.submit(getBatchWorker(event.getProject().getId()), work);
}
}
}
}
+ @Sessional
@Override
public int getCommitCount(Project project) {
Integer commitCount = commitCountCache.get(project.getId());
@@ -805,6 +787,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
}
+ @Sessional
@Override
public void cloneInfo(Project source, Project target) {
BackupStrategy backupStrategy = getEnv(source.getId().toString()).getBackupStrategy();
@@ -824,6 +807,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
}
}
+ @Sessional
@Nullable
@Override
public ObjectId getLastCommit(Project project) {
@@ -849,6 +833,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
return infoDir;
}
+ @Sessional
@Override
public Collection<String> getPossibleHistoryPaths(Project project, String path) {
Environment env = getEnv(project.getId().toString());
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java
index 9ccaeb9478..738f1c16f6 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java
@@ -11,7 +11,6 @@ import javax.inject.Singleton;
import org.apache.commons.codec.CharEncoding;
import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.HtmlEmail;
-import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,11 +42,14 @@ public class DefaultMailManager implements MailManager {
@Sessional
@Override
public void sendMailAsync(Collection<String> toList, String subject, String body) {
- if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
- dao.doAsyncAfterCommit(newSendMailRunnable(toList, subject, body));
- } else {
- executorService.execute(newSendMailRunnable(toList, subject, body));
- }
+ dao.doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ executorService.execute(newSendMailRunnable(toList, subject, body));
+ }
+
+ });
}
private Runnable newSendMailRunnable(Collection<String> toList, String subject, String body) {
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
index 9100e11427..8ceb64bfc5 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
@@ -24,7 +24,7 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -147,11 +147,13 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
listenerRegistry.post(new ProjectRenamed(project, oldName));
}
+ File gitDir = project.getGitDir();
+
dao.doAfterCommit(new Runnable() {
@Override
public void run() {
- checkGit(project);
+ checkGit(gitDir);
}
});
@@ -160,25 +162,17 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Transactional
@Override
public void delete(Project project) {
- Query query = getSession().createQuery("update Project set forkedFrom=null where forkedFrom=:forkedFrom");
+ Query<?> query = getSession().createQuery("update Project set forkedFrom=null where forkedFrom=:forkedFrom");
query.setParameter("forkedFrom", project);
query.executeUpdate();
dao.remove(project);
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- synchronized (repositoryCache) {
- Repository repository = repositoryCache.remove(project.getId());
- if (repository != null)
- repository.close();
- }
-
- }
-
- });
+ synchronized (repositoryCache) {
+ Repository repository = repositoryCache.remove(project.getId());
+ if (repository != null)
+ repository.close();
+ }
}
@Override
@@ -196,15 +190,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
save(to);
FileUtils.cleanDir(to.getGitDir());
new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();
-
- doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- commitInfoManager.cloneInfo(from, to);
- }
-
- });
+ commitInfoManager.cloneInfo(from, to);
}
private boolean isGitHookValid(File gitDir, String hookName) {
@@ -226,8 +212,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
return true;
}
- private void checkGit(Project project) {
- File gitDir = project.getGitDir();
+ private void checkGit(File gitDir) {
if (gitDir.listFiles().length == 0) {
logger.info("Initializing git repository in '" + gitDir + "'...");
try {
@@ -270,7 +255,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Listen
public void on(SystemStarted event) {
for (Project project: findAll())
- checkGit(project);
+ checkGit(project.getGitDir());
}
@Transactional
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index c78309a88b..53b0ac61f8 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -15,9 +15,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -33,10 +31,10 @@ import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
-import org.hibernate.Query;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -247,13 +245,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
MergeStrategy strategy = request.getMergeStrategy();
if ((strategy == ALWAYS_MERGE || strategy == MERGE_IF_NECESSARY || strategy == SQUASH_MERGE)
&& !preview.getMerged().equals(preview.getRequestHead())
- && !mergedCommit.getFullMessage().equals(request.getCommitMessage(strategy))) {
+ && !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {
try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());
ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {
CommitBuilder newCommit = new CommitBuilder();
newCommit.setAuthor(mergedCommit.getAuthorIdent());
newCommit.setCommitter(committer);
- newCommit.setMessage(request.getCommitMessage(strategy));
+ newCommit.setMessage(request.getCommitMessage());
newCommit.setTreeId(mergedCommit.getTree());
newCommit.setParentIds(mergedCommit.getParents());
mergedId = inserter.insert(newCommit);
@@ -286,7 +284,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
Long requestId = request.getId();
Subject subject = SecurityUtils.getSubject();
ObjectId newTargetHeadId = mergedId;
- doUnitOfWorkAsyncAfterCommit(new Runnable() {
+ dao.doUnitOfWorkAsyncAfterCommit(new Runnable() {
@Override
public void run() {
@@ -311,7 +309,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
if (nextNumber == null) {
long maxNumber;
- Query query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");
+ Query<?> query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");
query.setParameter("project", project);
Object result = query.uniqueResult();
if (result != null) {
@@ -465,18 +463,15 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
if (request.isOpen() && !request.isMergeIntoTarget()
&& (lastPreview == null || lastPreview.isObsolete(request))) {
int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;
- if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
- doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- batchWorkManager.submit(getMergePreviewer(request), new Prioritized(priority));
- }
-
- });
- } else {
- batchWorkManager.submit(getMergePreviewer(request), new Prioritized(priority));
- }
+ Long requestId = request.getId();
+ dao.doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ batchWorkManager.submit(getMergePreviewer(requestId), new Prioritized(priority));
+ }
+
+ });
return null;
} else {
return lastPreview;
@@ -486,95 +481,67 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
}
- private BatchWorker getMergePreviewer(PullRequest request) {
- Long requestId = request.getId();
-
+ private BatchWorker getMergePreviewer(Long requestId) {
return new BatchWorker("request-" + requestId + "-previewMerge", 1) {
@Override
public void doWorks(Collection<Prioritized> works) {
- try {
- Preconditions.checkState(works.size() == 1);
-
- AtomicReference<String> projectNameRef = new AtomicReference<>(null);
- AtomicReference<Long> requestNumberRef = new AtomicReference<>(null);
- AtomicReference<Repository> repositoryRef = new AtomicReference<>(null);
- AtomicReference<String> mergeRefRef = new AtomicReference<>(null);
-
- MergePreview mergePreview = unitOfWork.call(new Callable<MergePreview>() {
-
- @Override
- public MergePreview call() throws Exception {
- PullRequest request = load(requestId);
- Project targetProject = request.getTargetProject();
- requestNumberRef.set(request.getNumber());
- projectNameRef.set(targetProject.getName());
- repositoryRef.set(targetProject.getRepository());
- mergeRefRef.set(request.getMergeRef());
-
- MergePreview mergePreview = request.getLastMergePreview();
- if (request.isOpen()
- && !request.isMergeIntoTarget()
- && (mergePreview == null || mergePreview.isObsolete(request))) {
- return new MergePreview(request.getTarget().getObjectName(),
- request.getHeadCommitHash(), request.getMergeStrategy(), null);
- } else {
- return null;
- }
- }
- });
-
- if (mergePreview != null) {
- logger.debug("Calculating merge preview of pull request #{} in project '{}'...",
- requestNumberRef.get(), projectNameRef.get());
- ObjectId targetHeadId = ObjectId.fromString(mergePreview.getTargetHead());
- ObjectId requestHeadId = ObjectId.fromString(mergePreview.getRequestHead());
+ unitOfWork.run(new Runnable() {
+
+ @Override
+ public void run() {
+ Preconditions.checkState(works.size() == 1);
+
+ PullRequest request = load(requestId);
- if ((mergePreview.getMergeStrategy() == MERGE_IF_NECESSARY)
- && GitUtils.isMergedInto(repositoryRef.get(), targetHeadId, requestHeadId)) {
- mergePreview.setMerged(mergePreview.getRequestHead());
- RefUpdate refUpdate = GitUtils.getRefUpdate(repositoryRef.get(), mergeRefRef.get());
- refUpdate.setNewObjectId(requestHeadId);
- GitUtils.updateRef(refUpdate);
- } else {
- PersonIdent user = new PersonIdent(GitPlex.NAME, "");
- ObjectId merged;
- if (mergePreview.getMergeStrategy() == REBASE_MERGE) {
- merged = GitUtils.rebase(repositoryRef.get(), requestHeadId, targetHeadId, user);
- } else if (mergePreview.getMergeStrategy() == SQUASH_MERGE) {
- merged = GitUtils.merge(repositoryRef.get(), requestHeadId, targetHeadId, true, user,
- request.getCommitMessage(mergePreview.getMergeStrategy()));
- } else {
- merged = GitUtils.merge(repositoryRef.get(), requestHeadId, targetHeadId, false, user,
- request.getCommitMessage(mergePreview.getMergeStrategy()));
- }
-
- RefUpdate refUpdate = GitUtils.getRefUpdate(repositoryRef.get(), mergeRefRef.get());
- if (merged != null) {
- mergePreview.setMerged(merged.name());
- refUpdate.setNewObjectId(merged);
+ Project targetProject = request.getTargetProject();
+ MergePreview mergePreview = request.getLastMergePreview();
+ if (request.isOpen()
+ && !request.isMergeIntoTarget()
+ && (mergePreview == null || mergePreview.isObsolete(request))) {
+ mergePreview = new MergePreview(request.getTarget().getObjectName(),
+ request.getHeadCommitHash(), request.getMergeStrategy(), null);
+ logger.debug("Calculating merge preview of pull request #{} in project '{}'...",
+ request.getNumber(), targetProject.getName());
+ ObjectId targetHeadId = ObjectId.fromString(mergePreview.getTargetHead());
+ ObjectId requestHeadId = ObjectId.fromString(mergePreview.getRequestHead());
+ Repository repository = targetProject.getRepository();
+ if ((mergePreview.getMergeStrategy() == MERGE_IF_NECESSARY)
+ && GitUtils.isMergedInto(repository, targetHeadId, requestHeadId)) {
+ mergePreview.setMerged(mergePreview.getRequestHead());
+ RefUpdate refUpdate = GitUtils.getRefUpdate(repository, request.getMergeRef());
+ refUpdate.setNewObjectId(requestHeadId);
GitUtils.updateRef(refUpdate);
} else {
- GitUtils.deleteRef(refUpdate);
+ PersonIdent user = new PersonIdent(GitPlex.NAME, "");
+ ObjectId merged;
+ if (mergePreview.getMergeStrategy() == REBASE_MERGE) {
+ merged = GitUtils.rebase(repository, requestHeadId, targetHeadId, user);
+ } else if (mergePreview.getMergeStrategy() == SQUASH_MERGE) {
+ merged = GitUtils.merge(repository, requestHeadId, targetHeadId, true, user,
+ request.getCommitMessage());
+ } else {
+ merged = GitUtils.merge(repository, requestHeadId, targetHeadId, false, user,
+ request.getCommitMessage());
+ }
+
+ RefUpdate refUpdate = GitUtils.getRefUpdate(repository, request.getMergeRef());
+ if (merged != null) {
+ mergePreview.setMerged(merged.name());
+ refUpdate.setNewObjectId(merged);
+ GitUtils.updateRef(refUpdate);
+ } else {
+ GitUtils.deleteRef(refUpdate);
+ }
}
- }
-
- unitOfWork.call(new Callable<Void>() {
- @Override
- public Void call() throws Exception {
- PullRequest request = load(requestId);
- request.setLastMergePreview(mergePreview);
- dao.persist(request);
- listenerRegistry.post(new PullRequestMergePreviewCalculated(request));
- return null;
- }
-
- });
+ request.setLastMergePreview(mergePreview);
+ dao.persist(request);
+ listenerRegistry.post(new PullRequestMergePreviewCalculated(request));
+ }
}
- } catch (Exception e) {
- logger.error("Error calculating pull request merge preview", e);
- }
+
+ });
}
};
@@ -590,7 +557,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
discard(request, "Source project is deleted.");
}
- Query query = getSession().createQuery("update PullRequest set sourceProject=null where "
+ Query<?> query = getSession().createQuery("update PullRequest set sourceProject=null where "
+ "sourceProject=:project");
query.setParameter("project", project);
query.executeUpdate();
@@ -723,7 +690,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
Long requestId = request.getId();
Subject subject = SecurityUtils.getSubject();
if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
- doUnitOfWorkAsyncAfterCommit(newCheckStatusRunnable(requestId, subject));
+ dao.doUnitOfWorkAsyncAfterCommit(newCheckStatusRunnable(requestId, subject));
} else {
unitOfWork.doAsync(newCheckStatusRunnable(requestId, subject));
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java
index 7cadc189a4..3b82f5207d 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java
@@ -102,16 +102,29 @@ public class DefaultStorageManager implements StorageManager {
@Transactional
@Listen
public void on(EntityRemoved event) {
+ Long id = event.getEntity().getId();
+
+ File projectDir;
+ if (event.getEntity() instanceof Project)
+ projectDir = getProjectDir(id);
+ else
+ projectDir = null;
+
+ File userDir;
+ if (event.getEntity() instanceof User)
+ userDir = getUserInfoDir(id);
+ else
+ userDir = null;
+
dao.doAfterCommit(new Runnable() {
@Override
public void run() {
try {
- if (event.getEntity() instanceof Project) {
- new File(getProjectDir(event.getEntity().getId()), DELETE_MARK).createNewFile();
- } else if (event.getEntity() instanceof User) {
- new File(getUserInfoDir(event.getEntity().getId()), DELETE_MARK).createNewFile();
- }
+ if (projectDir != null)
+ new File(projectDir, DELETE_MARK).createNewFile();
+ if (userDir != null)
+ new File(userDir, DELETE_MARK).createNewFile();
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserInfoManager.java
index 603a78a03a..aa69de67eb 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserInfoManager.java
@@ -12,7 +12,6 @@ import com.gitplex.server.manager.UserInfoManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.User;
import com.gitplex.server.persistence.annotation.Transactional;
-import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityRemoved;
import com.gitplex.server.util.facade.ProjectFacade;
import com.gitplex.server.util.facade.UserFacade;
@@ -40,11 +39,8 @@ public class DefaultUserInfoManager extends AbstractEnvironmentManager implement
private final StorageManager storageManager;
- private final Dao dao;
-
@Inject
- public DefaultUserInfoManager(Dao dao, StorageManager storageManager) {
- this.dao = dao;
+ public DefaultUserInfoManager(StorageManager storageManager) {
this.storageManager = storageManager;
}
@@ -84,16 +80,8 @@ public class DefaultUserInfoManager extends AbstractEnvironmentManager implement
@Transactional
@Listen
public void on(EntityRemoved event) {
- if (event.getEntity() instanceof User) {
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- removeEnv(event.getEntity().getId().toString());
- }
-
- });
- }
+ if (event.getEntity() instanceof User)
+ removeEnv(event.getEntity().getId().toString());
}
@Override
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java
index 52891a686b..8d0c37933b 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java
@@ -5,8 +5,8 @@ import javax.inject.Singleton;
import org.apache.shiro.authc.credential.PasswordService;
import org.eclipse.jgit.lib.PersonIdent;
-import org.hibernate.Query;
import org.hibernate.ReplicationMode;
+import org.hibernate.query.Query;
import com.gitplex.launcher.loader.Listen;
import com.gitplex.launcher.loader.ListenerRegistry;
@@ -76,7 +76,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
@Transactional
@Override
public void delete(User user) {
- Query query = getSession().createQuery("update PullRequest set submitter=null, submitterName=:submitterName "
+ Query<?> query = getSession().createQuery("update PullRequest set submitter=null, submitterName=:submitterName "
+ "where submitter=:submitter");
query.setParameter("submitter", user);
query.setParameter("submitterName", user.getDisplayName());
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
index a4b896194f..2bb03ce650 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
@@ -28,7 +28,6 @@ import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.persistence.annotation.Transactional;
-import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityRemoved;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.util.Verification;
@@ -63,12 +62,9 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
private final ListenerRegistry listenerRegistry;
- private final Dao dao;
-
@Inject
- public DefaultVerificationManager(Dao dao, StorageManager storageManager, PullRequestManager pullRequestManager,
+ public DefaultVerificationManager(StorageManager storageManager, PullRequestManager pullRequestManager,
ListenerRegistry listenerRegistry) {
- this.dao = dao;
this.storageManager = storageManager;
this.pullRequestManager = pullRequestManager;
this.listenerRegistry = listenerRegistry;
@@ -161,16 +157,8 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
@Transactional
@Listen
public void on(EntityRemoved event) {
- if (event.getEntity() instanceof Project) {
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- removeEnv(event.getEntity().getId().toString());
- }
-
- });
- }
+ if (event.getEntity() instanceof Project)
+ removeEnv(event.getEntity().getId().toString());
}
@Override
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java
index 716a02632e..0f82da2828 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java
@@ -19,7 +19,6 @@ import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.User;
import com.gitplex.server.persistence.annotation.Transactional;
-import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityRemoved;
import com.gitplex.server.util.FileUtils;
@@ -45,11 +44,8 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V
private final StorageManager storageManager;
- private final Dao dao;
-
@Inject
- public DefaultVisitManager(Dao dao, StorageManager storageManager) {
- this.dao = dao;
+ public DefaultVisitManager(StorageManager storageManager) {
this.storageManager = storageManager;
}
@@ -183,16 +179,8 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V
@Transactional
@Listen
public void on(EntityRemoved event) {
- if (event.getEntity() instanceof Project) {
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- removeEnv(event.getEntity().getId().toString());
- }
-
- });
- }
+ if (event.getEntity() instanceof Project)
+ removeEnv(event.getEntity().getId().toString());
}
@Override
diff --git a/core/src/main/java/com/gitplex/server/model/Project.java b/core/src/main/java/com/gitplex/server/model/Project.java
index c9dbbb7b0f..8efbf48b2d 100644
--- a/core/src/main/java/com/gitplex/server/model/Project.java
+++ b/core/src/main/java/com/gitplex/server/model/Project.java
@@ -128,6 +128,9 @@ public class Project extends AbstractEntity {
@Version
private long version;
+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
+ private Collection<BranchWatch> branchWatches = new ArrayList<>();
+
@Lob
@Column(nullable=false, length=65535)
private ArrayList<BranchProtection> branchProtections = new ArrayList<>();
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.java
index 428e526315..0607290b96 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java
@@ -670,7 +670,8 @@ public class PullRequest extends AbstractEntity {
return commits;
}
- public String getCommitMessage(MergeStrategy mergeStrategy) {
+ @Nullable
+ public String getCommitMessage() {
if (mergeStrategy == MergeStrategy.SQUASH_MERGE) {
String commitMessage = getTitle() + "\n\n";
if (getDescription() != null)
diff --git a/core/src/main/java/com/gitplex/server/persistence/DefaultIdManager.java b/core/src/main/java/com/gitplex/server/persistence/DefaultIdManager.java
index 2a9a44ce32..828ecef5c0 100644
--- a/core/src/main/java/com/gitplex/server/persistence/DefaultIdManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultIdManager.java
@@ -6,10 +6,11 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.inject.Inject;
import javax.inject.Singleton;
-
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Projections;
-import org.hibernate.metadata.ClassMetadata;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import javax.persistence.metamodel.EntityType;
import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.persistence.dao.Dao;
@@ -30,19 +31,19 @@ public class DefaultIdManager implements IdManager {
}
private long getMaxId(Class<?> entityClass) {
- Criteria criteria = dao.getSession().createCriteria(entityClass);
- criteria.setProjection(Projections.max("id"));
- Long maxId = (Long) criteria.uniqueResult();
- if (maxId == null)
- maxId = 0L;
- return maxId;
+ CriteriaBuilder builder = persistManager.getSessionFactory().getCriteriaBuilder();
+ CriteriaQuery<Number> query = builder.createQuery(Number.class);
+ Root<?> root = query.from(entityClass);
+ query.select(builder.max(root.get("id")));
+ Number result = dao.getSession().createQuery(query).getSingleResult();
+ return result!=null?result.longValue():0;
}
@Sessional
@Override
public void init() {
- for (ClassMetadata metadata: persistManager.getSessionFactory().getAllClassMetadata().values()) {
- Class<?> entityClass = metadata.getMappedClass();
+ for (EntityType<?> entityType: ((EntityManagerFactory)persistManager.getSessionFactory()).getMetamodel().getEntities()) {
+ Class<?> entityClass = entityType.getJavaType();
nextIds.put(entityClass, new AtomicLong(getMaxId(entityClass)+1));
}
}
diff --git a/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java b/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java
index c208704236..ae2ccb8ad7 100644
--- a/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java
@@ -12,16 +12,18 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
-import java.util.Iterator;
import java.util.List;
+import javax.persistence.EntityManagerFactory;
import javax.persistence.ManyToOne;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import javax.persistence.metamodel.EntityType;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
-import org.hibernate.Criteria;
import org.hibernate.Interceptor;
-import org.hibernate.Query;
import org.hibernate.ReplicationMode;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -32,9 +34,8 @@ import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.query.Query;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.schema.TargetType;
import org.slf4j.Logger;
@@ -325,13 +326,8 @@ public class DefaultPersistManager implements PersistManager {
*/
private List<Class<?>> getEntityTypes(SessionFactory sessionFactory) {
List<Class<?>> entityTypes = new ArrayList<>();
- for (Iterator<String> it = sessionFactory.getAllClassMetadata().keySet().iterator(); it.hasNext();) {
- String entityTypeName = (String) it.next();
- try {
- entityTypes.add(Class.forName(entityTypeName));
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
+ for (EntityType<?> entityType: ((EntityManagerFactory)sessionFactory).getMetamodel().getEntities()) {
+ entityTypes.add(entityType.getJavaType());
}
/* Collections.sort does not work here */
@@ -377,10 +373,13 @@ public class DefaultPersistManager implements PersistManager {
logger.info("Querying table ids...");
- Criteria criteria = session.createCriteria(entityType, "entity")
- .setProjection(Projections.property("entity.id")).addOrder(Order.asc("id"));
- @SuppressWarnings("unchecked")
- List<Long> ids = criteria.list();
+ CriteriaBuilder builder = sessionFactory.getCriteriaBuilder();
+ CriteriaQuery<Number> query = builder.createQuery(Number.class);
+ Root<?> root = query.from(entityType);
+ query.select(root.get("id")).orderBy(builder.asc(root.get("id")));
+
+ List<Number> ids = session.createQuery(query).list();
+
int count = ids.size();
for (int i=0; i<count/batchSize; i++) {
@@ -396,10 +395,10 @@ public class DefaultPersistManager implements PersistManager {
}
}
- private void exportEntity(Session session, Class<?> entityType, List<Long> ids, int start, int count, int batchSize, File exportDir) {
+ private void exportEntity(Session session, Class<?> entityType, List<Number> ids, int start, int count, int batchSize, File exportDir) {
logger.info("Loading table rows ({}->{}) from database...", String.valueOf(start+1), (start + count));
- Query query = session.createQuery("from " + entityType.getSimpleName() + " where id>=:fromId and id<=:toId");
+ Query<?> query = session.createQuery("from " + entityType.getSimpleName() + " where id>=:fromId and id<=:toId");
query.setParameter("fromId", ids.get(start));
query.setParameter("toId", ids.get(start+count-1));
@@ -439,9 +438,9 @@ public class DefaultPersistManager implements PersistManager {
});
for (File file: dataFiles) {
+ Transaction transaction = session.beginTransaction();
try {
logger.info("Importing from data file '" + file.getName() + "'...");
- session.beginTransaction();
VersionedDocument dom = VersionedDocument.fromFile(file);
for (Element element: dom.getRootElement().elements()) {
@@ -451,9 +450,9 @@ public class DefaultPersistManager implements PersistManager {
}
session.flush();
session.clear();
- session.getTransaction().commit();
+ transaction.commit();
} catch (Throwable e) {
- session.getTransaction().rollback();
+ transaction.rollback();
throw Throwables.propagate(e);
}
}
diff --git a/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java b/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java
index 11edb976fd..732a996355 100644
--- a/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java
+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java
@@ -31,9 +31,13 @@ public class DefaultUnitOfWork implements UnitOfWork {
@Override
protected Session openObject() {
Session session = persistManager.getSessionFactory().openSession();
-
- // Session is supposed to be able to write only in transactional methods
- session.setFlushMode(FlushMode.MANUAL);
+ try {
+ // Session is supposed to be able to write only in transactional methods
+ session.setHibernateFlushMode(FlushMode.MANUAL);
+ } catch (Exception e) {
+ session.close();
+ throw Throwables.propagate(e);
+ }
return session;
}
diff --git a/core/src/main/java/com/gitplex/server/persistence/IdGenerator.java b/core/src/main/java/com/gitplex/server/persistence/IdGenerator.java
index 679d645740..616718d86a 100644
--- a/core/src/main/java/com/gitplex/server/persistence/IdGenerator.java
+++ b/core/src/main/java/com/gitplex/server/persistence/IdGenerator.java
@@ -5,7 +5,7 @@ import java.util.Properties;
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.id.Configurable;
import org.hibernate.id.IdentifierGenerator;
import org.hibernate.service.ServiceRegistry;
@@ -16,12 +16,12 @@ import com.gitplex.launcher.loader.AppLoader;
public class IdGenerator implements IdentifierGenerator, Configurable {
@Override
- public Serializable generate(SessionImplementor session, Object object) throws HibernateException {
- return AppLoader.getInstance(IdManager.class).nextId(object.getClass());
+ public void configure(Type type, Properties params, ServiceRegistry serviceRegistry) throws MappingException {
}
@Override
- public void configure(Type type, Properties params, ServiceRegistry serviceRegistry) throws MappingException {
+ public Serializable generate(SharedSessionContractImplementor session, Object object) throws HibernateException {
+ return AppLoader.getInstance(IdManager.class).nextId(object.getClass());
}
}
\ No newline at end of file
diff --git a/core/src/main/java/com/gitplex/server/persistence/SessionFactoryProvider.java b/core/src/main/java/com/gitplex/server/persistence/SessionFactoryProvider.java
new file mode 100644
index 0000000000..75309793ef
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/persistence/SessionFactoryProvider.java
@@ -0,0 +1,24 @@
+package com.gitplex.server.persistence;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+import org.hibernate.SessionFactory;
+
+@Singleton
+public class SessionFactoryProvider implements Provider<SessionFactory> {
+
+ private final PersistManager persistManager;
+
+ @Inject
+ public SessionFactoryProvider(PersistManager persistManager) {
+ this.persistManager = persistManager;
+ }
+
+ @Override
+ public SessionFactory get() {
+ return persistManager.getSessionFactory();
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/persistence/SessionProvider.java b/core/src/main/java/com/gitplex/server/persistence/SessionProvider.java
new file mode 100644
index 0000000000..f653a57ef0
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/persistence/SessionProvider.java
@@ -0,0 +1,24 @@
+package com.gitplex.server.persistence;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+import org.hibernate.Session;
+
+@Singleton
+public class SessionProvider implements Provider<Session> {
+
+ private final UnitOfWork unitOfWork;
+
+ @Inject
+ public SessionProvider(UnitOfWork unitOfWork) {
+ this.unitOfWork = unitOfWork;
+ }
+
+ @Override
+ public Session get() {
+ return unitOfWork.getSession();
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java b/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java
index 559d046ba1..98156ede57 100644
--- a/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java
+++ b/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java
@@ -2,11 +2,11 @@ package com.gitplex.server.persistence;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.hibernate.FlushMode;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.resource.transaction.spi.TransactionStatus;
+import com.google.common.base.Throwables;
import com.google.inject.Inject;
public class TransactionInterceptor implements MethodInterceptor {
@@ -26,23 +26,16 @@ public class TransactionInterceptor implements MethodInterceptor {
return mi.proceed();
} else {
Transaction tx = session.beginTransaction();
- FlushMode previousMode = session.getFlushMode();
- session.setFlushMode(FlushMode.COMMIT);
try {
Object result = mi.proceed();
+ session.flush();
tx.commit();
return result;
} catch (Throwable t) {
- try {
- tx.rollback();
- } catch (Throwable t2) {
- }
- throw t;
- } finally {
- session.setFlushMode(previousMode);
+ tx.rollback();
+ throw Throwables.propagate(t);
}
}
-
} finally {
unitOfWork.end();
}
diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java b/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java
index 9db0a27614..a7d9d751d8 100644
--- a/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java
@@ -75,14 +75,6 @@ public abstract class AbstractEntityManager<T extends AbstractEntity> implements
return dao.count(detachedCriteria);
}
- protected void doAfterCommit(Runnable runnable) {
- dao.doAfterCommit(runnable);
- }
-
- protected void doUnitOfWorkAsyncAfterCommit(Runnable runnable) {
- dao.doUnitOfWorkAsyncAfterCommit(runnable);
- }
-
protected Session getSession() {
return dao.getSession();
}
diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java b/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java
index 438e8d24c9..6c3baa0233 100644
--- a/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java
@@ -94,10 +94,14 @@ public interface Dao {
*/
<T extends AbstractEntity> int count(EntityCriteria<T> detachedCriteria);
+ /**
+ * Do some work after commit if there is an active transaction, or do the work immediately if there is no active
+ * transaction. Note that the work should not involve any other database operations in current thread
+ *
+ * @param runnable
+ */
void doAfterCommit(Runnable runnable);
- void doAsyncAfterCommit(Runnable runnable);
-
void doUnitOfWorkAsyncAfterCommit(Runnable runnable);
Session getSession();
diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java b/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java
index a8f9a8ff70..1beedb9b76 100644
--- a/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java
@@ -3,7 +3,6 @@ package com.gitplex.server.persistence.dao;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.List;
-import java.util.concurrent.ExecutorService;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -20,6 +19,7 @@ import com.gitplex.server.model.AbstractEntity;
import com.gitplex.server.persistence.UnitOfWork;
import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.util.ClassUtils;
@Singleton
@SuppressWarnings("unchecked")
@@ -29,26 +29,22 @@ public class DefaultDao implements Dao, Serializable {
private final ListenerRegistry listenerRegistry;
- private final ExecutorService executorService;
-
@Inject
- public DefaultDao(UnitOfWork unitOfWork, ListenerRegistry listenerRegistry,
- ExecutorService executorService) {
+ public DefaultDao(UnitOfWork unitOfWork, ListenerRegistry listenerRegistry) {
this.unitOfWork = unitOfWork;
this.listenerRegistry = listenerRegistry;
- this.executorService = executorService;
}
@Sessional
@Override
public <T extends AbstractEntity> T get(Class<T> entityClass, Long entityId) {
- return (T) getSession().get(unproxy(getSession(), entityClass), entityId);
+ return (T) getSession().get(ClassUtils.unproxy(entityClass), entityId);
}
@Sessional
@Override
public <T extends AbstractEntity> T load(Class<T> entityClass, Long entityId) {
- return (T) getSession().load(unproxy(getSession(), entityClass), entityId);
+ return (T) getSession().load(ClassUtils.unproxy(entityClass), entityId);
}
@Transactional
@@ -71,20 +67,6 @@ public class DefaultDao implements Dao, Serializable {
return unitOfWork.getSession();
}
- protected <T extends AbstractEntity> Class<T> unproxy(Session session, Class<T> entityClass) {
- //class meta data will be null if entityClass is not registered with Hibernate or when
- //it is a Hibernate proxy class (e.x. test.googlecode.genericdao.model.Person_$$_javassist_5).
- //So if a class is not recognized, we will look at superclasses to see if
- //it is a proxy.
- while (session.getSessionFactory().getClassMetadata(entityClass) == null) {
- entityClass = (Class<T>) entityClass.getSuperclass();
- if (Object.class.equals(entityClass))
- return null;
- }
-
- return entityClass;
- }
-
@Sessional
@Override
public <T extends AbstractEntity> List<T> findRange(EntityCriteria<T> entityCriteria, int firstResult, int maxResults) {
@@ -97,7 +79,7 @@ public class DefaultDao implements Dao, Serializable {
@Sessional
@Override
public <T extends AbstractEntity> List<T> findAll(EntityCriteria<T> entityCriteria) {
- return findRange(entityCriteria, 0, 0);
+ return findRange(entityCriteria, 0, Integer.MAX_VALUE);
}
@Sessional
@@ -128,31 +110,24 @@ public class DefaultDao implements Dao, Serializable {
@Override
public void doAfterCommit(Runnable runnable) {
- getSession().getTransaction().registerSynchronization(new Synchronization() {
-
- @Override
- public void beforeCompletion() {
- }
-
- @Override
- public void afterCompletion(int status) {
- if (status == Status.STATUS_COMMITTED)
- runnable.run();
- }
- });
- }
-
- @Override
- public void doAsyncAfterCommit(Runnable runnable) {
- doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- executorService.submit(runnable);
- }
-
- });
- }
+ if (getSession().getTransaction().isActive()) {
+ getSession().getTransaction().registerSynchronization(new Synchronization() {
+
+ @Override
+ public void beforeCompletion() {
+ }
+
+ @Override
+ public void afterCompletion(int status) {
+ if (status == Status.STATUS_COMMITTED)
+ runnable.run();
+ }
+
+ });
+ } else {
+ runnable.run();
+ }
+ }
@Override
public void doUnitOfWorkAsyncAfterCommit(Runnable runnable) {
diff --git a/product/system/conf/hibernate.properties b/product/system/conf/hibernate.properties
index 0b96f5ce81..ca900b07eb 100644
--- a/product/system/conf/hibernate.properties
+++ b/product/system/conf/hibernate.properties
@@ -84,9 +84,10 @@ hibernate.connection.password=
hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider
+hibernate.connection.autocommit=true
hibernate.hikari.transactionIsolation=TRANSACTION_READ_COMMITTED
-hibernate.hikari.autoCommit=false
+hibernate.hikari.autoCommit=true
hibernate.hikari.maximumPoolSize=25
hibernate.hikari.leakDetectionThreshold=1800000
diff --git a/product/system/conf/logback.xml b/product/system/conf/logback.xml
index 7d47b9a468..679f020349 100644
--- a/product/system/conf/logback.xml
+++ b/product/system/conf/logback.xml
@@ -35,8 +35,6 @@
<logger name="org.apache.shiro.realm.AuthorizingRealm" level="WARN"/>
<logger name="jetbrains.exodus" level="WARN"/>
<logger name="jetbrains.exodus.io.FileDataWriter" level="ERROR"/>
- <logger name="com.zaxxer.hikari.HikariDataSource" level="ERROR"/>
- <logger name="com.zaxxer.hikari.util.DriverDataSource" level="ERROR"/>
<logger name="com.gitplex" level="INFO"/>
<root level="WARN">
diff --git a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
index 1fed13ac1e..71c854cbec 100644
--- a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
+++ b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
-import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Inject;
@@ -75,6 +74,7 @@ import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.StorageManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.util.BatchWorker;
import com.gitplex.server.util.ContentDetector;
import com.gitplex.server.util.IndexResult;
@@ -305,52 +305,27 @@ public class DefaultIndexManager implements IndexManager {
return config;
}
- private BatchWorker getBatchWorker(Project project) {
- Long projectId = project.getId();
-
- return new BatchWorker("project-" + project.getForkRoot().getId() + "-indexBlob", 1) {
+ private BatchWorker getBatchWorker(Long projectId, Long forkRootId) {
+ return new BatchWorker("project-" + forkRootId + "-indexBlob", 1) {
@Override
public void doWorks(Collection<Prioritized> works) {
- Preconditions.checkState(works.size() == 1);
-
- ObjectId commitId = ((IndexWork) works.iterator().next()).getCommitId();
-
- AtomicReference<Repository> projectRepositoryRef = new AtomicReference<>(null);
- AtomicReference<Repository> forkRootRepositoryRef = new AtomicReference<>(null);
- AtomicReference<File> forkRootIndexDirRef = new AtomicReference<>(null);
- AtomicReference<Long> forkRootIdRef = new AtomicReference<>(null);
- AtomicReference<String> forkRootNameRef = new AtomicReference<>(null);
-
- unitOfWork.call(new Callable<Void>() {
+ unitOfWork.run(new Runnable() {
@Override
- public Void call() throws Exception {
+ public void run() {
+ Preconditions.checkState(works.size() == 1);
+
Project project = projectManager.load(projectId);
Project forkRoot = project.getForkRoot();
- forkRootIdRef.set(forkRoot.getId());
- forkRootNameRef.set(forkRoot.getName());
- projectRepositoryRef.set(project.getRepository());
- forkRootRepositoryRef.set(forkRoot.getRepository());
- forkRootIndexDirRef.set(storageManager.getProjectIndexDir(forkRoot.getId()));
- return null;
- }
-
- });
-
- if (!forkRootIdRef.get().equals(projectId) && !forkRootRepositoryRef.get().hasObject(commitId)) {
- GitUtils.fetch(projectRepositoryRef.get(), commitId, forkRootRepositoryRef.get(), null);
- }
- doIndex(forkRootRepositoryRef.get(), forkRootIndexDirRef.get(), commitId, forkRootNameRef.get());
-
- unitOfWork.call(new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- Project project = projectManager.load(projectId);
+ ObjectId commitId = ((IndexWork) works.iterator().next()).getCommitId();
+
+ if (!forkRootId.equals(projectId) && !forkRoot.getRepository().hasObject(commitId))
+ GitUtils.fetch(project.getRepository(), commitId, forkRoot.getRepository(), null);
+ doIndex(forkRoot, commitId);
+
listenerRegistry.post(new CommitIndexed(project, commitId.copy()));
- return null;
}
});
@@ -359,9 +334,9 @@ public class DefaultIndexManager implements IndexManager {
};
}
- private IndexResult doIndex(Repository repository, File indexDir, ObjectId commit, String projectName) {
+ private IndexResult doIndex(Project project, ObjectId commit) {
IndexResult indexResult;
- try (Directory directory = FSDirectory.open(indexDir)) {
+ try (Directory directory = FSDirectory.open(storageManager.getProjectIndexDir(project.getId()))) {
if (DirectoryReader.indexExists(directory)) {
try (IndexReader reader = DirectoryReader.open(directory)) {
IndexSearcher searcher = new IndexSearcher(reader);
@@ -370,8 +345,8 @@ public class DefaultIndexManager implements IndexManager {
} else {
try (IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig())) {
try {
- logger.debug("Indexing commit (project: {}, commit: {})", projectName, commit.getName());
- indexResult = index(repository, commit, writer, searcher);
+ logger.debug("Indexing commit (project: {}, commit: {})", project.getName(), commit.getName());
+ indexResult = index(project.getRepository(), commit, writer, searcher);
writer.commit();
} catch (Exception e) {
writer.rollback();
@@ -383,8 +358,8 @@ public class DefaultIndexManager implements IndexManager {
} else {
try (IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig())) {
try {
- logger.debug("Indexing commit (project: {}, commit: {})", projectName, commit.getName());
- indexResult = index(repository, commit, writer, null);
+ logger.debug("Indexing commit (project: {}, commit: {})", project.getName(), commit.getName());
+ indexResult = index(project.getRepository(), commit, writer, null);
writer.commit();
} catch (Exception e) {
writer.rollback();
@@ -427,16 +402,18 @@ public class DefaultIndexManager implements IndexManager {
}
}
+ @Sessional
@Listen
public void on(RefUpdated event) {
// only index branches at back end, tags will be indexed on demand from GUI
// as many tags might be pushed all at once when the repository is imported
if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewObjectId().equals(ObjectId.zeroId())) {
IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewObjectId());
- batchWorkManager.submit(getBatchWorker(event.getProject()), work);
+ batchWorkManager.submit(getBatchWorker(event.getProject().getId(), event.getProject().getForkRoot().getId()), work);
}
}
+ @Sessional
@Override
public void indexAsync(Project project, ObjectId commit) {
int priority;
@@ -445,7 +422,7 @@ public class DefaultIndexManager implements IndexManager {
else
priority = BACKEND_INDEXING_PRIORITY;
IndexWork work = new IndexWork(priority, commit);
- batchWorkManager.submit(getBatchWorker(project), work);
+ batchWorkManager.submit(getBatchWorker(project.getId(), project.getForkRoot().getId()), work);
}
private static class IndexWork extends Prioritized {
diff --git a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java
index ad4fabcc56..f0647807d9 100644
--- a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java
+++ b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java
@@ -45,7 +45,6 @@ import com.gitplex.server.event.lifecycle.SystemStopping;
import com.gitplex.server.manager.StorageManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.persistence.annotation.Transactional;
-import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityRemoved;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.query.BlobQuery;
@@ -58,13 +57,10 @@ public class DefaultSearchManager implements SearchManager {
private final StorageManager storageManager;
- private final Dao dao;
-
private final Map<Long, SearcherManager> searcherManagers = new ConcurrentHashMap<>();
@Inject
- public DefaultSearchManager(Dao dao, StorageManager storageManager) {
- this.dao = dao;
+ public DefaultSearchManager(StorageManager storageManager) {
this.storageManager = storageManager;
}
@@ -233,7 +229,9 @@ public class DefaultSearchManager implements SearchManager {
@Listen
public void on(CommitIndexed event) {
try {
- getSearcherManager(event.getProject()).maybeRefresh();
+ SearcherManager searcherManager = getSearcherManager(event.getProject().getForkRoot());
+ if (searcherManager != null)
+ searcherManager.maybeRefresh();
} catch (InterruptedException | IOException e) {
Throwables.propagate(e);
}
@@ -243,24 +241,17 @@ public class DefaultSearchManager implements SearchManager {
@Listen
public void on(EntityRemoved event) {
if (event.getEntity() instanceof Project) {
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- synchronized (searcherManagers) {
- Long projectId = event.getEntity().getId();
- SearcherManager searcherManager = searcherManagers.remove(projectId);
- if (searcherManager != null) {
- try {
- searcherManager.close();
- } catch (IOException e) {
- Throwables.propagate(e);
- }
- }
+ synchronized (searcherManagers) {
+ Long projectId = event.getEntity().getId();
+ SearcherManager searcherManager = searcherManagers.remove(projectId);
+ if (searcherManager != null) {
+ try {
+ searcherManager.close();
+ } catch (IOException e) {
+ Throwables.propagate(e);
}
}
-
- });
+ }
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java
index f979a814d2..323a0999cb 100644
--- a/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java
+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java
@@ -19,7 +19,7 @@ import com.gitplex.launcher.bootstrap.Bootstrap;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.ConfigManager;
import com.gitplex.server.model.User;
-import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.util.LockUtils;
import com.gitplex.server.util.StringUtils;
@@ -42,7 +42,7 @@ public class DefaultAvatarManager implements AvatarManager {
this.configManager = configManager;
}
- @Transactional
+ @Sessional
@Override
public String getAvatarUrl(@Nullable UserFacade user) {
if (user == null) {
@@ -119,7 +119,7 @@ public class DefaultAvatarManager implements AvatarManager {
return new File(Bootstrap.getSiteDir(), "avatars/uploaded/" + user.getId());
}
- @Transactional
+ @Sessional
@Override
public void useAvatar(User user, FileUpload upload) {
Lock avatarLock = LockUtils.getLock("uploaded-avatar:" + user.getId());
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/DefaultWebSocketManager.java b/web/src/main/java/com/gitplex/server/web/websocket/DefaultWebSocketManager.java
index da52585339..eddb13cf97 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/DefaultWebSocketManager.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/DefaultWebSocketManager.java
@@ -19,7 +19,6 @@ import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
import org.apache.wicket.protocol.ws.api.registry.SimpleWebSocketConnectionRegistry;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
-import org.hibernate.resource.transaction.spi.TransactionStatus;
import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.persistence.dao.Dao;
@@ -67,33 +66,25 @@ public class DefaultWebSocketManager implements WebSocketManager {
@Sessional
@Override
public void render(WebSocketRegion region, @Nullable PageKey sourcePageKey) {
- if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
- dao.doAfterCommit(new Runnable() {
+ dao.doAfterCommit(new Runnable() {
- @Override
- public void run() {
- doRender(region, sourcePageKey);
- }
-
- });
- } else {
- doRender(region, sourcePageKey);
- }
- }
-
- private void doRender(WebSocketRegion region, @Nullable PageKey sourcePageKey) {
- for (IWebSocketConnection connection: connectionRegistry.getConnections(application)) {
- PageKey pageKey = ((WebSocketConnection) connection).getPageKey();
- if (connection.isOpen()
- && (sourcePageKey == null || !sourcePageKey.equals(pageKey))
- && containsRegion(connection, region)) {
- try {
- connection.sendMessage(RENDER_CALLBACK);
- } catch (IOException e) {
- throw new RuntimeException(e);
+ @Override
+ public void run() {
+ for (IWebSocketConnection connection: connectionRegistry.getConnections(application)) {
+ PageKey pageKey = ((WebSocketConnection) connection).getPageKey();
+ if (connection.isOpen()
+ && (sourcePageKey == null || !sourcePageKey.equals(pageKey))
+ && containsRegion(connection, region)) {
+ try {
+ connection.sendMessage(RENDER_CALLBACK);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
}
- }
+
+ });
}
private boolean containsRegion(IWebSocketConnection connection, WebSocketRegion region) {