Experimental: cache Java database only

Author: cklin

lib/overlay-database-utils.js

@@ -8,7 +8,8 @@ import { type CodeQL } from "./codeql";
 import { type Config } from "./config-utils";
 import { getFileOidsUnderPath } from "./git-utils";
 import { Logger } from "./logging";
-import { isInTestMode, withTimeout } from "./util";
+import { getCodeQLDatabasePath, isInTestMode, withTimeout } from "./util";
+import { Language } from "./languages";
 
 export enum OverlayDatabaseMode {
   Overlay = "overlay",
@@ -68,7 +69,7 @@ async function readBaseDatabaseOidsFile(
 }
 
 function getBaseDatabaseOidsFilePath(config: Config): string {
-  return path.join(config.dbLocation, "base-database-oids.json");
+  return path.join(config.dbLocation, "java", "base-database-oids.json");
 }
 
 /**
@@ -203,7 +204,7 @@ export async function uploadOverlayBaseDatabaseToCache(
     return false;
   }
 
-  const dbLocation = config.dbLocation;
+  const dbLocation = getCodeQLDatabasePath(config, Language.java);
   const cacheKey = generateCacheKey((await codeql.getVersion()).version);
   logger.info(
     `Uploading overlay-base database to Actions cache with key ${cacheKey}`,
@@ -267,7 +268,7 @@ export async function downloadOverlayBaseDatabaseFromCache(
     return false;
   }
 
-  const dbLocation = config.dbLocation;
+  const dbLocation = getCodeQLDatabasePath(config, Language.java);
   const codeQlVersion = (await codeql.getVersion()).version;
   const restoreKey = getCacheRestoreKey(codeQlVersion);
 
@@ -329,5 +330,5 @@ function getCacheRestoreKey(codeQlVersion: string): string {
   // we are analyzing. However, since overlay-base databases are built from the
   // default branch and used in PR analysis, it is exceedingly unlikely that
   // the commit SHA will ever be the same, so we can just leave it out.
-  return `${CACHE_PREFIX}-${CACHE_VERSION}-${codeQlVersion}-`;
+  return `${CACHE_PREFIX}-${CACHE_VERSION}-${codeQlVersion}-java-`;
 }