Move queryRunner to query-server/queryRunner

norascheuch · norascheuch · commit f97105ba4180 · 2023-04-19T14:11:05.000Z
diff --git a/extensions/ql-vscode/src/contextual/locationFinder.ts b/extensions/ql-vscode/src/contextual/locationFinder.ts
@@ -20,7 +20,7 @@ import {
 } from "./queryResolver";
 import { CancellationToken, LocationLink, Uri } from "vscode";
 import { QueryOutputDir } from "../run-queries-shared";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server/queryRunner";
 import { QueryResultType } from "../pure/new-messages";
 
 export const SELECT_QUERY_NAME = "#select";
diff --git a/extensions/ql-vscode/src/contextual/queryResolver.ts b/extensions/ql-vscode/src/contextual/queryResolver.ts
@@ -16,7 +16,7 @@ import { DatabaseItem } from "../local-databases";
 import { extLogger, TeeLogger } from "../common";
 import { CancellationToken } from "vscode";
 import { ProgressCallback } from "../progress";
-import { CoreCompletedQuery, QueryRunner } from "../queryRunner";
+import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";
 import { redactableError } from "../pure/errors";
 import { QLPACK_FILENAMES } from "../pure/ql";
 
diff --git a/extensions/ql-vscode/src/contextual/templateProvider.ts b/extensions/ql-vscode/src/contextual/templateProvider.ts
@@ -32,7 +32,7 @@ import {
   runContextualQuery,
 } from "./queryResolver";
 import { isCanary, NO_CACHE_AST_VIEWER } from "../config";
-import { CoreCompletedQuery, QueryRunner } from "../queryRunner";
+import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";
 
 /**
  * Runs templated CodeQL queries to find definitions in
diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts
@@ -2,7 +2,7 @@ import { ExtensionContext } from "vscode";
 import { DataExtensionsEditorView } from "./data-extensions-editor-view";
 import { DataExtensionsEditorCommands } from "../common/commands";
 import { CliVersionConstraint, CodeQLCliServer } from "../cli";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server/queryRunner";
 import { DatabaseManager } from "../local-databases";
 import { ensureDir } from "fs-extra";
 import { join } from "path";
diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts
@@ -13,7 +13,7 @@ import {
   ToDataExtensionsEditorMessage,
 } from "../pure/interface-types";
 import { ProgressUpdate } from "../progress";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server/queryRunner";
 import {
   showAndLogErrorMessage,
   showAndLogExceptionWithTelemetry,
diff --git a/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts b/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts
@@ -1,4 +1,4 @@
-import { CoreCompletedQuery, QueryRunner } from "../queryRunner";
+import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";
 import { dir } from "tmp-promise";
 import { writeFile } from "fs-extra";
 import { dump as dumpYaml } from "js-yaml";
diff --git a/extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts b/extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts
@@ -1,7 +1,7 @@
 import { CancellationToken } from "vscode";
 import { DatabaseItem } from "../local-databases";
 import { join } from "path";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server/queryRunner";
 import { CodeQLCliServer } from "../cli";
 import { TeeLogger } from "../common";
 import { extensiblePredicateDefinitions } from "./predicates";
diff --git a/extensions/ql-vscode/src/debugger/debug-session.ts b/extensions/ql-vscode/src/debugger/debug-session.ts
@@ -14,7 +14,11 @@ import { Disposable } from "vscode";
 import { CancellationTokenSource } from "vscode-jsonrpc";
 import { BaseLogger, LogOptions, queryServerLogger } from "../common";
 import { QueryResultType } from "../pure/new-messages";
-import { CoreQueryResults, CoreQueryRun, QueryRunner } from "../queryRunner";
+import {
+  CoreQueryResults,
+  CoreQueryRun,
+  QueryRunner,
+} from "../query-server/queryRunner";
 import * as CodeQLProtocol from "./debug-protocol";
 import { QuickEvalContext } from "../run-queries-shared";
 import { getErrorMessage } from "../pure/helpers-pure";
diff --git a/extensions/ql-vscode/src/debugger/debugger-factory.ts b/extensions/ql-vscode/src/debugger/debugger-factory.ts
@@ -11,7 +11,7 @@ import {
 import { isCanary } from "../config";
 import { LocalQueries } from "../local-queries";
 import { DisposableObject } from "../pure/disposable-object";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server/queryRunner";
 import { QLDebugConfigurationProvider } from "./debug-configuration";
 import { QLDebugSession } from "./debug-session";
 
diff --git a/extensions/ql-vscode/src/debugger/debugger-ui.ts b/extensions/ql-vscode/src/debugger/debugger-ui.ts
@@ -10,7 +10,7 @@ import {
 import { DebuggerCommands } from "../common/commands";
 import { DatabaseManager } from "../local-databases";
 import { DisposableObject } from "../pure/disposable-object";
-import { CoreQueryResults } from "../queryRunner";
+import { CoreQueryResults } from "../query-server/queryRunner";
 import {
   getQuickEvalContext,
   QueryOutputDir,
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
@@ -99,7 +99,7 @@ import { JoinOrderScannerProvider } from "./log-insights/join-order";
 import { LogScannerService } from "./log-insights/log-scanner-service";
 import { LegacyQueryRunner } from "./query-server/legacy/legacy-query-runner";
 import { NewQueryRunner } from "./query-server/new-query-runner";
-import { QueryRunner } from "./queryRunner";
+import { QueryRunner } from "./query-server/queryRunner";
 import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view";
 import { VariantAnalysisViewSerializer } from "./variant-analysis/variant-analysis-view-serializer";
 import { VariantAnalysisManager } from "./variant-analysis/variant-analysis-manager";
diff --git a/extensions/ql-vscode/src/local-databases-ui.ts b/extensions/ql-vscode/src/local-databases-ui.ts
@@ -41,7 +41,7 @@ import {
   promptImportInternetDatabase,
 } from "./databaseFetcher";
 import { asError, asyncFilter, getErrorMessage } from "./pure/helpers-pure";
-import { QueryRunner } from "./queryRunner";
+import { QueryRunner } from "./query-server/queryRunner";
 import { isCanary } from "./config";
 import { App } from "./common/app";
 import { redactableError } from "./pure/errors";
diff --git a/extensions/ql-vscode/src/local-databases.ts b/extensions/ql-vscode/src/local-databases.ts
@@ -23,7 +23,7 @@ import {
 import { DisposableObject } from "./pure/disposable-object";
 import { Logger, extLogger } from "./common";
 import { asError, getErrorMessage } from "./pure/helpers-pure";
-import { QueryRunner } from "./queryRunner";
+import { QueryRunner } from "./query-server/queryRunner";
 import { pathsEqual } from "./pure/files";
 import { redactableError } from "./pure/errors";
 import { isCodespacesTemplate } from "./config";
diff --git a/extensions/ql-vscode/src/local-queries/local-queries.ts b/extensions/ql-vscode/src/local-queries/local-queries.ts
@@ -21,7 +21,7 @@ import {
   showBinaryChoiceDialog,
 } from "../helpers";
 import { displayQuickQuery } from "../quick-query";
-import { CoreCompletedQuery, QueryRunner } from "../queryRunner";
+import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";
 import { QueryHistoryManager } from "../query-history/query-history-manager";
 import { DatabaseUI } from "../local-databases-ui";
 import { ResultsView } from "../interface";
diff --git a/extensions/ql-vscode/src/local-queries/local-query-run.ts b/extensions/ql-vscode/src/local-queries/local-query-run.ts
@@ -4,7 +4,7 @@ import {
   showAndLogWarningMessage,
   tryGetQueryMetadata,
 } from "../helpers";
-import { CoreQueryResults } from "../queryRunner";
+import { CoreQueryResults } from "../query-server/queryRunner";
 import { QueryHistoryManager } from "../query-history/query-history-manager";
 import { DatabaseItem } from "../local-databases";
 import {
diff --git a/extensions/ql-vscode/src/query-editor.ts b/extensions/ql-vscode/src/query-editor.ts
@@ -1,6 +1,6 @@
 import { Uri, window } from "vscode";
 import { CodeQLCliServer } from "./cli";
-import { QueryRunner } from "./queryRunner";
+import { QueryRunner } from "./query-server/queryRunner";
 import { basename, join } from "path";
 import { getErrorMessage } from "./pure/helpers-pure";
 import { redactableError } from "./pure/errors";
diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts
@@ -49,7 +49,7 @@ import { EvalLogViewer } from "../eval-log-viewer";
 import EvalLogTreeBuilder from "../eval-log-tree-builder";
 import { EvalLogData, parseViewerData } from "../pure/log-summary-parser";
 import { QueryWithResults } from "../run-queries-shared";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server/queryRunner";
 import { VariantAnalysisManager } from "../variant-analysis/variant-analysis-manager";
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
 import { getTotalResultCount } from "../variant-analysis/shared/variant-analysis";
diff --git a/extensions/ql-vscode/src/query-server/legacy/legacy-query-runner.ts b/extensions/ql-vscode/src/query-server/legacy/legacy-query-runner.ts
@@ -8,11 +8,7 @@ import {
   deregisterDatabases,
   registerDatabases,
 } from "../../pure/legacy-messages";
-import {
-  CoreQueryResults,
-  CoreQueryTarget,
-  QueryRunner,
-} from "../../queryRunner";
+import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "../queryRunner";
 import { QueryOutputDir } from "../../run-queries-shared";
 import { QueryServerClient } from "./query-server-client";
 import {
diff --git a/extensions/ql-vscode/src/query-server/legacy/run-queries.ts b/extensions/ql-vscode/src/query-server/legacy/run-queries.ts
@@ -24,7 +24,7 @@ import { asError, getErrorMessage } from "../../pure/helpers-pure";
 import { compileDatabaseUpgradeSequence } from "./upgrades";
 import { QueryEvaluationInfo, QueryOutputDir } from "../../run-queries-shared";
 import { redactableError } from "../../pure/errors";
-import { CoreQueryResults, CoreQueryTarget } from "../../queryRunner";
+import { CoreQueryResults, CoreQueryTarget } from "../queryRunner";
 import { Position } from "../../pure/messages-shared";
 
 export async function compileQuery(
diff --git a/extensions/ql-vscode/src/query-server/new-query-runner.ts b/extensions/ql-vscode/src/query-server/new-query-runner.ts
@@ -9,7 +9,7 @@ import {
   registerDatabases,
   upgradeDatabase,
 } from "../pure/new-messages";
-import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "../queryRunner";
+import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "./queryRunner";
 import { QueryServerClient } from "./query-server-client";
 import { compileAndRunQueryAgainstDatabaseCore } from "./run-queries";
 import * as vscode from "vscode";
diff --git a/extensions/ql-vscode/src/query-server/queryRunner.ts b/extensions/ql-vscode/src/query-server/queryRunner.ts
@@ -1,10 +1,10 @@
 import { CancellationToken } from "vscode";
-import { CodeQLCliServer } from "./cli";
-import { ProgressCallback } from "./progress";
-import { DatabaseItem } from "./local-databases";
-import { QueryOutputDir } from "./run-queries-shared";
-import { Position, QueryResultType } from "./pure/new-messages";
-import { BaseLogger, Logger } from "./common";
+import { CodeQLCliServer } from "../cli";
+import { ProgressCallback } from "../progress";
+import { DatabaseItem } from "../local-databases";
+import { QueryOutputDir } from "../run-queries-shared";
+import { Position, QueryResultType } from "../pure/new-messages";
+import { BaseLogger, Logger } from "../common";
 import { basename, join } from "path";
 import { nanoid } from "nanoid";
 
diff --git a/extensions/ql-vscode/src/query-server/run-queries.ts b/extensions/ql-vscode/src/query-server/run-queries.ts
@@ -3,7 +3,7 @@ import { ProgressCallback } from "../progress";
 import * as messages from "../pure/new-messages";
 import { QueryOutputDir } from "../run-queries-shared";
 import * as qsClient from "./query-server-client";
-import { CoreQueryResults, CoreQueryTarget } from "../queryRunner";
+import { CoreQueryResults, CoreQueryTarget } from "./queryRunner";
 import { Logger } from "../common";
 
 /**
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts
@@ -10,7 +10,7 @@ import {
 import * as CodeQLProtocol from "../../../../src/debugger/debug-protocol";
 import { DisposableObject } from "../../../../src/pure/disposable-object";
 import { QueryResultType } from "../../../../src/pure/legacy-messages";
-import { CoreCompletedQuery } from "../../../../src/queryRunner";
+import { CoreCompletedQuery } from "../../../../src/query-server/queryRunner";
 import { QueryOutputDir } from "../../../../src/run-queries-shared";
 import {
   QLDebugArgs,
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
@@ -17,7 +17,10 @@ import {
 } from "../global.helper";
 import { CliVersionConstraint, CodeQLCliServer } from "../../../src/cli";
 import { describeWithCodeQL } from "../cli";
-import { CoreCompletedQuery, QueryRunner } from "../../../src/queryRunner";
+import {
+  CoreCompletedQuery,
+  QueryRunner,
+} from "../../../src/query-server/queryRunner";
 import { SELECT_QUERY_NAME } from "../../../src/contextual/locationFinder";
 import { LocalQueries } from "../../../src/local-queries";
 import { QueryResultType } from "../../../src/pure/new-messages";
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
@@ -20,7 +20,7 @@ import {
   encodeSourceArchiveUri,
 } from "../../../src/archive-filesystem-provider";
 import { testDisposeHandler } from "../test-dispose-handler";
-import { QueryRunner } from "../../../src/queryRunner";
+import { QueryRunner } from "../../../src/query-server/queryRunner";
 import * as helpers from "../../../src/helpers";
 import { Setting } from "../../../src/config";
 import { QlPackGenerator } from "../../../src/qlpack-generator";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts
@@ -9,7 +9,7 @@ import { tmpDir } from "../../../../src/helpers";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
 import { ResultsView } from "../../../../src/interface";
 import { EvalLogViewer } from "../../../../src/eval-log-viewer";
-import { QueryRunner } from "../../../../src/queryRunner";
+import { QueryRunner } from "../../../../src/query-server/queryRunner";
 import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
 import { QueryHistoryInfo } from "../../../../src/query-history/query-history-info";
 import {
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts
@@ -10,7 +10,7 @@ import { tmpDir } from "../../../../src/helpers";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
 import { ResultsView } from "../../../../src/interface";
 import { EvalLogViewer } from "../../../../src/eval-log-viewer";
-import { QueryRunner } from "../../../../src/queryRunner";
+import { QueryRunner } from "../../../../src/query-server/queryRunner";
 import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
 import { QueryHistoryInfo } from "../../../../src/query-history/query-history-info";
 import {
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts
@@ -16,7 +16,7 @@ import { testDisposeHandler } from "../../test-dispose-handler";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
 import { ResultsView } from "../../../../src/interface";
 import { EvalLogViewer } from "../../../../src/eval-log-viewer";
-import { QueryRunner } from "../../../../src/queryRunner";
+import { QueryRunner } from "../../../../src/query-server/queryRunner";
 import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
 import { QueryHistoryManager } from "../../../../src/query-history/query-history-manager";
 import { mockedObject } from "../../utils/mocking.helpers";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CoreCompletedQuery, QueryRunner } from "../queryRunner";`
	`1`	`+import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";`
`2`	`2`	`import { dir } from "tmp-promise";`
`3`	`3`	`import { writeFile } from "fs-extra";`
`4`	`4`	`import { dump as dumpYaml } from "js-yaml";`