MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Implemented transient/persistent delta control (jps/incremental).

Browse Source
This commit is contained in:
Dmitry Boulytchev
2012-01-19 05:23:12 +04:00
parent 31eb374571
commit 12c0da3a06
3 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class BuildDataManager {
final File mappingsRoot = getMappingsRoot();
myMappings = createStorage(mappingsRoot, new StorageFactory<Mappings>() {
public Mappings create(File dataFile) throws Exception {
return new Mappings(mappingsRoot);
return new Mappings(mappingsRoot, false);
}
});
}
jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+49 -38
View File
@@ -27,7 +27,8 @@ public class Mappings {
private final static String SOURCE_TO_USAGES = "sourceToUsages.tab";
private final static String CLASS_TO_SOURCE = "classToSource.tab";
private final boolean myIsTansient;
private final boolean myIsDelta;
private final boolean myDeltaIsTransient;
private final File myRootDir;
private DependencyContext myContext;
@@ -69,56 +70,66 @@ public class Mappings {
};
private Mappings(final Mappings base) throws IOException {
myIsTansient = true;
myIsDelta = true;
myDeltaIsTransient = base.myDeltaIsTransient;
myRootDir = new File(FileUtil.toSystemIndependentName(base.myRootDir.getAbsolutePath()) + File.separatorChar + "delta");
myContext = base.myContext;
myRootDir.mkdirs();
createImplementation(myRootDir, true);
createImplementation();
}
public Mappings(final File rootDir) throws IOException {
myIsTansient = false;
public Mappings(final File rootDir, final boolean transientDelta) throws IOException {
myIsDelta = false;
myDeltaIsTransient = transientDelta;
myRootDir = rootDir;
createImplementation(rootDir, myIsTansient);
myContext = new DependencyContext(rootDir);
createImplementation();
}
private void createImplementation(final File rootDir, final boolean isTransient) throws IOException {
if (!isTransient) {
myContext = new DependencyContext(rootDir);
private void createImplementation() throws IOException {
if (!myIsDelta) {
myContext = new DependencyContext(myRootDir);
}
myClassToSubclasses =
new PersistentMultiMaplet<DependencyContext.S, DependencyContext.S>(DependencyContext.getTableFile(rootDir, CLASS_TO_SUBCLASSES),
DependencyContext.descriptorS, DependencyContext.descriptorS,
ourStringSetConstructor);
if (myIsDelta && myDeltaIsTransient) {
myClassToSubclasses = new TransientMultiMaplet<DependencyContext.S, DependencyContext.S>(ourStringSetConstructor);
myClassToClassDependency = new TransientMultiMaplet<DependencyContext.S, DependencyContext.S>(ourStringSetConstructor);
mySourceFileToClasses = new TransientMultiMaplet<DependencyContext.S, ClassRepr>(ourClassSetConstructor);
mySourceFileToAnnotationUsages = new TransientMultiMaplet<DependencyContext.S, UsageRepr.Usage>(ourUsageSetConstructor);
mySourceFileToUsages = new TransientMultiMaplet<DependencyContext.S, UsageRepr.Cluster>(ourUsageClusterSetConstructor);
myClassToSourceFile = new TransientMaplet<DependencyContext.S, DependencyContext.S>();
}
else {
myClassToSubclasses =
new PersistentMultiMaplet<DependencyContext.S, DependencyContext.S>(DependencyContext.getTableFile(myRootDir, CLASS_TO_SUBCLASSES),
DependencyContext.descriptorS, DependencyContext.descriptorS,
ourStringSetConstructor);
myClassToClassDependency =
new PersistentMultiMaplet<DependencyContext.S, DependencyContext.S>(DependencyContext.getTableFile(rootDir, CLASS_TO_CLASS),
DependencyContext.descriptorS, DependencyContext.descriptorS,
ourStringSetConstructor);
myClassToClassDependency =
new PersistentMultiMaplet<DependencyContext.S, DependencyContext.S>(DependencyContext.getTableFile(myRootDir, CLASS_TO_CLASS),
DependencyContext.descriptorS, DependencyContext.descriptorS,
ourStringSetConstructor);
mySourceFileToClasses =
new PersistentMultiMaplet<DependencyContext.S, ClassRepr>(DependencyContext.getTableFile(rootDir, SOURCE_TO_CLASS),
DependencyContext.descriptorS, ClassRepr.externalizer(myContext),
ourClassSetConstructor);
mySourceFileToClasses =
new PersistentMultiMaplet<DependencyContext.S, ClassRepr>(DependencyContext.getTableFile(myRootDir, SOURCE_TO_CLASS),
DependencyContext.descriptorS, ClassRepr.externalizer(myContext),
ourClassSetConstructor);
mySourceFileToAnnotationUsages =
new PersistentMultiMaplet<DependencyContext.S, UsageRepr.Usage>(DependencyContext.getTableFile(rootDir, SOURCE_TO_ANNOTATIONS),
DependencyContext.descriptorS, UsageRepr.externalizer(myContext),
ourUsageSetConstructor);
mySourceFileToAnnotationUsages =
new PersistentMultiMaplet<DependencyContext.S, UsageRepr.Usage>(DependencyContext.getTableFile(myRootDir, SOURCE_TO_ANNOTATIONS),
DependencyContext.descriptorS, UsageRepr.externalizer(myContext),
ourUsageSetConstructor);
mySourceFileToUsages =
new PersistentMultiMaplet<DependencyContext.S, UsageRepr.Cluster>(DependencyContext.getTableFile(rootDir, SOURCE_TO_USAGES),
DependencyContext.descriptorS,
UsageRepr.Cluster.clusterExternalizer(myContext),
ourUsageClusterSetConstructor);
mySourceFileToUsages =
new PersistentMultiMaplet<DependencyContext.S, UsageRepr.Cluster>(DependencyContext.getTableFile(myRootDir, SOURCE_TO_USAGES),
DependencyContext.descriptorS,
UsageRepr.Cluster.clusterExternalizer(myContext),
ourUsageClusterSetConstructor);
myClassToSourceFile =
new PersistentMaplet<DependencyContext.S, DependencyContext.S>(DependencyContext.getTableFile(rootDir, CLASS_TO_SOURCE),
DependencyContext.descriptorS, DependencyContext.descriptorS);
myClassToSourceFile =
new PersistentMaplet<DependencyContext.S, DependencyContext.S>(DependencyContext.getTableFile(myRootDir, CLASS_TO_SOURCE),
DependencyContext.descriptorS, DependencyContext.descriptorS);
}
}
public Mappings createDelta() {
@@ -166,7 +177,7 @@ public class Mappings {
if (myRootDir != null) {
close();
FileUtil.delete(myRootDir);
createImplementation(myRootDir, myIsTansient);
createImplementation();
}
}
@@ -1418,7 +1429,7 @@ public class Mappings {
mySourceFileToUsages.close();
myClassToSourceFile.close();
if (!myIsTansient) {
if (!myIsDelta) {
// only close if you own the context
myContext.close();
jps/src/org/jetbrains/ether/ProjectWrapper.java
+2 -2
View File
@@ -852,7 +852,7 @@ public class ProjectWrapper {
myHomeDir + File.separator + myJPSDir + File.separator + myRoot.replace(File.separatorChar, myFileSeparatorReplacement);
try {
dependencyMapping = new Mappings(getMapDir());
dependencyMapping = new Mappings(getMapDir(), true);
}
catch (IOException e) {
throw new RuntimeException(e);
@@ -913,7 +913,7 @@ public class ProjectWrapper {
RW.readMany(r, RW.myStringReader, affectedFiles);
try {
dependencyMapping = new Mappings(getMapDir());
dependencyMapping = new Mappings(getMapDir(), true);
}
catch (IOException e) {
throw new RuntimeException(e);