Merge pull request #2141 from github/nickrolfe/deprecate-ff

Deprecate fine-grained parallelism feature-flag

Author: nickrolfe

lib/analyze.js

@@ -295,7 +295,7 @@ export async function runQueries(
       logger.startGroup(`Running queries for ${language}`);
       const startTimeRunQueries = new Date().getTime();
       const databasePath = util.getCodeQLDatabasePath(config, language);
-      await codeql.databaseRunQueries(databasePath, queryFlags, features);
+      await codeql.databaseRunQueries(databasePath, queryFlags);
       logger.debug(`Finished running queries for ${language}.`);
       // TODO should not be using `builtin` here. We should be using `all` instead.
       // The status report does not support `all` yet.

lib/analyze.js.map

@@ -147,11 +147,7 @@ export interface CodeQL {
   /**
    * Run 'codeql database run-queries'.
    */
-  databaseRunQueries(
-    databasePath: string,
-    flags: string[],
-    features: FeatureEnablement,
-  ): Promise<void>;
+  databaseRunQueries(databasePath: string, flags: string[]): Promise<void>;
   /**
    * Run 'codeql database interpret-results'.
    */
@@ -803,7 +799,6 @@ export async function getCodeQLForCmd(
     async databaseRunQueries(
       databasePath: string,
       flags: string[],
-      features: FeatureEnablement,
     ): Promise<void> {
       const codeqlArgs = [
         "database",
@@ -818,19 +813,12 @@ export async function getCodeQLForCmd(
         codeqlArgs.push("--expect-discarded-cache");
       }
       if (
-        await features.getValue(
-          Feature.EvaluatorFineGrainedParallelismEnabled,
-          this,
-        )
-      ) {
-        codeqlArgs.push("--intra-layer-parallelism");
-      } else if (
         await util.codeQlVersionAbove(
           this,
           CODEQL_VERSION_FINE_GRAINED_PARALLELISM,
         )
       ) {
-        codeqlArgs.push("--no-intra-layer-parallelism");
+        codeqlArgs.push("--intra-layer-parallelism");
       }
       await runTool(cmd, codeqlArgs);
     },

lib/codeql.js

@@ -50,7 +50,6 @@ export enum Feature {
   DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
   DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
   PythonDefaultIsToSkipDependencyInstallationEnabled = "python_default_is_to_skip_dependency_installation_enabled",
-  EvaluatorFineGrainedParallelismEnabled = "evaluator_fine_grained_parallelism_enabled",
   ExportDiagnosticsEnabled = "export_diagnostics_enabled",
   QaTelemetryEnabled = "qa_telemetry_enabled",
 }
@@ -79,11 +78,6 @@ export const featureConfig: Record<
     minimumVersion: undefined,
     defaultValue: false,
   },
-  [Feature.EvaluatorFineGrainedParallelismEnabled]: {
-    envVar: "CODEQL_EVALUATOR_FINE_GRAINED_PARALLELISM",
-    minimumVersion: CODEQL_VERSION_FINE_GRAINED_PARALLELISM,
-    defaultValue: false,
-  },
   [Feature.ExportDiagnosticsEnabled]: {
     envVar: "CODEQL_ACTION_EXPORT_DIAGNOSTICS",
     minimumVersion: "2.12.4",