Configure cache dir

docker/server-slim/src/main/docker/image-bootstrap.properties

@@ -2,4 +2,5 @@ Configuration.rootFile=grpc-api.prop
 workspace=.
 devroot=.
 
-deephaven.console.type=groovy
+deephaven.console.type=groovy
+deephaven.cache.dir=/cache

docker/server/src/main/configure/image-bootstrap.properties

@@ -1,3 +1,5 @@
 Configuration.rootFile=grpc-api.prop
 workspace=.
 devroot=.
+
+deephaven.cache.dir=/cache

engine/table/src/main/java/io/deephaven/engine/util/AbstractScriptSession.java

@@ -9,7 +9,6 @@
 import io.deephaven.api.util.NameValidator;
 import io.deephaven.base.FileUtils;
 import io.deephaven.compilertools.CompilerTools;
-import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.lang.QueryLibrary;
@@ -31,11 +30,11 @@
  * evaluateScript which handles liveness and diffs in a consistent way.
  */
 public abstract class AbstractScriptSession extends LivenessScope implements ScriptSession, VariableProvider {
- public static final String CLASS_CACHE_LOCATION = Configuration.getInstance()
-  .getStringWithDefault("ScriptSession.classCacheDirectory", "/tmp/dh_class_cache");
+
+ private static final Path CLASS_CACHE_LOCATION = CacheDir.get().resolve("script-session-classes");
 
  public static void createScriptCache() {
- final File classCacheDirectory = new File(CLASS_CACHE_LOCATION);
+ final File classCacheDirectory = CLASS_CACHE_LOCATION.toFile();
  createOrClearDirectory(classCacheDirectory);
  }
 
@@ -60,8 +59,9 @@ private static void createOrClearDirectory(final File directory) {
  protected AbstractScriptSession(@Nullable Listener changeListener, boolean isDefaultScriptSession) {
  this.changeListener = changeListener;
 
+ // TODO(deephaven-core#1713): Introduce instance-id concept
  final UUID scriptCacheId = UuidCreator.getRandomBased();
- classCacheDirectory = new File(CLASS_CACHE_LOCATION, UuidCreator.toString(scriptCacheId));
+ classCacheDirectory = CLASS_CACHE_LOCATION.resolve(UuidCreator.toString(scriptCacheId)).toFile();
  createOrClearDirectory(classCacheDirectory);
 
  queryScope = newQueryScope();

engine/table/src/main/java/io/deephaven/engine/util/CacheDir.java

@@ -0,0 +1,39 @@
+package io.deephaven.engine.util;
+
+import io.deephaven.configuration.Configuration;
+
+import java.nio.file.Path;
+
+/**
+ * The cache directory is a directory that the application may use for storing data with "cache-like" semantics.
+ * Cache-like data is data that may be preserved across restarts, but the application logic should not make the
+ * assumptions that the data will be available.
+ */
+public final class CacheDir {
+ private static final String DEEPHAVEN_CACHE_DIR = "deephaven.cache.dir";
+ private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
+
+ private static final Path cacheDir;
+
+ static {
+ final Configuration config = Configuration.getInstance();
+ if (config.hasProperty(DEEPHAVEN_CACHE_DIR)) {
+ cacheDir = Path.of(config.getProperty(DEEPHAVEN_CACHE_DIR));
+ } else {
+ cacheDir = Path.of(System.getProperty(JAVA_IO_TMPDIR), "deephaven", "cache");
+ }
+ }
+
+ /**
+ * Return the value for the configuration {@value DEEPHAVEN_CACHE_DIR} if it is present.
+ *
+ * <p>
+ * Otherwise, return "%s/deephaven/cache", parameterized from the value of the system property
+ * {@value JAVA_IO_TMPDIR}.
+ *
+ * @return the cache dir
+ */
+ public static Path get() {
+ return cacheDir;
+ }
+}

engine/time/src/main/java/io/deephaven/time/calendar/Calendars.java

@@ -131,7 +131,7 @@ private void load(final String businessCalendarConfig)
  final File calendarFile = inputStreamToFile(inputStream);
  final BusinessCalendar businessCalendar = DefaultBusinessCalendar.getInstance(calendarFile);
  addCalendar(businessCalendar);
- calendarFile.deleteOnExit();
+ calendarFile.delete();
  } else {
  logger.warn("Could not open " + filePath + " from classpath");
  throw new RuntimeException("Could not open " + filePath + " from classpath");