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

artificially split stub hierarchy index keys to reduce memory usage during index queries

Browse Source
This commit is contained in:
peter
2016-06-27 10:31:31 +02:00
parent 44fd03bf32
commit c4b79ff4df
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyServiceImpl.java
+10 -8
View File
@@ -69,20 +69,18 @@ public class HierarchyServiceImpl extends HierarchyService {
StubEnter stubEnter = new StubEnter(symbols);
IdSets idSets = IdSets.getIdSets(myProject);
loadUnits(idSets.libraryFiles, StubHierarchyIndex.BINARY_FILES, stubEnter);
loadUnits(idSets.libraryFiles, StubHierarchyIndex.BINARY_KEYS, stubEnter);
stubEnter.connect1();
loadUnits(idSets.sourceFiles, StubHierarchyIndex.SOURCE_FILES, stubEnter);
loadUnits(idSets.sourceFiles, StubHierarchyIndex.SOURCE_KEYS, stubEnter);
stubEnter.connect2();
return symbols.createHierarchy();
}
private void loadUnits(BitSet files, int indexKey, StubEnter stubEnter) {
ProgressIndicator indicator = ProgressIndicatorProvider.getGlobalProgressIndicator();
FileBasedIndexImpl index = (FileBasedIndexImpl)FileBasedIndex.getInstance();
index.processAllValues(StubHierarchyIndex.INDEX_ID, indexKey, myProject, new FileBasedIndexImpl.IdValueProcessor<IndexTree.Unit>() {
private void loadUnits(BitSet files, int[] indexKeys, StubEnter stubEnter) {
FileBasedIndexImpl.IdValueProcessor<IndexTree.Unit> processor = new FileBasedIndexImpl.IdValueProcessor<IndexTree.Unit>() {
final ProgressIndicator indicator = ProgressIndicatorProvider.getGlobalProgressIndicator();
int count = 0;
@Override
public boolean process(int fileId, IndexTree.Unit unit) {
@@ -92,7 +90,11 @@ public class HierarchyServiceImpl extends HierarchyService {
}
return true;
}
});
};
for (int indexKey : indexKeys) {
((FileBasedIndexImpl)FileBasedIndex.getInstance()).processAllValues(StubHierarchyIndex.INDEX_ID, indexKey, myProject, processor);
}
}
private static class IdSets {
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java
+10 -5
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileWithId;
import com.intellij.psi.impl.java.stubs.hierarchy.IndexTree;
import com.intellij.psi.impl.java.stubs.index.JavaUnitDescriptor;
import com.intellij.psi.stubsHierarchy.StubHierarchyIndexer;
@@ -30,13 +31,15 @@ import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
import java.util.Collections;
import java.util.stream.IntStream;
/**
* @author peter
*/
public class StubHierarchyIndex extends FileBasedIndexExtension<Integer, IndexTree.Unit> implements PsiDependentIndex {
public static final int BINARY_FILES = 0;
public static final int SOURCE_FILES = 1;
private static final int KEY_COUNT = 20;
static final int[] BINARY_KEYS = IntStream.rangeClosed(1, KEY_COUNT).toArray();
static final int[] SOURCE_KEYS = IntStream.rangeClosed(-KEY_COUNT, -1).toArray();
static final ID<Integer, IndexTree.Unit> INDEX_ID = ID.create("jvm.hierarchy");
private static final StubHierarchyIndexer[] ourIndexers = StubHierarchyIndexer.EP_NAME.getExtensions();
@@ -51,9 +54,11 @@ public class StubHierarchyIndex extends FileBasedIndexExtension<Integer, IndexTr
public DataIndexer<Integer, IndexTree.Unit, FileContent> getIndexer() {
return inputData -> {
for (StubHierarchyIndexer indexer : ourIndexers) {
IndexTree.Unit unit = indexer.handlesFile(inputData.getFile()) ? indexer.indexFile(inputData) : null;
VirtualFile file = inputData.getFile();
IndexTree.Unit unit = indexer.handlesFile(file) ? indexer.indexFile(inputData) : null;
if (unit != null && unit.myDecls.length > 0) {
return Collections.singletonMap(inputData.getFile().getFileType().isBinary() ? BINARY_FILES : SOURCE_FILES, unit);
int[] keys = file.getFileType().isBinary() ? BINARY_KEYS : SOURCE_KEYS;
return Collections.singletonMap(keys[((VirtualFileWithId) file).getId() % keys.length], unit);
}
}
return Collections.emptyMap();
@@ -74,7 +79,7 @@ public class StubHierarchyIndex extends FileBasedIndexExtension<Integer, IndexTr
@Override
public int getVersion() {
return IndexTree.STUB_HIERARCHY_ENABLED ? 4 + Arrays.stream(ourIndexers).mapToInt(StubHierarchyIndexer::getVersion).sum() : 0;
return IndexTree.STUB_HIERARCHY_ENABLED ? 5 + Arrays.stream(ourIndexers).mapToInt(StubHierarchyIndexer::getVersion).sum() : 0;
}
@NotNull