aboutsummaryrefslogtreecommitdiffstats
path: root/modules/indexer
diff options
context:
space:
mode:
authorkolaente <konrad@kola-entertainments.de>2019-06-12 21:41:28 +0200
committertechknowlogick <techknowlogick@gitea.io>2019-06-12 15:41:28 -0400
commitf9ec2f89f2265bc1371a6c62359de9816534fa6b (patch)
treef48b138a457e5ac6cf843bbb38400926704370f7 /modules/indexer
parent5832f8d90df2d72cb38698c3e9050f2b29717dc7 (diff)
downloadgitea-f9ec2f89f2265bc1371a6c62359de9816534fa6b.tar.gz
gitea-f9ec2f89f2265bc1371a6c62359de9816534fa6b.zip
Add golangci (#6418)
Diffstat (limited to 'modules/indexer')
-rw-r--r--modules/indexer/indexer.go17
-rw-r--r--modules/indexer/issues/indexer.go13
-rw-r--r--modules/indexer/issues/queue_channel.go6
-rw-r--r--modules/indexer/issues/queue_disk.go4
-rw-r--r--modules/indexer/issues/queue_redis.go4
5 files changed, 16 insertions, 28 deletions
diff --git a/modules/indexer/indexer.go b/modules/indexer/indexer.go
index 9e12a7f501..29261c693b 100644
--- a/modules/indexer/indexer.go
+++ b/modules/indexer/indexer.go
@@ -5,7 +5,6 @@
package indexer
import (
- "fmt"
"os"
"strconv"
@@ -24,15 +23,6 @@ func indexerID(id int64) string {
return strconv.FormatInt(id, 36)
}
-// idOfIndexerID the integer id associated with an indexer id
-func idOfIndexerID(indexerID string) (int64, error) {
- id, err := strconv.ParseInt(indexerID, 36, 64)
- if err != nil {
- return 0, fmt.Errorf("Unexpected indexer ID %s: %v", indexerID, err)
- }
- return id, nil
-}
-
// numericEqualityQuery a numeric equality query for the given value and field
func numericEqualityQuery(value int64, field string) *query.NumericRangeQuery {
f := float64(value)
@@ -42,13 +32,6 @@ func numericEqualityQuery(value int64, field string) *query.NumericRangeQuery {
return q
}
-func newMatchPhraseQuery(matchPhrase, field, analyzer string) *query.MatchPhraseQuery {
- q := bleve.NewMatchPhraseQuery(matchPhrase)
- q.FieldVal = field
- q.Analyzer = analyzer
- return q
-}
-
const unicodeNormalizeName = "unicodeNormalize"
func addUnicodeNormalizeTokenFilter(m *mapping.IndexMappingImpl) error {
diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go
index 75e6893b87..df8bfd6305 100644
--- a/modules/indexer/issues/indexer.go
+++ b/modules/indexer/issues/indexer.go
@@ -101,7 +101,12 @@ func InitIssueIndexer(syncReindex bool) error {
return fmt.Errorf("Unsupported indexer queue type: %v", setting.Indexer.IssueQueueType)
}
- go issueIndexerQueue.Run()
+ go func() {
+ err = issueIndexerQueue.Run()
+ if err != nil {
+ log.Error("issueIndexerQueue.Run: %v", err)
+ }
+ }()
if populate {
if syncReindex {
@@ -161,7 +166,7 @@ func UpdateIssueIndexer(issue *models.Issue) {
comments = append(comments, comment.Content)
}
}
- issueIndexerQueue.Push(&IndexerData{
+ _ = issueIndexerQueue.Push(&IndexerData{
ID: issue.ID,
RepoID: issue.RepoID,
Title: issue.Title,
@@ -179,11 +184,11 @@ func DeleteRepoIssueIndexer(repo *models.Repository) {
return
}
- if len(ids) <= 0 {
+ if len(ids) == 0 {
return
}
- issueIndexerQueue.Push(&IndexerData{
+ _ = issueIndexerQueue.Push(&IndexerData{
IDs: ids,
IsDelete: true,
})
diff --git a/modules/indexer/issues/queue_channel.go b/modules/indexer/issues/queue_channel.go
index bd92f6b7b1..b6458d3eb5 100644
--- a/modules/indexer/issues/queue_channel.go
+++ b/modules/indexer/issues/queue_channel.go
@@ -34,20 +34,20 @@ func (c *ChannelQueue) Run() error {
select {
case data := <-c.queue:
if data.IsDelete {
- c.indexer.Delete(data.IDs...)
+ _ = c.indexer.Delete(data.IDs...)
continue
}
datas = append(datas, data)
if len(datas) >= c.batchNumber {
- c.indexer.Index(datas)
+ _ = c.indexer.Index(datas)
// TODO: save the point
datas = make([]*IndexerData, 0, c.batchNumber)
}
case <-time.After(time.Millisecond * 100):
i++
if i >= 3 && len(datas) > 0 {
- c.indexer.Index(datas)
+ _ = c.indexer.Index(datas)
// TODO: save the point
datas = make([]*IndexerData, 0, c.batchNumber)
}
diff --git a/modules/indexer/issues/queue_disk.go b/modules/indexer/issues/queue_disk.go
index cf9e6aee22..e5ac2a7981 100644
--- a/modules/indexer/issues/queue_disk.go
+++ b/modules/indexer/issues/queue_disk.go
@@ -44,7 +44,7 @@ func (l *LevelQueue) Run() error {
for {
i++
if len(datas) > l.batchNumber || (len(datas) > 0 && i > 3) {
- l.indexer.Index(datas)
+ _ = l.indexer.Index(datas)
datas = make([]*IndexerData, 0, l.batchNumber)
i = 0
continue
@@ -59,7 +59,7 @@ func (l *LevelQueue) Run() error {
continue
}
- if len(bs) <= 0 {
+ if len(bs) == 0 {
time.Sleep(time.Millisecond * 100)
continue
}
diff --git a/modules/indexer/issues/queue_redis.go b/modules/indexer/issues/queue_redis.go
index a9434c4f92..aeccd7920c 100644
--- a/modules/indexer/issues/queue_redis.go
+++ b/modules/indexer/issues/queue_redis.go
@@ -96,12 +96,12 @@ func (r *RedisQueue) Run() error {
i++
if len(datas) > r.batchNumber || (len(datas) > 0 && i > 3) {
- r.indexer.Index(datas)
+ _ = r.indexer.Index(datas)
datas = make([]*IndexerData, 0, r.batchNumber)
i = 0
}
- if len(bs) <= 0 {
+ if len(bs) == 0 {
time.Sleep(time.Millisecond * 100)
continue
}