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

[r=max] fix cyclic dependency problem (IDEA-62466)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2010-12-06 22:07:09 +03:00
parent ca2dd631cf
commit 567dfb55ba
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
+18 -5
View File
@@ -45,6 +45,7 @@ import com.intellij.util.io.DataInputOutputUtil;
import gnu.trove.TIntArrayList;
import gnu.trove.TObjectIntHashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.DataInput;
import java.io.DataOutput;
@@ -52,6 +53,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
@State(
@@ -64,6 +66,7 @@ import java.util.concurrent.locks.Lock;
}
)
public class StubIndexImpl extends StubIndex implements ApplicationComponent, PersistentStateComponent<StubIndexState> {
private static final AtomicReference<Boolean> ourForcedClean = new AtomicReference<Boolean>(null);
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.StubIndexImpl");
private final Map<StubIndexKey<?,?>, MyIndex<?>> myIndices = new HashMap<StubIndexKey<?,?>, MyIndex<?>>();
private final TObjectIntHashMap<ID<?, ?>> myIndexIdToVersionMap = new TObjectIntHashMap<ID<?, ?>>();
@@ -71,19 +74,29 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
private StubIndexState myPreviouslyRegistered;
public StubIndexImpl(FileBasedIndex fileBasedIndex /* need this to ensure initialization order*/ ) throws IOException {
final boolean forceClean = Boolean.TRUE == ourForcedClean.getAndSet(Boolean.FALSE);
final StubIndexExtension<?, ?>[] extensions = Extensions.getExtensions(StubIndexExtension.EP_NAME);
boolean needRebuild = false;
for (StubIndexExtension extension : extensions) {
//noinspection unchecked
needRebuild |= registerIndexer(extension);
needRebuild |= registerIndexer(extension, forceClean);
}
if (needRebuild) {
requestRebuild();
}
dropUnregisteredIndices();
}
private <K> boolean registerIndexer(final StubIndexExtension<K, ?> extension) throws IOException {
@Nullable
public static StubIndexImpl getInstanceOrInvalidate() {
if (ourForcedClean.compareAndSet(null, Boolean.TRUE)) {
return null;
}
return (StubIndexImpl)getInstance();
}
private <K> boolean registerIndexer(final StubIndexExtension<K, ?> extension, final boolean forceClean) throws IOException {
final StubIndexKey<K, ?> indexKey = extension.getKey();
final int version = extension.getVersion();
myIndexIdToVersionMap.put(indexKey, version);
@@ -91,10 +104,10 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
final boolean versionFileExisted = versionFile.exists();
final File indexRootDir = IndexInfrastructure.getIndexRootDir(indexKey);
boolean needRebuild = false;
if (IndexInfrastructure.versionDiffers(versionFile, version)) {
if (forceClean || IndexInfrastructure.versionDiffers(versionFile, version)) {
final String[] children = indexRootDir.list();
// rebuild only if there exists what to rebuild
needRebuild = versionFileExisted || children != null && children.length > 0;
needRebuild = !forceClean && (versionFileExisted || children != null && children.length > 0);
if (needRebuild) {
LOG.info("Version has changed for stub index " + extension.getKey() + ". The index will be rebuilt.");
}
platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
+12 -6
View File
@@ -370,19 +370,25 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
}
public void clear() throws StorageException {
final StubIndexImpl stubIndex = getStubIndex();
final StubIndexImpl stubIndex = StubIndexImpl.getInstanceOrInvalidate();
try {
for (StubIndexKey key : stubIndex.getAllStubIndexKeys()) {
stubIndex.getWriteLock(key).lock();
if (stubIndex != null) {
for (StubIndexKey key : stubIndex.getAllStubIndexKeys()) {
stubIndex.getWriteLock(key).lock();
}
}
getWriteLock().lock();
stubIndex.clearAllIndices();
if (stubIndex != null) {
stubIndex.clearAllIndices();
}
super.clear();
}
finally {
getWriteLock().unlock();
for (StubIndexKey key : stubIndex.getAllStubIndexKeys()) {
stubIndex.getWriteLock(key).unlock();
if (stubIndex != null) {
for (StubIndexKey key : stubIndex.getAllStubIndexKeys()) {
stubIndex.getWriteLock(key).unlock();
}
}
}
}