Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit97a3fc2

Browse files
kacpersawethanndickson
authored andcommitted
chore(coderd/database): optimize AuditLogs queries (#18600)
Closes#17689This PR optimizes the audit logs query performance by extracting thecount operation into a separate query and replacing the OR-basedworkspace_builds with conditional joins.## Query changes* Extracted count query to separate one* Replaced single `workspace_builds` join with OR conditions withseparate conditional joins* Added conditional joins* `wb_build` for workspace_build audit logs (which is a direct lookup) * `wb_workspace` for workspace create audit logs (via workspace)Optimized AuditLogsOffset query:https://explain.dalibo.com/plan/4g1hbedg4a564bg8New CountAuditLogs query:https://explain.dalibo.com/plan/ga2fbcecb9efbce3
1 parentd6b2ca1 commit97a3fc2

File tree

15 files changed

+763
-244
lines changed

15 files changed

+763
-244
lines changed

‎coderd/audit.go‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
4646
}
4747

4848
queryStr:=r.URL.Query().Get("q")
49-
filter,errs:=searchquery.AuditLogs(ctx,api.Database,queryStr)
49+
filter,countFilter,errs:=searchquery.AuditLogs(ctx,api.Database,queryStr)
5050
iflen(errs)>0 {
5151
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{
5252
Message:"Invalid audit search query.",
@@ -62,9 +62,12 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
6262
iffilter.Username=="me" {
6363
filter.UserID=apiKey.UserID
6464
filter.Username=""
65+
countFilter.UserID=apiKey.UserID
66+
countFilter.Username=""
6567
}
6668

67-
dblogs,err:=api.Database.GetAuditLogsOffset(ctx,filter)
69+
// Use the same filters to count the number of audit logs
70+
count,err:=api.Database.CountAuditLogs(ctx,countFilter)
6871
ifdbauthz.IsNotAuthorizedError(err) {
6972
httpapi.Forbidden(rw)
7073
return
@@ -73,19 +76,28 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
7376
httpapi.InternalServerError(rw,err)
7477
return
7578
}
76-
// GetAuditLogsOffset does not return ErrNoRows because it uses a window function to get the count.
77-
// So we need to check if the dblogs is empty and return an empty array if so.
78-
iflen(dblogs)==0 {
79+
// If count is 0, then we don't need to query audit logs
80+
ifcount==0 {
7981
httpapi.Write(ctx,rw,http.StatusOK, codersdk.AuditLogResponse{
8082
AuditLogs: []codersdk.AuditLog{},
8183
Count:0,
8284
})
8385
return
8486
}
8587

88+
dblogs,err:=api.Database.GetAuditLogsOffset(ctx,filter)
89+
ifdbauthz.IsNotAuthorizedError(err) {
90+
httpapi.Forbidden(rw)
91+
return
92+
}
93+
iferr!=nil {
94+
httpapi.InternalServerError(rw,err)
95+
return
96+
}
97+
8698
httpapi.Write(ctx,rw,http.StatusOK, codersdk.AuditLogResponse{
8799
AuditLogs:api.convertAuditLogs(ctx,dblogs),
88-
Count:dblogs[0].Count,
100+
Count:count,
89101
})
90102
}
91103

‎coderd/database/dbauthz/dbauthz.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,6 +1301,22 @@ func (q *querier) CleanTailnetTunnels(ctx context.Context) error {
13011301
returnq.db.CleanTailnetTunnels(ctx)
13021302
}
13031303

1304+
func (q*querier)CountAuditLogs(ctx context.Context,arg database.CountAuditLogsParams) (int64,error) {
1305+
// Shortcut if the user is an owner. The SQL filter is noticeable,
1306+
// and this is an easy win for owners. Which is the common case.
1307+
err:=q.authorizeContext(ctx,policy.ActionRead,rbac.ResourceAuditLog)
1308+
iferr==nil {
1309+
returnq.db.CountAuditLogs(ctx,arg)
1310+
}
1311+
1312+
prep,err:=prepareSQLFilter(ctx,q.auth,policy.ActionRead,rbac.ResourceAuditLog.Type)
1313+
iferr!=nil {
1314+
return0,xerrors.Errorf("(dev error) prepare sql filter: %w",err)
1315+
}
1316+
1317+
returnq.db.CountAuthorizedAuditLogs(ctx,arg,prep)
1318+
}
1319+
13041320
func (q*querier)CountInProgressPrebuilds(ctx context.Context) ([]database.CountInProgressPrebuildsRow,error) {
13051321
iferr:=q.authorizeContext(ctx,policy.ActionRead,rbac.ResourceWorkspace.All());err!=nil {
13061322
returnnil,err
@@ -5256,3 +5272,7 @@ func (q *querier) GetAuthorizedUsers(ctx context.Context, arg database.GetUsersP
52565272
func (q*querier)GetAuthorizedAuditLogsOffset(ctx context.Context,arg database.GetAuditLogsOffsetParams,_ rbac.PreparedAuthorized) ([]database.GetAuditLogsOffsetRow,error) {
52575273
returnq.GetAuditLogsOffset(ctx,arg)
52585274
}
5275+
5276+
func (q*querier)CountAuthorizedAuditLogs(ctx context.Context,arg database.CountAuditLogsParams,_ rbac.PreparedAuthorized) (int64,error) {
5277+
returnq.CountAuditLogs(ctx,arg)
5278+
}

‎coderd/database/dbauthz/dbauthz_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,16 @@ func (s *MethodTestSuite) TestAuditLogs() {
327327
LimitOpt:10,
328328
},emptyPreparedAuthorized{}).Asserts(rbac.ResourceAuditLog,policy.ActionRead)
329329
}))
330+
s.Run("CountAuditLogs",s.Subtest(func(db database.Store,check*expects) {
331+
_=dbgen.AuditLog(s.T(),db, database.AuditLog{})
332+
_=dbgen.AuditLog(s.T(),db, database.AuditLog{})
333+
check.Args(database.CountAuditLogsParams{}).Asserts(rbac.ResourceAuditLog,policy.ActionRead).WithNotAuthorized("nil")
334+
}))
335+
s.Run("CountAuthorizedAuditLogs",s.Subtest(func(db database.Store,check*expects) {
336+
_=dbgen.AuditLog(s.T(),db, database.AuditLog{})
337+
_=dbgen.AuditLog(s.T(),db, database.AuditLog{})
338+
check.Args(database.CountAuditLogsParams{},emptyPreparedAuthorized{}).Asserts(rbac.ResourceAuditLog,policy.ActionRead)
339+
}))
330340
}
331341

332342
func (s*MethodTestSuite)TestFile() {

‎coderd/database/dbauthz/setup_test.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func (s *MethodTestSuite) NotAuthorizedErrorTest(ctx context.Context, az *coderd
271271

272272
// This is unfortunate, but if we are using `Filter` the error returned will be nil. So filter out
273273
// any case where the error is nil and the response is an empty slice.
274-
iferr!=nil||!hasEmptySliceResponse(resp) {
274+
iferr!=nil||!hasEmptyResponse(resp) {
275275
// Expect the default error
276276
iftestCase.notAuthorizedExpect=="" {
277277
s.ErrorContainsf(err,"unauthorized","error string should have a good message")
@@ -296,8 +296,8 @@ func (s *MethodTestSuite) NotAuthorizedErrorTest(ctx context.Context, az *coderd
296296
resp,err:=callMethod(ctx)
297297

298298
// This is unfortunate, but if we are using `Filter` the error returned will be nil. So filter out
299-
// any case where the error is nil and the response is an empty slice.
300-
iferr!=nil||!hasEmptySliceResponse(resp) {
299+
// any case where the error is nil and the response is an empty slice or int64(0).
300+
iferr!=nil||!hasEmptyResponse(resp) {
301301
iftestCase.cancelledCtxExpect=="" {
302302
s.Errorf(err,"method should an error with cancellation")
303303
s.ErrorIsf(err,context.Canceled,"error should match context.Canceled")
@@ -308,13 +308,20 @@ func (s *MethodTestSuite) NotAuthorizedErrorTest(ctx context.Context, az *coderd
308308
})
309309
}
310310

311-
funchasEmptySliceResponse(values []reflect.Value)bool {
311+
funchasEmptyResponse(values []reflect.Value)bool {
312312
for_,r:=rangevalues {
313313
ifr.Kind()==reflect.Slice||r.Kind()==reflect.Array {
314314
ifr.Len()==0 {
315315
returntrue
316316
}
317317
}
318+
319+
// Special case for int64, as it's the return type for count query.
320+
ifr.Kind()==reflect.Int64 {
321+
ifr.Int()==0 {
322+
returntrue
323+
}
324+
}
318325
}
319326
returnfalse
320327
}

‎coderd/database/dbmem/dbmem.go‎

Lines changed: 80 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,6 +1779,10 @@ func (*FakeQuerier) CleanTailnetTunnels(context.Context) error {
17791779
returnErrUnimplemented
17801780
}
17811781

1782+
func (q*FakeQuerier)CountAuditLogs(ctx context.Context,arg database.CountAuditLogsParams) (int64,error) {
1783+
returnq.CountAuthorizedAuditLogs(ctx,arg,nil)
1784+
}
1785+
17821786
func (q*FakeQuerier)CountInProgressPrebuilds(ctx context.Context) ([]database.CountInProgressPrebuildsRow,error) {
17831787
returnnil,ErrUnimplemented
17841788
}
@@ -13930,18 +13934,89 @@ func (q *FakeQuerier) GetAuthorizedAuditLogsOffset(ctx context.Context, arg data
1393013934
UserQuietHoursSchedule: sql.NullString{String:user.QuietHoursSchedule,Valid:userValid},
1393113935
UserStatus: database.NullUserStatus{UserStatus:user.Status,Valid:userValid},
1393213936
UserRoles:user.RBACRoles,
13933-
Count:0,
1393413937
})
1393513938

1393613939
iflen(logs)>=int(arg.LimitOpt) {
1393713940
break
1393813941
}
1393913942
}
1394013943

13941-
count:=int64(len(logs))
13942-
fori:=rangelogs {
13943-
logs[i].Count=count
13944+
returnlogs,nil
13945+
}
13946+
13947+
func (q*FakeQuerier)CountAuthorizedAuditLogs(ctx context.Context,arg database.CountAuditLogsParams,prepared rbac.PreparedAuthorized) (int64,error) {
13948+
iferr:=validateDatabaseType(arg);err!=nil {
13949+
return0,err
1394413950
}
1394513951

13946-
returnlogs,nil
13952+
// Call this to match the same function calls as the SQL implementation.
13953+
// It functionally does nothing for filtering.
13954+
ifprepared!=nil {
13955+
_,err:=prepared.CompileToSQL(ctx, regosql.ConvertConfig{
13956+
VariableConverter:regosql.AuditLogConverter(),
13957+
})
13958+
iferr!=nil {
13959+
return0,err
13960+
}
13961+
}
13962+
13963+
q.mutex.RLock()
13964+
deferq.mutex.RUnlock()
13965+
13966+
varcountint64
13967+
13968+
// q.auditLogs are already sorted by time DESC, so no need to sort after the fact.
13969+
for_,alog:=rangeq.auditLogs {
13970+
ifarg.RequestID!=uuid.Nil&&arg.RequestID!=alog.RequestID {
13971+
continue
13972+
}
13973+
ifarg.OrganizationID!=uuid.Nil&&arg.OrganizationID!=alog.OrganizationID {
13974+
continue
13975+
}
13976+
ifarg.Action!=""&&string(alog.Action)!=arg.Action {
13977+
continue
13978+
}
13979+
ifarg.ResourceType!=""&&!strings.Contains(string(alog.ResourceType),arg.ResourceType) {
13980+
continue
13981+
}
13982+
ifarg.ResourceID!=uuid.Nil&&alog.ResourceID!=arg.ResourceID {
13983+
continue
13984+
}
13985+
ifarg.Username!="" {
13986+
user,err:=q.getUserByIDNoLock(alog.UserID)
13987+
iferr==nil&&!strings.EqualFold(arg.Username,user.Username) {
13988+
continue
13989+
}
13990+
}
13991+
ifarg.Email!="" {
13992+
user,err:=q.getUserByIDNoLock(alog.UserID)
13993+
iferr==nil&&!strings.EqualFold(arg.Email,user.Email) {
13994+
continue
13995+
}
13996+
}
13997+
if!arg.DateFrom.IsZero() {
13998+
ifalog.Time.Before(arg.DateFrom) {
13999+
continue
14000+
}
14001+
}
14002+
if!arg.DateTo.IsZero() {
14003+
ifalog.Time.After(arg.DateTo) {
14004+
continue
14005+
}
14006+
}
14007+
ifarg.BuildReason!="" {
14008+
workspaceBuild,err:=q.getWorkspaceBuildByIDNoLock(context.Background(),alog.ResourceID)
14009+
iferr==nil&&!strings.EqualFold(arg.BuildReason,string(workspaceBuild.Reason)) {
14010+
continue
14011+
}
14012+
}
14013+
// If the filter exists, ensure the object is authorized.
14014+
ifprepared!=nil&&prepared.Authorize(ctx,alog.RBACObject())!=nil {
14015+
continue
14016+
}
14017+
14018+
count++
14019+
}
14020+
14021+
returncount,nil
1394714022
}

‎coderd/database/dbmetrics/querymetrics.go‎

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go‎

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/modelqueries.go‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,7 @@ func (q *sqlQuerier) GetAuthorizedUsers(ctx context.Context, arg GetUsersParams,
478478

479479
typeauditLogQuerierinterface {
480480
GetAuthorizedAuditLogsOffset(ctx context.Context,argGetAuditLogsOffsetParams,prepared rbac.PreparedAuthorized) ([]GetAuditLogsOffsetRow,error)
481+
CountAuthorizedAuditLogs(ctx context.Context,argCountAuditLogsParams,prepared rbac.PreparedAuthorized) (int64,error)
481482
}
482483

483484
func (q*sqlQuerier)GetAuthorizedAuditLogsOffset(ctx context.Context,argGetAuditLogsOffsetParams,prepared rbac.PreparedAuthorized) ([]GetAuditLogsOffsetRow,error) {
@@ -548,7 +549,6 @@ func (q *sqlQuerier) GetAuthorizedAuditLogsOffset(ctx context.Context, arg GetAu
548549
&i.OrganizationName,
549550
&i.OrganizationDisplayName,
550551
&i.OrganizationIcon,
551-
&i.Count,
552552
);err!=nil {
553553
returnnil,err
554554
}
@@ -563,6 +563,54 @@ func (q *sqlQuerier) GetAuthorizedAuditLogsOffset(ctx context.Context, arg GetAu
563563
returnitems,nil
564564
}
565565

566+
func (q*sqlQuerier)CountAuthorizedAuditLogs(ctx context.Context,argCountAuditLogsParams,prepared rbac.PreparedAuthorized) (int64,error) {
567+
authorizedFilter,err:=prepared.CompileToSQL(ctx, regosql.ConvertConfig{
568+
VariableConverter:regosql.AuditLogConverter(),
569+
})
570+
iferr!=nil {
571+
return0,xerrors.Errorf("compile authorized filter: %w",err)
572+
}
573+
574+
filtered,err:=insertAuthorizedFilter(countAuditLogs,fmt.Sprintf(" AND %s",authorizedFilter))
575+
iferr!=nil {
576+
return0,xerrors.Errorf("insert authorized filter: %w",err)
577+
}
578+
579+
query:=fmt.Sprintf("-- name: CountAuthorizedAuditLogs :one\n%s",filtered)
580+
581+
rows,err:=q.db.QueryContext(ctx,query,
582+
arg.ResourceType,
583+
arg.ResourceID,
584+
arg.OrganizationID,
585+
arg.ResourceTarget,
586+
arg.Action,
587+
arg.UserID,
588+
arg.Username,
589+
arg.Email,
590+
arg.DateFrom,
591+
arg.DateTo,
592+
arg.BuildReason,
593+
arg.RequestID,
594+
)
595+
iferr!=nil {
596+
return0,err
597+
}
598+
deferrows.Close()
599+
varcountint64
600+
forrows.Next() {
601+
iferr:=rows.Scan(&count);err!=nil {
602+
return0,err
603+
}
604+
}
605+
iferr:=rows.Close();err!=nil {
606+
return0,err
607+
}
608+
iferr:=rows.Err();err!=nil {
609+
return0,err
610+
}
611+
returncount,nil
612+
}
613+
566614
funcinsertAuthorizedFilter(querystring,replaceWithstring) (string,error) {
567615
if!strings.Contains(query,authorizedQueryPlaceholder) {
568616
return"",xerrors.Errorf("query does not contain authorized replace string, this is not an authorized query")

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp