Re-use results of a keyword search as list of matching IDs for an 'IN' db query.

Author: telackey

modules/indexer/issues/bleve/bleve.go

@@ -286,6 +286,14 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 			"updated_unix"))
 	}
 
+	if len(options.IssueIDs) > 0 {
+		var idQueries []query.Query
+		for _, issueId := range options.IssueIDs {
+			idQueries = append(idQueries, inner_bleve.NumericEqualityQuery(issueId, "id"))
+		}
+		queries = append(queries, bleve.NewDisjunctionQuery(idQueries...))
+	}
+
 	var indexerQuery query.Query = bleve.NewConjunctionQuery(queries...)
 	if len(queries) == 0 {
 		indexerQuery = bleve.NewMatchAllQuery()

modules/indexer/issues/db/options.go

@@ -73,7 +73,7 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m
 		ExcludedLabelNames: nil,
 		IncludeMilestones:  nil,
 		SortType:           sortType,
-		IssueIDs:           nil,
+		IssueIDs:           options.IssueIDs,
 		UpdatedAfterUnix:   options.UpdatedAfterUnix.Value(),
 		UpdatedBeforeUnix:  options.UpdatedBeforeUnix.Value(),
 		PriorityRepoID:     0,

modules/indexer/issues/dboptions.go

@@ -20,6 +20,7 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
 		IsPull:     opts.IsPull,
 		IsClosed:   opts.IsClosed,
 		IsArchived: opts.IsArchived,
+		IssueIDs:   opts.IssueIDs,
 	}
 
 	if len(opts.LabelIDs) == 1 && opts.LabelIDs[0] == 0 {

modules/indexer/issues/elasticsearch/elasticsearch.go

@@ -201,6 +201,10 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		}
 	}
 
+	if len(options.IssueIDs) > 0 {
+		query.Must(elastic.NewTermsQuery("id", toAnySlice(options.IssueIDs)...))
+	}
+
 	if len(options.MilestoneIDs) > 0 {
 		query.Must(elastic.NewTermsQuery("milestone_id", toAnySlice(options.MilestoneIDs)...))
 	}

modules/indexer/issues/indexer.go

@@ -8,12 +8,10 @@ import (
 	"fmt"
 	"os"
 	"runtime/pprof"
-	"strings"
 	"sync/atomic"
 	"time"
 
 	db_model "code.gitea.io/gitea/models/db"
-	issue_model "code.gitea.io/gitea/models/issues"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/indexer"
@@ -296,11 +294,6 @@ func SearchIssues(ctx context.Context, opts *SearchOptions) ([]int64, int64, err
 		ix = db.NewIndexer()
 	}
 
-	if strings.HasPrefix(string(opts.SortBy), issue_model.ScopeSortPrefix) {
-		// Sorting by label scope is currently only supported by the DB indexer.
-		ix = db.NewIndexer()
-	}
-
 	result, err := ix.Search(ctx, opts)
 	if err != nil {
 		return nil, 0, err

modules/indexer/issues/internal/model.go

@@ -94,6 +94,8 @@ type SearchOptions struct {
 
 	MilestoneIDs []int64 // milestones the issues have
 
+	IssueIDs []int64 // restrict search to these issues
+
 	ProjectID       optional.Option[int64] // project the issues belong to
 	ProjectColumnID optional.Option[int64] // project column the issues belong to
 

modules/indexer/issues/meilisearch/meilisearch.go

@@ -176,6 +176,10 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		}
 	}
 
+	if len(options.IssueIDs) > 0 {
+		query.And(inner_meilisearch.NewFilterIn("id", options.IssueIDs...))
+	}
+
 	if len(options.MilestoneIDs) > 0 {
 		query.And(inner_meilisearch.NewFilterIn("milestone_id", options.MilestoneIDs...))
 	}

routers/web/repo/issue_list.go

@@ -560,6 +560,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 		return
 	}
 
+	var keywordMatchedIssueIds []int64
 	var issueStats *issues_model.IssueStats
 	statsOpts := &issues_model.IssuesOptions{
 		RepoIDs:           []int64{repo.ID},
@@ -575,7 +576,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 		IssueIDs:          nil,
 	}
 	if keyword != "" {
-		allIssueIDs, err := issueIDsFromSearch(ctx, keyword, statsOpts)
+		keywordMatchedIssueIds, err = issueIDsFromSearch(ctx, keyword, statsOpts)
 		if err != nil {
 			if issue_indexer.IsAvailable(ctx) {
 				ctx.ServerError("issueIDsFromSearch", err)
@@ -584,7 +585,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 			ctx.Data["IssueIndexerUnavailable"] = true
 			return
 		}
-		statsOpts.IssueIDs = allIssueIDs
+		statsOpts.IssueIDs = keywordMatchedIssueIds
 	}
 	if keyword != "" && len(statsOpts.IssueIDs) == 0 {
 		// So it did search with the keyword, but no issue found.
@@ -641,7 +642,9 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 
 	var issues issues_model.IssueList
 	{
-		ids, err := issueIDsFromSearch(ctx, keyword, &issues_model.IssuesOptions{
+		// Do not repeat the keyword search, since if we had any keyword matches we should
+		// already have their IDs available in allMatchingIssueIDs.
+		ids, err := issueIDsFromSearch(ctx, "", &issues_model.IssuesOptions{
 			Paginator: &db.ListOptions{
 				Page:     pager.Paginater.Current(),
 				PageSize: setting.UI.IssuePagingNum,
@@ -658,6 +661,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 			IsPull:            isPullOption,
 			LabelIDs:          labelIDs,
 			SortType:          sortType,
+			IssueIDs:          keywordMatchedIssueIds,
 		})
 		if err != nil {
 			if issue_indexer.IsAvailable(ctx) {