Skip to content

Commit 1a41e55

Browse files
authored
Merge pull request #2141 from github/nickrolfe/deprecate-ff
Deprecate fine-grained parallelism feature-flag
2 parents 95d258a + f00392e commit 1a41e55

File tree

9 files changed

+9
-36
lines changed

9 files changed

+9
-36
lines changed

lib/analyze.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/feature-flags.js

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/feature-flags.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/analyze.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ export async function runQueries(
295295
logger.startGroup(`Running queries for ${language}`);
296296
const startTimeRunQueries = new Date().getTime();
297297
const databasePath = util.getCodeQLDatabasePath(config, language);
298-
await codeql.databaseRunQueries(databasePath, queryFlags, features);
298+
await codeql.databaseRunQueries(databasePath, queryFlags);
299299
logger.debug(`Finished running queries for ${language}.`);
300300
// TODO should not be using `builtin` here. We should be using `all` instead.
301301
// The status report does not support `all` yet.

src/codeql.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,7 @@ export interface CodeQL {
147147
/**
148148
* Run 'codeql database run-queries'.
149149
*/
150-
databaseRunQueries(
151-
databasePath: string,
152-
flags: string[],
153-
features: FeatureEnablement,
154-
): Promise<void>;
150+
databaseRunQueries(databasePath: string, flags: string[]): Promise<void>;
155151
/**
156152
* Run 'codeql database interpret-results'.
157153
*/
@@ -803,7 +799,6 @@ export async function getCodeQLForCmd(
803799
async databaseRunQueries(
804800
databasePath: string,
805801
flags: string[],
806-
features: FeatureEnablement,
807802
): Promise<void> {
808803
const codeqlArgs = [
809804
"database",
@@ -818,19 +813,12 @@ export async function getCodeQLForCmd(
818813
codeqlArgs.push("--expect-discarded-cache");
819814
}
820815
if (
821-
await features.getValue(
822-
Feature.EvaluatorFineGrainedParallelismEnabled,
823-
this,
824-
)
825-
) {
826-
codeqlArgs.push("--intra-layer-parallelism");
827-
} else if (
828816
await util.codeQlVersionAbove(
829817
this,
830818
CODEQL_VERSION_FINE_GRAINED_PARALLELISM,
831819
)
832820
) {
833-
codeqlArgs.push("--no-intra-layer-parallelism");
821+
codeqlArgs.push("--intra-layer-parallelism");
834822
}
835823
await runTool(cmd, codeqlArgs);
836824
},

src/feature-flags.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ export enum Feature {
5050
DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
5151
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
5252
PythonDefaultIsToSkipDependencyInstallationEnabled = "python_default_is_to_skip_dependency_installation_enabled",
53-
EvaluatorFineGrainedParallelismEnabled = "evaluator_fine_grained_parallelism_enabled",
5453
ExportDiagnosticsEnabled = "export_diagnostics_enabled",
5554
QaTelemetryEnabled = "qa_telemetry_enabled",
5655
}
@@ -79,11 +78,6 @@ export const featureConfig: Record<
7978
minimumVersion: undefined,
8079
defaultValue: false,
8180
},
82-
[Feature.EvaluatorFineGrainedParallelismEnabled]: {
83-
envVar: "CODEQL_EVALUATOR_FINE_GRAINED_PARALLELISM",
84-
minimumVersion: CODEQL_VERSION_FINE_GRAINED_PARALLELISM,
85-
defaultValue: false,
86-
},
8781
[Feature.ExportDiagnosticsEnabled]: {
8882
envVar: "CODEQL_ACTION_EXPORT_DIAGNOSTICS",
8983
minimumVersion: "2.12.4",

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy