summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorLauris BH <lauris@nix.lv>2021-01-16 06:55:17 +0200
committerGitHub <noreply@github.com>2021-01-16 12:55:17 +0800
commit0a3c3357f388cc60d5f43a056ee2381e51586cff (patch)
treeaff5abc553a1f417c943802c0f2e7d21aab8305f /modules
parent2db4733c7d75b3ca3d1b2750f7b6ed53ac75303c (diff)
downloadgitea-0a3c3357f388cc60d5f43a056ee2381e51586cff.tar.gz
gitea-0a3c3357f388cc60d5f43a056ee2381e51586cff.zip
Sort issue search results by revelance (#14353)
Diffstat (limited to 'modules')
-rw-r--r--modules/indexer/issues/bleve.go1
-rw-r--r--modules/indexer/issues/elastic_search.go2
-rw-r--r--modules/indexer/issues/indexer_test.go4
3 files changed, 4 insertions, 3 deletions
diff --git a/modules/indexer/issues/bleve.go b/modules/indexer/issues/bleve.go
index a1f51dba50..4a1e2bc51b 100644
--- a/modules/indexer/issues/bleve.go
+++ b/modules/indexer/issues/bleve.go
@@ -247,6 +247,7 @@ func (b *BleveIndexer) Search(keyword string, repoIDs []int64, limit, start int)
newMatchPhraseQuery(keyword, "Comments", issueIndexerAnalyzer),
))
search := bleve.NewSearchRequestOptions(indexerQuery, limit, start, false)
+ search.SortBy([]string{"-_score"})
result, err := b.indexer.Search(search)
if err != nil {
diff --git a/modules/indexer/issues/elastic_search.go b/modules/indexer/issues/elastic_search.go
index 4cdeff53dc..3af64ed30e 100644
--- a/modules/indexer/issues/elastic_search.go
+++ b/modules/indexer/issues/elastic_search.go
@@ -205,7 +205,7 @@ func (b *ElasticSearchIndexer) Search(keyword string, repoIDs []int64, limit, st
searchResult, err := b.client.Search().
Index(b.indexerName).
Query(query).
- Sort("id", true).
+ Sort("_score", false).
From(start).Size(limit).
Do(context.Background())
if err != nil {
diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go
index 95007d8faf..8c163f78d1 100644
--- a/modules/indexer/issues/indexer_test.go
+++ b/modules/indexer/issues/indexer_test.go
@@ -65,7 +65,7 @@ func TestBleveSearchIssues(t *testing.T) {
ids, err = SearchIssuesByKeyword([]int64{1}, "for")
assert.NoError(t, err)
- assert.EqualValues(t, []int64{1, 2, 3, 5, 11}, ids)
+ assert.ElementsMatch(t, []int64{1, 2, 3, 5, 11}, ids)
ids, err = SearchIssuesByKeyword([]int64{1}, "good")
assert.NoError(t, err)
@@ -89,7 +89,7 @@ func TestDBSearchIssues(t *testing.T) {
ids, err = SearchIssuesByKeyword([]int64{1}, "for")
assert.NoError(t, err)
- assert.EqualValues(t, []int64{1, 2, 3, 5, 11}, ids)
+ assert.ElementsMatch(t, []int64{1, 2, 3, 5, 11}, ids)
ids, err = SearchIssuesByKeyword([]int64{1}, "good")
assert.NoError(t, err)