fix

wxiaoguang · wxiaoguang · commit 259f1347458d · 2025-04-09T09:58:11.000+08:00
diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go
@@ -76,9 +76,10 @@ func applySorts(sess *xorm.Session, sortType string, priorityRepoID int64) {
 	if strings.HasPrefix(sortType, ScopeSortPrefix) {
 		scope := strings.TrimPrefix(sortType, ScopeSortPrefix)
 		sess.Join("LEFT", "issue_label", "issue.id = issue_label.issue_id")
-		sess.Join("LEFT", "label", "label.id = issue_label.label_id and label.name LIKE ?", scope+"/%")
-		// Use COALESCE to make sure we sort NULL last regardless of backend DB (9223372036854775807 == max bigint)
-		sess.OrderBy("COALESCE(label.exclusive_order, 9223372036854775807) ASC").Desc("issue.id")
+		// "exclusive_order=0" means "no order is set", so exclude it from the JOIN criteria and then "LEFT JOIN" result is also null
+		sess.Join("LEFT", "label", "label.id = issue_label.label_id AND label.exclusive_order <> 0 AND label.name LIKE ?", scope+"/%")
+		// Use COALESCE to make sure we sort NULL last regardless of backend DB (2147483647 == max int)
+		sess.OrderBy("COALESCE(label.exclusive_order, 2147483647) ASC").Desc("issue.id")
 		return
 	}
 
diff --git a/models/issues/label.go b/models/issues/label.go
@@ -87,7 +87,7 @@ type Label struct {
 	OrgID           int64 `xorm:"INDEX"`
 	Name            string
 	Exclusive       bool
-	ExclusiveOrder  int `xorm:"DEFAULT 0"`
+	ExclusiveOrder  int `xorm:"DEFAULT 0"` // 0 means no exclusive order
 	Description     string
 	Color           string `xorm:"VARCHAR(7)"`
 	NumIssues       int
diff --git a/models/migrations/v1_24/v319.go b/models/migrations/v1_24/v319.go
@@ -9,7 +9,7 @@ import (
 
 func AddExclusiveOrderColumnToLabelTable(x *xorm.Engine) error {
 	type Label struct {
-		ExclusiveOrder int64 `xorm:"DEFAULT 0"`
+		ExclusiveOrder int `xorm:"DEFAULT 0"`
 	}
 
 	return x.Sync(new(Label))
diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go
@@ -5,7 +5,6 @@ package bleve
 
 import (
 	"context"
-	"errors"
 	"strconv"
 
 	"code.gitea.io/gitea/modules/indexer"
@@ -287,10 +286,6 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 			"updated_unix"))
 	}
 
-	if len(options.IssueIDs) > 0 {
-		return nil, errors.New("options.IssueIDs is not yet supported")
-	}
-
 	var indexerQuery query.Query = bleve.NewConjunctionQuery(queries...)
 	if len(queries) == 0 {
 		indexerQuery = bleve.NewMatchAllQuery()
diff --git a/modules/indexer/issues/db/db.go b/modules/indexer/issues/db/db.go
@@ -6,6 +6,7 @@ package db
 import (
 	"context"
 	"strings"
+	"sync"
 
 	"code.gitea.io/gitea/models/db"
 	issue_model "code.gitea.io/gitea/models/issues"
@@ -18,7 +19,7 @@ import (
 	"xorm.io/builder"
 )
 
-var _ internal.Indexer = &Indexer{}
+var _ internal.Indexer = (*Indexer)(nil)
 
 // Indexer implements Indexer interface to use database's like search
 type Indexer struct {
@@ -29,11 +30,9 @@ func (i *Indexer) SupportedSearchModes() []indexer.SearchMode {
 	return indexer.SearchModesExactWords()
 }
 
-func NewIndexer() *Indexer {
-	return &Indexer{
-		Indexer: &inner_db.Indexer{},
-	}
-}
+var GetIndexer = sync.OnceValue(func() *Indexer {
+	return &Indexer{Indexer: &inner_db.Indexer{}}
+})
 
 // Index dummy function
 func (i *Indexer) Index(_ context.Context, _ ...*internal.IndexerData) error {
diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go
@@ -73,7 +73,6 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m
 		ExcludedLabelNames: nil,
 		IncludeMilestones:  nil,
 		SortType:           sortType,
-		IssueIDs:           options.IssueIDs,
 		UpdatedAfterUnix:   options.UpdatedAfterUnix.Value(),
 		UpdatedBeforeUnix:  options.UpdatedBeforeUnix.Value(),
 		PriorityRepoID:     0,
diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go
@@ -10,17 +10,20 @@ import (
 	issues_model "code.gitea.io/gitea/models/issues"
 	"code.gitea.io/gitea/modules/indexer/issues/internal"
 	"code.gitea.io/gitea/modules/optional"
+	"code.gitea.io/gitea/modules/setting"
 )
 
 func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOptions {
+	if opts.IssueIDs != nil {
+		setting.PanicInDevOrTesting("Indexer SearchOptions doesn't support IssueIDs")
+	}
 	searchOpt := &SearchOptions{
 		Keyword:    keyword,
 		RepoIDs:    opts.RepoIDs,
 		AllPublic:  opts.AllPublic,
 		IsPull:     opts.IsPull,
 		IsClosed:   opts.IsClosed,
 		IsArchived: opts.IsArchived,
-		IssueIDs:   opts.IssueIDs,
 	}
 
 	if len(opts.LabelIDs) == 1 && opts.LabelIDs[0] == 0 {
diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go
@@ -5,7 +5,6 @@ package elasticsearch
 
 import (
 	"context"
-	"errors"
 	"strconv"
 	"strings"
 
@@ -201,10 +200,6 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		}
 	}
 
-	if len(options.IssueIDs) > 0 {
-		return nil, errors.New("options.IssueIDs is not yet supported")
-	}
-
 	if len(options.MilestoneIDs) > 0 {
 		query.Must(elastic.NewTermsQuery("milestone_id", toAnySlice(options.MilestoneIDs)...))
 	}
diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go
@@ -103,7 +103,7 @@ func InitIssueIndexer(syncReindex bool) {
 				log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", setting.Indexer.IssueConnStr, err)
 			}
 		case "db":
-			issueIndexer = db.NewIndexer()
+			issueIndexer = db.GetIndexer()
 		case "meilisearch":
 			issueIndexer = meilisearch.NewIndexer(setting.Indexer.IssueConnStr, setting.Indexer.IssueConnAuth, setting.Indexer.IssueIndexerName)
 			existed, err = issueIndexer.Init(ctx)
@@ -291,20 +291,22 @@ func SearchIssues(ctx context.Context, opts *SearchOptions) ([]int64, int64, err
 		// So if the user creates an issue and list issues immediately, the issue may not be listed because the indexer needs time to index the issue.
 		// Even worse, the external indexer like elastic search may not be available for a while,
 		// and the user may not be able to list issues completely until it is available again.
-		ix = db.NewIndexer()
+		ix = db.GetIndexer()
 	}
 
 	result, err := ix.Search(ctx, opts)
 	if err != nil {
 		return nil, 0, err
 	}
+	return SearchResultToIDSlice(result), result.Total, nil
+}
 
+func SearchResultToIDSlice(result *internal.SearchResult) []int64 {
 	ret := make([]int64, 0, len(result.Hits))
 	for _, hit := range result.Hits {
 		ret = append(ret, hit.ID)
 	}
-
-	return ret, result.Total, nil
+	return ret
 }
 
 // CountIssues counts issues by options. It is a shortcut of SearchIssues(ctx, opts) but only returns the total count.
diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go
@@ -94,8 +94,6 @@ 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
 
diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go
@@ -176,10 +176,6 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		}
 	}
 
-	if len(options.IssueIDs) > 0 {
-		return nil, errors.New("options.IssueIDs is not yet supported")
-	}
-
 	if len(options.MilestoneIDs) > 0 {
 		query.And(inner_meilisearch.NewFilterIn("milestone_id", options.MilestoneIDs...))
 	}
diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go
@@ -111,11 +111,12 @@ func NewLabel(ctx *context.Context) {
 	}
 
 	l := &issues_model.Label{
-		RepoID:      ctx.Repo.Repository.ID,
-		Name:        form.Title,
-		Exclusive:   form.Exclusive,
-		Description: form.Description,
-		Color:       form.Color,
+		RepoID:         ctx.Repo.Repository.ID,
+		Name:           form.Title,
+		Exclusive:      form.Exclusive,
+		ExclusiveOrder: form.ExclusiveOrder,
+		Description:    form.Description,
+		Color:          form.Color,
 	}
 	if err := issues_model.NewLabel(ctx, l); err != nil {
 		ctx.ServerError("NewLabel", err)
diff --git a/routers/web/repo/issue_list.go b/routers/web/repo/issue_list.go
@@ -21,6 +21,7 @@ import (
 	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
 	issue_indexer "code.gitea.io/gitea/modules/indexer/issues"
+	db_indexer "code.gitea.io/gitea/modules/indexer/issues/db"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/optional"
 	"code.gitea.io/gitea/modules/setting"
@@ -515,7 +516,7 @@ func renderMilestones(ctx *context.Context) {
 	ctx.Data["ClosedMilestones"] = closedMilestones
 }
 
-func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption optional.Option[bool]) {
+func prepareIssueFilterAndList(ctx *context.Context, milestoneID, projectID int64, isPullOption optional.Option[bool]) {
 	var err error
 	viewType := ctx.FormString("type")
 	sortType := ctx.FormString("sort")
@@ -585,14 +586,17 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 			ctx.Data["IssueIndexerUnavailable"] = true
 			return
 		}
+		if len(keywordMatchedIssueIDs) == 0 {
+			// It did search with the keyword, but no issue found, just set issueStats to empty, then no need to do query again.
+			issueStats = &issues_model.IssueStats{}
+			// set keywordMatchedIssueIDs to empty slice, so we can distinguish it from "nil"
+			keywordMatchedIssueIDs = []int64{}
+		}
 		statsOpts.IssueIDs = keywordMatchedIssueIDs
 	}
-	if keyword != "" && len(statsOpts.IssueIDs) == 0 {
-		// So it did search with the keyword, but no issue found.
-		// Just set issueStats to empty.
-		issueStats = &issues_model.IssueStats{}
-	} else {
-		// So it did search with the keyword, and found some issues. It needs to get issueStats of these issues.
+
+	if issueStats == nil {
+		// Either it did search with the keyword, and found some issues, it needs to get issueStats of these issues.
 		// Or the keyword is empty, so it doesn't need issueIDs as filter, just get issueStats with statsOpts.
 		issueStats, err = issues_model.GetIssueStats(ctx, statsOpts)
 		if err != nil {
@@ -624,27 +628,21 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 		ctx.Data["TotalTrackedTime"] = totalTrackedTime
 	}
 
-	page := ctx.FormInt("page")
-	if page <= 1 {
-		page = 1
-	}
-
-	var total int
-	switch {
-	case isShowClosed.Value():
-		total = int(issueStats.ClosedCount)
-	case !isShowClosed.Has():
-		total = int(issueStats.OpenCount + issueStats.ClosedCount)
-	default:
-		total = int(issueStats.OpenCount)
+	// prepare pager
+	total := int(issueStats.OpenCount + issueStats.ClosedCount)
+	if isShowClosed.Value() {
+		total = util.Iif(isShowClosed.Value(), int(issueStats.ClosedCount), int(issueStats.OpenCount))
 	}
+	page := max(ctx.FormInt("page"), 1)
 	pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5)
 
+	// prepare real issue list:
 	var issues issues_model.IssueList
-	{
-		// Do not repeat the keyword search, since if we had any keyword matches we should
-		// already have their IDs available in keywordMatchedIssueIDs.
-		ids, err := issueIDsFromSearch(ctx, "", &issues_model.IssuesOptions{
+	if keywordMatchedIssueIDs == nil || len(keywordMatchedIssueIDs) > 0 {
+		// Either it did search with the keyword, and found some issues, then keywordMatchedIssueIDs is not null, it needs to use db indexer.
+		// Or the keyword is empty, it also needs to usd db indexer.
+		// In either case, no need to use keyword anymore
+		searchResult, err := db_indexer.GetIndexer().Search(ctx, issue_indexer.ToSearchOptions("", &issues_model.IssuesOptions{
 			Paginator: &db.ListOptions{
 				Page:     pager.Paginater.Current(),
 				PageSize: setting.UI.IssuePagingNum,
@@ -662,16 +660,13 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 			LabelIDs:          labelIDs,
 			SortType:          sortType,
 			IssueIDs:          keywordMatchedIssueIDs,
-		})
+		}))
 		if err != nil {
-			if issue_indexer.IsAvailable(ctx) {
-				ctx.ServerError("issueIDsFromSearch", err)
-				return
-			}
-			ctx.Data["IssueIndexerUnavailable"] = true
+			ctx.ServerError("DBIndexer.Search", err)
 			return
 		}
-		issues, err = issues_model.GetIssuesByIDs(ctx, ids, true)
+		issueIDs := issue_indexer.SearchResultToIDSlice(searchResult)
+		issues, err = issues_model.GetIssuesByIDs(ctx, issueIDs, true)
 		if err != nil {
 			ctx.ServerError("GetIssuesByIDs", err)
 			return
@@ -807,7 +802,7 @@ func Issues(ctx *context.Context) {
 		ctx.Data["NewIssueChooseTemplate"] = issue_service.HasTemplatesOrContactLinks(ctx.Repo.Repository, ctx.Repo.GitRepo)
 	}
 
-	issues(ctx, ctx.FormInt64("milestone"), ctx.FormInt64("project"), optional.Some(isPullList))
+	prepareIssueFilterAndList(ctx, ctx.FormInt64("milestone"), ctx.FormInt64("project"), optional.Some(isPullList))
 	if ctx.Written() {
 		return
 	}
diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go
@@ -263,7 +263,7 @@ func MilestoneIssuesAndPulls(ctx *context.Context) {
 	ctx.Data["Title"] = milestone.Name
 	ctx.Data["Milestone"] = milestone
 
-	issues(ctx, milestoneID, projectID, optional.None[bool]())
+	prepareIssueFilterAndList(ctx, milestoneID, projectID, optional.None[bool]())
 
 	ret := issue.ParseTemplatesFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo)
 	ctx.Data["NewIssueChooseTemplate"] = len(ret.IssueTemplates) > 0

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`func AddExclusiveOrderColumnToLabelTable(x *xorm.Engine) error {`
`11`	`11`	`type Label struct {`
`12`		- ExclusiveOrder int64 `xorm:"DEFAULT 0"`
	`12`	+ ExclusiveOrder int `xorm:"DEFAULT 0"`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`return x.Sync(new(Label))`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ package elasticsearch`
`5`	`5`
`6`	`6`	`import (`
`7`	`7`	`"context"`
`8`		`- "errors"`
`9`	`8`	`"strconv"`
`10`	`9`	`"strings"`
`11`	`10`
`@@ -201,10 +200,6 @@ func (b Indexer) Search(ctx context.Context, options internal.SearchOptions) (`
`201`	`200`	`}`
`202`	`201`	`}`
`203`	`202`
`204`		`- if len(options.IssueIDs) > 0 {`
`205`		`- return nil, errors.New("options.IssueIDs is not yet supported")`
`206`		`- }`
`207`		`-`
`208`	`203`	`if len(options.MilestoneIDs) > 0 {`
`209`	`204`	`query.Must(elastic.NewTermsQuery("milestone_id", toAnySlice(options.MilestoneIDs)...))`
`210`	`205`	`}`