From 0a108fe06e3324973a6f8029f597249967cfbb1b Mon Sep 17 00:00:00 2001
From: Dmitro Batko <dmitry.batkovich@jetbrains.com>
Date: Tue, 10 Mar 2020 11:38:41 +0300
Subject: [PATCH] indexes: allow to process inline keys for every index storage
 (only testing purposes)

GitOrigin-RevId: 0fc3d02aabe827b34957a91012f905c7fcb01f4c
---
 .../util/indexing/VfsAwareMapIndexStorage.java         |  7 -------
 .../intellij/util/indexing/impl/MapIndexStorage.java   | 10 +++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/util/indexing/VfsAwareMapIndexStorage.java b/platform/lang-impl/src/com/intellij/util/indexing/VfsAwareMapIndexStorage.java
index eed8d2494fcd..a96cf56b3221 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/VfsAwareMapIndexStorage.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/VfsAwareMapIndexStorage.java
@@ -239,13 +239,6 @@ public final class VfsAwareMapIndexStorage<Key, Value> extends MapIndexStorage<K
     }
   }
 
-  private boolean doProcessKeys(@NotNull Processor<? super Key> processor) throws IOException {
-    return myMap instanceof PersistentHashMap && myKeyDescriptor instanceof InlineKeyDescriptor
-           // process keys and check that they're already present in map because we don't have separated key storage we must check keys
-           ? ((PersistentHashMap<Key, UpdatableValueContainer<Value>>)myMap).processKeysWithExistingMapping(processor)
-           // optimization: process all keys, some of them might be already deleted but we don't care. We just read key storage file here
-           : myMap.processKeys(processor);
-  }
 
   @NotNull
   private static TIntHashSet loadHashedIds(@NotNull File fileWithCaches) throws IOException {
diff --git a/platform/util/src/com/intellij/util/indexing/impl/MapIndexStorage.java b/platform/util/src/com/intellij/util/indexing/impl/MapIndexStorage.java
index 28228df1d86d..5a04556da62f 100644
--- a/platform/util/src/com/intellij/util/indexing/impl/MapIndexStorage.java
+++ b/platform/util/src/com/intellij/util/indexing/impl/MapIndexStorage.java
@@ -292,7 +292,7 @@ public abstract class MapIndexStorage<Key, Value> implements IndexStorage<Key, V
     l.lock();
     try {
       myCache.clear(); // this will ensure that all new keys are made into the map
-      return myMap.processKeys(processor);
+      return doProcessKeys(processor);
     }
     catch (IOException e) {
       throw new StorageException(e);
@@ -306,6 +306,14 @@ public abstract class MapIndexStorage<Key, Value> implements IndexStorage<Key, V
     }
   }
 
+  protected boolean doProcessKeys(@NotNull Processor<? super Key> processor) throws IOException {
+    return myMap instanceof PersistentHashMap && myKeyDescriptor instanceof InlineKeyDescriptor
+           // process keys and check that they're already present in map because we don't have separated key storage we must check keys
+           ? ((PersistentHashMap<Key, UpdatableValueContainer<Value>>)myMap).processKeysWithExistingMapping(processor)
+           // optimization: process all keys, some of them might be already deleted but we don't care. We just read key storage file here
+           : myMap.processKeys(processor);
+  }
+
   @TestOnly
   public PersistentMap<Key, UpdatableValueContainer<Value>> getIndexMap() {
     return myMap;