From 8101d1537bef79fd2f526181aba0f7291e7778c7 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 20 Jun 2017 20:04:11 +0300 Subject: [PATCH] [vcs-log] inline indexOneByOne method --- .../vcs/log/data/index/VcsLogPersistentIndex.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/VcsLogPersistentIndex.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/VcsLogPersistentIndex.java index 406ca58c0498..f633adc58b5c 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/VcsLogPersistentIndex.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/VcsLogPersistentIndex.java @@ -587,9 +587,9 @@ public class VcsLogPersistentIndex implements VcsLogIndex, Disposable { TroveUtil.processBatches(commits, BATCH_SIZE, batch -> { counter.indicator.checkCanceled(); - if (indexOneByOne(batch)) { - counter.newIndexedCommits += batch.size(); - } + List hashes = TroveUtil.map(batch, value -> myStorage.getCommitId(value).getHash().asString()); + myProviders.get(myRoot).readFullDetails(myRoot, hashes, VcsLogPersistentIndex.this::storeDetail, true); + counter.newIndexedCommits += batch.size(); counter.displayProgress(); }); @@ -597,13 +597,6 @@ public class VcsLogPersistentIndex implements VcsLogIndex, Disposable { flush(); } - private boolean indexOneByOne(@NotNull TIntHashSet commits) throws VcsException { - VcsLogProvider provider = myProviders.get(myRoot); - List hashes = TroveUtil.map(commits, value -> myStorage.getCommitId(value).getHash().asString()); - provider.readFullDetails(myRoot, hashes, VcsLogPersistentIndex.this::storeDetail, true); - return true; - } - public void indexAll(@NotNull TIntHashSet commits, @NotNull CommitsCounter counter) throws VcsException { counter.displayProgress();