Skip to content

Commit

Permalink
Improve indices for action table (#23532)
Browse files Browse the repository at this point in the history
Close #21611 

Add the index mentioned in
#21611 (comment) .
Since we already have an index for `("created_unix", "user_id",
"is_deleted")` columns on PostgreSQL, I removed the database type check
to apply this index to all types of databases.
  • Loading branch information
Zettat123 authored Mar 24, 2023
1 parent e52ea44 commit b958dba
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 6 deletions.
10 changes: 4 additions & 6 deletions models/activities/action.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,10 @@ func (a *Action) TableIndices() []*schemas.Index {
actUserIndex := schemas.NewIndex("au_r_c_u_d", schemas.IndexType)
actUserIndex.AddColumn("act_user_id", "repo_id", "created_unix", "user_id", "is_deleted")

indices := []*schemas.Index{actUserIndex, repoIndex}
if setting.Database.Type.IsPostgreSQL() {
cudIndex := schemas.NewIndex("c_u_d", schemas.IndexType)
cudIndex.AddColumn("created_unix", "user_id", "is_deleted")
indices = append(indices, cudIndex)
}
cudIndex := schemas.NewIndex("c_u_d", schemas.IndexType)
cudIndex.AddColumn("created_unix", "user_id", "is_deleted")

indices := []*schemas.Index{actUserIndex, repoIndex, cudIndex}

return indices
}
Expand Down
2 changes: 2 additions & 0 deletions models/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,8 @@ var migrations = []Migration{
NewMigration("Fix incorrect project type", v1_20.FixIncorrectProjectType),
// v248 -> v249
NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner),
// v249 -> v250
NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices),
}

// GetCurrentDBVersion returns the current db version
Expand Down
45 changes: 45 additions & 0 deletions models/migrations/v1_20/v249.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

package v1_20 //nolint

import (
"code.gitea.io/gitea/modules/timeutil"

"xorm.io/xorm"
"xorm.io/xorm/schemas"
)

type Action struct {
UserID int64 // Receiver user id.
ActUserID int64 // Action user id.
RepoID int64
IsDeleted bool `xorm:"NOT NULL DEFAULT false"`
IsPrivate bool `xorm:"NOT NULL DEFAULT false"`
CreatedUnix timeutil.TimeStamp `xorm:"created"`
}

// TableName sets the name of this table
func (a *Action) TableName() string {
return "action"
}

// TableIndices implements xorm's TableIndices interface
func (a *Action) TableIndices() []*schemas.Index {
repoIndex := schemas.NewIndex("r_u_d", schemas.IndexType)
repoIndex.AddColumn("repo_id", "user_id", "is_deleted")

actUserIndex := schemas.NewIndex("au_r_c_u_d", schemas.IndexType)
actUserIndex.AddColumn("act_user_id", "repo_id", "created_unix", "user_id", "is_deleted")

cudIndex := schemas.NewIndex("c_u_d", schemas.IndexType)
cudIndex.AddColumn("created_unix", "user_id", "is_deleted")

indices := []*schemas.Index{actUserIndex, repoIndex, cudIndex}

return indices
}

func ImproveActionTableIndices(x *xorm.Engine) error {
return x.Sync(new(Action))
}

0 comments on commit b958dba

Please sign in to comment.