From 21bc91ea100818f1c4fb0586ac5bb74a1732dbc6 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Wed, 7 Nov 2018 16:34:42 +0100
Subject: [PATCH] deprecate FSCache and remove unnecesary usages (followup
 IDEA-CR-35372)

---
 .../src/org/jetbrains/jps/cmdline/BuildSession.java        | 2 --
 .../src/org/jetbrains/jps/cmdline/ProjectDescriptor.java   | 7 +++++--
 .../src/org/jetbrains/jps/incremental/FSCache.java         | 4 ++--
 .../org/jetbrains/jps/incremental/IncProjectBuilder.java   | 5 -----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
index f5ca6c863f97..25546b0e7dc6 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
@@ -395,7 +395,6 @@ final class BuildSession implements Runnable, CanceledStatus {
       Collection<BuildRootDescriptor> descriptor = pd.getBuildRootIndex().findAllParentDescriptors(file, null, null);
       if (!descriptor.isEmpty()) {
         if (!cacheCleared) {
-          pd.getFSCache().clear();
           cacheCleared = true;
         }
         if (LOG.isDebugEnabled()) {
@@ -427,7 +426,6 @@ final class BuildSession implements Runnable, CanceledStatus {
             final long stamp = timestamps.getStamp(file, descriptor.getTarget());
             if (stamp != fileStamp) {
               if (!cacheCleared) {
-                pd.getFSCache().clear();
                 cacheCleared = true;
               }
               pd.fsState.markDirty(null, file, descriptor, timestamps, saveEventStamp);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ProjectDescriptor.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ProjectDescriptor.java
index d5a6aa41d448..ad2398cdcc42 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ProjectDescriptor.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ProjectDescriptor.java
@@ -87,13 +87,16 @@ public final class ProjectDescriptor {
   }
 
   /**
-   * @Deprecated not used after file traversal rewrite to NIO
+   * @deprecated not used after file traversal rewrite to NIO
    */
   @NotNull
   public FSCache getFSCache() {
-    return myFSCache;
+    return FSCache.NO_CACHE;
   }
 
+  /**
+   * @deprecated not used after file traversal rewrite to NIO
+   */
   public void setFSCache(FSCache cache) {
     myFSCache = cache == null? FSCache.NO_CACHE : cache;
   }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSCache.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSCache.java
index ade3db09a792..d4eb5ffda54c 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSCache.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSCache.java
@@ -23,8 +23,8 @@ import java.util.Collections;
 import java.util.Map;
 
 /**
-* @author Eugene Zhuravlev
-*/
+ * @deprecated not used after file traversal rewrite to NIO
+ */
 public class FSCache {
 
   public static final FSCache NO_CACHE = new FSCache() {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index 2feef89c482f..5c5420b64bed 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -165,7 +165,6 @@ public class IncProjectBuilder {
   public void build(CompileScope scope, boolean forceCleanCaches) throws RebuildRequestedException {
 
     final LowMemoryWatcher memWatcher = LowMemoryWatcher.register(() -> {
-      myProjectDescriptor.getFSCache().clear();
       JavacMain.clearCompilerZipFileCache();
       myProjectDescriptor.dataManager.flush(false);
       myProjectDescriptor.timestamps.getStorage().force();
@@ -442,10 +441,6 @@ public class IncProjectBuilder {
   private CompileContextImpl createContext(CompileScope scope) throws ProjectBuildException {
     final CompileContextImpl context = new CompileContextImpl(scope, myProjectDescriptor, myMessageDispatcher, myBuilderParams, myCancelStatus);
 
-    // in project rebuild mode performance gain is hard to observe, so it is better to save memory
-    // in make mode it is critical to traverse file system as fast as possible, so we choose speed over memory savings
-    myProjectDescriptor.setFSCache(context.isProjectRebuild() ? FSCache.NO_CACHE : new FSCache());
-
     final Callbacks.ConstantAffectionResolver javaResolver = myJavaConstantResolver;
     if (javaResolver == null) {
       JavaBuilderUtil.CONSTANT_SEARCH_SERVICE.set(context, null);