coder · johnstcn · Jul 21, 2025 · Jul 10, 2025 · Jul 11, 2025 · Jul 20, 2025
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -2654,14 +2654,6 @@ func (q *querier) GetRunningPrebuiltWorkspaces(ctx context.Context) ([]database.
 	return q.db.GetRunningPrebuiltWorkspaces(ctx)
 }
 
-func (q *querier) GetRunningPrebuiltWorkspacesOptimized(ctx context.Context) ([]database.GetRunningPrebuiltWorkspacesOptimizedRow, error) {
-	// This query returns only prebuilt workspaces, but we decided to require permissions for all workspaces.
-	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspace.All()); err != nil {
-		return nil, err
-	}
-	return q.db.GetRunningPrebuiltWorkspacesOptimized(ctx)
-}
-
 func (q *querier) GetRuntimeConfig(ctx context.Context, key string) (string, error) {
 	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
 		return "", err

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -178,8 +178,7 @@ func TestDBAuthzRecursive(t *testing.T) {
 		if method.Name == "InTx" ||
 			method.Name == "Ping" ||
 			method.Name == "Wrappers" ||
-			method.Name == "PGLocks" ||
-			method.Name == "GetRunningPrebuiltWorkspacesOptimized" {
+			method.Name == "PGLocks" {
 			continue
 		}
 		// easy to know which method failed.

diff --git a/coderd/database/dbauthz/setup_test.go b/coderd/database/dbauthz/setup_test.go
@@ -41,8 +41,6 @@ var skipMethods = map[string]string{
 	"Wrappers":       "Not relevant",
 	"AcquireLock":    "Not relevant",
 	"TryAcquireLock": "Not relevant",
-	// This method will be removed once we know this works correctly.
-	"GetRunningPrebuiltWorkspacesOptimized": "Not relevant",
 }
 
 // TestMethodTestSuite runs MethodTestSuite.

diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/prebuilds.sql b/coderd/database/queries/prebuilds.sql
@@ -48,7 +48,7 @@ WHERE tvp.desired_instances IS NOT NULL -- Consider only presets that have a pre
   -- AND NOT t.deleted -- We don't exclude deleted templates because there's no constraint in the DB preventing a soft deletion on a template while workspaces are running.
 	AND (t.id = sqlc.narg('template_id')::uuid OR sqlc.narg('template_id') IS NULL);
 
--- name: GetRunningPrebuiltWorkspacesOptimized :many
+-- name: GetRunningPrebuiltWorkspaces :many
 WITH latest_prebuilds AS (
 	-- All workspaces that match the following criteria:
 	-- 1. Owned by prebuilds user
@@ -106,21 +106,6 @@ LEFT JOIN ready_agents ON ready_agents.job_id = latest_prebuilds.job_id
 LEFT JOIN workspace_latest_presets ON workspace_latest_presets.workspace_id = latest_prebuilds.id
 ORDER BY latest_prebuilds.id;
 
--- name: GetRunningPrebuiltWorkspaces :many
-SELECT
-		p.id,
-		p.name,
-		p.template_id,
-		b.template_version_id,
-		p.current_preset_id AS current_preset_id,
-		p.ready,
-		p.created_at
-FROM workspace_prebuilds p
-		INNER JOIN workspace_latest_builds b ON b.workspace_id = p.id
-WHERE (b.transition = 'start'::workspace_transition
-	AND b.job_status = 'succeeded'::provisioner_job_status)
-ORDER BY p.id;
-
 -- name: CountInProgressPrebuilds :many
 -- CountInProgressPrebuilds returns the number of in-progress prebuilds, grouped by preset ID and transition.
 -- Prebuild considered in-progress if it's in the "starting", "stopping", or "deleting" state.

diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go
@@ -12,7 +12,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/go-multierror"
 	"github.com/prometheus/client_golang/prometheus"
 
@@ -405,15 +404,6 @@ func (c *StoreReconciler) SnapshotState(ctx context.Context, store database.Stor
 			return xerrors.Errorf("failed to get running prebuilds: %w", err)
 		}
 
-		// Compare with optimized query to ensure behavioral correctness
-		optimized, err := db.GetRunningPrebuiltWorkspacesOptimized(ctx)
-		if err != nil {
-			// Log the error but continue with original results
-			c.logger.Error(ctx, "optimized GetRunningPrebuiltWorkspacesOptimized failed", slog.Error(err))
-		} else {
-			CompareGetRunningPrebuiltWorkspacesResults(ctx, c.logger, allRunningPrebuilds, optimized)
-		}
-
 		allPrebuildsInProgress, err := db.CountInProgressPrebuilds(ctx)
 		if err != nil {
 			return xerrors.Errorf("failed to get prebuilds in progress: %w", err)
@@ -933,30 +923,3 @@ func SetPrebuildsReconciliationPaused(ctx context.Context, db database.Store, pa
 	}
 	return db.UpsertPrebuildsSettings(ctx, string(settingsJSON))
 }
-
-// CompareGetRunningPrebuiltWorkspacesResults compares the original and optimized
-// query results and logs any differences found. This function can be easily
-// removed once we're confident the optimized query works correctly.
-// TODO(Cian): Remove this function once the optimized query is stable and correct.
-func CompareGetRunningPrebuiltWorkspacesResults(
-	ctx context.Context,
-	logger slog.Logger,
-	original []database.GetRunningPrebuiltWorkspacesRow,
-	optimized []database.GetRunningPrebuiltWorkspacesOptimizedRow,
-) {
-	if len(original) == 0 && len(optimized) == 0 {
-		return
-	}
-	// Convert optimized results to the same type as original for comparison
-	optimizedConverted := make([]database.GetRunningPrebuiltWorkspacesRow, len(optimized))
-	for i, row := range optimized {
-		optimizedConverted[i] = database.GetRunningPrebuiltWorkspacesRow(row)
-	}
-
-	// Compare the results and log an error if they differ.
-	// NOTE: explicitly not sorting here as both query results are ordered by ID.
-	if diff := cmp.Diff(original, optimizedConverted); diff != "" {
-		logger.Error(ctx, "results differ for GetRunningPrebuiltWorkspacesOptimized",
-			slog.F("diff", diff))
-	}
-}