feat(search): use `FULLTEXT` index (close #2716 pr #2726)

pull/2727/head
BoYanZh 2022-12-16 16:51:36 +08:00 committed by GitHub
parent 5a6b600ace
commit b3be9ef428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 7 deletions

View File

@ -42,6 +42,7 @@ func InitDB() {
var err error var err error
if flags.Dev { if flags.Dev {
dB, err = gorm.Open(sqlite.Open("file::memory:?cache=shared"), gormConfig) dB, err = gorm.Open(sqlite.Open("file::memory:?cache=shared"), gormConfig)
conf.Conf.Database.Type = "sqlite3"
} else { } else {
database := conf.Conf.Database database := conf.Conf.Database
switch database.Type { switch database.Type {

View File

@ -1,6 +1,7 @@
package db package db
import ( import (
"fmt"
"log" "log"
"github.com/alist-org/alist/v3/internal/conf" "github.com/alist-org/alist/v3/internal/conf"
@ -12,7 +13,21 @@ var db *gorm.DB
func Init(d *gorm.DB) { func Init(d *gorm.DB) {
db = d db = d
err := AutoMigrate(new(model.Storage), new(model.User), new(model.Meta), new(model.SettingItem), new(model.SearchNode)) var err error
switch conf.Conf.Database.Type {
case "sqlite3":
err = AutoMigrate(new(model.Storage), new(model.User), new(model.Meta), new(model.SettingItem), new(model.SearchNode))
case "mysql":
err = AutoMigrate(new(model.Storage), new(model.User), new(model.Meta), new(model.SettingItem), new(model.SearchNodeMySQL))
case "postgres":
err = AutoMigrate(new(model.Storage), new(model.User), new(model.Meta), new(model.SettingItem), new(model.SearchNode))
if err == nil {
db.Exec("CREATE EXTENSION pg_trgm;")
db.Exec("CREATE EXTENSION btree_gin;")
tableName := fmt.Sprintf("%ssearch_nodes", conf.Conf.Database.TablePrefix)
db.Exec(fmt.Sprintf("CREATE INDEX idx_%s_name ON %s USING GIN (name);", tableName, tableName))
}
}
if err != nil { if err != nil {
log.Fatalf("failed migrate database: %s", err.Error()) log.Fatalf("failed migrate database: %s", err.Error())
} }

View File

@ -5,6 +5,7 @@ import (
"path" "path"
"strings" "strings"
"github.com/alist-org/alist/v3/internal/conf"
"github.com/alist-org/alist/v3/internal/model" "github.com/alist-org/alist/v3/internal/model"
"github.com/alist-org/alist/v3/pkg/utils" "github.com/alist-org/alist/v3/pkg/utils"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -53,13 +54,21 @@ func GetSearchNodesByParent(parent string) ([]model.SearchNode, error) {
} }
func SearchNode(req model.SearchReq) ([]model.SearchNode, int64, error) { func SearchNode(req model.SearchReq) ([]model.SearchNode, int64, error) {
var searchDB *gorm.DB
switch conf.Conf.Database.Type {
case "sqlite3":
keywordsClause := db.Where("1 = 1") keywordsClause := db.Where("1 = 1")
for _, keyword := range strings.Split(req.Keywords, " ") { for _, keyword := range strings.Split(req.Keywords, " ") {
keywordsClause = keywordsClause.Where( keywordsClause = keywordsClause.Where("name LIKE ?", fmt.Sprintf("%%%s%%", keyword))
fmt.Sprintf("%s LIKE ?", columnName("name")), }
fmt.Sprintf("%%%s%%", keyword)) searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).Where(keywordsClause)
case "mysql":
searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
Where("MATCH (name) AGAINST (? IN NATURAL LANGUAGE MODE)", req.Keywords)
case "postgres":
searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
Where("to_tsvector(name) @@ to_tsquery(?)", req.Keywords)
} }
searchDB := db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).Where(keywordsClause)
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")

View File

@ -18,6 +18,13 @@ type SearchReq struct {
PageReq PageReq
} }
type SearchNodeMySQL struct {
Parent string `json:"parent" gorm:"index"`
Name string `json:"name" gorm:"index:,class:FULLTEXT"`
IsDir bool `json:"is_dir"`
Size int64 `json:"size"`
}
type SearchNode struct { type SearchNode struct {
Parent string `json:"parent" gorm:"index"` Parent string `json:"parent" gorm:"index"`
Name string `json:"name"` Name string `json:"name"`