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

indexes: single entry snapshot indexes should use corresponding diff builder

Browse Source 
GitOrigin-RevId: ad332a51e3a3a5e9536784a518d5a5921682ef5d
This commit is contained in:
Dmitro Batko
2020-02-19 21:53:58 +03:00
committed by intellij-monorepo-bot
parent b4459f6b88
commit 711b668a31
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/lang-impl/src/com/intellij/util/indexing/snapshot/HashIdForwardIndexAccessor.java
View File

@@ -6,6 +6,7 @@ import com.intellij.util.indexing.impl.InputDataDiffBuilder;
import com.intellij.util.indexing.impl.MapInputDataDiffBuilder; import com.intellij.util.indexing.impl.MapInputDataDiffBuilder;
import com.intellij.util.indexing.impl.forward.AbstractMapForwardIndexAccessor; import com.intellij.util.indexing.impl.forward.AbstractMapForwardIndexAccessor;
import com.intellij.util.indexing.impl.forward.IntForwardIndexAccessor; import com.intellij.util.indexing.impl.forward.IntForwardIndexAccessor;
import com.intellij.util.indexing.impl.forward.SingleEntryIndexForwardIndexAccessor;
import com.intellij.util.io.EnumeratorIntegerDescriptor; import com.intellij.util.io.EnumeratorIntegerDescriptor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -17,10 +18,12 @@ public class HashIdForwardIndexAccessor<Key, Value, Input>
extends AbstractMapForwardIndexAccessor<Key, Value, Integer> extends AbstractMapForwardIndexAccessor<Key, Value, Integer>
implements IntForwardIndexAccessor<Key, Value> { implements IntForwardIndexAccessor<Key, Value> {
private final UpdatableSnapshotInputMappingIndex<Key, Value, Input> mySnapshotInputMappingIndex; private final UpdatableSnapshotInputMappingIndex<Key, Value, Input> mySnapshotInputMappingIndex;
private final boolean myIsSingleEntryIndex;
HashIdForwardIndexAccessor(@NotNull UpdatableSnapshotInputMappingIndex<Key, Value, Input> snapshotInputMappingIndex) { HashIdForwardIndexAccessor(@NotNull UpdatableSnapshotInputMappingIndex<Key, Value, Input> snapshotInputMappingIndex, boolean isSingleEntryIndex) {
super(EnumeratorIntegerDescriptor.INSTANCE); super(EnumeratorIntegerDescriptor.INSTANCE);
mySnapshotInputMappingIndex = snapshotInputMappingIndex; mySnapshotInputMappingIndex = snapshotInputMappingIndex;
myIsSingleEntryIndex = isSingleEntryIndex;
} }
@Nullable @Nullable
@@ -32,7 +35,9 @@ public class HashIdForwardIndexAccessor<Key, Value, Input>
@NotNull @NotNull
@Override @Override
public InputDataDiffBuilder<Key, Value> getDiffBuilderFromInt(int inputId, int hashId) throws IOException { public InputDataDiffBuilder<Key, Value> getDiffBuilderFromInt(int inputId, int hashId) throws IOException {
return new MapInputDataDiffBuilder<>(inputId, convertToMap(hashId)); return myIsSingleEntryIndex
? new SingleEntryIndexForwardIndexAccessor.SingleValueDiffBuilder(inputId, convertToMap(hashId))
: new MapInputDataDiffBuilder<>(inputId, convertToMap(hashId));
} }
@Override @Override

2
platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotInputMappings.java
View File

@@ -55,7 +55,7 @@ public class SnapshotInputMappings<Key, Value> implements UpdatableSnapshotInput
myIndexer = indexExtension.getIndexer(); myIndexer = indexExtension.getIndexer();
myContents = createContentsIndex(); myContents = createContentsIndex();
myHashIdForwardIndexAccessor = new HashIdForwardIndexAccessor<>(this); myHashIdForwardIndexAccessor = new HashIdForwardIndexAccessor<>(this, storeOnlySingleValue);
myIndexingTrace = DebugAssertions.EXTRA_SANITY_CHECKS ? createIndexingTrace() : null; myIndexingTrace = DebugAssertions.EXTRA_SANITY_CHECKS ? createIndexingTrace() : null;
if (VfsAwareMapReduceIndex.isCompositeIndexer(myIndexer)) { if (VfsAwareMapReduceIndex.isCompositeIndexer(myIndexer)) {