The Unified and Autonomous Development Platform
Abstract common setting and behavior of various exodus info manager into AbstractEnvironmentManager
robin shen2b823ade94cb
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/AbstractEnvironmentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/AbstractEnvironmentManager.javanew file mode 100644index 0000000000..ec7972ac53--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/AbstractEnvironmentManager.java@@ -0,0 +1,153 @@+package com.gitplex.server.manager.impl;++import java.io.File;+import java.io.IOException;+import java.nio.ByteBuffer;+import java.util.Arrays;+import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;++import javax.annotation.Nullable;++import com.gitplex.launcher.loader.Listen;+import com.gitplex.server.event.lifecycle.SystemStopping;+import com.gitplex.server.util.FileUtils;+import com.google.common.base.Charsets;++import jetbrains.exodus.ArrayByteIterable;+import jetbrains.exodus.ByteIterable;+import jetbrains.exodus.env.Environment;+import jetbrains.exodus.env.EnvironmentConfig;+import jetbrains.exodus.env.Environments;+import jetbrains.exodus.env.Store;+import jetbrains.exodus.env.StoreConfig;+import jetbrains.exodus.env.Transaction;+import jetbrains.exodus.env.TransactionalComputable;++public abstract class AbstractEnvironmentManager {++ private static final String VERSION_FILE = "version.txt";++ private static final long DEFAULT_LOG_FILE_SIZE = 8192;++ private static final int MEMORY_USAGE_PERCENT = 25;++ private final Map<String, Environment> envs = new ConcurrentHashMap<>();++ protected void checkVersion(String envKey) {+ File versionFile = new File(getEnvDir(envKey), VERSION_FILE);+ int versionFromFile;+ if (versionFile.exists()) {+ try {+ versionFromFile = Integer.parseInt(FileUtils.readFileToString(versionFile).trim());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ versionFromFile = 0;+ }+ if (versionFromFile != getEnvVersion()) {+ FileUtils.cleanDir(versionFile.getParentFile());+ FileUtils.writeFile(versionFile, String.valueOf(getEnvVersion()));+ }+ }++ protected void writeVersion(String envKey) {+ File versionFile = new File(getEnvDir(envKey), VERSION_FILE);+ FileUtils.writeFile(versionFile, String.valueOf(getEnvVersion()));+ }++ protected abstract File getEnvDir(String envKey);++ protected abstract int getEnvVersion();++ protected long getLogFileSize() {+ return DEFAULT_LOG_FILE_SIZE;+ }++ protected Environment getEnv(String envKey) {+ Environment env = envs.get(envKey);+ if (env == null) synchronized (envs) {+ env = envs.get(envKey);+ if (env == null) {+ checkVersion(envKey);+ EnvironmentConfig config = new EnvironmentConfig();+ config.setEnvCloseForcedly(true);+ config.setMemoryUsagePercentage(MEMORY_USAGE_PERCENT);+ config.setLogFileSize(getLogFileSize());+ env = Environments.newInstance(getEnvDir(envKey), config);+ envs.put(envKey, env);+ }+ }+ return env;+ }++ protected Store getStore(Environment env, String storeName) {+ return env.computeInTransaction(new TransactionalComputable<Store>() {+ @Override+ public Store compute(Transaction txn) {+ return env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn);+ }+ });+ }++ protected void removeEnv(String envKey) {+ synchronized (envs) {+ Environment env = envs.remove(envKey);+ if (env != null)+ env.close();+ }+ }++ @Listen+ public void on(SystemStopping event) {+ synchronized (envs) {+ for (Environment env: envs.values())+ env.close();+ envs.clear();+ }+ }++ protected byte[] getBytes(@Nullable ByteIterable byteIterable) {+ if (byteIterable != null)+ return Arrays.copyOf(byteIterable.getBytesUnsafe(), byteIterable.getLength());+ else+ return null;+ }++ protected byte[] longToBytes(long value) {+ ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);+ buffer.putLong(value);+ return buffer.array();+ }++ protected long bytesToLong(byte[] bytes) {+ ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);+ buffer.put(bytes);+ buffer.flip();+ return buffer.getLong();+ }++ static class StringByteIterable extends ArrayByteIterable {+ StringByteIterable(String value) {+ super(value.getBytes(Charsets.UTF_8));+ }+ }++ static class StringPairByteIterable extends ArrayByteIterable {++ StringPairByteIterable(String value1, String value2) {+ super(getBytes(value1, value2));+ }++ private static byte[] getBytes(String value1, String value2) {+ byte[] bytes1 = value1.getBytes();+ byte[] bytes2 = value2.getBytes();+ byte[] bytes = new byte[bytes1.length+bytes2.length];+ System.arraycopy(bytes1, 0, bytes, 0, bytes1.length);+ System.arraycopy(bytes2, 0, bytes, bytes1.length, bytes2.length);+ return bytes;+ }+ }++}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.javaindex 5adf6603a3..ac2f5a30cc 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@@ -6,11 +6,9 @@ import java.io.Serializable;import java.nio.ByteBuffer;import java.nio.file.Paths;import java.util.ArrayList;-import java.util.Arrays;import java.util.Collection;import java.util.Collections;import java.util.Comparator;-import java.util.HashMap;import java.util.HashSet;import java.util.List;import java.util.Map;@@ -38,7 +36,6 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.event.lifecycle.SystemStarted;-import com.gitplex.server.event.lifecycle.SystemStopping;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.NameAndEmail;import com.gitplex.server.manager.BatchWorkManager;@@ -48,11 +45,11 @@ 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.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityRemoved;import com.gitplex.server.util.BatchWorker;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;-import com.gitplex.server.util.VersionUtils;import com.gitplex.server.util.concurrent.Prioritized;import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.util.facade.UserFacade;@@ -63,21 +60,20 @@ import jetbrains.exodus.ByteIterable;import jetbrains.exodus.backup.BackupStrategy;import jetbrains.exodus.backup.BackupStrategy.FileDescriptor;import jetbrains.exodus.env.Environment;-import jetbrains.exodus.env.EnvironmentConfig;-import jetbrains.exodus.env.Environments;import jetbrains.exodus.env.Store;-import jetbrains.exodus.env.StoreConfig;import jetbrains.exodus.env.Transaction;import jetbrains.exodus.env.TransactionalComputable;import jetbrains.exodus.env.TransactionalExecutable;@Singleton-public class DefaultCommitInfoManager implements CommitInfoManager {+public class DefaultCommitInfoManager extends AbstractEnvironmentManager implements CommitInfoManager {private static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class);private static final int INFO_VERSION = 1;+ private static final long LOG_FILE_SIZE = 64*1024;+private static final String INFO_DIR = "commit";private static final String DEFAULT_STORE = "default";@@ -106,7 +102,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {private final UnitOfWork unitOfWork;- private final Map<Long, Environment> envs = new HashMap<>();+ private final Dao dao;private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();@@ -118,17 +114,18 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Injectpublic DefaultCommitInfoManager(ProjectManager projectManager, StorageManager storageManager,- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork) {+ BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, Dao dao) {this.projectManager = projectManager;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;this.unitOfWork = unitOfWork;+ this.dao = dao;}private void doCollect(Project project, List<RevCommit> commits) {logger.debug("Collecting commits info (project: {}, commits: {})...", project, commits.size());- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());Store defaultStore = getStore(env, DEFAULT_STORE);Store commitsStore = getStore(env, COMMITS_STORE);Store contributionsStore = getStore(env, CONTRIBUTIONS_STORE);@@ -316,41 +313,11 @@ public class DefaultCommitInfoManager implements CommitInfoManager {new ArrayByteIterable(byteBuffer.array()));}- private Environment getEnv(Long projectId) {- synchronized (envs) {- Environment env = envs.get(projectId);- if (env == null) {- EnvironmentConfig config = new EnvironmentConfig();- config.setEnvCloseForcedly(true);- config.setLogFileSize(64*1024);- env = Environments.newInstance(getInfoDir(projectId), config);- envs.put(projectId, env);- }- return env;- }- }-- private File getInfoDir(Long projectId) {- File infoDir = new File(storageManager.getProjectInfoDir(projectId), INFO_DIR);- if (!infoDir.exists())- FileUtils.createDir(infoDir);- return infoDir;- }-- private Store getStore(final Environment env, final String storeName) {- return env.computeInTransaction(new TransactionalComputable<Store>() {- @Override- public Store compute(Transaction txn) {- return env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn);- }- });- }-@Overridepublic List<NameAndEmail> getAuthors(Project project) {List<NameAndEmail> authors = authorsCache.get(project.getId());if (authors == null) {- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());Store store = getStore(env, DEFAULT_STORE);authors = env.computeInReadonlyTransaction(new TransactionalComputable<List<NameAndEmail>>() {@@ -378,7 +345,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {public List<NameAndEmail> getCommitters(Project project) {List<NameAndEmail> committers = committersCache.get(project.getId());if (committers == null) {- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());Store store = getStore(env, DEFAULT_STORE);committers = env.computeInReadonlyTransaction(new TransactionalComputable<List<NameAndEmail>>() {@@ -406,7 +373,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {public List<String> getFiles(Project project) {List<String> files = filesCache.get(project.getId());if (files == null) {- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());final Store store = getStore(env, DEFAULT_STORE);files = env.computeInReadonlyTransaction(new TransactionalComputable<List<String>>() {@@ -436,7 +403,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Overridepublic int getContributions(ProjectFacade project, UserFacade user, String path) {if (user.getEmail() != null) {- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());Store store = getStore(env, CONTRIBUTIONS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {@@ -457,7 +424,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Overridepublic Set<ObjectId> getDescendants(Project project, final ObjectId ancestor) {- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());final Store store = getStore(env, COMMITS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Set<ObjectId>>() {@@ -508,7 +475,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Overridepublic Set<ObjectId> getChildren(Project project, final ObjectId parent) {- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());final Store store = getStore(env, COMMITS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Set<ObjectId>>() {@@ -544,24 +511,21 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Listenpublic void on(EntityRemoved event) {if (event.getEntity() instanceof Project) {- synchronized (envs) {- Environment env = envs.remove(event.getEntity().getId());- if (env != null)- env.close();- }- filesCache.remove(event.getEntity().getId());- commitCountCache.remove(event.getEntity().getId());- authorsCache.remove(event.getEntity().getId());+ 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);+ }++ });}}- private byte[] getBytes(@Nullable ByteIterable byteIterable) {- if (byteIterable != null)- return Arrays.copyOf(byteIterable.getBytesUnsafe(), byteIterable.getLength());- else- return null;- }-private BatchWorker getBatchWorker(Project project) {Long projectId = project.getId();return new BatchWorker("project-" + projectId + "-collectCommitInfo") {@@ -601,7 +565,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {RevObject revObj = revWalk.peel(revWalk.parseAny(ref.getObjectId()));if (revObj instanceof RevCommit) {RevCommit commit = (RevCommit) revObj;- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());Store commitsStore = getStore(env, COMMITS_STORE);boolean collected = env.computeInReadonlyTransaction(new TransactionalComputable<Boolean>() {@@ -630,19 +594,11 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}}- @Listen- public void on(SystemStopping event) {- synchronized (envs) {- for (Environment env: envs.values())- env.close();- }- }-@Sessional@Listenpublic void on(SystemStarted event) {for (Project project: projectManager.findAll()) {- VersionUtils.checkInfoVersion(getInfoDir(project.getId()), INFO_VERSION);+ checkVersion(project.getId().toString());collect(project);}}@@ -662,7 +618,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {public int getCommitCount(Project project) {Integer commitCount = commitCountCache.get(project.getId());if (commitCount == null) {- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());Store store = getStore(env, DEFAULT_STORE);commitCount = env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {@@ -682,12 +638,6 @@ public class DefaultCommitInfoManager implements CommitInfoManager {return commitCount;}- static class StringByteIterable extends ArrayByteIterable {- StringByteIterable(String value) {- super(value.getBytes(Charsets.UTF_8));- }- }-static class CollectingWork extends Prioritized {private final ObjectId commitId;@@ -705,9 +655,9 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Overridepublic void cloneInfo(Project source, Project target) {- BackupStrategy backupStrategy = getEnv(source.getId()).getBackupStrategy();+ BackupStrategy backupStrategy = getEnv(source.getId().toString()).getBackupStrategy();try {- File targetDir = getInfoDir(target.getId());+ File targetDir = getEnvDir(target.getId().toString());backupStrategy.beforeBackup();try {for (FileDescriptor descriptor: backupStrategy.listFiles()) {@@ -716,7 +666,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {} finally {backupStrategy.afterBackup();}- VersionUtils.writeInfoVersion(targetDir, INFO_VERSION);+ writeVersion(target.getId().toString());} catch (Exception e) {throw new RuntimeException(e);}@@ -725,7 +675,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Nullable@Overridepublic ObjectId getLastCommit(Project project) {- Environment env = getEnv(project.getId());+ Environment env = getEnv(project.getId().toString());Store defaultStore = getStore(env, DEFAULT_STORE);return env.computeInTransaction(new TransactionalComputable<ObjectId>() {@@ -739,4 +689,22 @@ public class DefaultCommitInfoManager implements CommitInfoManager {});}+ @Override+ protected File getEnvDir(String envKey) {+ File infoDir = new File(storageManager.getProjectInfoDir(Long.valueOf(envKey)), INFO_DIR);+ if (!infoDir.exists())+ FileUtils.createDir(infoDir);+ return infoDir;+ }++ @Override+ protected long getLogFileSize() {+ return LOG_FILE_SIZE;+ }++ @Override+ protected int getEnvVersion() {+ return INFO_VERSION;+ }+}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.javaindex 63af102ecc..777b42df1f 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@@ -146,6 +146,20 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemquery.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();+ }++ }++ });}@Override@@ -239,7 +253,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemfor (Project project: findAll())checkGit(project);}-+@Transactional@Listenpublic void on(RefUpdated event) {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.javaindex 4db41f8545..603a78a03a 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@@ -1,18 +1,12 @@package com.gitplex.server.manager.impl;import java.io.File;-import java.nio.ByteBuffer;-import java.util.Arrays;import java.util.Date;-import java.util.HashMap;-import java.util.Map;-import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.event.lifecycle.SystemStopping;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.UserInfoManager;import com.gitplex.server.model.Project;@@ -20,17 +14,12 @@ 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.VersionUtils;import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.util.facade.UserFacade;import jetbrains.exodus.ArrayByteIterable;-import jetbrains.exodus.ByteIterable;import jetbrains.exodus.env.Environment;-import jetbrains.exodus.env.EnvironmentConfig;-import jetbrains.exodus.env.Environments;import jetbrains.exodus.env.Store;-import jetbrains.exodus.env.StoreConfig;import jetbrains.exodus.env.Transaction;import jetbrains.exodus.env.TransactionalComputable;import jetbrains.exodus.env.TransactionalExecutable;@@ -43,14 +32,12 @@ import jetbrains.exodus.env.TransactionalExecutable;**/@Singleton-public class DefaultUserInfoManager implements UserInfoManager {+public class DefaultUserInfoManager extends AbstractEnvironmentManager implements UserInfoManager {private static final int INFO_VERSION = 1;private static final String VISIT_STORE = "visit";- private final Map<Long, Environment> envs = new HashMap<>();-private final StorageManager storageManager;private final Dao dao;@@ -61,39 +48,9 @@ public class DefaultUserInfoManager implements UserInfoManager {this.storageManager = storageManager;}- private synchronized Environment getEnv(Long userId) {- Environment env = envs.get(userId);- if (env == null) {- EnvironmentConfig config = new EnvironmentConfig();- config.setEnvCloseForcedly(true);-- File infoDir = storageManager.getUserInfoDir(userId);- VersionUtils.checkInfoVersion(infoDir, INFO_VERSION);- env = Environments.newInstance(infoDir, config);- envs.put(userId, env);- }- return env;- }-- private Store getStore(Environment env, String storeName) {- return env.computeInTransaction(new TransactionalComputable<Store>() {- @Override- public Store compute(Transaction txn) {- return env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn);- }- });- }-- private byte[] getBytes(@Nullable ByteIterable byteIterable) {- if (byteIterable != null)- return Arrays.copyOf(byteIterable.getBytesUnsafe(), byteIterable.getLength());- else- return null;- }-@Overridepublic void visit(User user, Project project) {- Environment env = getEnv(user.getId());+ Environment env = getEnv(user.getId().toString());Store store = getStore(env, VISIT_STORE);env.executeInTransaction(new TransactionalExecutable() {@@ -108,7 +65,7 @@ public class DefaultUserInfoManager implements UserInfoManager {@Overridepublic Date getVisitDate(UserFacade user, ProjectFacade project) {- Environment env = getEnv(user.getId());+ Environment env = getEnv(user.getId().toString());Store store = getStore(env, VISIT_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@@ -124,51 +81,29 @@ public class DefaultUserInfoManager implements UserInfoManager {});}- private byte[] longToBytes(long value) {- ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);- buffer.putLong(value);- return buffer.array();- }-- private long bytesToLong(byte[] bytes) {- ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);- buffer.put(bytes);- buffer.flip();- return buffer.getLong();- }-@Transactional@Listenpublic void on(EntityRemoved event) {- if (event.getEntity() instanceof Project) {- Long projectId = event.getEntity().getId();+ if (event.getEntity() instanceof User) {dao.doAfterCommit(new Runnable() {@Overridepublic void run() {- synchronized (envs) {- Environment env = envs.remove(projectId);- if (env != null)- env.close();- }+ removeEnv(event.getEntity().getId().toString());}});}}- @Listen- public void on(SystemStopping event) {- synchronized (envs) {- for (Environment env: envs.values())- env.close();- }+ @Override+ protected File getEnvDir(String envKey) {+ return storageManager.getUserInfoDir(Long.valueOf(envKey));}- static class StringByteIterable extends ArrayByteIterable {- StringByteIterable(String value) {- super(value.getBytes());- }+ @Override+ protected int getEnvVersion() {+ return INFO_VERSION;}}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.javaindex 5928f93593..2d2c712997 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java@@ -1,18 +1,12 @@package com.gitplex.server.manager.impl;import java.io.File;-import java.nio.ByteBuffer;-import java.util.Arrays;import java.util.Date;-import java.util.HashMap;-import java.util.Map;-import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.event.lifecycle.SystemStopping;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;@@ -29,21 +23,16 @@ 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.VersionUtils;import jetbrains.exodus.ArrayByteIterable;-import jetbrains.exodus.ByteIterable;import jetbrains.exodus.env.Environment;-import jetbrains.exodus.env.EnvironmentConfig;-import jetbrains.exodus.env.Environments;import jetbrains.exodus.env.Store;-import jetbrains.exodus.env.StoreConfig;import jetbrains.exodus.env.Transaction;import jetbrains.exodus.env.TransactionalComputable;import jetbrains.exodus.env.TransactionalExecutable;@Singleton-public class DefaultVisitInfoManager implements VisitInfoManager {+public class DefaultVisitInfoManager extends AbstractEnvironmentManager implements VisitInfoManager {private static final int INFO_VERSION = 1;@@ -53,8 +42,6 @@ public class DefaultVisitInfoManager implements VisitInfoManager {private static final String CODE_COMMENT_STORE = "codeComment";- private final Map<Long, Environment> envs = new HashMap<>();-private final StorageManager storageManager;private final Dao dao;@@ -65,45 +52,9 @@ public class DefaultVisitInfoManager implements VisitInfoManager {this.storageManager = storageManager;}- private synchronized Environment getEnv(Long projectId) {- Environment env = envs.get(projectId);- if (env == null) {- File infoDir = getInfoDir(projectId);- VersionUtils.checkInfoVersion(infoDir, INFO_VERSION);- EnvironmentConfig config = new EnvironmentConfig();- config.setEnvCloseForcedly(true);- env = Environments.newInstance(infoDir, config);- envs.put(projectId, env);- }- return env;- }-- private File getInfoDir(Long projectId) {- File infoDir = new File(storageManager.getProjectInfoDir(projectId), INFO_DIR);- if (!infoDir.exists())- FileUtils.createDir(infoDir);- return infoDir;- }-- private Store getStore(Environment env, String storeName) {- return env.computeInTransaction(new TransactionalComputable<Store>() {- @Override- public Store compute(Transaction txn) {- return env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn);- }- });- }-- private byte[] getBytes(@Nullable ByteIterable byteIterable) {- if (byteIterable != null)- return Arrays.copyOf(byteIterable.getBytesUnsafe(), byteIterable.getLength());- else- return null;- }-@Overridepublic void visit(User user, PullRequest request) {- Environment env = getEnv(request.getTargetProject().getId());+ Environment env = getEnv(request.getTargetProject().getId().toString());Store store = getStore(env, PULL_REQUEST_STORE);env.executeInTransaction(new TransactionalExecutable() {@@ -118,7 +69,7 @@ public class DefaultVisitInfoManager implements VisitInfoManager {@Overridepublic void visit(User user, CodeComment comment) {- Environment env = getEnv(comment.getRequest().getTargetProject().getId());+ Environment env = getEnv(comment.getRequest().getTargetProject().getId().toString());Store store = getStore(env, CODE_COMMENT_STORE);env.executeInTransaction(new TransactionalExecutable() {@@ -133,7 +84,7 @@ public class DefaultVisitInfoManager implements VisitInfoManager {@Overridepublic Date getVisitDate(User user, PullRequest request) {- Environment env = getEnv(request.getTargetProject().getId());+ Environment env = getEnv(request.getTargetProject().getId().toString());Store store = getStore(env, PULL_REQUEST_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@@ -151,7 +102,7 @@ public class DefaultVisitInfoManager implements VisitInfoManager {@Overridepublic Date getVisitDate(User user, CodeComment comment) {- Environment env = getEnv(comment.getRequest().getTargetProject().getId());+ Environment env = getEnv(comment.getRequest().getTargetProject().getId().toString());Store store = getStore(env, CODE_COMMENT_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@@ -181,19 +132,6 @@ public class DefaultVisitInfoManager implements VisitInfoManager {visit(event.getComment().getUser(), event.getComment());}- private byte[] longToBytes(long value) {- ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);- buffer.putLong(value);- return buffer.array();- }-- private long bytesToLong(byte[] bytes) {- ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);- buffer.put(bytes);- buffer.flip();- return buffer.getLong();- }-@Listenpublic void on(PullRequestCommentCreated event) {visit(event.getComment().getUser(), event.getRequest());@@ -215,49 +153,28 @@ public class DefaultVisitInfoManager implements VisitInfoManager {@Listenpublic void on(EntityRemoved event) {if (event.getEntity() instanceof Project) {- Long projectId = event.getEntity().getId();dao.doAfterCommit(new Runnable() {@Overridepublic void run() {- synchronized (envs) {- Environment env = envs.remove(projectId);- if (env != null)- env.close();- }+ removeEnv(event.getEntity().getId().toString());}});}}- @Listen- public void on(SystemStopping event) {- synchronized (envs) {- for (Environment env: envs.values())- env.close();- }- }-- static class StringByteIterable extends ArrayByteIterable {- StringByteIterable(String value) {- super(value.getBytes());- }+ @Override+ protected File getEnvDir(String envKey) {+ File infoDir = new File(storageManager.getProjectInfoDir(Long.valueOf(envKey)), INFO_DIR);+ if (!infoDir.exists())+ FileUtils.createDir(infoDir);+ return infoDir;}- static class StringPairByteIterable extends ArrayByteIterable {- StringPairByteIterable(String uuid1, String uuid2) {- super(getBytes(uuid1, uuid2));- }-- private static byte[] getBytes(String uuid1, String uuid2) {- byte[] bytes1 = uuid1.getBytes();- byte[] bytes2 = uuid2.getBytes();- byte[] bytes = new byte[bytes1.length+bytes2.length];- System.arraycopy(bytes1, 0, bytes, 0, bytes1.length);- System.arraycopy(bytes2, 0, bytes, bytes1.length, bytes2.length);- return bytes;- }+ @Override+ protected int getEnvVersion() {+ return INFO_VERSION;}}diff --git a/core/src/main/java/com/gitplex/server/util/VersionUtils.java b/core/src/main/java/com/gitplex/server/util/VersionUtils.javadeleted file mode 100644index 36138e4835..0000000000--- a/core/src/main/java/com/gitplex/server/util/VersionUtils.java+++ /dev/null@@ -1,33 +0,0 @@-package com.gitplex.server.util;--import java.io.File;-import java.io.IOException;--public class VersionUtils {-- private static final String INFO_VERSION_FILE = "version.txt";-- public static void checkInfoVersion(File infoDir, int infoVersion) {- File versionFile = new File(infoDir, INFO_VERSION_FILE);- int infoVersionFromFile;- if (versionFile.exists()) {- try {- infoVersionFromFile = Integer.parseInt(FileUtils.readFileToString(versionFile).trim());- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- infoVersionFromFile = 0;- }- if (infoVersionFromFile != infoVersion) {- FileUtils.cleanDir(versionFile.getParentFile());- FileUtils.writeFile(versionFile, String.valueOf(infoVersion));- }- }-- public static void writeInfoVersion(File infoDir, int infoVersion) {- File versionFile = new File(infoDir, INFO_VERSION_FILE);- FileUtils.writeFile(versionFile, String.valueOf(infoVersion));- }--}diff --git a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.javaindex d4df398457..ad4fabcc56 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java@@ -243,20 +243,19 @@ public class DefaultSearchManager implements SearchManager {@Listenpublic void on(EntityRemoved event) {if (event.getEntity() instanceof Project) {- Long projectId = event.getEntity().getId();dao.doAfterCommit(new Runnable() {@Overridepublic void run() {synchronized (searcherManagers) {- SearcherManager searcherManager = searcherManagers.get(projectId);+ Long projectId = event.getEntity().getId();+ SearcherManager searcherManager = searcherManagers.remove(projectId);if (searcherManager != null) {try {searcherManager.close();} catch (IOException e) {Throwables.propagate(e);}- searcherManagers.remove(projectId);}}}