Skip to content

Improve action table indices #19472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 18, 2022
Merged

Improve action table indices #19472

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
133c63e
Improve action table indices
zeripath Apr 23, 2022
2f2234e
move for merge
zeripath May 4, 2022
aca1e3b
Merge remote-tracking branch 'origin/main' into action_indices
zeripath May 4, 2022
4a2c406
pre-merge
zeripath May 20, 2022
e2b1102
Merge remote-tracking branch 'origin/main' into action_indices
zeripath May 20, 2022
9d186bd
Drop indexes in migration
zeripath May 20, 2022
64bc7cd
Merge remote-tracking branch 'origin/main' into action_indices
zeripath Jun 1, 2022
a1f182b
Update models/migrations/migrations.go
zeripath Jun 4, 2022
715e529
Merge remote-tracking branch 'origin/main' into action_indices
zeripath Jun 17, 2022
24d7b94
Merge remote-tracking branch 'zeripath/action_indices' into action_in…
zeripath Jun 17, 2022
de86bd4
Use TableIndices to improve things
zeripath Jun 17, 2022
65ed667
Merge branch 'main' into action_indices
wxiaoguang Jun 17, 2022
1ad852c
Merge branch 'main' into action_indices
lunny Jun 17, 2022
a0147f0
Merge branch 'main' into action_indices
lunny Jun 18, 2022
4b32d19
Update models/migrations/v216.go
zeripath Jun 18, 2022
cf876d4
Merge branch 'main' into action_indices
lunny Jun 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions models/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@ const (
// used in template render.
type Action struct {
ID int64 `xorm:"pk autoincr"`
UserID int64 `xorm:"INDEX"` // Receiver user id.
UserID int64 `xorm:"INDEX(u_ua_and_r)"` // Receiver user id.
OpType ActionType
ActUserID int64 `xorm:"INDEX"` // Action user id.
ActUserID int64 `xorm:"INDEX(u_ua_and_r) INDEX(ua_and_r)"` // Action user id.
ActUser *user_model.User `xorm:"-"`
RepoID int64 `xorm:"INDEX"`
RepoID int64 `xorm:"INDEX(u_ua_and_r) INDEX(ua_and_r) INDEX(r)"`
Repo *repo_model.Repository `xorm:"-"`
CommentID int64 `xorm:"INDEX"`
Comment *Comment `xorm:"-"`
IsDeleted bool `xorm:"INDEX NOT NULL DEFAULT false"`
IsDeleted bool `xorm:"NOT NULL DEFAULT false"`
RefName string
IsPrivate bool `xorm:"INDEX NOT NULL DEFAULT false"`
IsPrivate bool `xorm:"NOT NULL DEFAULT false"`
Content string `xorm:"TEXT"`
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
CreatedUnix timeutil.TimeStamp `xorm:"INDEX(u_ua_and_r) INDEX(ua_and_r) INDEX(r) created"`
}

func init() {
Expand Down
2 changes: 2 additions & 0 deletions models/migrations/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,8 @@ var migrations = []Migration{
NewMigration("Add package tables", addPackageTables),
// v213 -> v214
NewMigration("Add allow edits from maintainers to PullRequest table", addAllowMaintainerEdit),
// v214 -> v215
NewMigration("Improve Action table indices", improveActionTableIndices),
}

// GetCurrentDBVersion returns the current db version
Expand Down
27 changes: 27 additions & 0 deletions models/migrations/v214.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

package migrations

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

func improveActionTableIndices(x *xorm.Engine) error {
type Action struct {
ID int64 `xorm:"pk autoincr"`
UserID int64 `xorm:"INDEX(u_ua_and_r)"` // Receiver user id.
OpType int
ActUserID int64 `xorm:"INDEX(u_ua_and_r) INDEX(ua_and_r)"` // Action user id.
RepoID int64 `xorm:"INDEX(u_ua_and_r) INDEX(ua_and_r) INDEX(r)"`
CommentID int64 `xorm:"INDEX"`
IsDeleted bool `xorm:"NOT NULL DEFAULT false"`
RefName string
IsPrivate bool `xorm:"NOT NULL DEFAULT false"`
Content string `xorm:"TEXT"`
CreatedUnix timeutil.TimeStamp `xorm:"INDEX(u_ua_and_r) INDEX(ua_and_r) INDEX(r) created"`
}
return x.Sync2(&Action{})
}