mirror of https://github.com/Xhofe/alist
feat: add database non full text index (close #2916)
parent
1c453ae147
commit
7902b646ff
|
@ -143,7 +143,7 @@ func InitialSettings() []model.SettingItem {
|
||||||
|
|
||||||
// single settings
|
// single settings
|
||||||
{Key: conf.Token, Value: token, Type: conf.TypeString, Group: model.SINGLE, Flag: model.PRIVATE},
|
{Key: conf.Token, Value: token, Type: conf.TypeString, Group: model.SINGLE, Flag: model.PRIVATE},
|
||||||
{Key: conf.SearchIndex, Value: "none", Type: conf.TypeSelect, Options: "database,bleve,none", Group: model.INDEX},
|
{Key: conf.SearchIndex, Value: "none", Type: conf.TypeSelect, Options: "database,database_non_full_text,bleve,none", Group: model.INDEX},
|
||||||
{Key: conf.AutoUpdateIndex, Value: "false", Type: conf.TypeBool, Group: model.INDEX},
|
{Key: conf.AutoUpdateIndex, Value: "false", Type: conf.TypeBool, Group: model.INDEX},
|
||||||
{Key: conf.IgnorePaths, Value: "", Type: conf.TypeText, Group: model.INDEX, Flag: model.PRIVATE, Help: `one path per line`},
|
{Key: conf.IgnorePaths, Value: "", Type: conf.TypeText, Group: model.INDEX, Flag: model.PRIVATE, Help: `one path per line`},
|
||||||
{Key: conf.IndexProgress, Value: "{}", Type: conf.TypeText, Group: model.SINGLE, Flag: model.PRIVATE},
|
{Key: conf.IndexProgress, Value: "{}", Type: conf.TypeText, Group: model.SINGLE, Flag: model.PRIVATE},
|
||||||
|
|
|
@ -54,15 +54,16 @@ func GetSearchNodesByParent(parent string) ([]model.SearchNode, error) {
|
||||||
return nodes, nil
|
return nodes, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func SearchNode(req model.SearchReq) ([]model.SearchNode, int64, error) {
|
func SearchNode(req model.SearchReq, useFullText bool) ([]model.SearchNode, int64, error) {
|
||||||
var searchDB *gorm.DB
|
var searchDB *gorm.DB
|
||||||
switch conf.Conf.Database.Type {
|
if !useFullText || conf.Conf.Database.Type == "sqlite3" {
|
||||||
case "sqlite3":
|
|
||||||
keywordsClause := db.Where("1 = 1")
|
keywordsClause := db.Where("1 = 1")
|
||||||
for _, keyword := range strings.Fields(req.Keywords) {
|
for _, keyword := range strings.Fields(req.Keywords) {
|
||||||
keywordsClause = keywordsClause.Where("name LIKE ?", fmt.Sprintf("%%%s%%", keyword))
|
keywordsClause = keywordsClause.Where("name LIKE ?", fmt.Sprintf("%%%s%%", keyword))
|
||||||
}
|
}
|
||||||
searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).Where(keywordsClause)
|
searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).Where(keywordsClause)
|
||||||
|
} else {
|
||||||
|
switch conf.Conf.Database.Type {
|
||||||
case "mysql":
|
case "mysql":
|
||||||
searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
|
searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
|
||||||
Where("MATCH (name) AGAINST (? IN BOOLEAN MODE)", "'*"+req.Keywords+"*'")
|
Where("MATCH (name) AGAINST (? IN BOOLEAN MODE)", "'*"+req.Keywords+"*'")
|
||||||
|
@ -70,6 +71,7 @@ func SearchNode(req model.SearchReq) ([]model.SearchNode, int64, error) {
|
||||||
searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
|
searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
|
||||||
Where("to_tsvector(name) @@ to_tsquery(?)", strings.Join(strings.Fields(req.Keywords), " & "))
|
Where("to_tsvector(name) @@ to_tsquery(?)", strings.Join(strings.Fields(req.Keywords), " & "))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
var count int64
|
var count int64
|
||||||
if err := searchDB.Count(&count).Error; err != nil {
|
if err := searchDB.Count(&count).Error; err != nil {
|
||||||
return nil, 0, errors.Wrapf(err, "failed get users count")
|
return nil, 0, errors.Wrapf(err, "failed get users count")
|
||||||
|
|
|
@ -15,7 +15,7 @@ func (D DB) Config() searcher.Config {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (D DB) Search(ctx context.Context, req model.SearchReq) ([]model.SearchNode, int64, error) {
|
func (D DB) Search(ctx context.Context, req model.SearchReq) ([]model.SearchNode, int64, error) {
|
||||||
return db.SearchNode(req)
|
return db.SearchNode(req, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (D DB) Index(ctx context.Context, node model.SearchNode) error {
|
func (D DB) Index(ctx context.Context, node model.SearchNode) error {
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/alist-org/alist/v3/internal/search/searcher"
|
||||||
|
)
|
||||||
|
|
||||||
|
var config = searcher.Config{
|
||||||
|
Name: "database_non_full_text",
|
||||||
|
AutoUpdate: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
searcher.RegisterSearcher(config, func() (searcher.Searcher, error) {
|
||||||
|
return &DB{}, nil
|
||||||
|
})
|
||||||
|
}
|
|
@ -0,0 +1,45 @@
|
||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/db"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/internal/search/searcher"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DB struct{}
|
||||||
|
|
||||||
|
func (D DB) Config() searcher.Config {
|
||||||
|
return config
|
||||||
|
}
|
||||||
|
|
||||||
|
func (D DB) Search(ctx context.Context, req model.SearchReq) ([]model.SearchNode, int64, error) {
|
||||||
|
return db.SearchNode(req, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (D DB) Index(ctx context.Context, node model.SearchNode) error {
|
||||||
|
return db.CreateSearchNode(&node)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (D DB) BatchIndex(ctx context.Context, nodes []model.SearchNode) error {
|
||||||
|
return db.BatchCreateSearchNodes(&nodes)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (D DB) Get(ctx context.Context, parent string) ([]model.SearchNode, error) {
|
||||||
|
return db.GetSearchNodesByParent(parent)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (D DB) Del(ctx context.Context, prefix string) error {
|
||||||
|
return db.DeleteSearchNodesByParent(prefix)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (D DB) Release(ctx context.Context) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (D DB) Clear(ctx context.Context) error {
|
||||||
|
return db.ClearSearchNodes()
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ searcher.Searcher = (*DB)(nil)
|
Loading…
Reference in New Issue