Skip to content

fix: remove accidental duplicate optimizations #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xetera merged 1 commit into from
Feb 5, 2026
+5 −32
Merged

fix: remove accidental duplicate optimizations #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 5 additions & 32 deletions src/remote/query-optimizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,28 +382,6 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
options: { timeoutMs: number },
): Promise<LiveQueryOptimization> {
const builder = new PostgresQueryBuilder(recent.query);
let cost: number;
let explainPlan: PostgresExplainStage | undefined;
try {
const explain = await withTimeout(
target.optimizer.testQueryWithStats(builder),
options.timeoutMs,
);
cost = explain.Plan["Total Cost"];
explainPlan = explain.Plan;
} catch (error) {
console.error("Error with baseline run", error);
if (error instanceof TimeoutError) {
return this.onTimeout(recent, options.timeoutMs);
} else if (error instanceof Error) {
return this.onError(recent, error.message);
} else {
return this.onError(recent, "Internal error");
}
}
if (cost === 0) {
return this.onZeroCostPlan(recent, explainPlan);
}
const indexes = this.getPotentialIndexCandidates(
target.statistics,
recent,
Expand All @@ -423,16 +401,13 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
if (error instanceof TimeoutError) {
return this.onTimeout(recent, options.timeoutMs);
} else if (error instanceof Error) {
return this.onError(recent, error.message, explainPlan);
return this.onError(recent, error.message);
} else {
return this.onError(recent, "Internal error", explainPlan);
return this.onError(recent, "Internal error");
}
}

if (!explainPlan) {
throw new Error("explainPlan should be defined after baseline run");
}
return this.onOptimizeReady(result, recent, explainPlan);
return this.onOptimizeReady(result, recent);
}

private async dropDisabledIndexes(tx: PostgresTransaction): Promise<void> {
Expand All @@ -444,7 +419,6 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
private onOptimizeReady(
result: OptimizeResult,
recent: OptimizedQuery,
explainPlan: PostgresExplainStage,
): LiveQueryOptimization {
switch (result.kind) {
case "ok": {
Expand Down Expand Up @@ -486,7 +460,7 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
}
// unlikely to hit if we've already checked the base plan for zero cost
case "zero_cost_plan":
return this.onZeroCostPlan(recent, explainPlan);
return this.onZeroCostPlan(recent, result.explainPlan);
}
}

Expand Down Expand Up @@ -583,11 +557,10 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
private onError(
recent: OptimizedQuery,
errorMessage: string,
explainPlan?: PostgresExplainStage,
): LiveQueryOptimization {
const error = new Error(errorMessage);
this.emit("error", error, recent);
return { state: "error", error: error.message, explainPlan };
return { state: "error", error: error.message };
}

private onTimeout(
Expand Down