Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 15:28:53 +09:00
|
|
|
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
package issues
|
|
|
|
|
|
|
|
import (
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
|
|
)
|
|
|
|
|
|
|
|
func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOptions {
|
|
|
|
searchOpt := &SearchOptions{
|
|
|
|
Keyword: keyword,
|
|
|
|
RepoIDs: opts.RepoIDs,
|
|
|
|
AllPublic: false,
|
|
|
|
IsPull: opts.IsPull,
|
|
|
|
IsClosed: opts.IsClosed,
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(opts.LabelIDs) == 1 && opts.LabelIDs[0] == 0 {
|
|
|
|
searchOpt.NoLabelOnly = true
|
|
|
|
} else {
|
|
|
|
for _, labelID := range opts.LabelIDs {
|
|
|
|
if labelID > 0 {
|
|
|
|
searchOpt.IncludedLabelIDs = append(searchOpt.IncludedLabelIDs, labelID)
|
|
|
|
} else {
|
|
|
|
searchOpt.ExcludedLabelIDs = append(searchOpt.ExcludedLabelIDs, -labelID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// opts.IncludedLabelNames and opts.ExcludedLabelNames are not supported here.
|
|
|
|
// It's not a TO DO, it's just unnecessary.
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(opts.MilestoneIDs) == 1 && opts.MilestoneIDs[0] == db.NoConditionID {
|
|
|
|
searchOpt.MilestoneIDs = []int64{0}
|
|
|
|
} else {
|
|
|
|
searchOpt.MilestoneIDs = opts.MilestoneIDs
|
|
|
|
}
|
|
|
|
|
2023-08-17 00:40:13 +09:00
|
|
|
// See the comment of issues_model.SearchOptions for the reason why we need to convert
|
|
|
|
convertID := func(id int64) *int64 {
|
|
|
|
if id > 0 {
|
|
|
|
return &id
|
|
|
|
}
|
|
|
|
if id == db.NoConditionID {
|
|
|
|
var zero int64
|
|
|
|
return &zero
|
|
|
|
}
|
|
|
|
return nil
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 15:28:53 +09:00
|
|
|
}
|
|
|
|
|
2023-08-17 00:40:13 +09:00
|
|
|
searchOpt.ProjectID = convertID(opts.ProjectID)
|
|
|
|
searchOpt.ProjectBoardID = convertID(opts.ProjectBoardID)
|
|
|
|
searchOpt.PosterID = convertID(opts.PosterID)
|
|
|
|
searchOpt.AssigneeID = convertID(opts.AssigneeID)
|
|
|
|
searchOpt.MentionID = convertID(opts.MentionedID)
|
|
|
|
searchOpt.ReviewedID = convertID(opts.ReviewedID)
|
|
|
|
searchOpt.ReviewRequestedID = convertID(opts.ReviewRequestedID)
|
|
|
|
searchOpt.SubscriberID = convertID(opts.SubscriberID)
|
|
|
|
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 15:28:53 +09:00
|
|
|
if opts.UpdatedAfterUnix > 0 {
|
|
|
|
searchOpt.UpdatedAfterUnix = &opts.UpdatedAfterUnix
|
|
|
|
}
|
|
|
|
if opts.UpdatedBeforeUnix > 0 {
|
|
|
|
searchOpt.UpdatedBeforeUnix = &opts.UpdatedBeforeUnix
|
|
|
|
}
|
|
|
|
|
|
|
|
searchOpt.Paginator = opts.Paginator
|
|
|
|
|
|
|
|
switch opts.SortType {
|
|
|
|
case "":
|
|
|
|
searchOpt.SortBy = SortByCreatedDesc
|
|
|
|
case "oldest":
|
|
|
|
searchOpt.SortBy = SortByCreatedAsc
|
|
|
|
case "recentupdate":
|
|
|
|
searchOpt.SortBy = SortByUpdatedDesc
|
|
|
|
case "leastupdate":
|
|
|
|
searchOpt.SortBy = SortByUpdatedAsc
|
|
|
|
case "mostcomment":
|
|
|
|
searchOpt.SortBy = SortByCommentsDesc
|
|
|
|
case "leastcomment":
|
|
|
|
searchOpt.SortBy = SortByCommentsAsc
|
|
|
|
case "nearduedate":
|
|
|
|
searchOpt.SortBy = SortByDeadlineAsc
|
|
|
|
case "farduedate":
|
|
|
|
searchOpt.SortBy = SortByDeadlineDesc
|
|
|
|
case "priority", "priorityrepo", "project-column-sorting":
|
|
|
|
// Unsupported sort type for search
|
|
|
|
searchOpt.SortBy = SortByUpdatedDesc
|
|
|
|
default:
|
|
|
|
searchOpt.SortBy = SortByUpdatedDesc
|
|
|
|
}
|
|
|
|
|
|
|
|
return searchOpt
|
|
|
|
}
|