Merge pull request #4019 from github/nickrolfe/join-order-cleanup

Fix reporting of bad join orders in recursive predicates

Author: nickrolfe

extensions/ql-vscode/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [UNRELEASED]
 
+- Fix reporting of bad join orders in recursive predicates. [#4019](https://github.com/github/vscode-codeql/pull/4019)
+
 ## 1.17.2 - 27 March 2025
 
 - Always authenticate when downloading databases from GitHub, instead of only when in canary mode. [#3941](https://github.com/github/vscode-codeql/pull/3941)

extensions/ql-vscode/src/compare-performance/compare-performance-view.ts

@@ -16,8 +16,9 @@ import { withProgress } from "../common/vscode/progress";
 import { telemetryListener } from "../common/vscode/telemetry";
 import type { HistoryItemLabelProvider } from "../query-history/history-item-label-provider";
 import { PerformanceOverviewScanner } from "../log-insights/performance-comparison";
-import { scanLog } from "../log-insights/log-scanner";
 import type { ResultsView } from "../local-queries";
+import { readJsonlFile } from "../common/jsonl-reader";
+import type { SummaryEvent } from "../log-insights/log-summary";
 
 export class ComparePerformanceView extends AbstractWebview<
   ToComparePerformanceViewMessage,
@@ -46,8 +47,20 @@ export class ComparePerformanceView extends AbstractWebview<
     function scanLogWithProgress(log: string, logDescription: string) {
       const bytes = statSync(log).size;
       return withProgress(
-        async (progress) =>
-          scanLog(log, new PerformanceOverviewScanner(), progress),
+        async (progress) => {
+          progress?.({
+            // all scans have step 1 - the backing progress tracker allows increments instead of
+            // steps - but for now we are happy with a tiny UI that says what is happening
+            message: `Scanning ...`,
+            step: 1,
+            maxStep: 2,
+          });
+          const scanner = new PerformanceOverviewScanner();
+          await readJsonlFile<SummaryEvent>(log, async (obj) => {
+            scanner.onEvent(obj);
+          });
+          return scanner;
+        },
 
         {
           title: `Scanning evaluator log ${logDescription} (${(bytes / 1024 / 1024).toFixed(1)} MB)`,

extensions/ql-vscode/src/extension.ts

@@ -28,7 +28,6 @@ import {
   CliConfigListener,
   DistributionConfigListener,
   GitHubDatabaseConfigListener,
-  joinOrderWarningThreshold,
   QueryHistoryConfigListener,
   QueryServerConfigListener,
   VariantAnalysisConfigListener,
@@ -102,7 +101,6 @@ import { getPackagingCommands } from "./packaging";
 import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider";
 import { EvalLogViewer } from "./query-evaluation-logging";
 import { SummaryLanguageSupport } from "./log-insights/summary-language-support";
-import { JoinOrderScannerProvider } from "./log-insights/join-order";
 import { LogScannerService } from "./log-insights/log-scanner-service";
 import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view";
 import { VariantAnalysisViewSerializer } from "./variant-analysis/variant-analysis-view-serializer";
@@ -941,11 +939,6 @@ async function activateWithInstalledDistribution(
   void extLogger.log("Initializing evaluation log scanners.");
   const logScannerService = new LogScannerService(qhm);
   ctx.subscriptions.push(logScannerService);
-  ctx.subscriptions.push(
-    logScannerService.scanners.registerLogScannerProvider(
-      new JoinOrderScannerProvider(() => joinOrderWarningThreshold()),
-    ),
-  );
 
   void extLogger.log("Initializing compare view.");
   const compareView = new CompareView(