diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-02-21 08:54:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-21 08:54:05 +0800 |
| commit | 0751153613bfd2e39cf28e83bbe04b76641d222f (patch) | |
| tree | 91ec0e2bd81c9007f15f9ab255e177d2be138f24 /routers | |
| parent | eaf9ded18201d8ad2587860ed98763ca040f0b71 (diff) | |
| download | gitea-0751153613bfd2e39cf28e83bbe04b76641d222f.tar.gz gitea-0751153613bfd2e39cf28e83bbe04b76641d222f.zip | |
refactor issue indexer, add some testing and fix a bug (#6131)
* refactor issue indexer, add some testing and fix a bug
* fix error copyright year on comment header
* issues indexer package import keep consistent
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/repo/issue.go | 3 | ||||
| -rw-r--r-- | routers/init.go | 3 | ||||
| -rw-r--r-- | routers/repo/issue.go | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index a129447c09..e63db4b6a4 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" @@ -77,7 +78,7 @@ func ListIssues(ctx *context.APIContext) { var labelIDs []int64 var err error if len(keyword) > 0 { - issueIDs, err = models.SearchIssuesByKeyword(ctx.Repo.Repository.ID, keyword) + issueIDs, err = issue_indexer.SearchIssuesByKeyword(ctx.Repo.Repository.ID, keyword) } if splitted := strings.Split(ctx.Query("labels"), ","); len(splitted) > 0 { diff --git a/routers/init.go b/routers/init.go index 1da21a351b..2fc3bb9668 100644 --- a/routers/init.go +++ b/routers/init.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/cache" "code.gitea.io/gitea/modules/cron" "code.gitea.io/gitea/modules/highlight" + issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/mailer" "code.gitea.io/gitea/modules/markup" @@ -90,7 +91,7 @@ func GlobalInit() { // Booting long running goroutines. cron.NewContext() - if err := models.InitIssueIndexer(); err != nil { + if err := issue_indexer.InitIssueIndexer(false); err != nil { log.Fatal(4, "Failed to initialize issue indexer: %v", err) } models.InitRepoIndexer() diff --git a/routers/repo/issue.go b/routers/repo/issue.go index f0a6d1bd5f..33d3ec6a74 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -23,6 +23,7 @@ import ( "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/notification" @@ -146,7 +147,7 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB var issueIDs []int64 if len(keyword) > 0 { - issueIDs, err = models.SearchIssuesByKeyword(repo.ID, keyword) + issueIDs, err = issue_indexer.SearchIssuesByKeyword(repo.ID, keyword) if err != nil { ctx.ServerError("issueIndexer.Search", err) return |