Movatterモバイル変換

Skip to content

coder/coderPublic

NotificationsYou must be signed in to change notification settings
Fork1k
Star11.1k

Commit47305c3

author

Callum Styan

committed

limit the scope of the template average build time query to the last 100

builds of a template as opposed to all builds in the last 30dSigned-off-by: Callum Styan <callum@coder.com>

1 parent39bf3ba commit47305c3Copy full SHA for 47305c3

File tree

8 files changed

+17

-27

lines changed

coderd
- database
  - dbauthz
    - dbauthz.go
    - dbauthz_test.go
  - dbmetrics
    - querymetrics.go
  - dbmock
    - dbmock.go
  - querier.go
  - queries.sql.go
  - queries
    - templates.sql
- metricscache
  - metricscache.go

8 files changed

+17

-27

lines changed

`‎coderd/database/dbauthz/dbauthz.go‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2792,7 +2792,7 @@ func (q *querier) GetTemplateAppInsightsByTemplate(ctx context.Context, arg data`
`2792`	`2792`	`}`
`2793`	`2793`
`2794`	`2794`	`// Only used by metrics cache.`
`2795`		`-func (q*querier)GetTemplateAverageBuildTime(ctx context.Context,argdatabase.GetTemplateAverageBuildTimeParams) (database.GetTemplateAverageBuildTimeRow,error) {`
	`2795`	`+func (q*querier)GetTemplateAverageBuildTime(ctx context.Context,arguuid.NullUUID) (database.GetTemplateAverageBuildTimeRow,error) {`
`2796`	`2796`	`iferr:=q.authorizeContext(ctx,policy.ActionRead,rbac.ResourceSystem);err!=nil {`
`2797`	`2797`	`return database.GetTemplateAverageBuildTimeRow{},err`
`2798`	`2798`	`}`

`‎coderd/database/dbauthz/dbauthz_test.go‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3160,7 +3160,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {`
`3160`	`3160`	`check.Args(arg).Asserts(rbac.ResourceSystem,policy.ActionRead).Returns(p)`
`3161`	`3161`	`}))`
`3162`	`3162`	`s.Run("GetTemplateAverageBuildTime",s.Mocked(func(dbmdbmock.MockStore,_gofakeit.Faker,check*expects) {`
`3163`		`-arg:=database.GetTemplateAverageBuildTimeParams{}`
	`3163`	`+arg:=uuid.NullUUID{}`
`3164`	`3164`	`dbm.EXPECT().GetTemplateAverageBuildTime(gomock.Any(),arg).Return(database.GetTemplateAverageBuildTimeRow{},nil).AnyTimes()`
`3165`	`3165`	`check.Args(arg).Asserts(rbac.ResourceSystem,policy.ActionRead)`
`3166`	`3166`	`}))`

`‎coderd/database/dbmetrics/querymetrics.go‎`

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

`‎coderd/database/dbmock/dbmock.go‎`

Lines changed: 4 additions & 4 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

`‎coderd/database/querier.go‎`

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

`‎coderd/database/queries.sql.go‎`

Lines changed: 3 additions & 8 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

`‎coderd/database/queries/templates.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -203,11 +203,11 @@ JOIN provisioner_jobs pj ON`
`203`	`203`	`WHERE`
`204`	`204`	`template_versions.template_id= @template_idAND`
`205`	`205`	`(pj.completed_atIS NOT NULL)AND (pj.started_atIS NOT NULL)AND`
`206`		`-(pj.started_at> @start_time)AND`
`207`	`206`	`(pj.canceled_at ISNULL)AND`
`208`	`207`	`((pj.error ISNULL)OR (pj.error=''))`
`209`	`208`	`ORDER BY`
`210`	`209`	`workspace_builds.created_atDESC`
	`210`	`+LIMIT100`
`211`	`211`	`)`
`212`	`212`	`SELECT`
`213`	`213`	`-- Postgres offers no clear way to DRY this short of a function or other`

`‎coderd/metricscache/metricscache.go‎`

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,16 +101,11 @@ func (c *Cache) refreshTemplateBuildTimes(ctx context.Context) error {`
`101`	`101`	`for_,template:=rangetemplates {`
`102`	`102`	`ids=append(ids,template.ID)`
`103`	`103`
`104`		`-templateAvgBuildTime,err:=c.database.GetTemplateAverageBuildTime(ctx, database.GetTemplateAverageBuildTimeParams{`
`105`		`-TemplateID: uuid.NullUUID{`
`106`		`-UUID:template.ID,`
`107`		`-Valid:true,`
`108`		`-},`
`109`		`-StartTime: sql.NullTime{`
`110`		`-Time:dbtime.Time(c.clock.Now().AddDate(0,0,-30)),`
`111`		`-Valid:true,`
`112`		`-},`
`113`		`-})`
	`104`	`+templateAvgBuildTime,err:=c.database.GetTemplateAverageBuildTime(ctx, uuid.NullUUID{`
	`105`	`+UUID:template.ID,`
	`106`	`+Valid:true,`
	`107`	`+},`
	`108`	`+)`
`114`	`109`	`iferr!=nil {`
`115`	`110`	`returnerr`
`116`	`111`	`}`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp