Skip to content

Commit 9df6554

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: remove job_status from SQL query
1 parent e8b53f7 commit 9df6554

File tree

3 files changed

+10
-25
lines changed

3 files changed

+10
-25
lines changed

‎coderd/database/querier_test.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3615,7 +3615,6 @@ func TestGetPresetsBackoff(t *testing.T) {
36153615
backoff := backoffs[0]
36163616
require.Equal(t, backoff.TemplateVersionID, tmpl.ActiveVersionID)
36173617
require.Equal(t, backoff.PresetID, tmplV1.preset.ID)
3618-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
36193618
require.Equal(t, int32(1), backoff.NumFailed)
36203619
})
36213620

@@ -3644,7 +3643,6 @@ func TestGetPresetsBackoff(t *testing.T) {
36443643
backoff := backoffs[0]
36453644
require.Equal(t, backoff.TemplateVersionID, tmpl.ActiveVersionID)
36463645
require.Equal(t, backoff.PresetID, tmplV1.preset.ID)
3647-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
36483646
require.Equal(t, int32(3), backoff.NumFailed)
36493647
})
36503648

@@ -3676,7 +3674,6 @@ func TestGetPresetsBackoff(t *testing.T) {
36763674
backoff := backoffs[0]
36773675
require.Equal(t, backoff.TemplateVersionID, tmpl.ActiveVersionID)
36783676
require.Equal(t, backoff.PresetID, tmplV2.preset.ID)
3679-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
36803677
require.Equal(t, int32(2), backoff.NumFailed)
36813678
})
36823679

@@ -3708,14 +3705,12 @@ func TestGetPresetsBackoff(t *testing.T) {
37083705
backoff := findBackoffByTmplVersionId(backoffs, tmpl1.ActiveVersionID)
37093706
require.Equal(t, backoff.TemplateVersionID, tmpl1.ActiveVersionID)
37103707
require.Equal(t, backoff.PresetID, tmpl1V1.preset.ID)
3711-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
37123708
require.Equal(t, int32(1), backoff.NumFailed)
37133709
}
37143710
{
37153711
backoff := findBackoffByTmplVersionId(backoffs, tmpl2.ActiveVersionID)
37163712
require.Equal(t, backoff.TemplateVersionID, tmpl2.ActiveVersionID)
37173713
require.Equal(t, backoff.PresetID, tmpl2V1.preset.ID)
3718-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
37193714
require.Equal(t, int32(1), backoff.NumFailed)
37203715
}
37213716
})
@@ -3758,21 +3753,18 @@ func TestGetPresetsBackoff(t *testing.T) {
37583753
backoff := findBackoffByTmplVersionId(backoffs, tmpl1.ActiveVersionID)
37593754
require.Equal(t, backoff.TemplateVersionID, tmpl1.ActiveVersionID)
37603755
require.Equal(t, backoff.PresetID, tmpl1V1.preset.ID)
3761-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
37623756
require.Equal(t, int32(1), backoff.NumFailed)
37633757
}
37643758
{
37653759
backoff := findBackoffByTmplVersionId(backoffs, tmpl2.ActiveVersionID)
37663760
require.Equal(t, backoff.TemplateVersionID, tmpl2.ActiveVersionID)
37673761
require.Equal(t, backoff.PresetID, tmpl2V1.preset.ID)
3768-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
37693762
require.Equal(t, int32(2), backoff.NumFailed)
37703763
}
37713764
{
37723765
backoff := findBackoffByTmplVersionId(backoffs, tmpl3.ActiveVersionID)
37733766
require.Equal(t, backoff.TemplateVersionID, tmpl3.ActiveVersionID)
37743767
require.Equal(t, backoff.PresetID, tmpl3V2.preset.ID)
3775-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
37763768
require.Equal(t, int32(3), backoff.NumFailed)
37773769
}
37783770
})
@@ -3931,7 +3923,6 @@ func TestGetPresetsBackoff(t *testing.T) {
39313923
backoff := backoffs[0]
39323924
require.Equal(t, backoff.TemplateVersionID, tmpl1.ActiveVersionID)
39333925
require.Equal(t, backoff.PresetID, tmpl1V1.preset.ID)
3934-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
39353926
require.Equal(t, int32(1), backoff.NumFailed)
39363927
}
39373928
})
@@ -3982,7 +3973,6 @@ func TestGetPresetsBackoff(t *testing.T) {
39823973
backoff := backoffs[0]
39833974
require.Equal(t, backoff.TemplateVersionID, tmpl1.ActiveVersionID)
39843975
require.Equal(t, backoff.PresetID, tmpl1V1.preset.ID)
3985-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
39863976
require.Equal(t, int32(2), backoff.NumFailed)
39873977
}
39883978
})
@@ -4037,7 +4027,6 @@ func TestGetPresetsBackoff(t *testing.T) {
40374027
backoff := backoffs[0]
40384028
require.Equal(t, backoff.TemplateVersionID, tmpl1.ActiveVersionID)
40394029
require.Equal(t, backoff.PresetID, tmpl1V1.preset.ID)
4040-
require.Equal(t, database.ProvisionerJobStatusFailed, backoff.LatestBuildStatus)
40414030
require.Equal(t, int32(5), backoff.NumFailed)
40424031
// make sure LastBuildAt is equal to latest failed build timestamp
40434032
require.Equal(t, 0, now.Compare(backoff.LastBuildAt.(time.Time)))

‎coderd/database/queries.sql.go

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

‎coderd/database/queries/prebuilds.sql

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,13 @@ WITH filtered_builds AS (
8686
GROUP BY preset_id)
8787
SELECT tsb.template_version_id,
8888
tsb.preset_id,
89-
tsb.job_status::provisioner_job_status AS latest_build_status,
90-
COALESCE(fc.num_failed, 0)::int AS num_failed,
91-
MAX(tsb.created_at::timestamptz) AS last_build_at
89+
COALESCE(fc.num_failed, 0)::int AS num_failed,
90+
MAX(tsb.created_at::timestamptz) AS last_build_at
9291
FROM time_sorted_builds tsb
9392
LEFT JOIN failed_count fc ON fc.preset_id = tsb.preset_id
9493
WHERE tsb.rn <= tsb.desired_instances -- Fetch the last N builds, where N is the number of desired instances; if any fail, we backoff
9594
AND tsb.job_status = 'failed'::provisioner_job_status
96-
GROUP BY tsb.template_version_id, tsb.preset_id, tsb.job_status, fc.num_failed;
95+
GROUP BY tsb.template_version_id, tsb.preset_id, fc.num_failed;
9796

9897
-- name: ClaimPrebuild :one
9998
UPDATE workspaces w

0 commit comments

Comments
 (0)