2017-10-27 02:10:54 -04:00
|
|
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
2022-11-27 13:20:29 -05:00
|
|
|
// SPDX-License-Identifier: MIT
|
2017-10-27 02:10:54 -04:00
|
|
|
|
2019-12-23 07:31:16 -05:00
|
|
|
package code
|
2017-10-27 02:10:54 -04:00
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2022-01-27 03:30:51 -05:00
|
|
|
"context"
|
2023-12-17 09:38:54 -05:00
|
|
|
"html/template"
|
2017-10-27 02:10:54 -04:00
|
|
|
"strings"
|
|
|
|
|
|
|
|
"code.gitea.io/gitea/modules/highlight"
|
Refactor indexer (#25174)
Refactor `modules/indexer` to make it more maintainable. And it can be
easier to support more features. I'm trying to solve some of issue
searching, this is a precursor to making functional changes.
Current supported engines and the index versions:
| engines | issues | code |
| - | - | - |
| db | Just a wrapper for database queries, doesn't need version | - |
| bleve | The version of index is **2** | The version of index is **6**
|
| elasticsearch | The old index has no version, will be treated as
version **0** in this PR | The version of index is **1** |
| meilisearch | The old index has no version, will be treated as version
**0** in this PR | - |
## Changes
### Split
Splited it into mutiple packages
```text
indexer
├── internal
│ ├── bleve
│ ├── db
│ ├── elasticsearch
│ └── meilisearch
├── code
│ ├── bleve
│ ├── elasticsearch
│ └── internal
└── issues
├── bleve
├── db
├── elasticsearch
├── internal
└── meilisearch
```
- `indexer/interanal`: Internal shared package for indexer.
- `indexer/interanal/[engine]`: Internal shared package for each engine
(bleve/db/elasticsearch/meilisearch).
- `indexer/code`: Implementations for code indexer.
- `indexer/code/internal`: Internal shared package for code indexer.
- `indexer/code/[engine]`: Implementation via each engine for code
indexer.
- `indexer/issues`: Implementations for issues indexer.
### Deduplication
- Combine `Init/Ping/Close` for code indexer and issues indexer.
- ~Combine `issues.indexerHolder` and `code.wrappedIndexer` to
`internal.IndexHolder`.~ Remove it, use dummy indexer instead when the
indexer is not ready.
- Duplicate two copies of creating ES clients.
- Duplicate two copies of `indexerID()`.
### Enhancement
- [x] Support index version for elasticsearch issues indexer, the old
index without version will be treated as version 0.
- [x] Fix spell of `elastic_search/ElasticSearch`, it should be
`Elasticsearch`.
- [x] Improve versioning of ES index. We don't need `Aliases`:
- Gitea does't need aliases for "Zero Downtime" because it never delete
old indexes.
- The old code of issues indexer uses the orignal name to create issue
index, so it's tricky to convert it to an alias.
- [x] Support index version for meilisearch issues indexer, the old
index without version will be treated as version 0.
- [x] Do "ping" only when `Ping` has been called, don't ping
periodically and cache the status.
- [x] Support the context parameter whenever possible.
- [x] Fix outdated example config.
- [x] Give up the requeue logic of issues indexer: When indexing fails,
call Ping to check if it was caused by the engine being unavailable, and
only requeue the task if the engine is unavailable.
- It is fragile and tricky, could cause data losing (It did happen when
I was doing some tests for this PR). And it works for ES only.
- Just always requeue the failed task, if it caused by bad data, it's a
bug of Gitea which should be fixed.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-06-23 08:37:56 -04:00
|
|
|
"code.gitea.io/gitea/modules/indexer/code/internal"
|
2020-02-20 14:53:55 -05:00
|
|
|
"code.gitea.io/gitea/modules/timeutil"
|
2017-10-27 02:10:54 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
// Result a search result to display
|
|
|
|
type Result struct {
|
2024-03-10 11:35:30 -04:00
|
|
|
RepoID int64
|
|
|
|
Filename string
|
|
|
|
CommitID string
|
|
|
|
UpdatedUnix timeutil.TimeStamp
|
|
|
|
Language string
|
|
|
|
Color string
|
|
|
|
Lines []ResultLine
|
|
|
|
}
|
|
|
|
|
|
|
|
type ResultLine struct {
|
|
|
|
Num int
|
|
|
|
FormattedContent template.HTML
|
2017-10-27 02:10:54 -04:00
|
|
|
}
|
|
|
|
|
Refactor indexer (#25174)
Refactor `modules/indexer` to make it more maintainable. And it can be
easier to support more features. I'm trying to solve some of issue
searching, this is a precursor to making functional changes.
Current supported engines and the index versions:
| engines | issues | code |
| - | - | - |
| db | Just a wrapper for database queries, doesn't need version | - |
| bleve | The version of index is **2** | The version of index is **6**
|
| elasticsearch | The old index has no version, will be treated as
version **0** in this PR | The version of index is **1** |
| meilisearch | The old index has no version, will be treated as version
**0** in this PR | - |
## Changes
### Split
Splited it into mutiple packages
```text
indexer
├── internal
│ ├── bleve
│ ├── db
│ ├── elasticsearch
│ └── meilisearch
├── code
│ ├── bleve
│ ├── elasticsearch
│ └── internal
└── issues
├── bleve
├── db
├── elasticsearch
├── internal
└── meilisearch
```
- `indexer/interanal`: Internal shared package for indexer.
- `indexer/interanal/[engine]`: Internal shared package for each engine
(bleve/db/elasticsearch/meilisearch).
- `indexer/code`: Implementations for code indexer.
- `indexer/code/internal`: Internal shared package for code indexer.
- `indexer/code/[engine]`: Implementation via each engine for code
indexer.
- `indexer/issues`: Implementations for issues indexer.
### Deduplication
- Combine `Init/Ping/Close` for code indexer and issues indexer.
- ~Combine `issues.indexerHolder` and `code.wrappedIndexer` to
`internal.IndexHolder`.~ Remove it, use dummy indexer instead when the
indexer is not ready.
- Duplicate two copies of creating ES clients.
- Duplicate two copies of `indexerID()`.
### Enhancement
- [x] Support index version for elasticsearch issues indexer, the old
index without version will be treated as version 0.
- [x] Fix spell of `elastic_search/ElasticSearch`, it should be
`Elasticsearch`.
- [x] Improve versioning of ES index. We don't need `Aliases`:
- Gitea does't need aliases for "Zero Downtime" because it never delete
old indexes.
- The old code of issues indexer uses the orignal name to create issue
index, so it's tricky to convert it to an alias.
- [x] Support index version for meilisearch issues indexer, the old
index without version will be treated as version 0.
- [x] Do "ping" only when `Ping` has been called, don't ping
periodically and cache the status.
- [x] Support the context parameter whenever possible.
- [x] Fix outdated example config.
- [x] Give up the requeue logic of issues indexer: When indexing fails,
call Ping to check if it was caused by the engine being unavailable, and
only requeue the task if the engine is unavailable.
- It is fragile and tricky, could cause data losing (It did happen when
I was doing some tests for this PR). And it works for ES only.
- Just always requeue the failed task, if it caused by bad data, it's a
bug of Gitea which should be fixed.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-06-23 08:37:56 -04:00
|
|
|
type SearchResultLanguages = internal.SearchResultLanguages
|
|
|
|
|
2017-10-27 02:10:54 -04:00
|
|
|
func indices(content string, selectionStartIndex, selectionEndIndex int) (int, int) {
|
|
|
|
startIndex := selectionStartIndex
|
|
|
|
numLinesBefore := 0
|
|
|
|
for ; startIndex > 0; startIndex-- {
|
|
|
|
if content[startIndex-1] == '\n' {
|
|
|
|
if numLinesBefore == 1 {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
numLinesBefore++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
endIndex := selectionEndIndex
|
|
|
|
numLinesAfter := 0
|
|
|
|
for ; endIndex < len(content); endIndex++ {
|
|
|
|
if content[endIndex] == '\n' {
|
|
|
|
if numLinesAfter == 1 {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
numLinesAfter++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return startIndex, endIndex
|
|
|
|
}
|
|
|
|
|
|
|
|
func writeStrings(buf *bytes.Buffer, strs ...string) error {
|
|
|
|
for _, s := range strs {
|
|
|
|
_, err := buf.WriteString(s)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
Refactor indexer (#25174)
Refactor `modules/indexer` to make it more maintainable. And it can be
easier to support more features. I'm trying to solve some of issue
searching, this is a precursor to making functional changes.
Current supported engines and the index versions:
| engines | issues | code |
| - | - | - |
| db | Just a wrapper for database queries, doesn't need version | - |
| bleve | The version of index is **2** | The version of index is **6**
|
| elasticsearch | The old index has no version, will be treated as
version **0** in this PR | The version of index is **1** |
| meilisearch | The old index has no version, will be treated as version
**0** in this PR | - |
## Changes
### Split
Splited it into mutiple packages
```text
indexer
├── internal
│ ├── bleve
│ ├── db
│ ├── elasticsearch
│ └── meilisearch
├── code
│ ├── bleve
│ ├── elasticsearch
│ └── internal
└── issues
├── bleve
├── db
├── elasticsearch
├── internal
└── meilisearch
```
- `indexer/interanal`: Internal shared package for indexer.
- `indexer/interanal/[engine]`: Internal shared package for each engine
(bleve/db/elasticsearch/meilisearch).
- `indexer/code`: Implementations for code indexer.
- `indexer/code/internal`: Internal shared package for code indexer.
- `indexer/code/[engine]`: Implementation via each engine for code
indexer.
- `indexer/issues`: Implementations for issues indexer.
### Deduplication
- Combine `Init/Ping/Close` for code indexer and issues indexer.
- ~Combine `issues.indexerHolder` and `code.wrappedIndexer` to
`internal.IndexHolder`.~ Remove it, use dummy indexer instead when the
indexer is not ready.
- Duplicate two copies of creating ES clients.
- Duplicate two copies of `indexerID()`.
### Enhancement
- [x] Support index version for elasticsearch issues indexer, the old
index without version will be treated as version 0.
- [x] Fix spell of `elastic_search/ElasticSearch`, it should be
`Elasticsearch`.
- [x] Improve versioning of ES index. We don't need `Aliases`:
- Gitea does't need aliases for "Zero Downtime" because it never delete
old indexes.
- The old code of issues indexer uses the orignal name to create issue
index, so it's tricky to convert it to an alias.
- [x] Support index version for meilisearch issues indexer, the old
index without version will be treated as version 0.
- [x] Do "ping" only when `Ping` has been called, don't ping
periodically and cache the status.
- [x] Support the context parameter whenever possible.
- [x] Fix outdated example config.
- [x] Give up the requeue logic of issues indexer: When indexing fails,
call Ping to check if it was caused by the engine being unavailable, and
only requeue the task if the engine is unavailable.
- It is fragile and tricky, could cause data losing (It did happen when
I was doing some tests for this PR). And it works for ES only.
- Just always requeue the failed task, if it caused by bad data, it's a
bug of Gitea which should be fixed.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-06-23 08:37:56 -04:00
|
|
|
func searchResult(result *internal.SearchResult, startIndex, endIndex int) (*Result, error) {
|
2017-10-27 02:10:54 -04:00
|
|
|
startLineNum := 1 + strings.Count(result.Content[:startIndex], "\n")
|
|
|
|
|
|
|
|
var formattedLinesBuffer bytes.Buffer
|
|
|
|
|
|
|
|
contentLines := strings.SplitAfter(result.Content[startIndex:endIndex], "\n")
|
2024-03-10 11:35:30 -04:00
|
|
|
lines := make([]ResultLine, 0, len(contentLines))
|
2017-10-27 02:10:54 -04:00
|
|
|
index := startIndex
|
|
|
|
for i, line := range contentLines {
|
|
|
|
var err error
|
|
|
|
if index < result.EndIndex &&
|
|
|
|
result.StartIndex < index+len(line) &&
|
|
|
|
result.StartIndex < result.EndIndex {
|
2023-09-03 06:34:57 -04:00
|
|
|
openActiveIndex := max(result.StartIndex-index, 0)
|
|
|
|
closeActiveIndex := min(result.EndIndex-index, len(line))
|
2017-10-27 02:10:54 -04:00
|
|
|
err = writeStrings(&formattedLinesBuffer,
|
2020-06-30 17:34:03 -04:00
|
|
|
line[:openActiveIndex],
|
|
|
|
line[openActiveIndex:closeActiveIndex],
|
|
|
|
line[closeActiveIndex:],
|
2017-10-27 02:10:54 -04:00
|
|
|
)
|
|
|
|
} else {
|
|
|
|
err = writeStrings(&formattedLinesBuffer,
|
2020-06-30 17:34:03 -04:00
|
|
|
line,
|
2017-10-27 02:10:54 -04:00
|
|
|
)
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2024-03-10 11:35:30 -04:00
|
|
|
lines = append(lines, ResultLine{Num: startLineNum + i})
|
2017-10-27 02:10:54 -04:00
|
|
|
index += len(line)
|
|
|
|
}
|
2022-11-19 06:08:06 -05:00
|
|
|
|
2024-03-10 11:35:30 -04:00
|
|
|
// we should highlight the whole code block first, otherwise it doesn't work well with multiple line highlighting
|
|
|
|
hl, _ := highlight.Code(result.Filename, "", formattedLinesBuffer.String())
|
|
|
|
highlightedLines := strings.Split(string(hl), "\n")
|
|
|
|
|
|
|
|
// The lines outputted by highlight.Code might not match the original lines, because "highlight" removes the last `\n`
|
|
|
|
lines = lines[:min(len(highlightedLines), len(lines))]
|
|
|
|
highlightedLines = highlightedLines[:len(lines)]
|
|
|
|
for i := 0; i < len(lines); i++ {
|
|
|
|
lines[i].FormattedContent = template.HTML(highlightedLines[i])
|
|
|
|
}
|
2022-11-19 06:08:06 -05:00
|
|
|
|
2017-10-27 02:10:54 -04:00
|
|
|
return &Result{
|
2024-03-10 11:35:30 -04:00
|
|
|
RepoID: result.RepoID,
|
|
|
|
Filename: result.Filename,
|
|
|
|
CommitID: result.CommitID,
|
|
|
|
UpdatedUnix: result.UpdatedUnix,
|
|
|
|
Language: result.Language,
|
|
|
|
Color: result.Color,
|
|
|
|
Lines: lines,
|
2017-10-27 02:10:54 -04:00
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// PerformSearch perform a search on a repository
|
Refactor indexer (#25174)
Refactor `modules/indexer` to make it more maintainable. And it can be
easier to support more features. I'm trying to solve some of issue
searching, this is a precursor to making functional changes.
Current supported engines and the index versions:
| engines | issues | code |
| - | - | - |
| db | Just a wrapper for database queries, doesn't need version | - |
| bleve | The version of index is **2** | The version of index is **6**
|
| elasticsearch | The old index has no version, will be treated as
version **0** in this PR | The version of index is **1** |
| meilisearch | The old index has no version, will be treated as version
**0** in this PR | - |
## Changes
### Split
Splited it into mutiple packages
```text
indexer
├── internal
│ ├── bleve
│ ├── db
│ ├── elasticsearch
│ └── meilisearch
├── code
│ ├── bleve
│ ├── elasticsearch
│ └── internal
└── issues
├── bleve
├── db
├── elasticsearch
├── internal
└── meilisearch
```
- `indexer/interanal`: Internal shared package for indexer.
- `indexer/interanal/[engine]`: Internal shared package for each engine
(bleve/db/elasticsearch/meilisearch).
- `indexer/code`: Implementations for code indexer.
- `indexer/code/internal`: Internal shared package for code indexer.
- `indexer/code/[engine]`: Implementation via each engine for code
indexer.
- `indexer/issues`: Implementations for issues indexer.
### Deduplication
- Combine `Init/Ping/Close` for code indexer and issues indexer.
- ~Combine `issues.indexerHolder` and `code.wrappedIndexer` to
`internal.IndexHolder`.~ Remove it, use dummy indexer instead when the
indexer is not ready.
- Duplicate two copies of creating ES clients.
- Duplicate two copies of `indexerID()`.
### Enhancement
- [x] Support index version for elasticsearch issues indexer, the old
index without version will be treated as version 0.
- [x] Fix spell of `elastic_search/ElasticSearch`, it should be
`Elasticsearch`.
- [x] Improve versioning of ES index. We don't need `Aliases`:
- Gitea does't need aliases for "Zero Downtime" because it never delete
old indexes.
- The old code of issues indexer uses the orignal name to create issue
index, so it's tricky to convert it to an alias.
- [x] Support index version for meilisearch issues indexer, the old
index without version will be treated as version 0.
- [x] Do "ping" only when `Ping` has been called, don't ping
periodically and cache the status.
- [x] Support the context parameter whenever possible.
- [x] Fix outdated example config.
- [x] Give up the requeue logic of issues indexer: When indexing fails,
call Ping to check if it was caused by the engine being unavailable, and
only requeue the task if the engine is unavailable.
- It is fragile and tricky, could cause data losing (It did happen when
I was doing some tests for this PR). And it works for ES only.
- Just always requeue the failed task, if it caused by bad data, it's a
bug of Gitea which should be fixed.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-06-23 08:37:56 -04:00
|
|
|
func PerformSearch(ctx context.Context, repoIDs []int64, language, keyword string, page, pageSize int, isMatch bool) (int, []*Result, []*internal.SearchResultLanguages, error) {
|
2017-10-27 02:10:54 -04:00
|
|
|
if len(keyword) == 0 {
|
2020-02-20 14:53:55 -05:00
|
|
|
return 0, nil, nil, nil
|
2017-10-27 02:10:54 -04:00
|
|
|
}
|
|
|
|
|
Refactor indexer (#25174)
Refactor `modules/indexer` to make it more maintainable. And it can be
easier to support more features. I'm trying to solve some of issue
searching, this is a precursor to making functional changes.
Current supported engines and the index versions:
| engines | issues | code |
| - | - | - |
| db | Just a wrapper for database queries, doesn't need version | - |
| bleve | The version of index is **2** | The version of index is **6**
|
| elasticsearch | The old index has no version, will be treated as
version **0** in this PR | The version of index is **1** |
| meilisearch | The old index has no version, will be treated as version
**0** in this PR | - |
## Changes
### Split
Splited it into mutiple packages
```text
indexer
├── internal
│ ├── bleve
│ ├── db
│ ├── elasticsearch
│ └── meilisearch
├── code
│ ├── bleve
│ ├── elasticsearch
│ └── internal
└── issues
├── bleve
├── db
├── elasticsearch
├── internal
└── meilisearch
```
- `indexer/interanal`: Internal shared package for indexer.
- `indexer/interanal/[engine]`: Internal shared package for each engine
(bleve/db/elasticsearch/meilisearch).
- `indexer/code`: Implementations for code indexer.
- `indexer/code/internal`: Internal shared package for code indexer.
- `indexer/code/[engine]`: Implementation via each engine for code
indexer.
- `indexer/issues`: Implementations for issues indexer.
### Deduplication
- Combine `Init/Ping/Close` for code indexer and issues indexer.
- ~Combine `issues.indexerHolder` and `code.wrappedIndexer` to
`internal.IndexHolder`.~ Remove it, use dummy indexer instead when the
indexer is not ready.
- Duplicate two copies of creating ES clients.
- Duplicate two copies of `indexerID()`.
### Enhancement
- [x] Support index version for elasticsearch issues indexer, the old
index without version will be treated as version 0.
- [x] Fix spell of `elastic_search/ElasticSearch`, it should be
`Elasticsearch`.
- [x] Improve versioning of ES index. We don't need `Aliases`:
- Gitea does't need aliases for "Zero Downtime" because it never delete
old indexes.
- The old code of issues indexer uses the orignal name to create issue
index, so it's tricky to convert it to an alias.
- [x] Support index version for meilisearch issues indexer, the old
index without version will be treated as version 0.
- [x] Do "ping" only when `Ping` has been called, don't ping
periodically and cache the status.
- [x] Support the context parameter whenever possible.
- [x] Fix outdated example config.
- [x] Give up the requeue logic of issues indexer: When indexing fails,
call Ping to check if it was caused by the engine being unavailable, and
only requeue the task if the engine is unavailable.
- It is fragile and tricky, could cause data losing (It did happen when
I was doing some tests for this PR). And it works for ES only.
- Just always requeue the failed task, if it caused by bad data, it's a
bug of Gitea which should be fixed.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-06-23 08:37:56 -04:00
|
|
|
total, results, resultLanguages, err := (*globalIndexer.Load()).Search(ctx, repoIDs, language, keyword, page, pageSize, isMatch)
|
2017-10-27 02:10:54 -04:00
|
|
|
if err != nil {
|
2020-02-20 14:53:55 -05:00
|
|
|
return 0, nil, nil, err
|
2017-10-27 02:10:54 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
displayResults := make([]*Result, len(results))
|
|
|
|
|
|
|
|
for i, result := range results {
|
|
|
|
startIndex, endIndex := indices(result.Content, result.StartIndex, result.EndIndex)
|
|
|
|
displayResults[i], err = searchResult(result, startIndex, endIndex)
|
|
|
|
if err != nil {
|
2020-02-20 14:53:55 -05:00
|
|
|
return 0, nil, nil, err
|
2017-10-27 02:10:54 -04:00
|
|
|
}
|
|
|
|
}
|
2020-02-20 14:53:55 -05:00
|
|
|
return int(total), displayResults, resultLanguages, nil
|
2017-10-27 02:10:54 -04:00
|
|
|
}
|